Merge m-c to inbound.

2024-10-09 19:35:51 +00:00 · 2013-01-25 12:32:22 -05:00 · 2013-01-25 12:32:22 -05:00 · e4e09704bb
commit e4e09704bb
parent 1432a9eacd 817909da7e
17 changed files with 9 additions and 88 deletions
--- a/content/defs.mk
+++ b/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
--- a/content/xbl/src/nsXBLWindowKeyHandler.cpp
+++ b/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);
 }

--- a/docshell/defs.mk
+++ b/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
--- a/dom/defs.mk
+++ b/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
--- a/gfx/defs.mk
+++ b/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
--- a/intl/defs.mk
+++ b/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
--- a/layout/defs.mk
+++ b/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
--- a/netwerk/defs.mk
+++ b/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
--- a/parser/defs.mk
+++ b/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
--- a/security/manager/defs.mk
+++ b/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
--- a/toolkit/defs.mk
+++ b/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
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/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);
    }
--- a/uriloader/defs.mk
+++ b/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
--- a/view/defs.mk
+++ b/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
--- a/widget/defs.mk
+++ b/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
--- a/xpcom/defs.mk
+++ b/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
--- a/xpfe/defs.mk
+++ b/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