From 9680eca5eb5a1cb1bd6d75e5d21066a616679b10 Mon Sep 17 00:00:00 2001 From: Olli Pettay Date: Thu, 20 Oct 2011 15:11:31 +0300 Subject: [PATCH] Bug 695758 - Don't limit E10s event/focus handling to xul:browser, but allow also xul:iframe, r=felipe --- content/events/src/nsEventStateManager.cpp | 3 ++- dom/base/nsFocusManager.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp index 5c9d935ae1f..4132825c63d 100644 --- a/content/events/src/nsEventStateManager.cpp +++ b/content/events/src/nsEventStateManager.cpp @@ -1675,7 +1675,8 @@ nsEventStateManager::DispatchCrossProcessEvent(nsEvent* aEvent, nsIFrameLoader* bool nsEventStateManager::IsRemoteTarget(nsIContent* target) { return target && - target->Tag() == nsGkAtoms::browser && + (target->Tag() == nsGkAtoms::browser || + target->Tag() == nsGkAtoms::iframe) && target->IsXUL() && target->AttrValueIs(kNameSpaceID_None, nsGkAtoms::Remote, nsGkAtoms::_true, eIgnoreCase); diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp index 49f1205e8d4..c60503a02ec 100644 --- a/dom/base/nsFocusManager.cpp +++ b/dom/base/nsFocusManager.cpp @@ -2980,7 +2980,8 @@ nsFocusManager::GetRootForFocus(nsPIDOMWindow* aWindow, TabParent* nsFocusManager::GetRemoteForContent(nsIContent* aContent) { if (!aContent || - aContent->Tag() != nsGkAtoms::browser || + (aContent->Tag() != nsGkAtoms::browser && + aContent->Tag() != nsGkAtoms::iframe) || !aContent->IsXUL() || !aContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::Remote, nsGkAtoms::_true, eIgnoreCase))