Permalink
Browse files

Merge from mozilla-inbound to mozilla-central

  • Loading branch information...
2 parents 629521d + daf9b5a commit e1fb2d3d3b71f5a65537334560c05a08130e1367 @mbrubeck mbrubeck committed Dec 27, 2011
Showing with 3,437 additions and 448 deletions.
  1. +2 −2 browser/base/content/test/browser_save_video.js
  2. +0 −1 browser/installer/package-manifest.in
  3. +7 −0 config/rules.mk
  4. +5 −2 content/html/content/test/test_bug500885.html
  5. +2 −1 content/html/content/test/test_bug592802.html
  6. +32 −0 content/svg/content/src/nsSVGElement.cpp
  7. +1 −0 content/svg/content/src/nsSVGElement.h
  8. +3 −0 content/svg/content/src/nsSVGLength2.h
  9. +14 −0 content/svg/content/src/nsSVGSVGElement.cpp
  10. +8 −1 dom/workers/WorkerPrivate.cpp
  11. +6 −0 dom/workers/WorkerScope.cpp
  12. +20 −7 gfx/skia/Makefile.in
  13. +7 −0 js/src/config/rules.mk
  14. +2 −2 layout/forms/test/test_bug36619.html
  15. +2 −2 layout/forms/test/test_bug377624.html
  16. +2 −2 layout/forms/test/test_bug536567.html
  17. +1 −0 layout/media/symbols.def.in
  18. +38 −0 layout/reftests/bugs/531200-1-ref.html
  19. +38 −0 layout/reftests/bugs/531200-1.html
  20. +13 −0 layout/reftests/bugs/711359-1-ref.html
  21. +32 −0 layout/reftests/bugs/711359-1.html
  22. +31 −0 layout/reftests/bugs/712849-1-ref.html
  23. +39 −0 layout/reftests/bugs/712849-1.html
  24. +3 −0 layout/reftests/bugs/reftest.list
  25. +0 −52 layout/reftests/svg/sizing/dynamic--inline-resize-cb-height.xhtml
  26. +0 −52 layout/reftests/svg/sizing/dynamic--inline-resize-cb-width.xhtml
  27. +0 −4 layout/reftests/svg/sizing/reftest.list
  28. +16 −1 layout/style/viewsource.css
  29. +1 −1 layout/svg/crashtests/crashtests.list
  30. +10 −4 layout/tables/nsCellMap.cpp
  31. +9 −21 layout/tables/nsTableRowFrame.cpp
  32. +5 −0 layout/tables/nsTableRowGroupFrame.cpp
  33. +1 −1 memory/mozutils/mozutils.def.in
  34. +45 −19 mobile/android/base/AwesomeBar.java
  35. +1 −1 mobile/android/base/GeckoPreferences.java
  36. +1 −1 mobile/android/base/Tabs.java
  37. +2 −0 mobile/android/base/ui/PanZoomController.java
  38. +2 −1 mobile/android/chrome/content/about.xhtml
  39. +9 −7 mobile/android/chrome/content/browser.js
  40. +5 −11 mobile/android/locales/en-US/chrome/about.dtd
  41. +1 −1 mobile/android/themes/core/aboutPage.css
  42. +27 −24 parser/htmlparser/tests/reftest/bug482921-1-ref.html
  43. +28 −25 parser/htmlparser/tests/reftest/bug482921-2-ref.html
  44. +17 −13 parser/htmlparser/tests/reftest/bug535530-2-ref.html
  45. +4 −1 parser/htmlparser/tests/reftest/bug704667-1-ref.html
  46. +40 −9 testing/mochitest/MockFilePicker.jsm
  47. +7 −4 testing/mozbase/README
  48. +9 −0 testing/mozbase/docs.manifest
  49. +5 −5 testing/mozbase/manifestdestiny/README.md
  50. +8 −2 testing/mozbase/mozinstall/mozinstall/mozinstall.py
  51. +18 −6 testing/mozbase/mozprocess/mozprocess/processhandler.py
  52. +1 −1 testing/mozbase/mozprocess/mozprocess/winprocess.py
  53. +2 −2 testing/mozbase/mozprocess/setup.py
  54. +57 −0 testing/mozbase/mozprocess/tests/Makefile
  55. +6 −0 testing/mozbase/mozprocess/tests/iniparser/AUTHORS
  56. +15 −0 testing/mozbase/mozprocess/tests/iniparser/INSTALL
  57. +21 −0 testing/mozbase/mozprocess/tests/iniparser/LICENSE
  58. +118 −0 testing/mozbase/mozprocess/tests/iniparser/Makefile
  59. +12 −0 testing/mozbase/mozprocess/tests/iniparser/README
  60. +407 −0 testing/mozbase/mozprocess/tests/iniparser/dictionary.c
  61. +176 −0 testing/mozbase/mozprocess/tests/iniparser/dictionary.h
  62. +648 −0 testing/mozbase/mozprocess/tests/iniparser/iniparser.c
  63. +273 −0 testing/mozbase/mozprocess/tests/iniparser/iniparser.h
  64. +2 −0 testing/mozbase/mozprocess/tests/manifest.ini
  65. +187 −0 testing/mozbase/mozprocess/tests/mozprocess1.py
  66. +177 −0 testing/mozbase/mozprocess/tests/mozprocess2.py
  67. +11 −0 testing/mozbase/mozprocess/tests/process_normal_finish.ini
  68. +11 −0 testing/mozbase/mozprocess/tests/process_waittimeout.ini
  69. +8 −0 testing/mozbase/mozprocess/tests/process_waittimeout_10s.ini
  70. +189 −0 testing/mozbase/mozprocess/tests/proclaunch.c
  71. +64 −3 testing/mozbase/mozprofile/README.md
  72. +1 −1 testing/mozbase/mozprofile/mozprofile/addons.py
  73. +10 −2 testing/mozbase/mozprofile/mozprofile/profile.py
  74. +146 −0 testing/mozbase/mozprofile/tests/addonid.py
  75. +3 −0 testing/mozbase/mozprofile/tests/manifest.ini
  76. +65 −0 testing/mozbase/mozprofile/tests/server_locations.py
  77. +141 −0 testing/mozbase/mozprofile/tests/testprofile.py
  78. +28 −125 testing/mozbase/mozrunner/mozrunner/runner.py
  79. +1 −1 testing/mozbase/mozrunner/setup.py
  80. +5 −0 testing/mozbase/test-manifest.ini
  81. +62 −0 testing/mozbase/test.py
  82. +2 −2 toolkit/content/tests/browser/browser_save_resend_postdata.js
  83. +2 −2 toolkit/mozapps/downloads/tests/unit/test_privatebrowsing_downloadLastDir.js
  84. +2 −2 toolkit/mozapps/extensions/test/browser/browser_bug567127.js
  85. +2 −2 toolkit/mozapps/extensions/test/browser/browser_inlinesettings.js
  86. +0 −1 tools/profiler/sps/platform-linux.cc
  87. +0 −1 tools/profiler/sps/platform-macos.cc
  88. +0 −1 tools/profiler/sps/platform-win32.cc
  89. +2 −11 tools/profiler/sps/platform.h
  90. +1 −5 tools/profiler/sps/v8-support.h
@@ -2,7 +2,7 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
var MockFilePicker = SpecialPowers.MockFilePicker;
-MockFilePicker.reset();
+MockFilePicker.init();
/**
* TestCase for bug 564387
@@ -54,7 +54,7 @@ function test() {
registerCleanupFunction(function () {
mockTransferRegisterer.unregister();
- MockFilePicker.reset();
+ MockFilePicker.cleanup();
destDir.remove(true);
});
@@ -14,7 +14,6 @@
; Mac bundle stuff
@APPNAME@/Contents/Info.plist
@APPNAME@/Contents/PkgInfo
-@APPNAME@/Contents/Plug-Ins/
@APPNAME@/Contents/Resources/
#endif
View
@@ -373,6 +373,13 @@ ifdef MAPFILE
OS_LDFLAGS += -MAP:$(MAPFILE)
endif
+else #!GNU_CC
+
+ifdef DEFFILE
+OS_LDFLAGS += $(call normalizepath,$(DEFFILE))
+EXTRA_DEPS += $(DEFFILE)
+endif
+
endif # !GNU_CC
endif # WINNT
@@ -18,7 +18,7 @@
<script type="text/javascript">
var MockFilePicker = SpecialPowers.MockFilePicker;
-MockFilePicker.reset();
+MockFilePicker.init();
MockFilePicker.returnValue = MockFilePicker.returnOK;
function test() {
@@ -47,7 +47,10 @@
is(domActivateEvents, 1, "click on button should fire 1 DOMActivate event");
} finally {
- SimpleTest.executeSoon(SimpleTest.finish);
+ SimpleTest.executeSoon(function() {
+ MockFilePicker.cleanup();
+ SimpleTest.finish();
+ });
}
}
@@ -26,7 +26,7 @@
SimpleTest.waitForExplicitFinish();
var MockFilePicker = SpecialPowers.MockFilePicker;
-MockFilePicker.reset();
+MockFilePicker.init();
var testData = [
/* visibility | display | multiple */
@@ -43,6 +43,7 @@
function finished()
{
+ MockFilePicker.cleanup();
SimpleTest.finish();
}
@@ -1112,6 +1112,24 @@ nsSVGElement::UpdateContentStyleRule()
if (!attrName->IsAtom() || !IsAttributeMapped(attrName->Atom()))
continue;
+ if (Tag() == nsGkAtoms::svg) {
+ // Special case: we don't want <svg> 'width'/'height' mapped into style
+ // if the attribute value isn't a valid <length> according to SVG (which
+ // only supports a subset of the CSS <length> values). We don't enforce
+ // this by checking the attribute value in nsSVGSVGElement::
+ // IsAttributeMapped since we don't want that method to depend on the
+ // value of the attribute that is being checked. Rather we just prevent
+ // the actual mapping here, as necessary.
+ if (attrName->Atom() == nsGkAtoms::width &&
+ !GetAnimatedLength(nsGkAtoms::width)->HasBaseVal()) {
+ continue;
+ }
+ if (attrName->Atom() == nsGkAtoms::height &&
+ !GetAnimatedLength(nsGkAtoms::height)->HasBaseVal()) {
+ continue;
+ }
+ }
+
nsAutoString value;
mAttrsAndChildren.AttrAt(i)->ToString(value);
mappedAttrParser.ParseMappedAttrValue(attrName->Atom(), value);
@@ -1314,6 +1332,20 @@ nsSVGElement::DidAnimateLength(PRUint8 aAttrEnum)
}
}
+nsSVGLength2*
+nsSVGElement::GetAnimatedLength(const nsIAtom *aAttrName)
+{
+ LengthAttributesInfo lengthInfo = GetLengthInfo();
+
+ for (PRUint32 i = 0; i < lengthInfo.mLengthCount; i++) {
+ if (aAttrName == *lengthInfo.mLengthInfo[i].mName) {
+ return &lengthInfo.mLengths[i];
+ }
+ }
+ NS_ABORT_IF_FALSE(false, "no matching length found");
+ return nsnull;
+}
+
void
nsSVGElement::GetAnimatedLengthValues(float *aFirst, ...)
{
@@ -195,6 +195,7 @@ class nsSVGElement : public nsSVGElementBase // nsIContent
virtual void DidAnimateTransformList();
virtual void DidAnimateString(PRUint8 aAttrEnum);
+ nsSVGLength2* GetAnimatedLength(const nsIAtom *aAttrName);
void GetAnimatedLengthValues(float *aFirst, ...);
void GetAnimatedNumberValues(float *aFirst, ...);
void GetAnimatedIntegerValues(PRInt32 *aFirst, ...);
@@ -100,6 +100,9 @@ class nsSVGLength2
float GetAnimValue(nsSVGSVGElement* aCtx) const
{ return mAnimVal / GetUnitScaleFactor(aCtx, mSpecifiedUnitType); }
+ bool HasBaseVal() const {
+ return mIsBaseSet;
+ }
// Returns true if the animated value of this length has been explicitly
// set (either by animation, or by taking on the base value which has been
// explicitly set by markup or a DOM call), false otherwise.
@@ -883,6 +883,20 @@ nsSVGSVGElement::GetTimedDocumentRoot()
NS_IMETHODIMP_(bool)
nsSVGSVGElement::IsAttributeMapped(const nsIAtom* name) const
{
+ // We want to map the 'width' and 'height' attributes into style for
+ // outer-<svg>, except when the attributes aren't set (since their default
+ // values of '100%' can cause unexpected and undesirable behaviour for SVG
+ // inline in HTML). We rely on nsSVGElement::UpdateContentStyleRule() to
+ // prevent mapping of the default values into style (it only maps attributes
+ // that are set). We also rely on a check in nsSVGElement::
+ // UpdateContentStyleRule() to prevent us mapping the attributes when they're
+ // given a <length> value that is not currently recognized by the SVG
+ // specification.
+
+ if (!IsInner() && (name == nsGkAtoms::width || name == nsGkAtoms::height)) {
+ return true;
+ }
+
static const MappedAttributeEntry* const map[] = {
sColorMap,
sFEFloodMap,
@@ -79,6 +79,9 @@
#include "Worker.h"
#include "WorkerFeature.h"
#include "WorkerScope.h"
+#ifdef ANDROID
+#include <android/log.h>
+#endif
#include "WorkerInlines.h"
@@ -1149,7 +1152,11 @@ class ReportErrorRunnable : public WorkerRunnable
}
if (!logged) {
- fputs(NS_ConvertUTF16toUTF8(aMessage).get(), stderr);
+ NS_ConvertUTF16toUTF8 msg(aMessage);
+#ifdef ANDROID
+ __android_log_print(ANDROID_LOG_INFO, "Gecko", msg.get());
+#endif
+ fputs(msg.get(), stderr);
fflush(stderr);
}
@@ -61,6 +61,9 @@
#include "Worker.h"
#include "WorkerPrivate.h"
#include "XMLHttpRequest.h"
+#ifdef ANDROID
+#include <android/log.h>
+#endif
#include "WorkerInlines.h"
@@ -517,6 +520,9 @@ class WorkerGlobalScope : public events::EventTarget
return false;
}
+#ifdef ANDROID
+ __android_log_print(ANDROID_LOG_INFO, "Gecko", buffer.ptr());
+#endif
fputs(buffer.ptr(), stderr);
fflush(stderr);
}
View
@@ -302,22 +302,15 @@ EXPORTS_skia += \
$(NULL)
CPPSRCS += \
SkFontHost_mac_coretext.cpp \
- SkBitmapProcState_opts_SSE2.cpp \
- SkBlitRow_opts_SSE2.cpp \
- SkUtils_opts_SSE2.cpp \
- opts_check_SSE2.cpp \
SkTime_Unix.cpp \
$(NULL)
endif
ifeq (android,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS += \
- SkBitmapProcState_opts_arm.cpp \
- SkBlitRow_opts_arm.cpp \
SkFontHost_FreeType.cpp \
SkFontHost_android.cpp \
SkFontHost_gamma.cpp \
- SkUtils_opts_none.cpp \
SkMMapStream.cpp \
SkTime_Unix.cpp \
$(NULL)
@@ -334,11 +327,31 @@ EXPORTS_skia += \
CPPSRCS += \
SkFontHost_win.cpp \
SkTime_win.cpp \
+ $(NULL)
+endif
+
+ifneq (,$(INTEL_ARCHITECTURE))
+CPPSRCS += \
SkBitmapProcState_opts_SSE2.cpp \
SkBlitRow_opts_SSE2.cpp \
SkUtils_opts_SSE2.cpp \
opts_check_SSE2.cpp \
$(NULL)
+else
+ifeq ($(CPU_ARCH)_$(GNU_CC),arm_1)
+CPPSRCS += \
+ SkBitmapProcState_opts_arm.cpp \
+ SkBlitRow_opts_arm.cpp \
+ opts_check_arm.cpp \
+ $(NULL)
+SSRCS += memset.arm.S
+else
+CPPSRCS += \
+ SkBitmapProcState_opts_none.cpp \
+ SkBlitRow_opts_none.cpp \
+ SkUtils_opts_none.cpp \
+ $(NULL)
+endif
endif
include $(topsrcdir)/config/rules.mk
@@ -373,6 +373,13 @@ ifdef MAPFILE
OS_LDFLAGS += -MAP:$(MAPFILE)
endif
+else #!GNU_CC
+
+ifdef DEFFILE
+OS_LDFLAGS += $(call normalizepath,$(DEFFILE))
+EXTRA_DEPS += $(DEFFILE)
+endif
+
endif # !GNU_CC
endif # WINNT
@@ -24,7 +24,7 @@
SimpleTest.waitForExplicitFinish();
var MockFilePicker = SpecialPowers.MockFilePicker;
-MockFilePicker.reset();
+MockFilePicker.init();
// enable popups the first time
SpecialPowers.pushPrefEnv({'set': [
@@ -45,7 +45,7 @@
document.getElementById("a").click();
SimpleTest.executeSoon(function() {
ok(!MockFilePicker.shown, "File picker show method should not have been called");
- MockFilePicker.reset();
+ MockFilePicker.cleanup();
SimpleTest.finish();
});
@@ -33,7 +33,7 @@
SimpleTest.waitForExplicitFinish();
var MockFilePicker = SpecialPowers.MockFilePicker;
-MockFilePicker.reset();
+MockFilePicker.init();
var testData = [["a", MockFilePicker.filterImages, 1],
["b", MockFilePicker.filterAudio, 1],
@@ -88,7 +88,7 @@
"File picker should show the correct filter index");
if (++currentTest == testData.length) {
- MockFilePicker.reset();
+ MockFilePicker.cleanup();
SimpleTest.finish();
} else {
launchNextTest();
@@ -24,7 +24,7 @@
const Cm = Components.manager;
var MockFilePicker = SpecialPowers.MockFilePicker;
-MockFilePicker.reset();
+MockFilePicker.init();
var ioSvc = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
var dirSvc = Cc["@mozilla.org/file/directory_service;1"].getService(Ci.nsIProperties);
@@ -134,7 +134,7 @@
dirs[i].remove(true);
}
- MockFilePicker.reset();
+ MockFilePicker.cleanup();
SimpleTest.finish();
}
@@ -20,6 +20,7 @@ nestegg_track_type
nestegg_track_video_params
nestegg_tstamp_scale
#ifndef MOZ_NATIVE_LIBVPX
+vpx_codec_control_
vpx_codec_dec_init_ver
vpx_codec_decode
vpx_codec_destroy
@@ -0,0 +1,38 @@
+<html class="reftest-print">
+<head>
+<title>push rowspan on to next page if it can't be splitted</title>
+<style>
+img {
+ width: 10px;
+ height: 30px;
+}
+</style>
+</head>
+<body>
+ <div style="height: 110px"></div>
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td></td>
+ <td>
+ <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAMAAADzN3VRAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAZQTFRF/wAAAAAAQaMSAwAAABJJREFUeNpiYBgFo2AwAIAAAwACigABtnCV2AAAAABJRU5ErkJggg==">
+ </td>
+ </tr>
+ <tr style="page-break-after:always">
+ <td>
+ <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAMAAADzN3VRAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAZQTFRF/wAAAAAAQaMSAwAAABJJREFUeNpiYBgFo2AwAIAAAwACigABtnCV2AAAAABJRU5ErkJggg==">
+ </td>
+ </tr>
+ <tr>
+ <td rowspan="2">
+ <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAMAAADzN3VRAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAZQTFRF/wAAAAAAQaMSAwAAABJJREFUeNpiYBgFo2AwAIAAAwACigABtnCV2AAAAABJRU5ErkJggg==">
+ </td>
+ <td rowspan="2"></td>
+ </tr>
+ <tr>
+ <td>
+ <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAMAAADzN3VRAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAZQTFRF/wAAAAAAQaMSAwAAABJJREFUeNpiYBgFo2AwAIAAAwACigABtnCV2AAAAABJRU5ErkJggg==">
+ </td>
+ </tr>
+ </table>
+</body>
+</html>
Oops, something went wrong.

0 comments on commit e1fb2d3

Please sign in to comment.