Merge m-c to fx-team a=merge

CLOBBER

@@ -22,5 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1100184 - Lots of file moves from the /netwerk flattening and zero faith
+Bug 1115998 - (DOMString or sequence<DOMString>) needs binding flush (Bug 1103153)
-in the build system to properly handle them.

accessible/base/RelationType.h

@@ -12,7 +12,7 @@
 namespace mozilla {
 namespace a11y {
 
-MOZ_BEGIN_ENUM_CLASS(RelationType)
+enum class RelationType {
 
   /**
    * This object is labelled by a target object.
@@ -131,7 +131,7 @@ MOZ_BEGIN_ENUM_CLASS(RelationType)
 
   LAST = CONTAINING_APPLICATION
 
-MOZ_END_ENUM_CLASS(RelationType)
+};
 
 } // namespace a11y
 } // namespace mozilla

b2g/config/dolphin/sources.xml

@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e06971db7acf7a35c32eb74d675a4e12e288e6be">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="e45c5dbdcfc2d598c889dfbea72fa11157422afe"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="917b6c36717fddc6e71ffc1ec249633c8044c93c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

b2g/config/emulator-ics/sources.xml

@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e45c5dbdcfc2d598c889dfbea72fa11157422afe"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="917b6c36717fddc6e71ffc1ec249633c8044c93c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>

b2g/config/emulator-jb/sources.xml

@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="e45c5dbdcfc2d598c889dfbea72fa11157422afe"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="917b6c36717fddc6e71ffc1ec249633c8044c93c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="fe91ec3af5396edab45b15e546e21613785724b5"/>

b2g/config/emulator-kk/sources.xml

@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e06971db7acf7a35c32eb74d675a4e12e288e6be">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="e45c5dbdcfc2d598c889dfbea72fa11157422afe"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="917b6c36717fddc6e71ffc1ec249633c8044c93c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

b2g/config/emulator/sources.xml

@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e45c5dbdcfc2d598c889dfbea72fa11157422afe"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="917b6c36717fddc6e71ffc1ec249633c8044c93c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>

b2g/config/flame-kk/sources.xml

@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e06971db7acf7a35c32eb74d675a4e12e288e6be">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="e45c5dbdcfc2d598c889dfbea72fa11157422afe"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="917b6c36717fddc6e71ffc1ec249633c8044c93c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

b2g/config/flame/sources.xml

@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="e45c5dbdcfc2d598c889dfbea72fa11157422afe"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="917b6c36717fddc6e71ffc1ec249633c8044c93c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="fe91ec3af5396edab45b15e546e21613785724b5"/>

b2g/config/gaia.json

@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "e45c5dbdcfc2d598c889dfbea72fa11157422afe", 
+        "git_revision": "917b6c36717fddc6e71ffc1ec249633c8044c93c", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "ecc956a2747963c2db6edf513cd3a8a75ca8884a", 
+    "revision": "3033c2214b5863d8ac50d2067b34c5cb02fb054d", 
     "repo_path": "integration/gaia-central"
 }

b2g/config/hamachi/sources.xml

@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e45c5dbdcfc2d598c889dfbea72fa11157422afe"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="917b6c36717fddc6e71ffc1ec249633c8044c93c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>

b2g/config/helix/sources.xml

@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e45c5dbdcfc2d598c889dfbea72fa11157422afe"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="917b6c36717fddc6e71ffc1ec249633c8044c93c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

b2g/config/nexus-4/sources.xml

@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="e45c5dbdcfc2d598c889dfbea72fa11157422afe"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="917b6c36717fddc6e71ffc1ec249633c8044c93c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="fe91ec3af5396edab45b15e546e21613785724b5"/>

b2g/config/wasabi/sources.xml

@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e45c5dbdcfc2d598c889dfbea72fa11157422afe"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="917b6c36717fddc6e71ffc1ec249633c8044c93c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

browser/base/content/test/general/browser_windowactivation.js

@@ -84,6 +84,14 @@ function test() {
     }
   });
 
+  window.messageManager.addMessageListener("Test:ActivateEvent", function(message) {
+    ok(message.data.ok, "Test:ActivateEvent");
+  });
+
+  window.messageManager.addMessageListener("Test:DeactivateEvent", function(message) {
+    ok(message.data.ok, "Test:DeactivateEvent");
+  });
+
   browser1.addEventListener("load", check, true);
   browser2.addEventListener("load", check, true);
   browser1.contentWindow.location = testPage;
@@ -132,6 +140,25 @@ function childFunction()
     sendAsyncMessage("Test:FocusReceived", { });
   }, false);
 
+  var windowGotActivate = false;
+  var windowGotDeactivate = false;
+  addEventListener("activate", function() {
+      sendAsyncMessage("Test:ActivateEvent", { ok: !windowGotActivate });
+      windowGotActivate = false;
+    });
+  
+  addEventListener("deactivate", function() {
+      sendAsyncMessage("Test:DeactivateEvent", { ok: !windowGotDeactivate });
+      windowGotDeactivate = false;
+    });
+  content.addEventListener("activate", function() {
+      windowGotActivate = true;;
+    });
+  
+  content.addEventListener("deactivate", function() {
+      windowGotDeactivate = true;
+    });
+
   content.setInterval(function () {
     if (!expectingResponse) {
       return;

browser/base/content/test/social/browser.ini

@@ -31,6 +31,7 @@ skip-if = e10s # Bug 1053965 "cw.ensureSnippetsMapThen is not a function", also
 [browser_addons.js]
 [browser_blocklist.js]
 [browser_share.js]
+skip-if = true # bug 1115131
 [browser_social_activation.js]
 skip-if = e10s # Bug 933103 synthesizeMouseAtCenter not e10s friendly
 [browser_social_chatwindow.js]

dom/base/nsContentUtils.cpp

@@ -3620,7 +3620,8 @@ nsresult
 nsContentUtils::DispatchEvent(nsIDocument* aDoc, nsISupports* aTarget,
                               const nsAString& aEventName,
                               bool aCanBubble, bool aCancelable,
-                              bool aTrusted, bool *aDefaultAction)
+                              bool aTrusted, bool *aDefaultAction,
+                              bool aOnlyChromeDispatch)
 {
   nsCOMPtr<nsIDOMEvent> event;
   nsCOMPtr<EventTarget> target;
@@ -3628,6 +3629,7 @@ nsContentUtils::DispatchEvent(nsIDocument* aDoc, nsISupports* aTarget,
                                   aCancelable, aTrusted, getter_AddRefs(event),
                                   getter_AddRefs(target));
   NS_ENSURE_SUCCESS(rv, rv);
+  event->GetInternalNSEvent()->mFlags.mOnlyChromeDispatch = aOnlyChromeDispatch;
 
   bool dummy;
   return target->DispatchEvent(event, aDefaultAction ? aDefaultAction : &dummy);
@@ -3664,6 +3666,17 @@ nsContentUtils::DispatchChromeEvent(nsIDocument *aDoc,
   return rv;
 }
 
+nsresult
+nsContentUtils::DispatchEventOnlyToChrome(nsIDocument* aDoc,
+                                          nsISupports* aTarget,
+                                          const nsAString& aEventName,
+                                          bool aCanBubble, bool aCancelable,
+                                          bool* aDefaultAction)
+{
+  return DispatchEvent(aDoc, aTarget, aEventName, aCanBubble, aCancelable,
+                       true, aDefaultAction, true);
+}
+
 /* static */
 Element*
 nsContentUtils::MatchElementId(nsIContent *aContent, const nsIAtom* aId)

dom/base/nsContentUtils.h

@@ -987,7 +987,10 @@ public:
 
   /**
    * This method creates and dispatches a trusted event to the chrome
-   * event handler.
+   * event handler (the parent object of the DOM Window in the event target
+   * chain). Note, chrome event handler is used even if aTarget is a chrome
+   * object. Use DispatchEventOnlyToChrome if the normal event dispatching is
+   * wanted in case aTarget is a chrome object.
    * Works only with events which can be created by calling
    * nsIDOMDocument::CreateEvent() with parameter "Events".
    * @param aDocument      The document which will be used to create the event,
@@ -1007,6 +1010,32 @@ public:
                                       bool aCancelable,
                                       bool *aDefaultAction = nullptr);
 
+
+  /**
+   * This method creates and dispatches a trusted event.
+   * If aTarget is not a chrome object, the nearest chrome object in the
+   * propagation path will be used as the start of the event target chain.
+   * This method is different than DispatchChromeEvent, which always dispatches
+   * events to chrome event handler. DispatchEventOnlyToChrome works like
+   * DispatchTrustedEvent in the case aTarget is a chrome object.
+   * Works only with events which can be created by calling
+   * nsIDOMDocument::CreateEvent() with parameter "Events".
+   * @param aDoc           The document which will be used to create the event.
+   * @param aTarget        The target of the event, should be QIable to
+   *                       nsIDOMEventTarget.
+   * @param aEventName     The name of the event.
+   * @param aCanBubble     Whether the event can bubble.
+   * @param aCancelable    Is the event cancelable.
+   * @param aDefaultAction Set to true if default action should be taken,
+   *                       see nsIDOMEventTarget::DispatchEvent.
+   */
+  static nsresult DispatchEventOnlyToChrome(nsIDocument* aDoc,
+                                            nsISupports* aTarget,
+                                            const nsAString& aEventName,
+                                            bool aCanBubble,
+                                            bool aCancelable,
+                                            bool *aDefaultAction = nullptr);
+
   /**
    * Determines if an event attribute name (such as onclick) is valid for
    * a given element type. Types are from the EventNameType enumeration
@@ -1252,7 +1281,7 @@ public:
    * @param aDiscoverMode Set to eRecurseIntoChildren to descend recursively
    * into children.
    */
-  enum TextContentDiscoverMode MOZ_ENUM_TYPE(uint8_t) {
+  enum TextContentDiscoverMode : uint8_t {
     eRecurseIntoChildren, eDontRecurseIntoChildren
   };
 
@@ -2046,7 +2075,7 @@ public:
    */
   static bool IsAutocompleteEnabled(nsIDOMHTMLInputElement* aInput);
 
-  enum AutocompleteAttrState MOZ_ENUM_TYPE(uint8_t)
+  enum AutocompleteAttrState : uint8_t
   {
     eAutocompleteAttrState_Unknown = 1,
     eAutocompleteAttrState_Invalid,
@@ -2253,7 +2282,8 @@ private:
                                 bool aCanBubble,
                                 bool aCancelable,
                                 bool aTrusted,
-                                bool *aDefaultAction = nullptr);
+                                bool *aDefaultAction = nullptr,
+                                bool aOnlyChromeDispatch = false);
 
   static void InitializeModifierStrings();
 

dom/base/nsFocusManager.cpp

@@ -1145,11 +1145,12 @@ nsFocusManager::ActivateOrDeactivate(nsPIDOMWindow* aWindow, bool aActive)
   aWindow->ActivateOrDeactivate(aActive);
 
   // Send the activate event.
-  nsContentUtils::DispatchTrustedEvent(aWindow->GetExtantDoc(),
+  nsContentUtils::DispatchEventOnlyToChrome(aWindow->GetExtantDoc(),
-                                       aWindow,
+                                            aWindow,
-                                       aActive ? NS_LITERAL_STRING("activate") :
+                                            aActive ?
-                                                 NS_LITERAL_STRING("deactivate"),
+                                              NS_LITERAL_STRING("activate") :
-                                       true, true, nullptr);
+                                              NS_LITERAL_STRING("deactivate"),
+                                            true, true, nullptr);
 
   // Look for any remote child frames, iterate over them and send the activation notification.
   nsContentUtils::CallOnAllRemoteChildren(aWindow, ActivateOrDeactivateChild,

dom/bindings/BindingDeclarations.h

@@ -461,7 +461,7 @@ GetWrapperCache(const SmartPtr<T>& aObject)
   return GetWrapperCache(aObject.get());
 }
 
-struct ParentObject {
+struct MOZ_STACK_CLASS ParentObject {
   template<class T>
   ParentObject(T* aObject) :
     mObject(aObject),
@@ -482,7 +482,9 @@ struct ParentObject {
     mUseXBLScope(false)
   {}
 
-  nsISupports* const mObject;
+  // We don't want to make this an nsCOMPtr because of performance reasons, but
+  // it's safe because ParentObject is a stack class.
+  nsISupports* const MOZ_NON_OWNING_REF mObject;
   nsWrapperCache* const mWrapperCache;
   bool mUseXBLScope;
 };

dom/broadcastchannel/BroadcastChannel.cpp

@@ -187,7 +187,7 @@ public:
     MOZ_ASSERT(mActor);
   }
 
-  NS_IMETHODIMP Run()
+  NS_IMETHODIMP Run() MOZ_OVERRIDE
   {
     MOZ_ASSERT(mActor);
     if (mActor->IsActorDestroyed()) {
@@ -221,7 +221,7 @@ public:
     return NS_OK;
   }
 
-  NS_IMETHODIMP Cancel()
+  NS_IMETHODIMP Cancel() MOZ_OVERRIDE
   {
     mActor = nullptr;
     return NS_OK;
@@ -247,13 +247,13 @@ public:
     MOZ_ASSERT(mBC);
   }
 
-  NS_IMETHODIMP Run()
+  NS_IMETHODIMP Run() MOZ_OVERRIDE
   {
     mBC->Shutdown();
     return NS_OK;
   }
 
-  NS_IMETHODIMP Cancel()
+  NS_IMETHODIMP Cancel() MOZ_OVERRIDE
   {
     mBC = nullptr;
     return NS_OK;
@@ -278,7 +278,7 @@ public:
     MOZ_ASSERT(mActor);
   }
 
-  NS_IMETHODIMP Run()
+  NS_IMETHODIMP Run() MOZ_OVERRIDE
   {
     MOZ_ASSERT(mActor);
     if (!mActor->IsActorDestroyed()) {
@@ -287,7 +287,7 @@ public:
     return NS_OK;
   }
 
-  NS_IMETHODIMP Cancel()
+  NS_IMETHODIMP Cancel() MOZ_OVERRIDE
   {
     mActor = nullptr;
     return NS_OK;

dom/broadcastchannel/BroadcastChannelChild.h

@@ -42,7 +42,7 @@ private:
 
   ~BroadcastChannelChild();
 
-  void ActorDestroy(ActorDestroyReason aWhy);
+  virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
 
   // This raw pointer is actually the parent object.
   // It's set to null when the parent object is deleted.

dom/camera/CameraPreferences.cpp

@@ -37,7 +37,6 @@ StaticRefPtr<CameraPreferences> CameraPreferences::sObserver;
 NS_IMPL_ISUPPORTS(CameraPreferences, nsIObserver);
 #endif
 
-#ifdef CAMERAPREFERENCES_HAVE_SEPARATE_UINT32_AND_NSRESULT
 /* static */
 nsresult
 CameraPreferences::UpdatePref(const char* aPref, nsresult& aVal)
@@ -49,7 +48,6 @@ CameraPreferences::UpdatePref(const char* aPref, nsresult& aVal)
   }
   return rv;
 }
-#endif
 
 /* static */
 nsresult
@@ -156,7 +154,6 @@ CameraPreferences::PreferenceChanged(const char* aPref, void* aClosure)
   nsresult rv;
   switch (p.mValueType) {
     case kPrefValueIsNsResult:
-    #ifdef CAMERAPREFERENCES_HAVE_SEPARATE_UINT32_AND_NSRESULT
       {
         nsresult& v = *p.mValue.mAsNsResult;
         rv = UpdatePref(aPref, v);
@@ -165,7 +162,6 @@ CameraPreferences::PreferenceChanged(const char* aPref, void* aClosure)
         }
       }
       break;
-    #endif
 
     case kPrefValueIsUint32:
       {
@@ -331,7 +327,6 @@ CameraPreferences::GetPref(const char* aPref, nsACString& aVal)
   return true;
 }
 
-#ifdef CAMERAPREFERENCES_HAVE_SEPARATE_UINT32_AND_NSRESULT
 /* static */
 bool
 CameraPreferences::GetPref(const char* aPref, nsresult& aVal)
@@ -359,7 +354,6 @@ CameraPreferences::GetPref(const char* aPref, nsresult& aVal)
   aVal = v;
   return true;
 }
-#endif
 
 /* static */
 bool

dom/camera/CameraPreferences.h

@@ -12,13 +12,6 @@
 #include "mozilla/StaticPtr.h"
 #endif
 
-#if defined(MOZ_HAVE_CXX11_STRONG_ENUMS) || defined(MOZ_HAVE_CXX11_ENUM_TYPE)
-// Older compilers that don't support strongly-typed enums
-// just typedef uint32_t to nsresult, which results in conflicting
-// overloaded members in CameraPreferences.
-#define CAMERAPREFERENCES_HAVE_SEPARATE_UINT32_AND_NSRESULT
-#endif
-
 namespace mozilla {
 
 template<class T> class StaticAutoPtr;
@@ -38,9 +31,7 @@ public:
   static void Shutdown();
 
   static bool GetPref(const char* aPref, nsACString& aVal);
-#ifdef CAMERAPREFERENCES_HAVE_SEPARATE_UINT32_AND_NSRESULT
   static bool GetPref(const char* aPref, nsresult& aVal);
-#endif
   static bool GetPref(const char* aPref, uint32_t& aVal);
   static bool GetPref(const char* aPref, bool& aVal);
 
@@ -49,9 +40,7 @@ protected:
   static uint32_t PrefToIndex(const char* aPref);
 
   static void PreferenceChanged(const char* aPref, void* aClosure);
-#ifdef CAMERAPREFERENCES_HAVE_SEPARATE_UINT32_AND_NSRESULT
   static nsresult UpdatePref(const char* aPref, nsresult& aVar);
-#endif
   static nsresult UpdatePref(const char* aPref, uint32_t& aVar);
   static nsresult UpdatePref(const char* aPref, nsACString& aVar);
   static nsresult UpdatePref(const char* aPref, bool& aVar);

dom/events/EventListenerManager.h

@@ -162,7 +162,7 @@ public:
     nsString mTypeString; // for non-main-threads
     uint16_t mEventType;
 
-    enum ListenerType MOZ_ENUM_TYPE(uint8_t)
+    enum ListenerType : uint8_t
     {
       eNativeListener = 0,
       eJSEventListener,

dom/events/EventStateManager.h

@@ -429,7 +429,7 @@ protected:
     /**
      * Computes the default action for the aEvent with the prefs.
      */
-    enum Action MOZ_ENUM_TYPE(uint8_t)
+    enum Action : uint8_t
     {
       ACTION_NONE = 0,
       ACTION_SCROLL,

dom/media/PeerConnection.js

@@ -323,13 +323,24 @@ RTCPeerConnection.prototype = {
   init: function(win) { this._win = win; },
 
   __init: function(rtcConfig) {
+    this._winID = this._win.QueryInterface(Ci.nsIInterfaceRequestor)
+    .getInterface(Ci.nsIDOMWindowUtils).currentInnerWindowID;
+
     if (!rtcConfig.iceServers ||
         !Services.prefs.getBoolPref("media.peerconnection.use_document_iceservers")) {
       rtcConfig.iceServers =
         JSON.parse(Services.prefs.getCharPref("media.peerconnection.default_iceservers"));
     }
-    this._winID = this._win.QueryInterface(Ci.nsIInterfaceRequestor)
+    // Normalize iceServers input
-      .getInterface(Ci.nsIDOMWindowUtils).currentInnerWindowID;
+    rtcConfig.iceServers.forEach(server => {
+      if (typeof server.urls === "string") {
+        server.urls = [server.urls];
+      } else if (!server.urls && server.url) {
+        // TODO: Remove support for legacy iceServer.url eventually (Bug 1116766)
+        server.urls = [server.url];
+        this.logWarning("RTCIceServer.url is deprecated! Use urls instead.", null, 0);
+      }
+    });
     this._mustValidateRTCConfiguration(rtcConfig,
         "RTCPeerConnection constructor passed invalid RTCConfiguration");
     if (_globalPCList._networkdown || !this._win.navigator.onLine) {
@@ -432,10 +443,11 @@ RTCPeerConnection.prototype = {
   },
 
   /**
-   * An RTCConfiguration looks like this:
+   * An RTCConfiguration may look like this:
    *
-   * { "iceServers": [ { url:"stun:stun.example.org" },
+   * { "iceServers": [ { urls: "stun:stun.example.org", },
-   *                   { url:"turn:turn.example.org",
+   *                   { url: "stun:stun.example.org", }, // deprecated version
+   *                   { urls: ["turn:turn1.x.org", "turn:turn2.x.org"],
    *                     username:"jib", credential:"mypass"} ] }
    *
    * WebIDL normalizes structure for us, so we test well-formed stun/turn urls,
@@ -456,27 +468,29 @@ RTCPeerConnection.prototype = {
     };
 
     rtcConfig.iceServers.forEach(server => {
-      if (!server.url) {
+      if (!server.urls) {
-        throw new this._win.DOMException(msg + " - missing url", "InvalidAccessError");
+        throw new this._win.DOMException(msg + " - missing urls", "InvalidAccessError");
       }
-      let url = nicerNewURI(server.url);
+      server.urls.forEach(urlStr => {
-      if (url.scheme in { turn:1, turns:1 }) {
+        let url = nicerNewURI(urlStr);
-        if (!server.username) {
+        if (url.scheme in { turn:1, turns:1 }) {
-          throw new this._win.DOMException(msg + " - missing username: " + server.url,
+          if (!server.username) {
-                                           "InvalidAccessError");
+            throw new this._win.DOMException(msg + " - missing username: " + urlStr,
+                                             "InvalidAccessError");
+          }
+          if (!server.credential) {
+            throw new this._win.DOMException(msg + " - missing credential: " + urlStr,
+                                             "InvalidAccessError");
+          }
         }
-        if (!server.credential) {
+        else if (!(url.scheme in { stun:1, stuns:1 })) {
-          throw new this._win.DOMException(msg + " - missing credential: " + server.url,
+          throw new this._win.DOMException(msg + " - improper scheme: " + url.scheme,
-                                           "InvalidAccessError");
+                                           "SyntaxError");
         }
-      }
+        if (url.scheme in { stuns:1, turns:1 }) {
-      else if (!(url.scheme in { stun:1, stuns:1 })) {
+          this.logWarning(url.scheme.toUpperCase() + " is not yet supported.", null, 0);
-        throw new this._win.DOMException(msg + " - improper scheme: " + url.scheme,
+        }
-                                         "SyntaxError");
+      });
-      }
-      if (url.scheme in { stuns:1, turns:1 }) {
-        this.logWarning(url.scheme.toUpperCase() + " is not yet supported.", null, 0);
-      }
     });
   },
 

dom/media/tests/mochitest/test_peerConnection_bug825703.html

@@ -14,78 +14,66 @@
     title: "RTCConfiguration valid/invalid permutations"
   });
 
-  makePC = function (config, expect_success) {
+  makePC = (config, expected_error) => {
-      var exception = null;
+    var exception;
-      var pc = null;
+    try {
-
+      new mozRTCPeerConnection(config).close();
-      try {
+    } catch (e) {
-          pc = new mozRTCPeerConnection(config);
+      exception = e;
-      } catch (e) {
+    }
-          exception = e;
+    is((exception? exception.name : "success"), expected_error || "success",
-      }
+       "mozRTCPeerConnection(" + JSON.stringify(config) + ")");
-      if (pc !== null) {
-        pc.close();
-      }
-      pc = null
-
-      if (expect_success) {
-          ok(!exception, "mozRTCPeerConnection(" +
-             JSON.stringify(config) + ") succeeds");
-      } else {
-          ok(exception, "mozRTCPeerConnection(" +
-             JSON.stringify(config) + ") throws");
-      }
   }
 
   // This is a test of the iceServers parsing code + readable errors
 
   runNetworkTest(function () {
-    var pcs = null;
     var exception = null;
-    var config;
 
     try {
-      pcs = new mozRTCPeerConnection();
+      new mozRTCPeerConnection().close();
     } catch (e) {
       exception = e;
     }
     ok(!exception, "mozRTCPeerConnection() succeeds");
-    if (pcs !== null) {
-      pcs.close();
-    }
-    pcs = null;
     exception = null;
 
-    makePC(1, false);
+    makePC();
 
-    makePC({}, true);
+    makePC(1, "TypeError");
 
-    makePC({ iceServers: [] }, true);
+    makePC({});
 
-    makePC({ iceServers: [{ url:"" }] }, false);
+    makePC({ iceServers: [] });
+
+    makePC({ iceServers: [{ urls:"" }] }, "SyntaxError");
 
     makePC({ iceServers: [
-                { url:"stun:127.0.0.1" },
+      { urls:"stun:127.0.0.1" },
-                { url:"stuns:localhost", foo:"" },
+      { urls:"stun:localhost", foo:"" },
-                { url:"turn:[::1]:3478", username:"p", credential:"p" },
+      { urls: ["stun:127.0.0.1", "stun:localhost"] },
-                { url:"turns:localhost:3478?transport=udp", username:"p", credential:"p" }
+      { urls:"stuns:localhost", foo:"" },
-                ]}, true);
+      { urls:"turn:[::1]:3478", username:"p", credential:"p" },
+      { urls:"turn:localhost:3478?transport=udp", username:"p", credential:"p" },
+      { urls: ["turn:[::1]:3478", "turn:localhost"], username:"p", credential:"p" },
+      { urls:"turns:localhost:3478?transport=udp", username:"p", credential:"p" },
+      { url:"stun:localhost", foo:"" },
+      { url:"turn:localhost", username:"p", credential:"p" }
+    ]});
 
-    makePC({ iceServers: [{ url:"turns:localhost:3478", username:"p" }] }, false);
+    makePC({ iceServers: [{ urls: ["stun:127.0.0.1", ""] }] }, "SyntaxError");
 
-    makePC({ iceServers: [{ url:"turns:localhost:3478", credential:"p" }] }, false);
+    makePC({ iceServers: [{ urls:"turns:localhost:3478", username:"p" }] }, "InvalidAccessError");
 
-    makePC({ iceServers: [{ url:"http:0.0.0.0" }] }, false);
+    makePC({ iceServers: [{ url:"turns:localhost:3478", credential:"p" }] }, "InvalidAccessError");
+
+    makePC({ iceServers: [{ urls:"http:0.0.0.0" }] }, "SyntaxError");
     try {
-        pcs = new mozRTCPeerConnection({ iceServers: [{ url:"http:0.0.0.0" }] });
+      new mozRTCPeerConnection({ iceServers: [{ url:"http:0.0.0.0" }] }).close();
     } catch (e) {
-        ok(e.message.indexOf("http") > 0,
+      ok(e.message.indexOf("http") > 0,
-           "mozRTCPeerConnection() constructor has readable exceptions");
+         "mozRTCPeerConnection() constructor has readable exceptions");
     }
-    if (pcs !== null) {
-      pcs.close();
-    }
-    pcs = null;
 
     networkTestFinished();
   });

dom/media/webaudio/AudioEventTimeline.h

@@ -23,7 +23,7 @@ namespace dom {
 
 // This is an internal helper class and should not be used outside of this header.
 struct AudioTimelineEvent {
-  enum Type MOZ_ENUM_TYPE(uint32_t) {
+  enum Type : uint32_t {
     SetValue,
     LinearRamp,
     ExponentialRamp,

dom/network/NetworkStatsDB.jsm

@@ -48,18 +48,33 @@ NetworkStatsDB.prototype = {
     return this.newTxn(txn_type, store_name, callback, successCb, errorCb);
   },
 
+  /**
+   * The onupgradeneeded handler of the IDBOpenDBRequest.
+   * This function is called in IndexedDBHelper open() method.
+   *
+   * @param {IDBTransaction} aTransaction
+   *        {IDBDatabase} aDb
+   *        {64-bit integer} aOldVersion The version number on local storage.
+   *        {64-bit integer} aNewVersion The version number to be upgraded to.
+   *
+   * @note  Be careful with the database upgrade pattern.
+   *        Because IndexedDB operations are performed asynchronously, we must
+   *        apply a recursive approach instead of an iterative approach while
+   *        upgrading versions.
+   */
   upgradeSchema: function upgradeSchema(aTransaction, aDb, aOldVersion, aNewVersion) {
     if (DEBUG) {
       debug("upgrade schema from: " + aOldVersion + " to " + aNewVersion + " called!");
     }
     let db = aDb;
     let objectStore;
-    for (let currVersion = aOldVersion; currVersion < aNewVersion; currVersion++) {
-      if (currVersion == 0) {
-        /**
-         * Create the initial database schema.
-         */
 
+    // An array of upgrade functions for each version.
+    let upgradeSteps = [
+      function upgrade0to1() {
+        if (DEBUG) debug("Upgrade 0 to 1: Create object stores and indexes.");
+
+        // Create the initial database schema.
         objectStore = db.createObjectStore(DEPRECATED_STORE_NAME, { keyPath: ["connectionType", "timestamp"] });
         objectStore.createIndex("connectionType", "connectionType", { unique: false });
         objectStore.createIndex("timestamp", "timestamp", { unique: false });
@@ -67,10 +82,18 @@ NetworkStatsDB.prototype = {
         objectStore.createIndex("txBytes", "txBytes", { unique: false });
         objectStore.createIndex("rxTotalBytes", "rxTotalBytes", { unique: false });
         objectStore.createIndex("txTotalBytes", "txTotalBytes", { unique: false });
-        if (DEBUG) {
+
-          debug("Created object stores and indexes");
+        upgradeNextVersion();
-        }
+      },
-      } else if (currVersion == 2) {
+
+      function upgrade1to2() {
+        if (DEBUG) debug("Upgrade 1 to 2: Do nothing.");
+        upgradeNextVersion();
+      },
+
+      function upgrade2to3() {
+        if (DEBUG) debug("Upgrade 2 to 3: Add keyPath appId to object store.");
+
         // In order to support per-app traffic data storage, the original
         // objectStore needs to be replaced by a new objectStore with new
         // key path ("appId") and new index ("appId").
@@ -99,11 +122,13 @@ NetworkStatsDB.prototype = {
         objectStore.createIndex("rxTotalBytes", "rxTotalBytes", { unique: false });
         objectStore.createIndex("txTotalBytes", "txTotalBytes", { unique: false });
 
-        if (DEBUG) {
+        upgradeNextVersion();
-          debug("Created object stores and indexes for version 3");
+      },
-        }
+
-      } else if (currVersion == 3) {
+      function upgrade3to4() {
-        // Delete redundent indexes (leave "network" only).
+        if (DEBUG) debug("Upgrade 3 to 4: Delete redundant indexes.");
+
+        // Delete redundant indexes (leave "network" only).
         objectStore = aTransaction.objectStore(DEPRECATED_STORE_NAME);
         if (objectStore.indexNames.contains("appId")) {
           objectStore.deleteIndex("appId");
@@ -127,10 +152,12 @@ NetworkStatsDB.prototype = {
           objectStore.deleteIndex("txTotalBytes");
         }
 
-        if (DEBUG) {
+        upgradeNextVersion();
-          debug("Deleted redundent indexes for version 4");
+      },
-        }
+
-      } else if (currVersion == 4) {
+      function upgrade4to5() {
+        if (DEBUG) debug("Upgrade 4 to 5: Create object store for alarms.");
+
         // In order to manage alarms, it is necessary to use a global counter
         // (totalBytes) that will increase regardless of the system reboot.
         objectStore = aTransaction.objectStore(DEPRECATED_STORE_NAME);
@@ -143,6 +170,8 @@ NetworkStatsDB.prototype = {
         objectStore.openCursor().onsuccess = function(event) {
           let cursor = event.target.result;
           if (!cursor){
+            // upgrade4to5 completed now.
+            upgradeNextVersion();
             return;
           }
 
@@ -188,11 +217,11 @@ NetworkStatsDB.prototype = {
         objectStore = db.createObjectStore(ALARMS_STORE_NAME, { keyPath: "id", autoIncrement: true });
         objectStore.createIndex("alarm", ['networkId','threshold'], { unique: false });
         objectStore.createIndex("manifestURL", "manifestURL", { unique: false });
+      },
+
+      function upgrade5to6() {
+        if (DEBUG) debug("Upgrade 5 to 6: Add keyPath serviceType to object store.");
 
-        if (DEBUG) {
-          debug("Created alarms store for version 5");
-        }
-      } else if (currVersion == 5) {
         // In contrast to "per-app" traffic data, "system-only" traffic data
         // refers to data which can not be identified by any applications.
         // To further support "system-only" data storage, the data can be
@@ -209,6 +238,8 @@ NetworkStatsDB.prototype = {
           let cursor = event.target.result;
           if (!cursor) {
             db.deleteObjectStore(DEPRECATED_STORE_NAME);
+            // upgrade5to6 completed now.
+            upgradeNextVersion();
             return;
           }
 
@@ -217,11 +248,11 @@ NetworkStatsDB.prototype = {
           newObjectStore.put(newStats);
           cursor.continue();
         };
+      },
+
+      function upgrade6to7() {
+        if (DEBUG) debug("Upgrade 6 to 7: Replace alarm threshold by relativeThreshold.");
 
-        if (DEBUG) {
-          debug("Added new key 'serviceType' for version 6");
-        }
-      } else if (currVersion == 6) {
         // Replace threshold attribute of alarm index by relativeThreshold in alarms DB.
         // Now alarms are indexed by relativeThreshold, which is the threshold relative
         // to current system stats.
@@ -239,6 +270,7 @@ NetworkStatsDB.prototype = {
         alarmsStore.openCursor().onsuccess = function(event) {
           let cursor = event.target.result;
           if (!cursor) {
+            upgrade6to7_updateTotalBytes();
             return;
           }
 
@@ -250,75 +282,132 @@ NetworkStatsDB.prototype = {
           cursor.continue();
         }
 
-        // Previous versions save accumulative totalBytes, increasing althought the system
+        function upgrade6to7_updateTotalBytes() {
-        // reboots or resets stats. But is necessary to reset the total counters when reset
+          if (DEBUG) debug("Upgrade 6 to 7: Update TotalBytes.");
-        // through 'clearInterfaceStats'.
+          // Previous versions save accumulative totalBytes, increasing although the system
-        let statsStore = aTransaction.objectStore(STATS_STORE_NAME);
+          // reboots or resets stats. But is necessary to reset the total counters when reset
-        let networks = [];
+          // through 'clearInterfaceStats'.
-        // Find networks stored in the database.
+          let statsStore = aTransaction.objectStore(STATS_STORE_NAME);
-        statsStore.index("network").openKeyCursor(null, "nextunique").onsuccess = function(event) {
+          let networks = [];
-          let cursor = event.target.result;
-          if (cursor) {
-            networks.push(cursor.key);
-            cursor.continue();
-            return;
-          }
 
-          networks.forEach(function(network) {
+          // Find networks stored in the database.
-            let lowerFilter = [0, "", network, 0];
+          statsStore.index("network").openKeyCursor(null, "nextunique").onsuccess = function(event) {
-            let upperFilter = [0, "", network, ""];
+            let cursor = event.target.result;
-            let range = IDBKeyRange.bound(lowerFilter, upperFilter, false, false);
 
-            // Find number of samples for a given network.
+            // Store each network into an array.
-            statsStore.count(range).onsuccess = function(event) {
+            if (cursor) {
-              // If there are more samples than the max allowed, there is no way to know
+              networks.push(cursor.key);
-              // when does reset take place.
+              cursor.continue();
-              if (event.target.result >= VALUES_MAX_LENGTH) {
+              return;
-                return;
+            }
-              }
 
-              let last = null;
+            // Start to deal with each network.
-              // Reset detected if the first sample totalCounters are different than bytes
+            let pending = networks.length;
-              // counters. If so, the total counters should be recalculated.
+
-              statsStore.openCursor(range).onsuccess = function(event) {
+            if (pending === 0) {
-                let cursor = event.target.result;
+              // Found no records of network. upgrade6to7 completed now.
-                if (!cursor) {
+              upgradeNextVersion();
+              return;
+            }
+
+            networks.forEach(function(network) {
+              let lowerFilter = [0, "", network, 0];
+              let upperFilter = [0, "", network, ""];
+              let range = IDBKeyRange.bound(lowerFilter, upperFilter, false, false);
+
+              // Find number of samples for a given network.
+              statsStore.count(range).onsuccess = function(event) {
+                let recordCount = event.target.result;
+
+                // If there are more samples than the max allowed, there is no way to know
+                // when does reset take place.
+                if (recordCount === 0 || recordCount >= VALUES_MAX_LENGTH) {
+                  pending--;
+                  if (pending === 0) {
+                    upgradeNextVersion();
+                  }
                   return;
                 }
-                if (!last) {
+
-                  if (cursor.value.rxTotalBytes == cursor.value.rxBytes &&
+                let last = null;
-                      cursor.value.txTotalBytes == cursor.value.txBytes) {
+                // Reset detected if the first sample totalCounters are different than bytes
+                // counters. If so, the total counters should be recalculated.
+                statsStore.openCursor(range).onsuccess = function(event) {
+                  let cursor = event.target.result;
+                  if (!cursor) {
+                    pending--;
+                    if (pending === 0) {
+                      upgradeNextVersion();
+                    }
+                    return;
+                  }
+                  if (!last) {
+                    if (cursor.value.rxTotalBytes == cursor.value.rxBytes &&
+                        cursor.value.txTotalBytes == cursor.value.txBytes) {
+                      pending--;
+                      if (pending === 0) {
+                        upgradeNextVersion();
+                      }
+                      return;
+                    }
+
+                    cursor.value.rxTotalBytes = cursor.value.rxBytes;
+                    cursor.value.txTotalBytes = cursor.value.txBytes;
+                    cursor.update(cursor.value);
+                    last = cursor.value;
+                    cursor.continue();
                     return;
                   }
 
-                  cursor.value.rxTotalBytes = cursor.value.rxBytes;
+                  // Recalculate the total counter for last / current sample
-                  cursor.value.txTotalBytes = cursor.value.txBytes;
+                  cursor.value.rxTotalBytes = last.rxTotalBytes + cursor.value.rxBytes;
+                  cursor.value.txTotalBytes = last.txTotalBytes + cursor.value.txBytes;
                   cursor.update(cursor.value);
                   last = cursor.value;
                   cursor.continue();
-                  return;
                 }
-
-                // Recalculate the total counter for last / current sample
-                cursor.value.rxTotalBytes = last.rxTotalBytes + cursor.value.rxBytes;
-                cursor.value.txTotalBytes = last.txTotalBytes + cursor.value.txBytes;
-                cursor.update(cursor.value);
-                last = cursor.value;
-                cursor.continue();
               }
-            }
+            }, this); // end of networks.forEach()
-          }, this);
+          }; // end of statsStore.index("network").openKeyCursor().onsuccess callback
-        };
+        } // end of function upgrade6to7_updateTotalBytes
-      } else if (currVersion == 7) {
+      },
+
+      function upgrade7to8() {
+        if (DEBUG) debug("Upgrade 7 to 8: Create index serviceType.");
+
         // Create index for 'ServiceType' in order to make it retrievable.
         let statsStore = aTransaction.objectStore(STATS_STORE_NAME);
         statsStore.createIndex("serviceType", "serviceType", { unique: false });
+      },
+    ];
 
-        if (DEBUG) {
+    let index = aOldVersion;
-          debug("Create index of 'serviceType' for version 8");
+    let outer = this;
-        }
+
+    function upgradeNextVersion() {
+      if (index == aNewVersion) {
+        debug("Upgrade finished.");
+        return;
+      }
+
+      try {
+        var i = index++;
+        if (DEBUG) debug("Upgrade step: " + i + "\n");
+        upgradeSteps[i].call(outer);
+      } catch (ex) {
+        dump("Caught exception " + ex);
+        throw ex;
+        return;
       }
     }
+
+    if (aNewVersion > upgradeSteps.length) {
+      debug("No migration steps for the new version!");
+      aTransaction.abort();
+      return;
+    }
+
+    upgradeNextVersion();
   },
 
   importData: function importData(aStats) {

dom/plugins/base/nsPluginHost.cpp

@@ -1557,6 +1557,10 @@ nsPluginHost::ClearSiteData(nsIPluginTag* plugin, const nsACString& domain,
 
   nsPluginTag* tag = static_cast<nsPluginTag*>(plugin);
 
+  if (!tag->IsEnabled()) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
   // We only ensure support for clearing Flash site data for now.
   // We will also attempt to clear data for any plugin that happens
   // to be loaded already.

dom/svg/SVGCircleElement.cpp

@@ -90,8 +90,7 @@ SVGCircleElement::GetGeometryBounds(Rect* aBounds, Float aStrokeWidth,
 
   if (r <= 0.f) {
     // Rendering of the element is disabled
-    aBounds->MoveTo(x, y);
+    *aBounds = Rect(aTransform * Point(x, y), Size());
-    aBounds->SetEmpty();
     return true;
   }
 

dom/svg/SVGEllipseElement.cpp

@@ -101,8 +101,7 @@ SVGEllipseElement::GetGeometryBounds(Rect* aBounds, Float aStrokeWidth,
 
   if (rx <= 0.f || ry <= 0.f) {
     // Rendering of the element is disabled
-    aBounds->MoveTo(x, y);
+    *aBounds = Rect(aTransform * Point(x, y), Size());
-    aBounds->SetEmpty();
     return true;
   }
 

dom/svg/SVGImageElement.cpp

@@ -226,6 +226,23 @@ SVGImageElement::IsAttributeMapped(const nsIAtom* name) const
 
 /* For the purposes of the update/invalidation logic pretend to
    be a rectangle. */
+bool
+SVGImageElement::GetGeometryBounds(Rect* aBounds, Float aStrokeWidth,
+                                   const Matrix& aTransform)
+{
+  Rect rect;
+  GetAnimatedLengthValues(&rect.x, &rect.y, &rect.width,
+                          &rect.height, nullptr);
+
+  if (rect.IsEmpty()) {
+    // Rendering of the element disabled
+    rect.SetEmpty(); // Make sure width/height are zero and not negative
+  }
+
+  *aBounds = aTransform.TransformBounds(rect);
+  return true;
+}
+
 TemporaryRef<Path>
 SVGImageElement::BuildPath(PathBuilder* aBuilder)
 {

dom/svg/SVGImageElement.h

@@ -53,6 +53,8 @@ public:
   NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* name) const MOZ_OVERRIDE;
 
   // nsSVGPathGeometryElement methods:
+  virtual bool GetGeometryBounds(Rect* aBounds, Float aStrokeWidth,
+                                 const Matrix& aTransform) MOZ_OVERRIDE;
   virtual TemporaryRef<Path> BuildPath(PathBuilder* aBuilder) MOZ_OVERRIDE;
 
   // nsSVGSVGElement methods:

dom/svg/SVGPreserveAspectRatio.h

@@ -17,7 +17,7 @@
 
 namespace mozilla {
 // Alignment Types
-enum SVGAlign MOZ_ENUM_TYPE(uint8_t) {
+enum SVGAlign : uint8_t {
   SVG_PRESERVEASPECTRATIO_UNKNOWN = 0,
   SVG_PRESERVEASPECTRATIO_NONE = 1,
   SVG_PRESERVEASPECTRATIO_XMINYMIN = 2,
@@ -37,7 +37,7 @@ const uint16_t SVG_ALIGN_MIN_VALID = SVG_PRESERVEASPECTRATIO_NONE;
 const uint16_t SVG_ALIGN_MAX_VALID = SVG_PRESERVEASPECTRATIO_XMAXYMAX;
 
 // Meet-or-slice Types
-enum SVGMeetOrSlice MOZ_ENUM_TYPE(uint8_t) {
+enum SVGMeetOrSlice : uint8_t {
   SVG_MEETORSLICE_UNKNOWN = 0,
   SVG_MEETORSLICE_MEET = 1,
   SVG_MEETORSLICE_SLICE = 2

dom/svg/SVGRectElement.cpp

@@ -122,7 +122,8 @@ SVGRectElement::GetGeometryBounds(Rect* aBounds, Float aStrokeWidth,
   if (rect.IsEmpty()) {
     // Rendering of the element disabled
     rect.SetEmpty(); // Make sure width/height are zero and not negative
-    *aBounds = rect; // We still want the x/y position from 'rect'
+    // We still want the x/y position from 'rect'
+    *aBounds = aTransform.TransformBounds(rect);
     return true;
   }
 

dom/svg/SVGSVGElement.cpp

@@ -1247,5 +1247,33 @@ SVGSVGElement::ClearTransformProperty()
   return UnsetProperty(nsGkAtoms::transform);
 }
 
+int32_t
+SVGSVGElement::GetIntrinsicWidth()
+{
+  if (mLengthAttributes[ATTR_WIDTH].IsPercentage()) {
+    return -1;
+  }
+  // Passing |this| as a SVGSVGElement* invokes the variant of GetAnimValue
+  // that uses the passed argument as the context, but that's fine since we
+  // know the length isn't a percentage so the context won't be used (and we
+  // need to pass the element to be able to resolve em/ex units).
+  float width = mLengthAttributes[ATTR_WIDTH].GetAnimValue(this);
+  return nsSVGUtils::ClampToInt(width);
+}
+
+int32_t
+SVGSVGElement::GetIntrinsicHeight()
+{
+  if (mLengthAttributes[ATTR_HEIGHT].IsPercentage()) {
+    return -1;
+  }
+  // Passing |this| as a SVGSVGElement* invokes the variant of GetAnimValue
+  // that uses the passed argument as the context, but that's fine since we
+  // know the length isn't a percentage so the context won't be used (and we
+  // need to pass the element to be able to resolve em/ex units).
+  float height = mLengthAttributes[ATTR_HEIGHT].GetAnimValue(this);
+  return nsSVGUtils::ClampToInt(height);
+}
+
 } // namespace dom
 } // namespace mozilla

dom/svg/SVGSVGElement.h

@@ -147,6 +147,15 @@ public:
 
   // public helpers:
 
+  /**
+   * Returns -1 if the width/height is a percentage, else returns the user unit
+   * length clamped to fit in a int32_t.
+   * XXX see bug 1112533 comment 3 - we should fix drawImage so that we can
+   * change these methods to make zero the error flag for percentages.
+   */
+  int32_t GetIntrinsicWidth();
+  int32_t GetIntrinsicHeight();
+
   /**
    * Returns true if this element has a base/anim value for its "viewBox"
    * attribute that defines a viewBox rectangle with finite values, or

dom/webidl/RTCConfiguration.webidl

@@ -8,7 +8,8 @@
  */
 
 dictionary RTCIceServer {
-    DOMString  url;
+    (DOMString or sequence<DOMString>) urls;
+    DOMString  url; //deprecated
     DOMString? credential = null;
     DOMString? username = null;
 };

gfx/2d/SVGTurbulenceRenderer-inl.h

@@ -125,8 +125,11 @@ SVGTurbulenceRenderer<Type,Stitch,f32x4_t,i32x4_t,u8x16_t>::InitFromSeed(int32_t
   float gradient[4][sBSize][2];
   for (int32_t k = 0; k < 4; k++) {
     for (int32_t i = 0; i < sBSize; i++) {
-      float a = float((rand.Next() % (sBSize + sBSize)) - sBSize) / sBSize;
+      float a, b;
-      float b = float((rand.Next() % (sBSize + sBSize)) - sBSize) / sBSize;
+      do {
+        a = float((rand.Next() % (sBSize + sBSize)) - sBSize) / sBSize;
+        b = float((rand.Next() % (sBSize + sBSize)) - sBSize) / sBSize;
+      } while (a == 0 && b == 0);
       float s = sqrt(a * a + b * b);
       gradient[k][i][0] = a / s;
       gradient[k][i][1] = b / s;

gfx/layers/d3d11/CompositorD3D11.cpp

@@ -1050,6 +1050,7 @@ CompositorD3D11::BeginFrame(const nsIntRegion& aInvalidRegion,
     return;
   }
 
+  nsIntSize oldSize = mSize;
   UpdateRenderTarget();
 
   // Failed to create a render target or the view.
@@ -1069,7 +1070,13 @@ CompositorD3D11::BeginFrame(const nsIntRegion& aInvalidRegion,
   nsIntRect intRect = nsIntRect(nsIntPoint(0, 0), mSize);
   // Sometimes the invalid region is larger than we want to draw.
   nsIntRegion invalidRegionSafe;
-  invalidRegionSafe.And(aInvalidRegion, intRect);
+
+  if (mSize != oldSize) {
+    invalidRegionSafe = intRect;
+  } else {
+    invalidRegionSafe.And(aInvalidRegion, intRect);
+  }
+
   nsIntRect invalidRect = invalidRegionSafe.GetBounds();
   mInvalidRect = IntRect(invalidRect.x, invalidRect.y, invalidRect.width, invalidRect.height);
   mInvalidRegion = invalidRegionSafe;

gfx/thebes/gfxPrefs.h

@@ -239,7 +239,7 @@ private:
   DECL_GFX_PREF(Live, "image.high_quality_downscaling.min_factor", ImageHQDownscalingMinFactor, uint32_t, 1000);
   DECL_GFX_PREF(Live, "image.high_quality_upscaling.max_size", ImageHQUpscalingMaxSize, uint32_t, 20971520);
   DECL_GFX_PREF(Once, "image.mem.decode_bytes_at_a_time",      ImageMemDecodeBytesAtATime, uint32_t, 200000);
-  DECL_GFX_PREF(Live, "image.mem.decodeondraw",                ImageMemDecodeOnDraw, bool, false);
+  DECL_GFX_PREF(Live, "image.mem.decodeondraw",                ImageMemDecodeOnDraw, bool, true);
   DECL_GFX_PREF(Live, "image.mem.discardable",                 ImageMemDiscardable, bool, false);
   DECL_GFX_PREF(Once, "image.mem.surfacecache.discard_factor", ImageMemSurfaceCacheDiscardFactor, uint32_t, 1);
   DECL_GFX_PREF(Once, "image.mem.surfacecache.max_size_kb",    ImageMemSurfaceCacheMaxSizeKB, uint32_t, 100 * 1024);

image/src/SVGDocumentWrapper.cpp

@@ -68,45 +68,6 @@ SVGDocumentWrapper::DestroyViewer()
   }
 }
 
-bool
-SVGDocumentWrapper::GetWidthOrHeight(Dimension aDimension,
-                                     int32_t& aResult)
-{
-  SVGSVGElement* rootElem = GetRootSVGElem();
-  NS_ABORT_IF_FALSE(rootElem, "root elem missing or of wrong type");
-
-  // Get the width or height SVG object
-  nsRefPtr<SVGAnimatedLength> domAnimLength;
-  if (aDimension == eWidth) {
-    domAnimLength = rootElem->Width();
-  } else {
-    NS_ABORT_IF_FALSE(aDimension == eHeight, "invalid dimension");
-    domAnimLength = rootElem->Height();
-  }
-  NS_ENSURE_TRUE(domAnimLength, false);
-
-  // Get the animated value from the object
-  nsRefPtr<DOMSVGLength> domLength = domAnimLength->AnimVal();
-  NS_ENSURE_TRUE(domLength, false);
-
-  // Check if it's a percent value (and fail if so)
-  uint16_t unitType;
-  nsresult rv = domLength->GetUnitType(&unitType);
-  NS_ENSURE_SUCCESS(rv, false);
-  if (unitType == nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE) {
-    return false;
-  }
-
-  // Non-percent value - woot! Grab it & return it.
-  float floatLength;
-  rv = domLength->GetValue(&floatLength);
-  NS_ENSURE_SUCCESS(rv, false);
-
-  aResult = nsSVGUtils::ClampToInt(floatLength);
-
-  return true;
-}
-
 nsIFrame*
 SVGDocumentWrapper::GetRootLayoutFrame()
 {

image/src/SVGDocumentWrapper.h

@@ -52,21 +52,6 @@ public:
     eHeight
   };
 
-  /**
-   * Looks up the value of the wrapped SVG document's |width| or |height|
-   * attribute in CSS pixels, and returns it by reference.  If the document has
-   * a percent value for the queried attribute, then this method fails
-   * (returns false).
-   *
-   * @param aDimension    Indicates whether the width or height is desired.
-   * @param[out] aResult  If this method succeeds, then this outparam will be
-                          populated with the width or height in CSS pixels.
-   * @return false to indicate failure, if the queried attribute has a
-   *         percent value.  Otherwise, true.
-   *
-   */
-  bool      GetWidthOrHeight(Dimension aDimension, int32_t& aResult);
-
   /**
    * Returns the wrapped document, or nullptr on failure. (No AddRef.)
    */

image/src/VectorImage.cpp

@@ -472,17 +472,14 @@ NS_IMETHODIMP
 VectorImage::GetWidth(int32_t* aWidth)
 {
   if (mError || !mIsFullyLoaded) {
-    *aWidth = 0;
+    *aWidth = -1;
-    return NS_ERROR_FAILURE;
+  } else {
+    SVGSVGElement* rootElem = mSVGDocumentWrapper->GetRootSVGElem();
+    MOZ_ASSERT(rootElem, "Should have a root SVG elem, since we finished "
+                         "loading without errors");
+    *aWidth = rootElem->GetIntrinsicWidth();
   }
-
+  return *aWidth >= 0 ? NS_OK : NS_ERROR_FAILURE;
-  if (!mSVGDocumentWrapper->GetWidthOrHeight(SVGDocumentWrapper::eWidth,
-                                             *aWidth)) {
-    *aWidth = 0;
-    return NS_ERROR_FAILURE;
-  }
-
-  return NS_OK;
 }
 
 //******************************************************************************
@@ -541,17 +538,14 @@ NS_IMETHODIMP
 VectorImage::GetHeight(int32_t* aHeight)
 {
   if (mError || !mIsFullyLoaded) {
-    *aHeight = 0;
+    *aHeight = -1;
-    return NS_ERROR_FAILURE;
+  } else {
+    SVGSVGElement* rootElem = mSVGDocumentWrapper->GetRootSVGElem();
+    MOZ_ASSERT(rootElem, "Should have a root SVG elem, since we finished "
+                         "loading without errors");
+    *aHeight = rootElem->GetIntrinsicHeight();
   }
-
+  return *aHeight >= 0 ? NS_OK : NS_ERROR_FAILURE;
-  if (!mSVGDocumentWrapper->GetWidthOrHeight(SVGDocumentWrapper::eHeight,
-                                             *aHeight)) {
-    *aHeight = 0;
-    return NS_ERROR_FAILURE;
-  }
-
-  return NS_OK;
 }
 
 //******************************************************************************
@@ -663,17 +657,20 @@ VectorImage::GetFrame(uint32_t aWhichFrame,
   if (aWhichFrame > FRAME_MAX_VALUE)
     return nullptr;
 
-  if (mError)
+  if (mError || !mIsFullyLoaded)
     return nullptr;
 
   // Look up height & width
   // ----------------------
-  nsIntSize imageIntSize;
+  SVGSVGElement* svgElem = mSVGDocumentWrapper->GetRootSVGElem();
-  if (!mSVGDocumentWrapper->GetWidthOrHeight(SVGDocumentWrapper::eWidth,
+  MOZ_ASSERT(svgElem, "Should have a root SVG elem, since we finished "
-                                             imageIntSize.width) ||
+                      "loading without errors");
-      !mSVGDocumentWrapper->GetWidthOrHeight(SVGDocumentWrapper::eHeight,
+  nsIntSize imageIntSize(svgElem->GetIntrinsicWidth(),
-                                             imageIntSize.height)) {
+                         svgElem->GetIntrinsicHeight());
-    // We'll get here if our SVG doc has a percent-valued width or height.
+  
+  if (imageIntSize.IsEmpty()) {
+    // We'll get here if our SVG doc has a percent-valued or negative width or
+    // height.
     return nullptr;
   }
 

intl/build/moz.build

@@ -9,9 +9,8 @@ SOURCES += [
 ]
 
 FINAL_LIBRARY = 'xul'
+CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
 LOCAL_INCLUDES += [
-    '../icu/source/common',
-    '../icu/source/i18n',
     '../locale',
     '../lwbrk',
     '../strres',

intl/locale/mac/moz.build

@@ -11,10 +11,9 @@ UNIFIED_SOURCES += [
 ]
 
 FINAL_LIBRARY = 'xul'
+CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
 LOCAL_INCLUDES += [
     '..',
-    '../../icu/source/common',
-    '../../icu/source/i18n',
 ]
 
 FAIL_ON_WARNINGS = True

ipc/nfc/Nfc.cpp

@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim: set sw=4 ts=8 et ft=cpp: */
+/* vim: set sw=2 ts=8 et ft=cpp: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -22,88 +22,86 @@
 
 #include "jsfriendapi.h"
 #include "mozilla/ArrayUtils.h"
+#include "mozilla/ipc/UnixSocketConnector.h"
 #include "nsThreadUtils.h" // For NS_IsMainThread.
 
 using namespace mozilla::ipc;
 
 namespace {
 
-const char* NFC_SOCKET_NAME = "/dev/socket/nfcd";
+static const char NFC_SOCKET_NAME[] = "/dev/socket/nfcd";
 
 // Network port to connect to for adb forwarded sockets when doing
 // desktop development.
-const uint32_t NFC_TEST_PORT = 6400;
+static const uint32_t NFC_TEST_PORT = 6400;
 
-class SendNfcSocketDataTask : public nsRunnable
+class SendNfcSocketDataTask MOZ_FINAL : public nsRunnable
 {
 public:
-    SendNfcSocketDataTask(NfcConsumer* aConsumer, UnixSocketRawData* aRawData)
+  SendNfcSocketDataTask(NfcConsumer* aConsumer, UnixSocketRawData* aRawData)
-        : mConsumer(aConsumer), mRawData(aRawData)
+    : mConsumer(aConsumer)
-    { }
+    , mRawData(aRawData)
+  { }
 
-    NS_IMETHOD Run()
+  NS_IMETHOD Run()
-    {
+  {
-        MOZ_ASSERT(NS_IsMainThread());
+    MOZ_ASSERT(NS_IsMainThread());
 
-        if (!mConsumer ||
+    if (!mConsumer ||
-            mConsumer->GetConnectionStatus() != SOCKET_CONNECTED) {
+      mConsumer->GetConnectionStatus() != SOCKET_CONNECTED) {
-            // Probably shuting down.
+      // Probably shuting down.
-            delete mRawData;
+      return NS_OK;
-            return NS_OK;
-        }
-
-        mConsumer->SendSocketData(mRawData);
-        return NS_OK;
     }
 
+    mConsumer->SendSocketData(mRawData.forget());
+    return NS_OK;
+  }
+
 private:
-    NfcConsumer* mConsumer;
+  NfcConsumer* mConsumer;
-    UnixSocketRawData* mRawData;
+  nsAutoPtr<UnixSocketRawData> mRawData;
 };
 
-class NfcConnector : public mozilla::ipc::UnixSocketConnector
+class NfcConnector MOZ_FINAL : public mozilla::ipc::UnixSocketConnector
 {
 public:
-    NfcConnector()
+  NfcConnector()
-    {}
+  { }
 
-    virtual ~NfcConnector()
+  int Create() MOZ_OVERRIDE;
-    {}
+  bool CreateAddr(bool aIsServer,
-
+                  socklen_t& aAddrSize,
-    virtual int Create();
+                  sockaddr_any& aAddr,
-    virtual bool CreateAddr(bool aIsServer,
+                  const char* aAddress) MOZ_OVERRIDE;
-                            socklen_t& aAddrSize,
+  bool SetUp(int aFd) MOZ_OVERRIDE;
-                            sockaddr_any& aAddr,
+  bool SetUpListenSocket(int aFd) MOZ_OVERRIDE;
-                            const char* aAddress);
+  void GetSocketAddr(const sockaddr_any& aAddr,
-    virtual bool SetUp(int aFd);
+                     nsAString& aAddrStr) MOZ_OVERRIDE;
-    virtual bool SetUpListenSocket(int aFd);
-    virtual void GetSocketAddr(const sockaddr_any& aAddr,
-                               nsAString& aAddrStr);
 };
 
 int
 NfcConnector::Create()
 {
-    MOZ_ASSERT(!NS_IsMainThread());
+  MOZ_ASSERT(!NS_IsMainThread());
 
-    int fd = -1;
+  int fd = -1;
 
 #if defined(MOZ_WIDGET_GONK)
-    fd = socket(AF_LOCAL, SOCK_STREAM, 0);
+  fd = socket(AF_LOCAL, SOCK_STREAM, 0);
 #else
-    // If we can't hit a local loopback, fail later in connect.
+  // If we can't hit a local loopback, fail later in connect.
-    fd = socket(AF_INET, SOCK_STREAM, 0);
+  fd = socket(AF_INET, SOCK_STREAM, 0);
 #endif
 
-    if (fd < 0) {
+  if (fd < 0) {
-        NS_WARNING("Could not open nfc socket!");
+    NS_WARNING("Could not open nfc socket!");
-        return -1;
+    return -1;
-    }
+  }
 
-    if (!SetUp(fd)) {
+  if (!SetUp(fd)) {
-        NS_WARNING("Could not set up socket!");
+    NS_WARNING("Could not set up socket!");
-    }
+  }
-    return fd;
+  return fd;
 }
 
 bool
@@ -112,56 +110,56 @@ NfcConnector::CreateAddr(bool aIsServer,
                          sockaddr_any& aAddr,
                          const char* aAddress)
 {
-    // We never open nfc socket as server.
+  // We never open nfc socket as server.
-    MOZ_ASSERT(!aIsServer);
+  MOZ_ASSERT(!aIsServer);
-    uint32_t af;
+  uint32_t af;
 #if defined(MOZ_WIDGET_GONK)
-    af = AF_LOCAL;
+  af = AF_LOCAL;
 #else
-    af = AF_INET;
+  af = AF_INET;
 #endif
-    switch (af) {
+  switch (af) {
-    case AF_LOCAL:
+  case AF_LOCAL:
-        aAddr.un.sun_family = af;
+    aAddr.un.sun_family = af;
-        if(strlen(aAddress) > sizeof(aAddr.un.sun_path)) {
+    if(strlen(aAddress) > sizeof(aAddr.un.sun_path)) {
-            NS_WARNING("Address too long for socket struct!");
+      NS_WARNING("Address too long for socket struct!");
-            return false;
+      return false;
-        }
-        strcpy((char*)&aAddr.un.sun_path, aAddress);
-        aAddrSize = strlen(aAddress) + offsetof(struct sockaddr_un, sun_path) + 1;
-        break;
-    case AF_INET:
-        aAddr.in.sin_family = af;
-        aAddr.in.sin_port = htons(NFC_TEST_PORT);
-        aAddr.in.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-        aAddrSize = sizeof(sockaddr_in);
-        break;
-    default:
-        NS_WARNING("Socket type not handled by connector!");
-        return false;
     }
-    return true;
+    strcpy((char*)&aAddr.un.sun_path, aAddress);
+    aAddrSize = strlen(aAddress) + offsetof(struct sockaddr_un, sun_path) + 1;
+    break;
+  case AF_INET:
+    aAddr.in.sin_family = af;
+    aAddr.in.sin_port = htons(NFC_TEST_PORT);
+    aAddr.in.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+    aAddrSize = sizeof(sockaddr_in);
+    break;
+  default:
+    NS_WARNING("Socket type not handled by connector!");
+    return false;
+  }
+  return true;
 }
 
 bool
 NfcConnector::SetUp(int aFd)
 {
-    // Nothing to do here.
+  // Nothing to do here.
-    return true;
+  return true;
 }
 
 bool
 NfcConnector::SetUpListenSocket(int aFd)
 {
-    // Nothing to do here.
+  // Nothing to do here.
-    return true;
+  return true;
 }
 
 void
 NfcConnector::GetSocketAddr(const sockaddr_any& aAddr,
                             nsAString& aAddrStr)
 {
-    MOZ_CRASH("This should never be called!");
+  MOZ_CRASH("This should never be called!");
 }
 
 } // anonymous namespace
@@ -170,66 +168,71 @@ namespace mozilla {
 namespace ipc {
 
 NfcConsumer::NfcConsumer(NfcSocketListener* aListener)
-    : mListener(aListener)
+  : mListener(aListener)
-    , mShutdown(false)
+  , mShutdown(false)
 {
-    mAddress = NFC_SOCKET_NAME;
+  mAddress = NFC_SOCKET_NAME;
 
-    ConnectSocket(new NfcConnector(), mAddress.get());
+  Connect(new NfcConnector(), mAddress.get());
 }
 
 void
 NfcConsumer::Shutdown()
 {
-    MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(NS_IsMainThread());
 
-    mShutdown = true;
+  mShutdown = true;
-    CloseSocket();
+  Close();
 }
 
 bool
 NfcConsumer::PostToNfcDaemon(const uint8_t* aData, size_t aSize)
 {
-    MOZ_ASSERT(!NS_IsMainThread());
+  MOZ_ASSERT(!NS_IsMainThread());
 
-    UnixSocketRawData* raw = new UnixSocketRawData(aData, aSize);
+  UnixSocketRawData* raw = new UnixSocketRawData(aData, aSize);
-    nsRefPtr<SendNfcSocketDataTask> task = new SendNfcSocketDataTask(this, raw);
+  nsRefPtr<SendNfcSocketDataTask> task = new SendNfcSocketDataTask(this, raw);
-    NS_DispatchToMainThread(task);
+  NS_DispatchToMainThread(task);
-    return true;
+  return true;
 }
 
 void
 NfcConsumer::ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aData)
 {
-    MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(NS_IsMainThread());
 
-    if (mListener) {
+  if (mListener) {
-        mListener->ReceiveSocketData(aData);
+    mListener->ReceiveSocketData(aData);
-    }
+  }
 }
 
 void
 NfcConsumer::OnConnectSuccess()
 {
-    // Nothing to do here.
+  // Nothing to do here.
-    CHROMIUM_LOG("NFC: %s\n", __FUNCTION__);
+  CHROMIUM_LOG("NFC: %s\n", __FUNCTION__);
 }
 
 void
 NfcConsumer::OnConnectError()
 {
-    CHROMIUM_LOG("NFC: %s\n", __FUNCTION__);
+  CHROMIUM_LOG("NFC: %s\n", __FUNCTION__);
-    CloseSocket();
+  Close();
 }
 
 void
 NfcConsumer::OnDisconnect()
 {
-    CHROMIUM_LOG("NFC: %s\n", __FUNCTION__);
+  CHROMIUM_LOG("NFC: %s\n", __FUNCTION__);
-    if (!mShutdown) {
+  if (!mShutdown) {
-        ConnectSocket(new NfcConnector(), mAddress.get(),
+    Connect(new NfcConnector(), mAddress.get(), GetSuggestedConnectDelayMs());
-                      GetSuggestedConnectDelayMs());
+  }
-    }
+}
+
+ConnectionOrientedSocketIO*
+NfcConsumer::GetIO()
+{
+  return PrepareAccept(new NfcConnector());
 }
 
 } // namespace ipc

ipc/nfc/Nfc.h

@@ -9,7 +9,7 @@
 #ifndef mozilla_ipc_Nfc_h
 #define mozilla_ipc_Nfc_h 1
 
-#include <mozilla/ipc/UnixSocket.h>
+#include <mozilla/ipc/StreamSocket.h>
 
 namespace mozilla {
 namespace ipc {
@@ -20,21 +20,23 @@ public:
   virtual void ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aData) = 0;
 };
 
-class NfcConsumer : public mozilla::ipc::UnixSocketConsumer
+class NfcConsumer MOZ_FINAL : public mozilla::ipc::StreamSocket
 {
 public:
   NfcConsumer(NfcSocketListener* aListener);
-  virtual ~NfcConsumer() { }
 
   void Shutdown();
   bool PostToNfcDaemon(const uint8_t* aData, size_t aSize);
 
-private:
+  ConnectionOrientedSocketIO* GetIO() MOZ_OVERRIDE;
-  virtual void ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aData);
 
-  virtual void OnConnectSuccess();
+private:
-  virtual void OnConnectError();
+  void ReceiveSocketData(
-  virtual void OnDisconnect();
+    nsAutoPtr<UnixSocketRawData>& aData) MOZ_OVERRIDE;
+
+  void OnConnectSuccess() MOZ_OVERRIDE;
+  void OnConnectError() MOZ_OVERRIDE;
+  void OnDisconnect() MOZ_OVERRIDE;
 
 private:
   NfcSocketListener* mListener;

js/src/configure.in

@@ -3052,18 +3052,6 @@ MOZ_ARG_WITH_STRING(wrap-malloc,
 [  --with-wrap-malloc=DIR  Location of malloc wrapper library],
     WRAP_LDFLAGS="${WRAP_LDFLAGS} $withval")
 
-dnl ========================================================
-dnl = Use compacting GC
-dnl ========================================================
-dnl Compact the heap by moving GC things when doing a shrinking colletion.
-MOZ_ARG_ENABLE_BOOL(gccompacting,
-[  --enable-gccompacting   Compact the heap by moving GC things],
-    JSGC_COMPACTING=1,
-    JSGC_COMPACTING= )
-if test -n "$JSGC_COMPACTING"; then
-    AC_DEFINE(JSGC_COMPACTING)
-fi
-
 dnl ========================================================
 dnl = Use a smaller chunk size for GC chunks
 dnl ========================================================

js/src/frontend/BytecodeEmitter.cpp

@@ -3257,6 +3257,8 @@ EmitDestructuringDeclsWithEmitter(ExclusiveContext *cx, BytecodeEmitter *bce, JS
                 MOZ_ASSERT(element->pn_kid->isKind(PNK_NAME));
                 target = element->pn_kid;
             }
+            if (target->isKind(PNK_ASSIGN))
+                target = target->pn_left;
             if (target->isKind(PNK_NAME)) {
                 if (!EmitName(cx, bce, prologOp, target))
                     return false;
@@ -3276,6 +3278,8 @@ EmitDestructuringDeclsWithEmitter(ExclusiveContext *cx, BytecodeEmitter *bce, JS
 
         ParseNode *target = member->isKind(PNK_MUTATEPROTO) ? member->pn_kid : member->pn_right;
 
+        if (target->isKind(PNK_ASSIGN))
+            target = target->pn_left;
         if (target->isKind(PNK_NAME)) {
             if (!EmitName(cx, bce, prologOp, target))
                 return false;
@@ -3341,7 +3345,7 @@ EmitDestructuringOpsHelper(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode
  * lhs expression. (Same post-condition as EmitDestructuringOpsHelper)
  */
 static bool
-EmitDestructuringLHS(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *pn, VarEmitOption emitOption)
+EmitDestructuringLHS(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *target, VarEmitOption emitOption)
 {
     MOZ_ASSERT(emitOption != DefineVars);
 
@@ -3349,10 +3353,12 @@ EmitDestructuringLHS(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *pn,
     // destructuring initialiser-form, call ourselves to handle it, then pop
     // the matched value. Otherwise emit an lvalue bytecode sequence followed
     // by an assignment op.
-    if (pn->isKind(PNK_SPREAD))
+    if (target->isKind(PNK_SPREAD))
-        pn = pn->pn_kid;
+        target = target->pn_kid;
-    if (pn->isKind(PNK_ARRAY) || pn->isKind(PNK_OBJECT)) {
+    else if (target->isKind(PNK_ASSIGN))
-        if (!EmitDestructuringOpsHelper(cx, bce, pn, emitOption))
+        target = target->pn_left;
+    if (target->isKind(PNK_ARRAY) || target->isKind(PNK_OBJECT)) {
+        if (!EmitDestructuringOpsHelper(cx, bce, target, emitOption))
             return false;
         if (emitOption == InitializeVars) {
             // Per its post-condition, EmitDestructuringOpsHelper has left the
@@ -3363,15 +3369,15 @@ EmitDestructuringLHS(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *pn,
     } else if (emitOption == PushInitialValues) {
         // The lhs is a simple name so the to-be-destructured value is
         // its initial value and there is nothing to do.
-        MOZ_ASSERT(pn->getOp() == JSOP_SETLOCAL || pn->getOp() == JSOP_INITLEXICAL);
+        MOZ_ASSERT(target->getOp() == JSOP_SETLOCAL || target->getOp() == JSOP_INITLEXICAL);
-        MOZ_ASSERT(pn->pn_dflags & PND_BOUND);
+        MOZ_ASSERT(target->pn_dflags & PND_BOUND);
     } else {
-        switch (pn->getKind()) {
+        switch (target->getKind()) {
           case PNK_NAME:
-            if (!BindNameToSlot(cx, bce, pn))
+            if (!BindNameToSlot(cx, bce, target))
                 return false;
 
-            switch (pn->getOp()) {
+            switch (target->getOp()) {
               case JSOP_SETNAME:
               case JSOP_STRICTSETNAME:
               case JSOP_SETGNAME:
@@ -3388,11 +3394,11 @@ EmitDestructuringLHS(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *pn,
                 // but the operands are on the stack in the wrong order for
                 // JSOP_SETPROP, so we have to add a JSOP_SWAP.
                 jsatomid atomIndex;
-                if (!bce->makeAtomIndex(pn->pn_atom, &atomIndex))
+                if (!bce->makeAtomIndex(target->pn_atom, &atomIndex))
                     return false;
 
-                if (!pn->isOp(JSOP_SETCONST)) {
+                if (!target->isOp(JSOP_SETCONST)) {
-                    bool global = pn->isOp(JSOP_SETGNAME) || pn->isOp(JSOP_STRICTSETGNAME);
+                    bool global = target->isOp(JSOP_SETGNAME) || target->isOp(JSOP_STRICTSETGNAME);
                     JSOp bindOp = global ? JSOP_BINDGNAME : JSOP_BINDNAME;
                     if (!EmitIndex32(cx, bindOp, atomIndex, bce))
                         return false;
@@ -3400,7 +3406,7 @@ EmitDestructuringLHS(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *pn,
                         return false;
                 }
 
-                if (!EmitIndexOp(cx, pn->getOp(), atomIndex, bce))
+                if (!EmitIndexOp(cx, target->getOp(), atomIndex, bce))
                     return false;
                 break;
               }
@@ -3408,7 +3414,7 @@ EmitDestructuringLHS(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *pn,
               case JSOP_SETLOCAL:
               case JSOP_SETARG:
               case JSOP_INITLEXICAL:
-                if (!EmitVarOp(cx, pn, pn->getOp(), bce))
+                if (!EmitVarOp(cx, target, target->getOp(), bce))
                     return false;
                 break;
 
@@ -3427,12 +3433,12 @@ EmitDestructuringLHS(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *pn,
             // In `[a.x] = [b]`, per spec, `b` is evaluated before `a`. Then we
             // need a property set -- but the operands are on the stack in the
             // wrong order for JSOP_SETPROP, so we have to add a JSOP_SWAP.
-            if (!EmitTree(cx, bce, pn->pn_expr))
+            if (!EmitTree(cx, bce, target->pn_expr))
                 return false;
             if (Emit1(cx, bce, JSOP_SWAP) < 0)
                 return false;
             JSOp setOp = bce->sc->strict ? JSOP_STRICTSETPROP : JSOP_SETPROP;
-            if (!EmitAtomOp(cx, pn, setOp, bce))
+            if (!EmitAtomOp(cx, target, setOp, bce))
                 return false;
             break;
           }
@@ -3443,14 +3449,14 @@ EmitDestructuringLHS(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *pn,
             // `[a[x]] = [b]`, is handled much the same way. The JSOP_SWAP
             // is emitted by EmitElemOperands.
             JSOp setOp = bce->sc->strict ? JSOP_STRICTSETELEM : JSOP_SETELEM;
-            if (!EmitElemOp(cx, pn, setOp, bce))
+            if (!EmitElemOp(cx, target, setOp, bce))
                 return false;
             break;
           }
 
           case PNK_CALL:
-            MOZ_ASSERT(pn->pn_xflags & PNX_SETCALL);
+            MOZ_ASSERT(target->pn_xflags & PNX_SETCALL);
-            if (!EmitTree(cx, bce, pn))
+            if (!EmitTree(cx, bce, target))
                 return false;
 
             // Pop the call return value. Below, we pop the RHS too, balancing
@@ -3500,6 +3506,33 @@ EmitIteratorNext(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *pn=nullp
     return true;
 }
 
+/**
+ * EmitDefault will check if the value on top of the stack is "undefined".
+ * If so, it will replace that value on the stack with the value defined by |defaultExpr|.
+ */
+static bool
+EmitDefault(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *defaultExpr)
+{
+    if (Emit1(cx, bce, JSOP_DUP) < 0)                          // VALUE VALUE
+        return false;
+    if (Emit1(cx, bce, JSOP_UNDEFINED) < 0)                    // VALUE VALUE UNDEFINED
+        return false;
+    if (Emit1(cx, bce, JSOP_STRICTEQ) < 0)                     // VALUE EQL?
+        return false;
+    // Emit source note to enable ion compilation.
+    if (NewSrcNote(cx, bce, SRC_IF) < 0)
+        return false;
+    ptrdiff_t jump = EmitJump(cx, bce, JSOP_IFEQ, 0);          // VALUE
+    if (jump < 0)
+        return false;
+    if (Emit1(cx, bce, JSOP_POP) < 0)                          // .
+        return false;
+    if (!EmitTree(cx, bce, defaultExpr))                       // DEFAULTVALUE
+        return false;
+    SetJumpOffsetAt(bce, jump);
+    return true;
+}
+
 static bool
 EmitDestructuringOpsArrayHelper(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *pattern,
                                 VarEmitOption emitOption)
@@ -3526,7 +3559,14 @@ EmitDestructuringOpsArrayHelper(ExclusiveContext *cx, BytecodeEmitter *bce, Pars
          * current property name "label" on the left of a colon in the object
          * initializer.
          */
-        if (member->isKind(PNK_SPREAD)) {
+        ParseNode *pndefault = nullptr;
+        ParseNode *elem = member;
+        if (elem->isKind(PNK_ASSIGN)) {
+            pndefault = elem->pn_right;
+            elem = elem->pn_left;
+        }
+
+        if (elem->isKind(PNK_SPREAD)) {
             /* Create a new array with the rest of the iterator */
             ptrdiff_t off = EmitN(cx, bce, JSOP_NEWARRAY, 3);          // ... OBJ? ITER ARRAY
             if (off < 0)
@@ -3581,8 +3621,11 @@ EmitDestructuringOpsArrayHelper(ExclusiveContext *cx, BytecodeEmitter *bce, Pars
                 return false;
         }
 
+        if (pndefault && !EmitDefault(cx, bce, pndefault))
+            return false;
+
         // Destructure into the pattern the element contains.
-        ParseNode *subpattern = member;
+        ParseNode *subpattern = elem;
         if (subpattern->isKind(PNK_ELISION)) {
             // The value destructuring into an elision just gets ignored.
             if (Emit1(cx, bce, JSOP_POP) < 0)                          // ... OBJ? ITER
@@ -3684,6 +3727,12 @@ EmitDestructuringOpsObjectHelper(ExclusiveContext *cx, BytecodeEmitter *bce, Par
         if (needsGetElem && !EmitElemOpBase(cx, bce, JSOP_GETELEM))    // ... OBJ PROP
             return false;
 
+        if (subpattern->isKind(PNK_ASSIGN)) {
+            if (!EmitDefault(cx, bce, subpattern->pn_right))
+                return false;
+            subpattern = subpattern->pn_left;
+        }
+
         // Destructure PROP per this member's subpattern.
         int32_t depthBefore = bce->stackDepth;
         if (!EmitDestructuringLHS(cx, bce, subpattern, emitOption))

js/src/frontend/Parser.cpp

@@ -3385,6 +3385,8 @@ Parser<FullParseHandler>::checkDestructuringObject(BindData<FullParseHandler> *d
             MOZ_ASSERT(member->isKind(PNK_COLON) || member->isKind(PNK_SHORTHAND));
             expr = member->pn_right;
         }
+        if (expr->isKind(PNK_ASSIGN))
+            expr = expr->pn_left;
 
         bool ok;
         if (expr->isKind(PNK_ARRAY) || expr->isKind(PNK_OBJECT)) {
@@ -3429,6 +3431,8 @@ Parser<FullParseHandler>::checkDestructuringArray(BindData<FullParseHandler> *da
                 report(ParseError, false, target, JSMSG_BAD_DESTRUCT_TARGET);
                 return false;
             }
+        } else if (target->isKind(PNK_ASSIGN)) {
+            target = target->pn_left;
         }
 
         bool ok;

js/src/gc/GCInternals.h

@@ -143,7 +143,6 @@ void
 CheckHashTablesAfterMovingGC(JSRuntime *rt);
 #endif
 
-#ifdef JSGC_COMPACTING
 struct MovingTracer : JSTracer {
     explicit MovingTracer(JSRuntime *rt) : JSTracer(rt, Visit, TraceWeakMapKeysValues) {}
 
@@ -152,7 +151,6 @@ struct MovingTracer : JSTracer {
         return trc->callback == Visit;
     }
 };
-#endif
 
 } /* namespace gc */
 } /* namespace js */

js/src/gc/GCRuntime.h

@@ -34,11 +34,8 @@ struct FinalizePhase;
 class MarkingValidator;
 struct AutoPrepareForTracing;
 class AutoTraceSession;
-
-#ifdef JSGC_COMPACTING
 struct ArenasToUpdate;
 struct MovingTracer;
-#endif
 
 class ChunkPool
 {
@@ -297,11 +294,7 @@ class GCRuntime
     bool isHeapMajorCollecting() { return heapState == js::MajorCollecting; }
     bool isHeapMinorCollecting() { return heapState == js::MinorCollecting; }
     bool isHeapCollecting() { return isHeapMajorCollecting() || isHeapMinorCollecting(); }
-#ifdef JSGC_COMPACTING
     bool isHeapCompacting() { return isHeapMajorCollecting() && state() == COMPACT; }
-#else
-    bool isHeapCompacting() { return false; }
-#endif
 
     bool triggerGC(JS::gcreason::Reason reason);
     void maybeAllocTriggerZoneGC(Zone *zone, const AutoLockGC &lock);
@@ -437,11 +430,9 @@ class GCRuntime
     void disableGenerationalGC();
     void enableGenerationalGC();
 
-#ifdef JSGC_COMPACTING
     void disableCompactingGC();
     void enableCompactingGC();
     bool isCompactingGCEnabled();
-#endif
 
     void setGrayRootsTracer(JSTraceDataOp traceOp, void *data);
     bool addBlackRootsTracer(JSTraceDataOp traceOp, void *data);
@@ -604,19 +595,17 @@ class GCRuntime
     void assertBackgroundSweepingFinished();
     bool shouldCompact();
     bool compactPhase(bool lastGC);
-#ifdef JSGC_COMPACTING
     void sweepTypesAfterCompacting(Zone *zone);
     void sweepZoneAfterCompacting(Zone *zone);
     ArenaHeader *relocateArenas();
-    void updateAllCellPointersParallel(ArenasToUpdate &source);
+    void updateAllCellPointersParallel(MovingTracer *trc);
-    void updateAllCellPointersSerial(MovingTracer *trc, ArenasToUpdate &source);
+    void updateAllCellPointersSerial(MovingTracer *trc);
     void updatePointersToRelocatedCells();
     void releaseRelocatedArenas(ArenaHeader *relocatedList);
     void releaseRelocatedArenasWithoutUnlocking(ArenaHeader *relocatedList, const AutoLockGC& lock);
 #ifdef DEBUG
     void protectRelocatedArenas(ArenaHeader *relocatedList);
     void unprotectRelocatedArenas(ArenaHeader *relocatedList);
-#endif
 #endif
     void finishCollection();
 
@@ -811,13 +800,11 @@ class GCRuntime
      */
     unsigned generationalDisabled;
 
-#ifdef JSGC_COMPACTING
     /*
      * Some code cannot tolerate compacting GC so it can be disabled with this
      * counter.
      */
     unsigned compactingDisabled;
-#endif
 
     /*
      * This is true if we are in the middle of a brain transplant (e.g.,
@@ -918,9 +905,7 @@ class GCRuntime
 
     size_t noGCOrAllocationCheck;
 
-#ifdef JSGC_COMPACTING
     ArenaHeader* relocatedArenasToRelease;
-#endif
 
 #endif
 

js/src/gc/Heap.h

@@ -642,10 +642,8 @@ struct ArenaHeader
 
     void unmarkAll();
 
-#ifdef JSGC_COMPACTING
     size_t countUsedCells();
     size_t countFreeCells();
-#endif
 };
 static_assert(ArenaZoneOffset == offsetof(ArenaHeader, zone),
               "The hardcoded API zone offset must match the actual offset.");

js/src/gc/Marking.cpp

@@ -161,18 +161,14 @@ CheckMarkedThing(JSTracer *trc, T **thingp)
     T *thing = *thingp;
     MOZ_ASSERT(*thingp);
 
-#ifdef JSGC_COMPACTING
     thing = MaybeForwarded(thing);
-#endif
 
     /* This function uses data that's not available in the nursery. */
     if (IsInsideNursery(thing))
         return;
 
-#ifdef JSGC_COMPACTING
     MOZ_ASSERT_IF(!MovingTracer::IsMovingTracer(trc) && !Nursery::IsMinorCollectionTracer(trc),
                   !IsForwarded(*thingp));
-#endif
 
     /*
      * Permanent atoms are not associated with this runtime, but will be ignored
@@ -184,13 +180,8 @@ CheckMarkedThing(JSTracer *trc, T **thingp)
     Zone *zone = thing->zoneFromAnyThread();
     JSRuntime *rt = trc->runtime();
 
-#ifdef JSGC_COMPACTING
     MOZ_ASSERT_IF(!MovingTracer::IsMovingTracer(trc), CurrentThreadCanAccessZone(zone));
     MOZ_ASSERT_IF(!MovingTracer::IsMovingTracer(trc), CurrentThreadCanAccessRuntime(rt));
-#else
-    MOZ_ASSERT(CurrentThreadCanAccessZone(zone));
-    MOZ_ASSERT(CurrentThreadCanAccessRuntime(rt));
-#endif
 
     MOZ_ASSERT(zone->runtimeFromAnyThread() == trc->runtime());
     MOZ_ASSERT(trc->hasTracingDetails());
@@ -437,10 +428,8 @@ IsMarkedFromAnyThread(T **thingp)
     Zone *zone = (*thingp)->asTenured().zoneFromAnyThread();
     if (!zone->isCollectingFromAnyThread() || zone->isGCFinished())
         return true;
-#ifdef JSGC_COMPACTING
     if (zone->isGCCompacting() && IsForwarded(*thingp))
         *thingp = Forwarded(*thingp);
-#endif
     return (*thingp)->asTenured().isMarked();
 }
 
@@ -481,12 +470,10 @@ IsAboutToBeFinalizedFromAnyThread(T **thingp)
             return false;
         return !thing->asTenured().isMarked();
     }
-#ifdef JSGC_COMPACTING
     else if (zone->isGCCompacting() && IsForwarded(thing)) {
         *thingp = Forwarded(thing);
         return false;
     }
-#endif
 
     return false;
 }
@@ -504,11 +491,10 @@ UpdateIfRelocated(JSRuntime *rt, T **thingp)
         return *thingp;
     }
 
-#ifdef JSGC_COMPACTING
     Zone *zone = (*thingp)->zone();
     if (zone->isGCCompacting() && IsForwarded(*thingp))
         *thingp = Forwarded(*thingp);
-#endif
+
     return *thingp;
 }
 
@@ -1815,10 +1801,8 @@ GCMarker::processMarkStackTop(SliceBudget &budget)
             // Global objects all have the same trace hook. That hook is safe without barriers
             // if the global has no custom trace hook of its own, or has been moved to a different
             // compartment, and so can't have one.
-            MOZ_ASSERT_IF(runtime()->gc.isIncrementalGCEnabled() &&
+            MOZ_ASSERT_IF(!(clasp->trace == JS_GlobalObjectTraceHook &&
-                          !(clasp->trace == JS_GlobalObjectTraceHook &&
+                            (!obj->compartment()->options().getTrace() || !obj->isOwnGlobal())),
-                            (!obj->compartment()->options().getTrace() ||
-                             !obj->isOwnGlobal())),
                           clasp->flags & JSCLASS_IMPLEMENTS_BARRIERS);
             if (clasp->trace == InlineTypedObject::obj_trace)
                 goto scan_typed_obj;

js/src/jit-test/tests/basic/destructuring-default.js

@@ -0,0 +1,166 @@
+
+load(libdir + 'asserts.js');
+load(libdir + 'eqArrayHelper.js');
+
+var arrayPattern = '[a = 1, b = 2, c = 3, d = 4, e = 5, f = 6]';
+var objectPattern = '{0: a = 1, 1: b = 2, 2: c = 3, 3: d = 4, 4: e = 5, 5: f = 6}';
+var nestedPattern = '{a: a = 1, b: [b = 2] = [], c: {c: [c]} = {c: [3]}, d: {d, e} = {d: 4, e: 5}, f: f = 6}';
+
+function testAll(fn) {
+  assertEqArray(fn(arrayPattern, []), [1, 2, 3, 4, 5, 6]);
+  assertEqArray(fn(arrayPattern, [2, 3, 4, 5, 6, 7, 8, 9]), [2, 3, 4, 5, 6, 7]);
+  assertEqArray(fn(arrayPattern, [undefined, 0, false, null, "", undefined]), [1, 0, false, null, "", 6]);
+  assertEqArray(fn(arrayPattern, [0, false]), [0, false, 3, 4, 5, 6]);
+
+  assertEqArray(fn(objectPattern, []), [1, 2, 3, 4, 5, 6]);
+  assertEqArray(fn(objectPattern, [2, 3, 4, 5, 6, 7, 8, 9]), [2, 3, 4, 5, 6, 7]);
+  assertEqArray(fn(objectPattern, [undefined, 0, false, null, "", undefined]), [1, 0, false, null, "", 6]);
+  assertEqArray(fn(objectPattern, [0, false]), [0, false, 3, 4, 5, 6]);
+
+  assertEqArray(fn(nestedPattern, {}), [1, 2, 3, 4, 5, 6]);
+  assertEqArray(fn(nestedPattern, {a: 2, b: [], c: undefined}), [2, 2, 3, 4, 5, 6]);
+  assertEqArray(fn(nestedPattern, {a: undefined, b: [3], c: {c: [4]}}), [1, 3, 4, 4, 5, 6]);
+  assertEqArray(fn(nestedPattern, {a: undefined, b: [3], c: {c: [4]}, d: {d: 5, e: 6}}), [1, 3, 4, 5, 6, 6]);
+}
+
+function testVar(pattern, input) {
+  return new Function('input',
+    'var ' + pattern + ' = input;' +
+    'return [a, b, c, d, e, f];'
+  )(input);
+}
+testAll(testVar);
+
+function testLet(pattern, input) {
+  return new Function('input',
+    'let ' + pattern + ' = input;' +
+    'return [a, b, c, d, e, f];'
+  )(input);
+}
+testAll(testLet);
+
+function testConst(pattern, input) {
+  return new Function('input',
+    'const ' + pattern + ' = input;' +
+    'return [a, b, c, d, e, f];'
+  )(input);
+}
+testAll(testConst);
+
+function testGlobal(pattern, input) {
+  return new Function('input',
+    '(' + pattern + ') = input;' +
+    'return [a, b, c, d, e, f];'
+  )(input);
+}
+testAll(testGlobal);
+
+function testClosure(pattern, input) {
+  return new Function('input',
+    'var rest; (function () {' +
+    '(' + pattern + ') = input;' +
+    '})();' +
+    'return [a, b, c, d, e, f];'
+  )(input);
+}
+testAll(testClosure);
+
+function testArgument(pattern, input) {
+  return new Function('input',
+    'return (function (' + pattern + ') {' +
+    'return [a, b, c, d, e, f]; })(input);'
+  )(input);
+}
+testAll(testArgument);
+
+function testArgumentFunction(pattern, input) {
+  return new Function(pattern,
+    'return [a, b, c, d, e, f];'
+  )(input);
+}
+// XXX: ES6 requires the `Function` constructor to accept arbitrary
+// `BindingElement`s as formal parameters. See Bug 1037939.
+// Once fixed, please update the assertions below.
+assertThrowsInstanceOf(() => testAll(testArgumentFunction), SyntaxError);
+
+function testThrow(pattern, input) {
+  return new Function('input',
+    'try { throw input }' +
+    'catch(' + pattern + ') {' +
+    'return [a, b, c, d, e, f]; }'
+  )(input);
+}
+testAll(testThrow);
+
+// XXX: Support for let blocks and expressions will be removed in bug 1023609.
+// However, they test a special code path in destructuring assignment so having
+// these tests here for now seems like a good idea.
+function testLetBlock(pattern, input) {
+  return new Function('input',
+    'let (' + pattern + ' = input)' +
+    '{ return [a, b, c, d, e, f]; }'
+  )(input);
+}
+testAll(testLetBlock);
+
+function testLetExpression(pattern, input) {
+  return new Function('input',
+    'return (let (' + pattern + ' = input) [a, b, c, d, e, f]);'
+  )(input);
+}
+testAll(testLetExpression);
+
+// test global const
+const [ca = 1, cb = 2] = [];
+assertEq(ca, 1);
+assertEq(cb, 2);
+
+const {a: {a: cc = 3} = {a: undefined}} = {};
+assertEq(cc, 3);
+
+// test that the assignment happens in source order
+var a = undefined, b = undefined, c = undefined;
+({a: a = 1, c: c = 2, b: b = 3}) = {
+  get a() {
+    assertEq(a, undefined);
+    assertEq(c, undefined);
+    assertEq(b, undefined);
+    return undefined;
+  },
+  get b() {
+    assertEq(a, 1);
+    assertEq(c, 2);
+    assertEq(b, undefined);
+    return 4;
+  },
+  get c() {
+    assertEq(a, 1);
+    assertEq(c, undefined);
+    assertEq(b, undefined);
+    return undefined;
+  }
+};
+assertEq(b, 4);
+
+assertThrowsInstanceOf(() => { var {a: {a} = null} = {}; }, TypeError);
+assertThrowsInstanceOf(() => { var [[a] = 2] = []; }, TypeError);
+
+// destructuring assignment might have  duplicate variable names.
+var [a = 1, a = 2] = [3];
+assertEq(a, 2);
+
+// assignment to properties of default params
+[a = {y: 2}, a.x = 1] = [];
+assertEq(typeof a, 'object');
+assertEq(a.x, 1);
+assertEq(a.y, 2);
+
+// defaults are evaluated even if there is no binding
+var evaled = false;
+({a: {} = (evaled = true, null)}) = {};
+assertEq(evaled, true);
+evaled = false;
+assertThrowsInstanceOf(() => { [[] = (evaled = true, 2)] = [] }, TypeError);
+assertEq(evaled, true);
+
+assertThrowsInstanceOf(() => new Function('var [...rest = defaults] = [];'), SyntaxError);

js/src/jit-test/tests/ion/simd-bug1123631.js

@@ -0,0 +1,9 @@
+if (!this.hasOwnProperty("SIMD"))
+  quit();
+
+var float64x2 = SIMD.float64x2;
+function test() {
+  var a = float64x2(1, 2);
+}
+test();
+test();

js/src/jit/MCallOptimize.cpp

@@ -2530,9 +2530,8 @@ IonBuilder::inlineConstructSimdObject(CallInfo &callInfo, SimdTypeDescr *descr)
       case SimdTypeDescr::TYPE_FLOAT32:
         simdType = MIRType_Float32x4;
         break;
-      default:
+      case SimdTypeDescr::TYPE_FLOAT64:
-        MOZ_CRASH("Unknown SIMD kind when generating MSimdBox instruction.");
+        return InliningStatus_NotInlined; // :TODO: NYI (Bug 1124205)
-        return InliningStatus_NotInlined;
     }
 
     // We do not inline SIMD constructors if the number of arguments does not

js/src/js-config.h.in

@@ -31,9 +31,6 @@
 /* Define to 1 if SpiderMonkey should use small chunks. */
 #undef JS_GC_SMALL_CHUNK_SIZE
 
-/* Define to 1 if SpiderMonkey should use Compacting GC. */
-#undef JSGC_COMPACTING
-
 /* Define to 1 if the <endian.h> header is present and
    useable.  See jscpucfg.h.  */
 #undef JS_HAVE_ENDIAN_H

js/src/jsapi-tests/testPersistentRooted.cpp

@@ -21,7 +21,7 @@ int BarkWhenTracedClass::finalizeCount;
 int BarkWhenTracedClass::traceCount;
 
 const JSClass BarkWhenTracedClass::class_ = {
-    "BarkWhenTracedClass", 0,
+    "BarkWhenTracedClass", JSCLASS_IMPLEMENTS_BARRIERS,
     nullptr,
     nullptr,
     nullptr,

js/src/jsapi-tests/testWeakMap.cpp

@@ -66,10 +66,6 @@ checkSize(JS::HandleObject map, uint32_t expected)
 }
 END_TEST(testWeakMap_basicOperations)
 
-// TODO: this test stores object pointers in a private slot which is not marked
-// and so doesn't work with compacting GC.
-#ifndef JSGC_COMPACTING
-
 BEGIN_TEST(testWeakMap_keyDelegates)
 {
     JS_SetGCParameter(rt, JSGC_MODE, JSGC_MODE_INCREMENTAL);
@@ -253,5 +249,3 @@ checkSize(JS::HandleObject map, uint32_t expected)
     return true;
 }
 END_TEST(testWeakMap_keyDelegates)
-
-#endif

js/src/jscompartment.cpp

@@ -649,8 +649,6 @@ JSCompartment::sweepCrossCompartmentWrappers()
     }
 }
 
-#ifdef JSGC_COMPACTING
-
 void JSCompartment::fixupAfterMovingGC()
 {
     fixupGlobal();
@@ -667,8 +665,6 @@ JSCompartment::fixupGlobal()
         global_.set(MaybeForwarded(global));
 }
 
-#endif // JSGC_COMPACTING
-
 void
 JSCompartment::purge()
 {

js/src/jscompartment.h

@@ -398,12 +398,10 @@ struct JSCompartment
     void purge();
     void clearTables();
 
-#ifdef JSGC_COMPACTING
     void fixupInitialShapeTable();
     void fixupNewTypeObjectTable(js::types::NewTypeObjectTable &table);
     void fixupAfterMovingGC();
     void fixupGlobal();
-#endif
 
     bool hasObjectMetadataCallback() const { return objectMetadataCallback; }
     void setObjectMetadataCallback(js::ObjectMetadataCallback callback);

js/src/jsgc.cpp

@@ -1112,9 +1112,7 @@ GCRuntime::GCRuntime(JSRuntime *rt) :
     sliceBudget(SliceBudget::Unlimited),
     incrementalAllowed(true),
     generationalDisabled(0),
-#ifdef JSGC_COMPACTING
     compactingDisabled(0),
-#endif
     manipulatingDeadZones(false),
     objectsMarkedInDeadZones(0),
     poked(false),
@@ -1134,9 +1132,7 @@ GCRuntime::GCRuntime(JSRuntime *rt) :
 #ifdef DEBUG
     inUnsafeRegion(0),
     noGCOrAllocationCheck(0),
-#ifdef JSGC_COMPACTING
     relocatedArenasToRelease(nullptr),
-#endif
 #endif
     lock(nullptr),
     lockOwner(nullptr),
@@ -1930,15 +1926,9 @@ ArenaLists::allocateFromArenaInner(JS::Zone *zone, ArenaHeader *aheader, AllocKi
 bool
 GCRuntime::shouldCompact()
 {
-#ifdef JSGC_COMPACTING
     return invocationKind == GC_SHRINK && isCompactingGCEnabled();
-#else
-    return false;
-#endif
 }
 
-#ifdef JSGC_COMPACTING
-
 void
 GCRuntime::disableCompactingGC()
 {
@@ -2373,13 +2363,19 @@ namespace gc {
 
 struct ArenasToUpdate
 {
-    explicit ArenasToUpdate(JSRuntime *rt);
+    enum KindsToUpdate {
+        FOREGROUND = 1,
+        BACKGROUND = 2,
+        ALL = FOREGROUND | BACKGROUND
+    };
+    ArenasToUpdate(JSRuntime *rt, KindsToUpdate kinds);
     bool done() { return initialized && arena == nullptr; }
     ArenaHeader* next();
     ArenaHeader *getArenasToUpdate(AutoLockHelperThreadState& lock, unsigned max);
 
   private:
     bool initialized;
+    KindsToUpdate kinds;
     GCZonesIter zone;    // Current zone to process, unless zone.done()
     unsigned kind;       // Current alloc kind to process
     ArenaHeader *arena;  // Next arena to process
@@ -2390,16 +2386,25 @@ struct ArenasToUpdate
 bool ArenasToUpdate::shouldProcessKind(unsigned kind)
 {
     MOZ_ASSERT(kind < FINALIZE_LIMIT);
-    return
+    if (kind == FINALIZE_FAT_INLINE_STRING ||
-        kind != FINALIZE_FAT_INLINE_STRING &&
+        kind == FINALIZE_STRING ||
-        kind != FINALIZE_STRING &&
+        kind == FINALIZE_EXTERNAL_STRING ||
-        kind != FINALIZE_EXTERNAL_STRING &&
+        kind == FINALIZE_SYMBOL)
-        kind != FINALIZE_SYMBOL;
+    {
+        return false;
+    }
+
+    if (kind > FINALIZE_OBJECT_LAST || js::gc::IsBackgroundFinalized(AllocKind(kind)))
+        return (kinds & BACKGROUND) != 0;
+    else
+        return (kinds & FOREGROUND) != 0;
 }
 
-ArenasToUpdate::ArenasToUpdate(JSRuntime *rt)
+ArenasToUpdate::ArenasToUpdate(JSRuntime *rt, KindsToUpdate kinds)
-  : initialized(false), zone(rt, SkipAtoms)
+  : initialized(false), kinds(kinds), zone(rt, SkipAtoms)
-{}
+{
+    MOZ_ASSERT(kinds && !(kinds & ~ALL));
+}
 
 ArenaHeader *
 ArenasToUpdate::next()
@@ -2526,20 +2531,23 @@ UpdateCellPointersTask::run()
 } // namespace js
 
 void
-GCRuntime::updateAllCellPointersParallel(ArenasToUpdate &source)
+GCRuntime::updateAllCellPointersParallel(MovingTracer *trc)
 {
     AutoDisableProxyCheck noProxyCheck(rt); // These checks assert when run in parallel.
 
     const size_t minTasks = 2;
     const size_t maxTasks = 8;
     unsigned taskCount = Min(Max(HelperThreadState().cpuCount / 2, minTasks),
-                             maxTasks);
+                             maxTasks) + 1;
     UpdateCellPointersTask updateTasks[maxTasks];
 
+    ArenasToUpdate fgArenas(rt, ArenasToUpdate::FOREGROUND);
+    ArenasToUpdate bgArenas(rt, ArenasToUpdate::BACKGROUND);
     AutoLockHelperThreadState lock;
     unsigned i;
-    for (i = 0; i < taskCount && !source.done(); ++i) {
+    for (i = 0; i < taskCount && !bgArenas.done(); ++i) {
-        updateTasks[i].init(rt, &source, lock);
+        ArenasToUpdate *source = i == 0 ? &fgArenas : &bgArenas;
+        updateTasks[i].init(rt, source, lock);
         startTask(updateTasks[i], gcstats::PHASE_COMPACT_UPDATE_CELLS);
     }
     unsigned tasksStarted = i;
@@ -2549,9 +2557,10 @@ GCRuntime::updateAllCellPointersParallel(ArenasToUpdate &source)
 }
 
 void
-GCRuntime::updateAllCellPointersSerial(MovingTracer *trc, ArenasToUpdate &source)
+GCRuntime::updateAllCellPointersSerial(MovingTracer *trc)
 {
-    while (ArenaHeader *arena = source.next())
+    ArenasToUpdate allArenas(rt, ArenasToUpdate::ALL);
+    while (ArenaHeader *arena = allArenas.next())
         UpdateCellPointers(trc, arena);
 }
 
@@ -2580,11 +2589,10 @@ GCRuntime::updatePointersToRelocatedCells()
     // Iterate through all cells that can contain JSObject pointers to update
     // them. Since updating each cell is independent we try to parallelize this
     // as much as possible.
-    ArenasToUpdate source(rt);
     if (CanUseExtraThreads())
-        updateAllCellPointersParallel(source);
+        updateAllCellPointersParallel(&trc);
     else
-        updateAllCellPointersSerial(&trc, source);
+        updateAllCellPointersSerial(&trc);
 
     // Mark roots to update them.
     {
@@ -2697,12 +2705,10 @@ GCRuntime::releaseRelocatedArenasWithoutUnlocking(ArenaHeader *relocatedList, co
     }
 }
 
-#endif // JSGC_COMPACTING
-
 void
 GCRuntime::releaseHeldRelocatedArenas()
 {
-#if defined(JSGC_COMPACTING) && defined(DEBUG)
+#ifdef DEBUG
     // In debug mode we don't release relocated arenas straight away.  Instead
     // we protect them and hold onto them until the next GC sweep phase to catch
     // any pointers to them that didn't get forwarded.
@@ -5462,9 +5468,6 @@ GCRuntime::endSweepPhase(bool lastGC)
 bool
 GCRuntime::compactPhase(bool lastGC)
 {
-#ifndef JSGC_COMPACTING
-    MOZ_CRASH();
-#else
     gcstats::AutoPhase ap(stats, gcstats::PHASE_COMPACT);
 
     if (isIncremental) {
@@ -5529,8 +5532,6 @@ GCRuntime::compactPhase(bool lastGC)
         }
     }
 #endif
-
-#endif // JSGC_COMPACTING
     return true;
 }
 
@@ -5690,7 +5691,6 @@ GCRuntime::resetIncrementalGC(const char *reason)
         break;
       }
 
-#ifdef JSGC_COMPACTING
       case COMPACT: {
         {
             gcstats::AutoPhase ap(stats, gcstats::PHASE_WAIT_BACKGROUND_THREAD);
@@ -5706,7 +5706,6 @@ GCRuntime::resetIncrementalGC(const char *reason)
         invocationKind = oldInvocationKind;
         break;
       }
-#endif
 
       default:
         MOZ_CRASH("Invalid incremental GC state");
@@ -6394,7 +6393,7 @@ GCRuntime::onOutOfMallocMemory(const AutoLockGC &lock)
 {
     // Release any relocated arenas we may be holding on to, without releasing
     // the GC lock.
-#if defined(JSGC_COMPACTING) && defined(DEBUG)
+#ifdef DEBUG
     unprotectRelocatedArenas(relocatedArenasToRelease);
     releaseRelocatedArenasWithoutUnlocking(relocatedArenasToRelease, lock);
     relocatedArenasToRelease = nullptr;
@@ -7115,19 +7114,13 @@ JS::IsIncrementalGCEnabled(JSRuntime *rt)
 JS_PUBLIC_API(void)
 JS::DisableCompactingGC(JSRuntime *rt)
 {
-#ifdef JSGC_COMPACTING
     rt->gc.disableCompactingGC();
-#endif
 }
 
 JS_PUBLIC_API(bool)
 JS::IsCompactingGCEnabled(JSRuntime *rt)
 {
-#ifdef JSGC_COMPACTING
     return rt->gc.isCompactingGCEnabled();
-#else
-    return false;
-#endif
 }
 
 JS_PUBLIC_API(bool)

js/src/jsgc.h

@@ -454,11 +454,9 @@ class ArenaList {
         return *this;
     }
 
-#ifdef JSGC_COMPACTING
     ArenaHeader *removeRemainingArenas(ArenaHeader **arenap, const AutoLockGC &lock);
     ArenaHeader *pickArenasToRelocate(JSRuntime *runtime);
     ArenaHeader *relocateArenas(ArenaHeader *toRelocate, ArenaHeader *relocated);
-#endif
 };
 
 /*
@@ -785,9 +783,7 @@ class ArenaLists
         MOZ_ASSERT(freeLists[kind].isEmpty());
     }
 
-#ifdef JSGC_COMPACTING
     ArenaHeader *relocateArenas(ArenaHeader *relocatedList);
-#endif
 
     void queueForegroundObjectsForSweep(FreeOp *fop);
     void queueForegroundThingsForSweep(FreeOp *fop);
@@ -1270,9 +1266,7 @@ inline void
 CheckGCThingAfterMovingGC(T *t)
 {
     MOZ_ASSERT_IF(t, !IsInsideNursery(t));
-#ifdef JSGC_COMPACTING
     MOZ_ASSERT_IF(t, !IsForwarded(t));
-#endif
 }
 
 inline void
@@ -1429,16 +1423,11 @@ struct AutoDisableProxyCheck
 
 struct AutoDisableCompactingGC
 {
-#ifdef JSGC_COMPACTING
     explicit AutoDisableCompactingGC(JSRuntime *rt);
     ~AutoDisableCompactingGC();
 
   private:
     gc::GCRuntime &gc;
-#else
-    explicit AutoDisableCompactingGC(JSRuntime *rt) {}
-    ~AutoDisableCompactingGC() {}
-#endif
 };
 
 void

js/src/jsinfer.cpp

@@ -4891,8 +4891,6 @@ JSCompartment::sweepNewTypeObjectTable(NewTypeObjectTable &table)
     }
 }
 
-#ifdef JSGC_COMPACTING
-
 void
 JSCompartment::fixupNewTypeObjectTable(NewTypeObjectTable &table)
 {
@@ -4966,8 +4964,6 @@ TypeObject::fixupAfterMovingGC()
     }
 }
 
-#endif // JSGC_COMPACTING
-
 #ifdef JSGC_HASH_TABLE_CHECKS
 
 void

js/src/jsinfer.h

@@ -293,7 +293,7 @@ public:
 };
 
 /* Flags and other state stored in TypeSet::flags */
-enum MOZ_ENUM_TYPE(uint32_t) {
+enum : uint32_t {
     TYPE_FLAG_UNDEFINED =   0x1,
     TYPE_FLAG_NULL      =   0x2,
     TYPE_FLAG_BOOLEAN   =   0x4,
@@ -352,7 +352,7 @@ enum MOZ_ENUM_TYPE(uint32_t) {
 typedef uint32_t TypeFlags;
 
 /* Flags and other state stored in TypeObject::flags */
-enum MOZ_ENUM_TYPE(uint32_t) {
+enum : uint32_t {
     /* Whether this type object is associated with some allocation site. */
     OBJECT_FLAG_FROM_ALLOCATION_SITE  = 0x1,
 
@@ -925,10 +925,7 @@ class TypeNewScript
 
     void trace(JSTracer *trc);
     void sweep();
-
-#ifdef JSGC_COMPACTING
     void fixupAfterMovingGC();
-#endif
 
     void registerNewObject(PlainObject *res);
     void unregisterNewObject(PlainObject *res);
@@ -1241,9 +1238,7 @@ struct TypeObject : public gc::TenuredCell
         flags_ |= generation << OBJECT_FLAG_GENERATION_SHIFT;
     }
 
-#ifdef JSGC_COMPACTING
     void fixupAfterMovingGC();
-#endif
 
     size_t sizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf) const;
 

js/src/jsobj.cpp

@@ -1232,32 +1232,10 @@ NewObject(ExclusiveContext *cx, types::TypeObject *type_, JSObject *parent, gc::
         obj = nobj;
     }
 
-    /*
-     * This will cancel an already-running incremental GC from doing any more
-     * slices, and it will prevent any future incremental GCs.
-     */
     bool globalWithoutCustomTrace = clasp->trace == JS_GlobalObjectTraceHook &&
                                     !cx->compartment()->options().getTrace();
-    if (clasp->trace &&
+    if (clasp->trace && !globalWithoutCustomTrace)
-        !globalWithoutCustomTrace &&
+        MOZ_RELEASE_ASSERT(clasp->flags & JSCLASS_IMPLEMENTS_BARRIERS);
-        !(clasp->flags & JSCLASS_IMPLEMENTS_BARRIERS))
-    {
-        if (!cx->shouldBeJSContext())
-            return nullptr;
-        JSRuntime *rt = cx->asJSContext()->runtime();
-        rt->gc.disallowIncrementalGC();
-
-#ifdef DEBUG
-        if (rt->gc.gcMode() == JSGC_MODE_INCREMENTAL) {
-            fprintf(stderr,
-                    "The class %s has a trace hook but does not declare the\n"
-                    "JSCLASS_IMPLEMENTS_BARRIERS flag. Please ensure that it correctly\n"
-                    "implements write barriers and then set the flag.\n",
-                    clasp->name);
-            MOZ_CRASH();
-        }
-#endif
-    }
 
     probes::CreateObject(cx, obj);
     return obj;
@@ -2928,13 +2906,18 @@ js::NonProxyLookupOwnProperty(JSContext *cx, LookupGenericOp lookup,
             MaybeRooted<JSObject*, allowGC>::template downcastHandle<NativeObject>(obj);
 
         bool done;
-        if (!LookupOwnPropertyInline<allowGC>(cx, nobj, id, objp, propp, &done))
+        if (!LookupOwnPropertyInline<allowGC>(cx, nobj, id, propp, &done))
             return false;
         if (!done) {
             objp.set(nullptr);
             propp.set(nullptr);
             return true;
         }
+
+        if (propp)
+            objp.set(obj);
+        else
+            objp.set(nullptr);
     }
 
     if (!propp)

js/src/jspropertytree.cpp

@@ -235,8 +235,6 @@ Shape::finalize(FreeOp *fop)
         fop->delete_(kids.toHash());
 }
 
-#ifdef JSGC_COMPACTING
-
 void
 Shape::fixupDictionaryShapeAfterMovingGC()
 {
@@ -322,8 +320,6 @@ Shape::fixupAfterMovingGC()
         fixupShapeTreeAfterMovingGC();
 }
 
-#endif // JSGC_COMPACTING
-
 void
 ShapeGetterSetterRef::mark(JSTracer *trc)
 {

js/src/jspubtd.h

@@ -20,8 +20,7 @@
 
 #include "js/TypeDecls.h"
 
-#if (defined(JS_GC_ZEAL)) || \
+#if (defined(JS_GC_ZEAL)) || defined(DEBUG)
-    (defined(JSGC_COMPACTING) && defined(DEBUG))
 # define JSGC_HASH_TABLE_CHECKS
 #endif
 

js/src/shell/js.cpp

@@ -357,6 +357,12 @@ ShellInterruptCallback(JSContext *cx)
     if (!gServiceInterrupt)
         return true;
 
+    // Reset gServiceInterrupt. CancelExecution or InterruptIf will set it to
+    // true to distinguish watchdog or user triggered interrupts.
+    // Do this first to prevent other interrupts that may occur while the
+    // user-supplied callback is executing from re-entering the handler.
+    gServiceInterrupt = false;
+
     bool result;
     RootedValue interruptFunc(cx, *gInterruptFunc);
     if (!interruptFunc.isNull()) {
@@ -379,10 +385,6 @@ ShellInterruptCallback(JSContext *cx)
     if (!result && gExitCode == 0)
         gExitCode = EXITCODE_TIMEOUT;
 
-    // Reset gServiceInterrupt. CancelExecution or InterruptIf will set it to
-    // true to distinguish watchdog or user triggered interrupts.
-    gServiceInterrupt = false;
-
     return result;
 }
 

js/src/tests/js1_8_5/extensions/reflect-parse.js

@@ -112,6 +112,11 @@ function compOfBlock(left, right) Pattern({ type: "ComprehensionBlock", left: le
 function arrPatt(elts) Pattern({ type: "ArrayPattern", elements: elts })
 function objPatt(elts) Pattern({ type: "ObjectPattern", properties: elts })
 
+function assignElem(target, defaultExpr = null, targetIdent = typeof target == 'string' ? ident(target) : target) defaultExpr ? aExpr('=', targetIdent, defaultExpr) : targetIdent
+function assignProp(property, target, defaultExpr = null, shorthand = !target, targetProp = target || ident(property)) Pattern({
+    type: "Property", key: ident(property), shorthand,
+    value: defaultExpr ? aExpr('=', targetProp, defaultExpr) : targetProp })
+
 function localSrc(src) "(function(){ " + src + " })"
 function localPatt(patt) program([exprStmt(funExpr(null, [], blockStmt([patt])))])
 function blockSrc(src) "(function(){ { " + src + " } })"
@@ -235,7 +240,7 @@ assertDecl("function f(a,b,c) { function b() { } }",
            funDecl(ident("f"), [ident("a"),ident("b"),ident("c")], blockStmt([funDecl(ident("b"), [], blockStmt([]))])));
 assertDecl("function f(a,[x,y]) { function a() { } }",
            funDecl(ident("f"),
-                   [ident("a"), arrPatt([ident("x"), ident("y")])],
+                   [ident("a"), arrPatt([assignElem("x"), assignElem("y")])],
                    blockStmt([funDecl(ident("a"), [], blockStmt([]))])));
 
 // Bug 632027: array holes should reflect as null
@@ -269,7 +274,7 @@ assertExpr("a => b => a", arrowExpr([ident("a")], arrowExpr([ident("b")], ident(
 assertExpr("a => {}", arrowExpr([ident("a")], blockStmt([])));
 assertExpr("a => ({})", arrowExpr([ident("a")], objExpr([])));
 assertExpr("(a, b, c) => {}", arrowExpr([ident("a"), ident("b"), ident("c")], blockStmt([])));
-assertExpr("([a, b]) => {}", arrowExpr([arrPatt([ident("a"), ident("b")])], blockStmt([])));
+assertExpr("([a, b]) => {}", arrowExpr([arrPatt([assignElem("a"), assignElem("b")])], blockStmt([])));
 assertExpr("(++x)", updExpr("++", ident("x"), true));
 assertExpr("(x++)", updExpr("++", ident("x"), false));
 assertExpr("(+x)", unExpr("+", ident("x")));
@@ -566,9 +571,9 @@ assertStmt("function f() { var x = 42; var x = 43; }",
                                               varDecl([{ id: ident("x"), init: lit(43) }])])));
 
 
-assertDecl("var {x:y} = foo;", varDecl([{ id: objPatt([{ key: ident("x"), value: ident("y"), shorthand: false }]),
+assertDecl("var {x:y} = foo;", varDecl([{ id: objPatt([assignProp("x", ident("y"))]),
                                           init: ident("foo") }]));
-assertDecl("var {x} = foo;", varDecl([{ id: objPatt([{ key: ident("x"), value: ident("x"), shorthand: true }]),
+assertDecl("var {x} = foo;", varDecl([{ id: objPatt([assignProp("x")]),
                                         init: ident("foo") }]));
 
 // Bug 632030: redeclarations between var and funargs, var and function
@@ -581,16 +586,16 @@ assertProg("f.p = 1; var f; f.p; function f(){}",
             funDecl(ident("f"), [], blockStmt([]))]);
 
 // global let is var
-assertGlobalDecl("let {x:y} = foo;", varDecl([{ id: objPatt([{ key: ident("x"), value: ident("y") }]),
+assertGlobalDecl("let {x:y} = foo;", varDecl([{ id: objPatt([assignProp("x", ident("y"))]),
                                                 init: ident("foo") }]));
 // function-global let is let
-assertLocalDecl("let {x:y} = foo;", letDecl([{ id: objPatt([{ key: ident("x"), value: ident("y") }]),
+assertLocalDecl("let {x:y} = foo;", letDecl([{ id: objPatt([assignProp("x", ident("y"))]),
                                                init: ident("foo") }]));
 // block-local let is let
-assertBlockDecl("let {x:y} = foo;", letDecl([{ id: objPatt([{ key: ident("x"), value: ident("y") }]),
+assertBlockDecl("let {x:y} = foo;", letDecl([{ id: objPatt([assignProp("x", ident("y"))]),
                                                init: ident("foo") }]));
 
-assertDecl("const {x:y} = foo;", constDecl([{ id: objPatt([{ key: ident("x"), value: ident("y") }]),
+assertDecl("const {x:y} = foo;", constDecl([{ id: objPatt([assignProp("x", ident("y"))]),
                                               init: ident("foo") }]));
 
 
@@ -670,16 +675,23 @@ function testParamPatternCombinations(makePattSrc, makePattPatt) {
 }
 
 testParamPatternCombinations(function(n) ("{a" + n + ":x" + n + "," + "b" + n + ":y" + n + "," + "c" + n + ":z" + n + "}"),
-                             function(n) (objPatt([{ key: ident("a" + n), value: ident("x" + n) },
+                             function(n) (objPatt([assignProp("a" + n, ident("x" + n)),
-                                                   { key: ident("b" + n), value: ident("y" + n) },
+                                                   assignProp("b" + n, ident("y" + n)),
-                                                   { key: ident("c" + n), value: ident("z" + n) }])));
+                                                   assignProp("c" + n, ident("z" + n))])));
+
+testParamPatternCombinations(function(n) ("{a" + n + ":x" + n + " = 10," + "b" + n + ":y" + n + " = 10," + "c" + n + ":z" + n + " = 10}"),
+                             function(n) (objPatt([assignProp("a" + n, ident("x" + n), lit(10)),
+                                                   assignProp("b" + n, ident("y" + n), lit(10)),
+                                                   assignProp("c" + n, ident("z" + n), lit(10))])));
 
 testParamPatternCombinations(function(n) ("[x" + n + "," + "y" + n + "," + "z" + n + "]"),
-                             function(n) (arrPatt([ident("x" + n), ident("y" + n), ident("z" + n)])));
+                             function(n) (arrPatt([assignElem("x" + n), assignElem("y" + n), assignElem("z" + n)])));
 
 testParamPatternCombinations(function(n) ("[a" + n + ", ..." + "b" + n + "]"),
-                             function(n) (arrPatt([ident("a" + n), spread(ident("b" + n))])));
+                             function(n) (arrPatt([assignElem("a" + n), spread(ident("b" + n))])));
 
+testParamPatternCombinations(function(n) ("[a" + n + ", " + "b" + n + " = 10]"),
+                             function(n) (arrPatt([assignElem("a" + n), assignElem("b" + n, lit(10))])));
 
 // destructuring variable declarations
 
@@ -712,19 +724,28 @@ function testVarPatternCombinations(makePattSrc, makePattPatt) {
 }
 
 testVarPatternCombinations(function (n) ("{a" + n + ":x" + n + "," + "b" + n + ":y" + n + "," + "c" + n + ":z" + n + "} = 0"),
-                           function (n) ({ id: objPatt([{ key: ident("a" + n), value: ident("x" + n) },
+                           function (n) ({ id: objPatt([assignProp("a" + n, ident("x" + n)),
-                                                        { key: ident("b" + n), value: ident("y" + n) },
+                                                        assignProp("b" + n, ident("y" + n)),
-                                                        { key: ident("c" + n), value: ident("z" + n) }]),
+                                                        assignProp("c" + n, ident("z" + n))]),
+                                           init: lit(0) }));
+
+testVarPatternCombinations(function (n) ("{a" + n + ":x" + n + " = 10," + "b" + n + ":y" + n + " = 10," + "c" + n + ":z" + n + " = 10} = 0"),
+                           function (n) ({ id: objPatt([assignProp("a" + n, ident("x" + n), lit(10)),
+                                                        assignProp("b" + n, ident("y" + n), lit(10)),
+                                                        assignProp("c" + n, ident("z" + n), lit(10))]),
                                            init: lit(0) }));
 
 testVarPatternCombinations(function(n) ("[x" + n + "," + "y" + n + "," + "z" + n + "] = 0"),
-                           function(n) ({ id: arrPatt([ident("x" + n), ident("y" + n), ident("z" + n)]),
+                           function(n) ({ id: arrPatt([assignElem("x" + n), assignElem("y" + n), assignElem("z" + n)]),
                                           init: lit(0) }));
 
 testVarPatternCombinations(function(n) ("[a" + n + ", ..." + "b" + n + "] = 0"),
-                           function(n) ({ id: arrPatt([ident("a" + n), spread(ident("b" + n))]),
+                           function(n) ({ id: arrPatt([assignElem("a" + n), spread(ident("b" + n))]),
                                           init: lit(0) }));
 
+testVarPatternCombinations(function(n) ("[a" + n + ", " + "b" + n + " = 10] = 0"),
+                           function(n) ({ id: arrPatt([assignElem("a" + n), assignElem("b" + n, lit(10))]),
+                                          init: lit(0) }));
 // destructuring assignment
 
 function testAssignmentCombinations(makePattSrc, makePattPatt) {
@@ -746,18 +767,18 @@ function testAssignmentCombinations(makePattSrc, makePattPatt) {
 
 testAssignmentCombinations(function (n) ("{a" + n + ":x" + n + "," + "b" + n + ":y" + n + "," + "c" + n + ":z" + n + "} = 0"),
                            function (n) (aExpr("=",
-                                               objPatt([{ key: ident("a" + n), value: ident("x" + n) },
+                                               objPatt([assignProp("a" + n, ident("x" + n)),
-                                                        { key: ident("b" + n), value: ident("y" + n) },
+                                                        assignProp("b" + n, ident("y" + n)),
-                                                        { key: ident("c" + n), value: ident("z" + n) }]),
+                                                        assignProp("c" + n, ident("z" + n))]),
                                                lit(0))));
 
 
 // destructuring in for-in and for-each-in loop heads
 
-var axbycz = objPatt([{ key: ident("a"), value: ident("x") },
+var axbycz = objPatt([assignProp("a", ident("x")),
-                      { key: ident("b"), value: ident("y") },
+                      assignProp("b", ident("y")),
-                      { key: ident("c"), value: ident("z") }]);
+                      assignProp("c", ident("z"))]);
-var xyz = arrPatt([ident("x"), ident("y"), ident("z")]);
+var xyz = arrPatt([assignElem("x"), assignElem("y"), assignElem("z")]);
 
 assertStmt("for (var {a:x,b:y,c:z} in foo);", forInStmt(varDecl([{ id: axbycz, init: null }]), ident("foo"), emptyStmt));
 assertStmt("for (let {a:x,b:y,c:z} in foo);", forInStmt(letDecl([{ id: axbycz, init: null }]), ident("foo"), emptyStmt));

js/src/vm/NativeObject-inl.h

@@ -400,38 +400,30 @@ NewNativeObjectWithClassProto(ExclusiveContext *cx, const js::Class *clasp, JSOb
 /*
  * Call obj's resolve hook.
  *
- * cx, id, and flags are the parameters initially passed to the ongoing lookup;
+ * cx and id are the parameters initially passed to the ongoing lookup;
- * objp and propp are its out parameters. obj is an object along the prototype
+ * propp and recursedp are its out parameters.
- * chain from where the lookup started.
  *
  * There are four possible outcomes:
  *
  *   - On failure, report an error or exception and return false.
  *
- *   - If we are already resolving a property of *curobjp, set *recursedp = true,
+ *   - If we are already resolving a property of obj, set *recursedp = true,
  *     and return true.
  *
- *   - If the resolve hook finds or defines the sought property, set *objp and
+ *   - If the resolve hook finds or defines the sought property, set propp
- *     *propp appropriately, set *recursedp = false, and return true.
+ *      appropriately, set *recursedp = false, and return true.
  *
- *   - Otherwise no property was resolved. Set *propp = nullptr and
+ *   - Otherwise no property was resolved. Set propp to nullptr and
  *     *recursedp = false and return true.
  */
 static MOZ_ALWAYS_INLINE bool
-CallResolveOp(JSContext *cx, HandleNativeObject obj, HandleId id, MutableHandleObject objp,
+CallResolveOp(JSContext *cx, HandleNativeObject obj, HandleId id, MutableHandleShape propp,
-              MutableHandleShape propp, bool *recursedp)
+              bool *recursedp)
 {
-    /*
+    // Avoid recursion on (obj, id) already being resolved on cx.
-     * Avoid recursion on (obj, id) already being resolved on cx.
-     *
-     * Once we have successfully added an entry for (obj, key) to
-     * cx->resolvingTable, control must go through cleanup: before
-     * returning.  But note that JS_DHASH_ADD may find an existing
-     * entry, in which case we bail to suppress runaway recursion.
-     */
     AutoResolving resolving(cx, obj, id);
     if (resolving.alreadyStarted()) {
-        /* Already resolving id in obj -- suppress recursion. */
+        // Already resolving id in obj, suppress recursion.
         *recursedp = true;
         return true;
     }
@@ -444,18 +436,14 @@ CallResolveOp(JSContext *cx, HandleNativeObject obj, HandleId id, MutableHandleO
     if (!resolved)
         return true;
 
-    objp.set(obj);
-
     if (JSID_IS_INT(id) && obj->containsDenseElement(JSID_TO_INT(id))) {
         MarkDenseOrTypedArrayElementFound<CanGC>(propp);
         return true;
     }
 
-    if (Shape *shape = obj->lookup(cx, id))
+    MOZ_ASSERT(!IsAnyTypedArray(obj));
-        propp.set(shape);
-    else
-        objp.set(nullptr);
 
+    propp.set(obj->lookup(cx, id));
     return true;
 }
 
@@ -464,13 +452,11 @@ static MOZ_ALWAYS_INLINE bool
 LookupOwnPropertyInline(ExclusiveContext *cx,
                         typename MaybeRooted<NativeObject*, allowGC>::HandleType obj,
                         typename MaybeRooted<jsid, allowGC>::HandleType id,
-                        typename MaybeRooted<JSObject*, allowGC>::MutableHandleType objp,
                         typename MaybeRooted<Shape*, allowGC>::MutableHandleType propp,
                         bool *donep)
 {
     // Check for a native dense element.
     if (JSID_IS_INT(id) && obj->containsDenseElement(JSID_TO_INT(id))) {
-        objp.set(obj);
         MarkDenseOrTypedArrayElementFound<allowGC>(propp);
         *donep = true;
         return true;
@@ -483,10 +469,8 @@ LookupOwnPropertyInline(ExclusiveContext *cx,
         uint64_t index;
         if (IsTypedArrayIndex(id, &index)) {
             if (index < AnyTypedArrayLength(obj)) {
-                objp.set(obj);
                 MarkDenseOrTypedArrayElementFound<allowGC>(propp);
             } else {
-                objp.set(nullptr);
                 propp.set(nullptr);
             }
             *donep = true;
@@ -496,7 +480,6 @@ LookupOwnPropertyInline(ExclusiveContext *cx,
 
     // Check for a native property.
     if (Shape *shape = obj->lookup(cx, id)) {
-        objp.set(obj);
         propp.set(shape);
         *donep = true;
         return true;
@@ -512,7 +495,6 @@ LookupOwnPropertyInline(ExclusiveContext *cx,
         if (!CallResolveOp(cx->asJSContext(),
                            MaybeRooted<NativeObject*, allowGC>::toHandle(obj),
                            MaybeRooted<jsid, allowGC>::toHandle(id),
-                           MaybeRooted<JSObject*, allowGC>::toMutableHandle(objp),
                            MaybeRooted<Shape*, allowGC>::toMutableHandle(propp),
                            &recursed))
         {
@@ -520,7 +502,6 @@ LookupOwnPropertyInline(ExclusiveContext *cx,
         }
 
         if (recursed) {
-            objp.set(nullptr);
             propp.set(nullptr);
             *donep = true;
             return true;
@@ -532,6 +513,7 @@ LookupOwnPropertyInline(ExclusiveContext *cx,
         }
     }
 
+    propp.set(nullptr);
     *donep = false;
     return true;
 }
@@ -584,10 +566,15 @@ LookupPropertyInline(ExclusiveContext *cx,
 
     while (true) {
         bool done;
-        if (!LookupOwnPropertyInline<allowGC>(cx, current, id, objp, propp, &done))
+        if (!LookupOwnPropertyInline<allowGC>(cx, current, id, propp, &done))
             return false;
-        if (done)
+        if (done) {
+            if (propp)
+                objp.set(current);
+            else
+                objp.set(nullptr);
             return true;
+        }
 
         typename MaybeRooted<JSObject*, allowGC>::RootType proto(cx, current->getProto());
 

js/src/vm/NativeObject.cpp

@@ -1458,14 +1458,8 @@ static bool
 NativeLookupOwnProperty(ExclusiveContext *cx, HandleNativeObject obj, HandleId id,
                         MutableHandle<Shape*> shapep)
 {
-    RootedObject pobj(cx);
     bool done;
-
+    return LookupOwnPropertyInline<CanGC>(cx, obj, id, shapep, &done);
-    if (!LookupOwnPropertyInline<CanGC>(cx, obj, id, &pobj, shapep, &done))
-        return false;
-    if (!done || pobj != obj)
-        shapep.set(nullptr);
-    return true;
 }
 
 template <AllowGC allowGC>
@@ -2072,13 +2066,9 @@ js::NativeSetProperty(JSContext *cx, HandleNativeObject obj, HandleObject receiv
     for (;;) {
         // Steps 2-3. ('done' is a SpiderMonkey-specific thing, used below.)
         bool done;
-        RootedObject ancestor(cx);
+        if (!LookupOwnPropertyInline<CanGC>(cx, pobj, id, &shape, &done))
-        if (!LookupOwnPropertyInline<CanGC>(cx, pobj, id, &ancestor, &shape, &done))
             return false;
 
-        if (!done || ancestor != pobj)
-            shape = nullptr;
-
         if (shape) {
             // Steps 5-6.
             return SetExistingProperty(cx, obj, receiver, id, pobj, shape, vp, strict);

js/src/vm/Shape-inl.h

@@ -224,14 +224,12 @@ GetShapeAttributes(JSObject *obj, Shape *shape)
     return shape->attributes();
 }
 
-#ifdef JSGC_COMPACTING
 inline void
 BaseShape::fixupAfterMovingGC()
 {
     if (hasTable())
         table().fixupAfterMovingGC();
 }
-#endif
 
 } /* namespace js */
 

js/src/vm/Shape.cpp

@@ -256,7 +256,6 @@ ShapeTable::search(jsid id, bool adding)
     MOZ_CRASH("Shape::search failed to find an expected entry.");
 }
 
-#ifdef JSGC_COMPACTING
 void
 ShapeTable::fixupAfterMovingGC()
 {
@@ -268,7 +267,6 @@ ShapeTable::fixupAfterMovingGC()
             entry.setPreservingCollision(Forwarded(shape));
     }
 }
-#endif
 
 bool
 ShapeTable::change(int log2Delta, ExclusiveContext *cx)
@@ -1693,7 +1691,6 @@ JSCompartment::sweepInitialShapeTable()
     }
 }
 
-#ifdef JSGC_COMPACTING
 void
 JSCompartment::fixupInitialShapeTable()
 {
@@ -1732,7 +1729,6 @@ JSCompartment::fixupInitialShapeTable()
         }
     }
 }
-#endif // JSGC_COMPACTING
 
 void
 AutoRooterGetterSetter::Inner::trace(JSTracer *trc)

js/src/vm/Shape.h

@@ -227,10 +227,8 @@ class ShapeTable {
     bool change(int log2Delta, ExclusiveContext *cx);
     Entry &search(jsid id, bool adding);
 
-#ifdef JSGC_COMPACTING
     /* Update entries whose shapes have been moved */
     void fixupAfterMovingGC();
-#endif
 
   private:
     Entry &getEntry(uint32_t i) const {
@@ -530,9 +528,7 @@ class BaseShape : public gc::TenuredCell
             gc::MarkObject(trc, &metadata, "metadata");
     }
 
-#ifdef JSGC_COMPACTING
     void fixupAfterMovingGC();
-#endif
 
   private:
     static void staticAsserts() {
@@ -1061,9 +1057,7 @@ class Shape : public gc::TenuredCell
     inline Shape *search(ExclusiveContext *cx, jsid id);
     inline Shape *searchLinear(jsid id);
 
-#ifdef JSGC_COMPACTING
     void fixupAfterMovingGC();
-#endif
 
     /* For JIT usage */
     static inline size_t offsetOfBase() { return offsetof(Shape, base_); }
@@ -1071,10 +1065,8 @@ class Shape : public gc::TenuredCell
     static inline uint32_t fixedSlotsMask() { return FIXED_SLOTS_MASK; }
 
   private:
-#ifdef JSGC_COMPACTING
     void fixupDictionaryShapeAfterMovingGC();
     void fixupShapeTreeAfterMovingGC();
-#endif
 
     static void staticAsserts() {
         JS_STATIC_ASSERT(offsetof(Shape, base_) == offsetof(js::shadow::Shape, base));

js/src/vm/StructuredClone.cpp

@@ -65,7 +65,7 @@ using JS::CanonicalizeNaN;
 // a stable ID, it need not be at the end of the list and should not be used for
 // sizing data structures.
 
-enum StructuredDataType MOZ_ENUM_TYPE(uint32_t) {
+enum StructuredDataType : uint32_t {
     /* Structured data types provided by the engine */
     SCTAG_FLOAT_MAX = 0xFFF00000,
     SCTAG_NULL = 0xFFFF0000,

js/xpconnect/src/xpcprivate.h

@@ -1065,9 +1065,12 @@ public:
     static void
     TraceWrappedNativesInAllScopes(JSTracer* trc, XPCJSRuntime* rt);
 
-    void TraceInside(JSTracer *trc) {
+    void TraceSelf(JSTracer *trc) {
         MOZ_ASSERT(mGlobalJSObject);
         mGlobalJSObject.trace(trc, "XPCWrappedNativeScope::mGlobalJSObject");
+    }
+
+    void TraceInside(JSTracer *trc) {
         if (mContentXBLScope)
             mContentXBLScope.trace(trc, "XPCWrappedNativeScope::mXBLScope");
         for (size_t i = 0; i < mAddonScopes.Length(); i++)
@@ -1847,7 +1850,7 @@ public:
                 mScriptableInfo->Mark();
         }
 
-        GetScope()->TraceInside(trc);
+        GetScope()->TraceSelf(trc);
     }
 
     void TraceJS(JSTracer *trc) {
@@ -2162,7 +2165,7 @@ public:
         if (HasProto())
             GetProto()->TraceSelf(trc);
         else
-            GetScope()->TraceInside(trc);
+            GetScope()->TraceSelf(trc);
         if (mFlatJSObject && JS_IsGlobalObject(mFlatJSObject))
         {
             xpc::TraceXPCGlobal(trc, mFlatJSObject);

layout/base/FrameLayerBuilder.cpp

@@ -2343,11 +2343,14 @@ ContainerState::PopPaintedLayerData()
     EventRegions regions;
     regions.mHitRegion = ScaleRegionToOutsidePixels(data->mHitRegion);
     // Points whose hit-region status we're not sure about need to be dispatched
-    // to the content thread.
+    // to the content thread. If a point is in both maybeHitRegion and hitRegion
+    // then it's not a "maybe" any more, and doesn't go into the dispatch-to-
+    // content region.
     nsIntRegion maybeHitRegion = ScaleRegionToOutsidePixels(data->mMaybeHitRegion);
     regions.mDispatchToContentHitRegion.Sub(maybeHitRegion, regions.mHitRegion);
-    regions.mDispatchToContentHitRegion.Or(regions.mDispatchToContentHitRegion,
+    regions.mDispatchToContentHitRegion.OrWith(
-                                           ScaleRegionToOutsidePixels(data->mDispatchToContentHitRegion));
+        ScaleRegionToOutsidePixels(data->mDispatchToContentHitRegion));
+    regions.mHitRegion.OrWith(maybeHitRegion);
 
     nsIntPoint translation = -GetTranslationForPaintedLayer(data->mLayer);
     regions.mHitRegion.MoveBy(translation);

layout/forms/moz.build

@@ -56,8 +56,4 @@ LOCAL_INCLUDES += [
 if CONFIG['ENABLE_INTL_API']:
     # nsNumberControlFrame.cpp requires ICUUtils.h which in turn requires
     # i18n/unum.h
-    LOCAL_INCLUDES += [
+    CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
-        '../../intl/icu/source/common',
-        '../../intl/icu/source/i18n',
-    ]
-

layout/forms/nsComboboxControlFrame.cpp

@@ -1469,7 +1469,7 @@ void nsDisplayComboboxFocus::Paint(nsDisplayListBuilder* aBuilder,
                                    nsRenderingContext* aCtx)
 {
   static_cast<nsComboboxControlFrame*>(mFrame)
-    ->PaintFocus(*aCtx, ToReferenceFrame());
+    ->PaintFocus(*aCtx->GetDrawTarget(), ToReferenceFrame());
 }
 
 void
@@ -1511,7 +1511,7 @@ nsComboboxControlFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   DisplaySelectionOverlay(aBuilder, aLists.Content());
 }
 
-void nsComboboxControlFrame::PaintFocus(nsRenderingContext& aRenderingContext,
+void nsComboboxControlFrame::PaintFocus(DrawTarget& aDrawTarget,
                                         nsPoint aPt)
 {
   /* Do we need to do anything? */
@@ -1519,13 +1519,12 @@ void nsComboboxControlFrame::PaintFocus(nsRenderingContext& aRenderingContext,
   if (eventStates.HasState(NS_EVENT_STATE_DISABLED) || sFocused != this)
     return;
 
-  gfxContext* gfx = aRenderingContext.ThebesContext();
+  int32_t appUnitsPerDevPixel = PresContext()->AppUnitsPerDevPixel();
 
-  gfx->Save();
   nsRect clipRect = mDisplayFrame->GetRect() + aPt;
-  gfx->Clip(NSRectToSnappedRect(clipRect,
+  aDrawTarget.PushClipRect(NSRectToSnappedRect(clipRect,
-                                PresContext()->AppUnitsPerDevPixel(),
+                                               appUnitsPerDevPixel,
-                                *aRenderingContext.GetDrawTarget()));
+                                               aDrawTarget));
 
   // REVIEW: Why does the old code paint mDisplayFrame again? We've
   // already painted it in the children above. So clipping it here won't do
@@ -1540,12 +1539,10 @@ void nsComboboxControlFrame::PaintFocus(nsRenderingContext& aRenderingContext,
   nscoord onePixel = nsPresContext::CSSPixelsToAppUnits(1);
   clipRect.width -= onePixel;
   clipRect.height -= onePixel;
-  Rect r =
+  Rect r = ToRect(nsLayoutUtils::RectToGfxRect(clipRect, appUnitsPerDevPixel));
-    ToRect(nsLayoutUtils::RectToGfxRect(clipRect, PresContext()->AppUnitsPerDevPixel()));
+  StrokeSnappedEdgesOfRect(r, aDrawTarget, color, strokeOptions);
-  StrokeSnappedEdgesOfRect(r, *aRenderingContext.GetDrawTarget(),
-                           color, strokeOptions);
 
-  gfx->Restore();
+  aDrawTarget.PopClip();
 }
 
 //---------------------------------------------------------

layout/forms/nsComboboxControlFrame.h

@@ -37,6 +37,12 @@ class nsComboboxDisplayFrame;
 class nsIDOMEventListener;
 class nsIScrollableFrame;
 
+namespace mozilla {
+namespace gfx {
+class DrawTarget;
+}
+}
+
 class nsComboboxControlFrame MOZ_FINAL : public nsBlockFrame,
                                          public nsIFormControlFrame,
                                          public nsIComboboxControlFrame,
@@ -45,6 +51,8 @@ class nsComboboxControlFrame MOZ_FINAL : public nsBlockFrame,
                                          public nsIRollupListener,
                                          public nsIStatefulFrame
 {
+  typedef mozilla::gfx::DrawTarget DrawTarget;
+
 public:
   friend nsContainerFrame* NS_NewComboboxControlFrame(nsIPresShell* aPresShell,
                                                       nsStyleContext* aContext,
@@ -84,7 +92,7 @@ public:
                                 const nsRect&           aDirtyRect,
                                 const nsDisplayListSet& aLists) MOZ_OVERRIDE;
 
-  void PaintFocus(nsRenderingContext& aRenderingContext, nsPoint aPt);
+  void PaintFocus(DrawTarget& aDrawTarget, nsPoint aPt);
 
   // XXXbz this is only needed to prevent the quirk percent height stuff from
   // leaking out of the combobox.  We may be able to get rid of this as more

layout/svg/SVGTextFrame.cpp

@@ -2916,8 +2916,9 @@ void
 SVGTextDrawPathCallbacks::HandleTextGeometry()
 {
   if (IsClipPathChild()) {
-    gfx->SetColor(gfxRGBA(1.0f, 1.0f, 1.0f, 1.0f));
+    RefPtr<Path> path = gfx->GetPath();
-    gfx->Fill();
+    ColorPattern white(Color(1.f, 1.f, 1.f, 1.f)); // for masking, so no ToDeviceColor
+    gfx->GetDrawTarget()->Fill(path, white);
   } else {
     // Normal painting.
     gfxContextMatrixAutoSaveRestore saveMatrix(gfx);
@@ -2984,11 +2985,15 @@ SVGTextDrawPathCallbacks::FillGeometry()
   GeneralPattern fillPattern;
   MakeFillPattern(&fillPattern);
   if (fillPattern.GetPattern()) {
-    gfx->SetFillRule(
+    RefPtr<Path> path = gfx->GetPath();
-      nsSVGUtils::ToFillRule(
+    FillRule fillRule = nsSVGUtils::ToFillRule(IsClipPathChild() ?
-        IsClipPathChild() ?
+                          mFrame->StyleSVG()->mClipRule :
-          mFrame->StyleSVG()->mClipRule : mFrame->StyleSVG()->mFillRule));
+                          mFrame->StyleSVG()->mFillRule);
-    gfx->Fill(fillPattern);
+    if (fillRule != path->GetFillRule()) {
+      RefPtr<PathBuilder> builder = path->CopyToBuilder(fillRule);
+      path = builder->Finish();
+    }
+    gfx->GetDrawTarget()->Fill(path, fillPattern);
   }
 }
 

media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp

@@ -468,20 +468,32 @@ PeerConnectionImpl::ConvertRTCConfiguration(const RTCConfiguration& aSrc,
                                             IceConfiguration *aDst)
 {
 #ifdef MOZILLA_INTERNAL_API
-  if (!aSrc.mIceServers.WasPassed()) {
+  if (aSrc.mIceServers.WasPassed()) {
-    return NS_OK;
+    for (size_t i = 0; i < aSrc.mIceServers.Value().Length(); i++) {
+      nsresult rv = AddIceServer(aSrc.mIceServers.Value()[i], aDst);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
   }
-  for (uint32_t i = 0; i < aSrc.mIceServers.Value().Length(); i++) {
+#endif
-    const RTCIceServer& server = aSrc.mIceServers.Value()[i];
+  return NS_OK;
-    NS_ENSURE_TRUE(server.mUrl.WasPassed(), NS_ERROR_UNEXPECTED);
+}
 
+nsresult
+PeerConnectionImpl::AddIceServer(const RTCIceServer &aServer,
+                                 IceConfiguration *aDst)
+{
+#ifdef MOZILLA_INTERNAL_API
+  NS_ENSURE_STATE(aServer.mUrls.WasPassed());
+  NS_ENSURE_STATE(aServer.mUrls.Value().IsStringSequence());
+  auto &urls = aServer.mUrls.Value().GetAsStringSequence();
+  for (size_t i = 0; i < urls.Length(); i++) {
     // Without STUN/TURN handlers, NS_NewURI returns nsSimpleURI rather than
     // nsStandardURL. To parse STUN/TURN URI's to spec
     // http://tools.ietf.org/html/draft-nandakumar-rtcweb-stun-uri-02#section-3
     // http://tools.ietf.org/html/draft-petithuguenin-behave-turn-uri-03#section-3
     // we parse out the query-string, and use ParseAuthority() on the rest
     nsRefPtr<nsIURI> url;
-    nsresult rv = NS_NewURI(getter_AddRefs(url), server.mUrl.Value());
+    nsresult rv = NS_NewURI(getter_AddRefs(url), urls[i]);
     NS_ENSURE_SUCCESS(rv, rv);
     bool isStun = false, isStuns = false, isTurn = false, isTurns = false;
     url->SchemeIs("stun", &isStun);
@@ -542,8 +554,8 @@ PeerConnectionImpl::ConvertRTCConfiguration(const RTCConfiguration& aSrc,
       port = (isStuns || isTurns)? 5349 : 3478;
 
     if (isTurn || isTurns) {
-      NS_ConvertUTF16toUTF8 credential(server.mCredential);
+      NS_ConvertUTF16toUTF8 credential(aServer.mCredential);
-      NS_ConvertUTF16toUTF8 username(server.mUsername);
+      NS_ConvertUTF16toUTF8 username(aServer.mUsername);
 
       // Bug 1039655 - TURN TCP is not e10s ready
       if ((transport == kNrIceTransportTcp) &&

media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h

@@ -78,6 +78,7 @@ class DOMMediaStream;
 
 namespace dom {
 struct RTCConfiguration;
+struct RTCIceServer;
 struct RTCOfferOptions;
 #ifdef USE_FAKE_MEDIA_STREAMS
 typedef Fake_MediaStreamTrack MediaStreamTrack;
@@ -118,6 +119,7 @@ namespace mozilla {
 
 using mozilla::dom::PeerConnectionObserver;
 using mozilla::dom::RTCConfiguration;
+using mozilla::dom::RTCIceServer;
 using mozilla::dom::RTCOfferOptions;
 using mozilla::DOMMediaStream;
 using mozilla::NrIceCtx;
@@ -259,6 +261,8 @@ public:
   static PeerConnectionImpl* CreatePeerConnection();
   static nsresult ConvertRTCConfiguration(const RTCConfiguration& aSrc,
                                           IceConfiguration *aDst);
+  static nsresult AddIceServer(const RTCIceServer& aServer,
+                               IceConfiguration* aDst);
   already_AddRefed<DOMMediaStream> MakeMediaStream(uint32_t aHint);
 
   nsresult CreateRemoteSourceStreamInfo(nsRefPtr<RemoteSourceStreamInfo>* aInfo,

mfbt/TypedEnum.h

@@ -14,31 +14,6 @@
 
 #if defined(__cplusplus)
 
-/**
- * MOZ_ENUM_TYPE specifies the underlying numeric type for an enum.  It's
- * specified by placing MOZ_ENUM_TYPE(type) immediately after the enum name in
- * its declaration, and before the opening curly brace, like
- *
- *   enum MyEnum MOZ_ENUM_TYPE(uint16_t)
- *   {
- *     A,
- *     B = 7,
- *     C
- *   };
- *
- * In supporting compilers, the macro will expand to ": uint16_t".  The
- * compiler will allocate exactly two bytes for MyEnum and will require all
- * enumerators to have values between 0 and 65535.  (Thus specifying "B =
- * 100000" instead of "B = 7" would fail to compile.)  In old compilers the
- * macro expands to the empty string, and the underlying type is generally
- * undefined.
- */
-#ifdef MOZ_HAVE_CXX11_ENUM_TYPE
-#  define MOZ_ENUM_TYPE(type)   : type
-#else
-#  define MOZ_ENUM_TYPE(type)   /* no support */
-#endif
-
 /**
  * MOZ_BEGIN_ENUM_CLASS and MOZ_END_ENUM_CLASS provide access to the
  * strongly-typed enumeration feature of C++11 ("enum class").  If supported
@@ -155,7 +130,7 @@
      class Name \
      { \
      public: \
-       enum Enum MOZ_ENUM_TYPE(type) \
+       enum Enum : type \
        {
 #  define MOZ_END_NESTED_ENUM_CLASS(Name) \
        }; \

mfbt/TypedEnumInternal.h

@@ -26,18 +26,15 @@
 #    define __has_extension __has_feature /* compatibility, for older versions of clang */
 #  endif
 #  if __has_extension(cxx_strong_enums)
-#    define MOZ_HAVE_CXX11_ENUM_TYPE
 #    define MOZ_HAVE_CXX11_STRONG_ENUMS
 #  endif
 #elif defined(__GNUC__)
 #  if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
 #    if MOZ_GCC_VERSION_AT_LEAST(4, 6, 3)
-#      define MOZ_HAVE_CXX11_ENUM_TYPE
 #      define MOZ_HAVE_CXX11_STRONG_ENUMS
 #    endif
 #  endif
 #elif defined(_MSC_VER)
-#  define MOZ_HAVE_CXX11_ENUM_TYPE
 #  define MOZ_HAVE_CXX11_STRONG_ENUMS
 #endif
 

mobile/android/app/mobile.js

@@ -563,7 +563,7 @@ pref("media.fragmented-mp4.android-media-codec.enabled", true);
 pref("media.fragmented-mp4.android-media-codec.preferred", true);
 
 // optimize images memory usage
-pref("image.mem.decodeondraw", false);
+pref("image.mem.decodeondraw", true);
 
 #ifdef NIGHTLY_BUILD
 // Shumway component (SWF player) is disabled by default. Also see bug 904346.

mobile/android/modules/TabMirror.jsm

@@ -7,7 +7,7 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Messaging.jsm");
 
-const CONFIG = { iceServers: [{ "url": "stun:stun.services.mozilla.com" }] };
+const CONFIG = { iceServers: [{ "urls": ["stun:stun.services.mozilla.com"] }] };
 
 let log = Cu.import("resource://gre/modules/AndroidLog.jsm",
                     {}).AndroidLog.d.bind(null, "TabMirror");

modules/libpref/init/all.js

@@ -360,7 +360,7 @@ pref("media.peerconnection.video.start_bitrate", 300);
 pref("media.peerconnection.video.max_bitrate", 2000);
 #endif
 pref("media.navigator.permission.disabled", false);
-pref("media.peerconnection.default_iceservers", "[{\"url\": \"stun:stun.services.mozilla.com\"}]");
+pref("media.peerconnection.default_iceservers", "[{\"urls\": [\"stun:stun.services.mozilla.com\"]}]");
 pref("media.peerconnection.ice.loopback", false); // Set only for testing in offline environments.
 pref("media.peerconnection.use_document_iceservers", true);
 // Do not enable identity before ensuring that the UX cannot be spoofed
@@ -3789,7 +3789,7 @@ pref("image.mem.discardable", true);
 
 // Prevents images from automatically being decoded on load, instead allowing
 // them to be decoded on demand when they are drawn.
-pref("image.mem.decodeondraw", false);
+pref("image.mem.decodeondraw", true);
 
 // Allows image locking of decoded image data in content processes.
 pref("image.mem.allow_locking_in_content_processes", true);

netwerk/protocol/http/HttpBaseChannel.cpp

@@ -2183,8 +2183,10 @@ HttpBaseChannel::SetupReplacementChannel(nsIURI       *newURI,
       nsCOMPtr<nsIURI> uri;
       mRedirects[i]->GetURI(getter_AddRefs(uri));
       nsCString spec;
-      uri->GetSpec(spec);
+      if (uri) {
-      LOG(("HttpBaseChannel::SetupReplacementChannel adding redirect %s "
+        uri->GetSpec(spec);
+      }
+      LOG(("HttpBaseChannel::SetupReplacementChannel adding redirect \'%s\' "
            "[this=%p]", spec.get(), this));
 #endif
       httpInternal->AddRedirect(mRedirects[i]);

netwerk/test/mochitests/mochitest.ini

@@ -1,5 +1,6 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || e10s
+skip-if = buildapp == 'b2g' || e10s || toolkit == 'android' # Android: Bug 1111137 & 1078267
+
 support-files =
   method.sjs
   partial_content.sjs
@@ -10,7 +11,6 @@ support-files =
 [test_partially_cached_content.html]
 [test_uri_scheme.html]
 [test_user_agent_overrides.html]
-skip-if = toolkit == 'android' # Bug 1111137
 [test_user_agent_updates.html]
 [test_user_agent_updates_reset.html]
 [test_xhr_method_case.html]

netwerk/test/unit/xpcshell.ini

@@ -263,8 +263,10 @@ fail-if = os == "android"
 # spdy and http2 unit tests require us to have node available to run the spdy and http2 server
 [test_spdy.js]
 run-if = hasNode
+run-sequentially = node server exceptions dont replay well
 [test_http2.js]
 run-if = hasNode
+run-sequentially = node server exceptions dont replay well
 [test_speculative_connect.js]
 [test_standardurl.js]
 [test_standardurl_port.js]

testing/config/mozharness/android_arm_4_4_config.py

@@ -0,0 +1,105 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+config = {
+    "suite_definitions": {
+        "mochitest": {
+            "run_filename": "runtestsremote.py",
+            "testsdir": "mochitest",
+            "options": ["--autorun", "--close-when-done", "--dm_trans=adb",
+                "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
+                "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
+                "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
+                "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
+                "--quiet", "--log-raw=%(raw_log_file)s",
+                "--total-chunks=16",
+                "--run-only-tests=android23.json",
+            ],
+        },
+        "mochitest-gl": {
+            "run_filename": "runtestsremote.py",
+            "testsdir": "mochitest",
+            "options": ["--autorun", "--close-when-done", "--dm_trans=adb",
+                "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
+                "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
+                "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
+                "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
+                "--quiet", "--log-raw=%(raw_log_file)s",
+                "--total-chunks=2",
+                "--test-manifest=gl.json",
+            ],
+        },
+        "robocop": {
+            "run_filename": "runtestsremote.py",
+            "testsdir": "mochitest",
+            "options": ["--autorun", "--close-when-done", "--dm_trans=adb",
+                "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
+                "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
+                "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
+                "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
+                "--quiet", "--log-raw=%(raw_log_file)s",
+                "--total-chunks=4",
+                "--robocop-path=../..",
+                "--robocop-ids=fennec_ids.txt",
+                "--robocop=robocop.ini",
+            ],
+        },
+        "reftest": {
+            "run_filename": "remotereftest.py",
+            "testsdir": "reftest",
+            "options": [ "--app=%(app)s", "--ignore-window-size",
+                "--dm_trans=adb",
+                "--bootstrap",
+                "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s",
+                "--utility-path=%(utility_path)s", "--http-port=%(http_port)s",
+                "--ssl-port=%(ssl_port)s", "--httpd-path", "%(modules_dir)s",
+                "--symbols-path=%(symbols_path)s",
+                "--total-chunks=16",
+                "tests/layout/reftests/reftest.list",
+            ],
+        },
+        "crashtest": {
+            "run_filename": "remotereftest.py",
+            "testsdir": "reftest",
+            "options": [ "--app=%(app)s", "--ignore-window-size",
+                "--dm_trans=adb",
+                "--bootstrap",
+                "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s",
+                "--utility-path=%(utility_path)s", "--http-port=%(http_port)s",
+                "--ssl-port=%(ssl_port)s", "--httpd-path", "%(modules_dir)s",
+                "--symbols-path=%(symbols_path)s",
+                "--total-chunks=2",
+                "tests/testing/crashtest/crashtests.list",
+            ],
+        },
+        "jsreftest": {
+            "run_filename": "remotereftest.py",
+            "testsdir": "reftest",
+            "options": [ "--app=%(app)s", "--ignore-window-size",
+                "--dm_trans=adb",
+                "--bootstrap",
+                "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s",
+                "--utility-path=%(utility_path)s", "--http-port=%(http_port)s",
+                "--ssl-port=%(ssl_port)s", "--httpd-path", "%(modules_dir)s",
+                "--symbols-path=%(symbols_path)s",
+                "../jsreftest/tests/jstests.list",
+                "--total-chunks=6",
+                "--extra-profile-file=jsreftest/tests/user.js",
+            ],
+        },
+        "xpcshell": {
+            "run_filename": "remotexpcshelltests.py",
+            "testsdir": "xpcshell",
+            "options": [
+                "--dm_trans=adb",
+                "--xre-path=%(xre_path)s", "--testing-modules-dir=%(modules_dir)s",
+                "--apk=%(installer_path)s", "--no-logfiles",
+                "--symbols-path=%(symbols_path)s",
+                "--manifest=tests/xpcshell.ini",
+                "--log-raw=%(raw_log_file)s",
+                "--total-chunks=3",
+            ],
+        },
+    }, # end suite_definitions
+}

testing/talos/talos.json

@@ -5,7 +5,7 @@
     },
     "global": {
         "talos_repo": "https://hg.mozilla.org/build/talos",
-        "talos_revision": "ebc4327b8cb8"
+        "talos_revision": "39c9c9b33cfc"
     },
     "extra_options": {
         "android": [ "--apkPath=%(apk_path)s" ]
@@ -39,7 +39,8 @@
             "tests": ["tpaint"]
         },
         "other-snow-e10s": {
-            "tests": ["tpaint"]
+            "tests": ["tpaint"],
+            "talos_options": ["--e10s"]
         },
         "other_nol64": {
             "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore"]
@@ -80,7 +81,8 @@
             "tests": ["glterrain"]
         },
         "g1-snow-e10s": {
-            "tests": ["glterrain"]
+            "tests": ["glterrain"],
+            "talos_options": ["--e10s"]
         },
         "svgr": {
             "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"]
@@ -93,7 +95,8 @@
             "tests": ["tsvgx", "tscrollx"]
         },
         "svgr-snow-e10s": {
-            "tests": ["tsvgx", "tscrollx"]
+            "tests": ["tsvgx", "tscrollx"],
+            "talos_options": ["--e10s"]
         },
         "tp5o": {
             "tests": ["tp5o"],

testing/web-platform/harness/wptrunner/browsers/firefox.py

@@ -186,8 +186,16 @@ class FirefoxBrowser(Browser):
         # TODO: Maybe only set this if certutil won't launch?
         env = os.environ.copy()
         certutil_dir = os.path.dirname(self.binary)
-        env["LD_LIBRARY_PATH"] = certutil_dir
+        if mozinfo.isMac:
-        env["PATH"] = os.path.pathsep.join([certutil_dir, env["PATH"]])
+            env_var = "DYLD_LIBRARY_PATH"
+        elif mozinfo.isUnix:
+            env_var = "LD_LIBRARY_PATH"
+        else:
+            env_var = "PATH"
+
+
+        env[env_var] = (os.path.pathsep.join([certutil_dir, env[env_var]])
+                        if env_var in env else certutil_dir)
 
         def certutil(*args):
             cmd = [self.certutil_binary] + list(args)

toolkit/content/tests/widgets/mochitest.ini

@@ -28,5 +28,6 @@ skip-if = toolkit == 'android' #TIMED_OUT
 [test_videocontrols_audio.html]
 [test_videocontrols_audio_direction.html]
 [test_videocontrols_standalone.html]
+skip-if = android_version == '10' # bug 1075573
 [test_videocontrols_video_direction.html]
 [test_bug898940.html]