Backed out changeset a7105b09ae0c (bug 1272961)

MozReview-Commit-ID: IxEySUZmSxW

layout/base/nsIPresShell.h

@@ -1723,13 +1723,6 @@ public:
 
   void SyncWindowProperties(nsView* aView);
 
-  /**
-   * Prevents retargeting of mouse events to a descendant popup.
-   */
-  void SetPreventPopupRetargeting(bool aValue) {
-    mPreventPopupRetargeting = aValue;
-  }
-
 #ifdef ANDROID
   virtual nsIDocument* GetTouchEventTargetDocument() = 0;
 #endif
@@ -1863,9 +1856,6 @@ protected:
   // to true, so we can avoid any paint calls for widget related to this
   // presshell.
   bool mIsNeverPainting;
-
-  // Prevents retargeting of mouse events to a descendant popup.
-  bool mPreventPopupRetargeting;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIPresShell, NS_IPRESSHELL_IID)

layout/base/nsPresShell.cpp

@@ -7763,7 +7763,6 @@ PresShell::HandleEvent(nsIFrame* aFrame,
       // If the popupFrame is an ancestor of the 'frame', the frame should
       // handle the event, otherwise, the popup should handle it.
       if (popupFrame &&
-          !mPreventPopupRetargeting &&
           !nsContentUtils::ContentIsCrossDocDescendantOf(
              framePresContext->GetPresShell()->GetDocument(),
              popupFrame->GetContent())) {
@@ -7771,11 +7770,6 @@ PresShell::HandleEvent(nsIFrame* aFrame,
       }
     }
 
-    if (aEvent->mClass == eMouseEventClass &&
-        aEvent->mMessage == eMouseUp) {
-      mPreventPopupRetargeting = false;
-    }
-
     bool captureRetarget = false;
     if (capturingContent) {
       // If a capture is active, determine if the docshell is visible. If not,

xpfe/appshell/nsWebShellWindow.cpp

@@ -261,13 +261,6 @@ nsWebShellWindow::WindowMoved(nsIWidget* aWidget, int32_t x, int32_t y)
     pm->AdjustPopupsOnWindowChange(window);
   }
 
-  // If the window has moved, don't allow popup retargeting during this
-  // mousedown-mousemoves-moseup session
-  nsIPresShell* presShell = GetPresShell();
-  if (presShell) {
-    presShell->SetPreventPopupRetargeting(true);
-  }
-
   // Notify all tabs that the widget moved.
   if (mDocShell && mDocShell->GetWindow()) {
     nsCOMPtr<EventTarget> eventTarget = mDocShell->GetWindow()->GetTopWindowRoot();
@@ -290,14 +283,6 @@ nsWebShellWindow::WindowResized(nsIWidget* aWidget, int32_t aWidth, int32_t aHei
   if (shellAsWin) {
     shellAsWin->SetPositionAndSize(0, 0, aWidth, aHeight, 0);
   }
-
-  // If the window has resized, don't allow popup retargeting during this
-  // mousedown-mousemoves-moseup session
-  nsIPresShell* presShell = GetPresShell();
-  if (presShell) {
-    presShell->SetPreventPopupRetargeting(true);
-  }
-
   // Persist size, but not immediately, in case this OS is firing
   // repeated size events as the user drags the sizing handle
   if (!IsLocked())