Merge m-c to inbound.

content/defs.mk

@@ -1,5 +0,0 @@
-ifeq ($(OS_TARGET),WINNT)
-ifneq (,$(filter nightly,$(MOZ_UPDATE_CHANNEL)))
-NO_PROFILE_GUIDED_OPTIMIZE := 1 # Don't PGO
-endif
-endif

content/xbl/src/nsXBLWindowKeyHandler.cpp

@@ -31,6 +31,7 @@
 #include "nsGUIEvent.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/Element.h"
+#include "nsEventStateManager.h"
 
 using namespace mozilla;
 
@@ -378,6 +379,14 @@ nsXBLWindowKeyHandler::HandleEvent(nsIDOMEvent* aEvent)
   nsCOMPtr<nsIAtom> eventTypeAtom = do_GetAtom(eventType);
   NS_ENSURE_TRUE(eventTypeAtom, NS_ERROR_OUT_OF_MEMORY);
 
+  if (!mWeakPtrForElement) {
+    nsCOMPtr<mozilla::dom::Element> originalTarget =
+      do_QueryInterface(aEvent->GetInternalNSEvent()->originalTarget);
+    if (nsEventStateManager::IsRemoteTarget(originalTarget)) {
+      return NS_OK;
+    }
+  }
+
   return WalkHandlers(keyEvent, eventTypeAtom);
 }
 

docshell/defs.mk

@@ -1,5 +0,0 @@
-ifeq ($(OS_TARGET),WINNT)
-ifneq (,$(filter nightly,$(MOZ_UPDATE_CHANNEL)))
-NO_PROFILE_GUIDED_OPTIMIZE := 1 # Don't PGO
-endif
-endif

dom/defs.mk

@@ -1,5 +0,0 @@
-ifeq ($(OS_TARGET),WINNT)
-ifneq (,$(filter nightly,$(MOZ_UPDATE_CHANNEL)))
-NO_PROFILE_GUIDED_OPTIMIZE := 1 # Don't PGO
-endif
-endif

gfx/defs.mk

@@ -1,5 +0,0 @@
-ifeq ($(OS_TARGET),WINNT)
-ifneq (,$(filter nightly,$(MOZ_UPDATE_CHANNEL)))
-NO_PROFILE_GUIDED_OPTIMIZE := 1 # Don't PGO
-endif
-endif

intl/defs.mk

@@ -1,5 +0,0 @@
-ifeq ($(OS_TARGET),WINNT)
-ifneq (,$(filter nightly,$(MOZ_UPDATE_CHANNEL)))
-NO_PROFILE_GUIDED_OPTIMIZE := 1 # Don't PGO
-endif
-endif

layout/defs.mk

@@ -1,5 +0,0 @@
-ifeq ($(OS_TARGET),WINNT)
-ifneq (,$(filter nightly,$(MOZ_UPDATE_CHANNEL)))
-NO_PROFILE_GUIDED_OPTIMIZE := 1 # Don't PGO
-endif
-endif

netwerk/defs.mk

@@ -1,5 +0,0 @@
-ifeq ($(OS_TARGET),WINNT)
-ifneq (,$(filter nightly,$(MOZ_UPDATE_CHANNEL)))
-NO_PROFILE_GUIDED_OPTIMIZE := 1 # Don't PGO
-endif
-endif

parser/defs.mk

@@ -1,5 +0,0 @@
-ifeq ($(OS_TARGET),WINNT)
-ifneq (,$(filter nightly,$(MOZ_UPDATE_CHANNEL)))
-NO_PROFILE_GUIDED_OPTIMIZE := 1 # Don't PGO
-endif
-endif

security/manager/defs.mk

@@ -1,5 +0,0 @@
-ifeq ($(OS_TARGET),WINNT)
-ifneq (,$(filter nightly,$(MOZ_UPDATE_CHANNEL)))
-NO_PROFILE_GUIDED_OPTIMIZE := 1 # Don't PGO
-endif
-endif

toolkit/defs.mk

@@ -1,5 +0,0 @@
-ifeq ($(OS_TARGET),WINNT)
-ifneq (,$(filter nightly,$(MOZ_UPDATE_CHANNEL)))
-NO_PROFILE_GUIDED_OPTIMIZE := 1 # Don't PGO
-endif
-endif

toolkit/xre/nsXREDirProvider.cpp

@@ -847,19 +847,6 @@ nsXREDirProvider::DoShutdown()
       obsSvc->NotifyObservers(nullptr, "profile-change-net-teardown", kShutdownPersist);
       obsSvc->NotifyObservers(nullptr, "profile-change-teardown", kShutdownPersist);
 
-      // Phase 2c: Now that things are torn down, force JS GC so that things which depend on
-      // resources which are about to go away in "profile-before-change" are destroyed first.
-
-      nsCOMPtr<nsIJSRuntimeService> rtsvc
-        (do_GetService("@mozilla.org/js/xpc/RuntimeService;1"));
-      if (rtsvc)
-      {
-        JSRuntime *rt = nullptr;
-        rtsvc->GetRuntime(&rt);
-        if (rt)
-          ::JS_GC(rt);
-      }
-
       // Phase 3: Notify observers of a profile change
       obsSvc->NotifyObservers(nullptr, "profile-before-change", kShutdownPersist);
     }

uriloader/defs.mk

@@ -1,5 +0,0 @@
-ifeq ($(OS_TARGET),WINNT)
-ifneq (,$(filter nightly,$(MOZ_UPDATE_CHANNEL)))
-NO_PROFILE_GUIDED_OPTIMIZE := 1 # Don't PGO
-endif
-endif

view/defs.mk

@@ -1,5 +0,0 @@
-ifeq ($(OS_TARGET),WINNT)
-ifneq (,$(filter nightly,$(MOZ_UPDATE_CHANNEL)))
-NO_PROFILE_GUIDED_OPTIMIZE := 1 # Don't PGO
-endif
-endif

widget/defs.mk

@@ -1,5 +0,0 @@
-ifeq ($(OS_TARGET),WINNT)
-ifneq (,$(filter nightly,$(MOZ_UPDATE_CHANNEL)))
-NO_PROFILE_GUIDED_OPTIMIZE := 1 # Don't PGO
-endif
-endif

xpcom/defs.mk

@@ -1,5 +0,0 @@
-ifeq ($(OS_TARGET),WINNT)
-ifneq (,$(filter nightly,$(MOZ_UPDATE_CHANNEL)))
-NO_PROFILE_GUIDED_OPTIMIZE := 1 # Don't PGO
-endif
-endif

xpfe/defs.mk

@@ -1,5 +0,0 @@
-ifeq ($(OS_TARGET),WINNT)
-ifneq (,$(filter nightly,$(MOZ_UPDATE_CHANNEL)))
-NO_PROFILE_GUIDED_OPTIMIZE := 1 # Don't PGO
-endif
-endif