Backed out changeset fad708985071 (bug 968647)

widget/cocoa/nsChildView.mm

@@ -1752,7 +1752,8 @@ bool nsChildView::PaintWindow(nsIntRegion aRegion)
 
 void nsChildView::ReportMoveEvent()
 {
-   NotifyWindowMoved(mBounds.x, mBounds.y);
+  if (mWidgetListener)
+    mWidgetListener->WindowMoved(this, mBounds.x, mBounds.y);
 }
 
 void nsChildView::ReportSizeEvent()

widget/cocoa/nsCocoaWindow.mm

@@ -1721,7 +1721,8 @@ nsCocoaWindow::ReportMoveEvent()
   UpdateBounds();
 
   // Dispatch the move event to Gecko
-  NotifyWindowMoved(mBounds.x, mBounds.y);
+  if (mWidgetListener)
+    mWidgetListener->WindowMoved(this, mBounds.x, mBounds.y);
 
   mInReportMoveEvent = false;
 

widget/gtk/nsWindow.cpp

@@ -2368,7 +2368,8 @@ nsWindow::OnConfigureEvent(GtkWidget *aWidget, GdkEventConfigure *aEvent)
 
     // XXX mozilla will invalidate the entire window after this move
     // complete.  wtf?
-    NotifyWindowMoved(mBounds.x, mBounds.y);
+    if (mWidgetListener)
+      mWidgetListener->WindowMoved(this, mBounds.x, mBounds.y);
 
     return FALSE;
 }

widget/qt/nsWindow.cpp

@@ -872,8 +872,8 @@ nsWindow::moveEvent(QMoveEvent* aEvent)
         return nsEventStatus_eIgnore;
     }
 
-    NotifyWindowMoved(aEvent->pos().x(), aEvent->pos().y());
+    bool moved = mWidgetListener->WindowMoved(this, aEvent->pos().x(), aEvent->pos().y());
-    return nsEventStatus_eConsumeNoDefault;
+    return moved ? nsEventStatus_eConsumeNoDefault : nsEventStatus_eIgnore;
 }
 
 nsEventStatus

widget/windows/nsWindow.cpp

@@ -5798,10 +5798,10 @@ void nsWindow::OnWindowPosChanged(WINDOWPOS* wp)
         break;
       case nsSizeMode_Maximized:
           PR_LOG(gWindowsLog, PR_LOG_ALWAYS, 
-                 ("*** mSizeMode: nsSizeMode_Maximized\n"));
+                 ("*** mSizeMode: nsSizeMode_Maximized\n");
         break;
       default:
-          PR_LOG(gWindowsLog, PR_LOG_ALWAYS, ("*** mSizeMode: ??????\n"));
+          PR_LOG(gWindowsLog, PR_LOG_ALWAYS, ("*** mSizeMode: ??????\n");
         break;
     };
 #endif
@@ -5825,7 +5825,9 @@ void nsWindow::OnWindowPosChanged(WINDOWPOS* wp)
     mBounds.x = wp->x;
     mBounds.y = wp->y;
 
-    NotifyWindowMoved(wp->x, wp->y);
+    if (mWidgetListener) {
+      mWidgetListener->WindowMoved(this, wp->x, wp->y);
+    }
   }
 
   // Handle window size changes

widget/windows/winrt/MetroWidget.cpp

@@ -1484,7 +1484,9 @@ MetroWidget::Activated(bool aActiveated)
 NS_IMETHODIMP
 MetroWidget::Move(double aX, double aY)
 {
-  NotifyWindowMoved(aX, aY);
+  if (mWidgetListener) {
+    mWidgetListener->WindowMoved(this, aX, aY);
+  }
   return NS_OK;
 }
 

widget/xpwidgets/nsBaseWidget.cpp

@@ -1471,18 +1471,6 @@ nsBaseWidget::NotifySizeMoveDone()
   }
 }
 
-void
-nsBaseWidget::NotifyWindowMoved(int32_t aX, int32_t aY)
-{
-  if (mWidgetListener) {
-    mWidgetListener->WindowMoved(this, aX, aY);
-  }
-
-  if (GetIMEUpdatePreference().WantPositionChanged()) {
-    NotifyIME(IMENotification(IMEMessage::NOTIFY_IME_OF_POSITION_CHANGE));
-  }
-}
-
 void
 nsBaseWidget::NotifySysColorChanged()
 {

widget/xpwidgets/nsBaseWidget.h

@@ -210,7 +210,6 @@ public:
 
   void NotifyWindowDestroyed();
   void NotifySizeMoveDone();
-  void NotifyWindowMoved(int32_t aX, int32_t aY);
 
   // Should be called by derived implementations to notify on system color and
   // theme changes.