diff options
Diffstat (limited to 'dom/base/InProcessBrowserChildMessageManager.cpp')
| -rw-r--r-- | dom/base/InProcessBrowserChildMessageManager.cpp | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/dom/base/InProcessBrowserChildMessageManager.cpp b/dom/base/InProcessBrowserChildMessageManager.cpp index 191ec9f7b5..830c57591b 100644 --- a/dom/base/InProcessBrowserChildMessageManager.cpp +++ b/dom/base/InProcessBrowserChildMessageManager.cpp @@ -13,7 +13,6 @@ #include "nsFrameLoaderOwner.h" #include "nsQueryObject.h" #include "xpcpublic.h" -#include "nsIMozBrowserFrame.h" #include "mozilla/EventDispatcher.h" #include "mozilla/dom/ChromeMessageSender.h" #include "mozilla/dom/Document.h" @@ -100,15 +99,6 @@ InProcessBrowserChildMessageManager::InProcessBrowserChildMessageManager( mOwner(aOwner), mChromeMessageManager(aChrome) { mozilla::HoldJSObjects(this); - - // If owner corresponds to an <iframe mozbrowser>, we'll have to tweak our - // GetEventTargetParent implementation. - nsCOMPtr<nsIMozBrowserFrame> browserFrame = do_QueryInterface(mOwner); - if (browserFrame) { - mIsBrowserFrame = browserFrame->GetReallyIsBrowser(); - } else { - mIsBrowserFrame = false; - } } InProcessBrowserChildMessageManager::~InProcessBrowserChildMessageManager() { @@ -236,19 +226,7 @@ void InProcessBrowserChildMessageManager::GetEventTargetParent( return; } - if (mIsBrowserFrame && - (!mOwner || !nsContentUtils::IsInChromeDocshell(mOwner->OwnerDoc()))) { - if (mOwner) { - if (nsPIDOMWindowInner* innerWindow = - mOwner->OwnerDoc()->GetInnerWindow()) { - // 'this' is already a "chrome handler", so we consider window's - // parent target to be part of that same part of the event path. - aVisitor.SetParentTarget(innerWindow->GetParentTarget(), false); - } - } - } else { - aVisitor.SetParentTarget(mOwner, false); - } + aVisitor.SetParentTarget(mOwner, false); } class nsAsyncScriptLoad : public Runnable { |