b=497498 no need to explicitly dispatch NS_DRAGDROP_ENTER as this is handled during NS_DRAGDROP_OVER r=enndeakin

--HG--
extra : rebase_source : 3c766e3ecb09a1aef295e8e0e9aca215f53e49c0

widget/gtk2/nsWindow.cpp

@@ -3295,14 +3295,14 @@ nsWindow::ThemeChanged()
 }
 
 void
-nsWindow::CheckNeedDragLeaveEnter(nsWindow* aInnerMostWidget,
-                                  nsIDragService* aDragService,
-                                  GdkDragContext *aDragContext,
-                                  nscoord aX, nscoord aY)
+nsWindow::CheckNeedDragLeave(nsWindow* aInnerMostWidget,
+                             nsIDragService* aDragService,
+                             GdkDragContext *aDragContext,
+                             nscoord aX, nscoord aY)
 {
     // check to see if there was a drag motion window already in place
     if (sLastDragMotionWindow) {
-        // same as the last window so no need for dragenter and dragleave events
+        // same as the last window so no need for dragleave event
         if (sLastDragMotionWindow == aInnerMostWidget) {
             UpdateDragStatus(aDragContext, aDragService);
             return;
@@ -3316,9 +3316,8 @@ nsWindow::CheckNeedDragLeaveEnter(nsWindow* aInnerMostWidget,
     // Make sure that the drag service knows we're now dragging
     aDragService->StartDragSession();
 
-    // update our drag status and send a dragenter event to the window
+    // update our drag status
     UpdateDragStatus(aDragContext, aDragService);
-    aInnerMostWidget->OnDragEnter(aX, aY);
 
     // set the last window to the innerMostWidget
     sLastDragMotionWindow = aInnerMostWidget;
@@ -3379,7 +3378,7 @@ nsWindow::OnDragMotionEvent(GtkWidget *aWidget,
         mDragLeaveTimer = nsnull;
     }
 
-    CheckNeedDragLeaveEnter(innerMostWidget, dragService, aDragContext, retx, rety);
+    CheckNeedDragLeave(innerMostWidget, dragService, aDragContext, retx, rety);
 
     // notify the drag service that we are starting a drag motion.
     dragSessionGTK->TargetStartDragMotion();
@@ -3468,7 +3467,7 @@ nsWindow::OnDragDropEvent(GtkWidget *aWidget,
         mDragLeaveTimer = nsnull;
     }
 
-    CheckNeedDragLeaveEnter(innerMostWidget, dragService, aDragContext, retx, rety);
+    CheckNeedDragLeave(innerMostWidget, dragService, aDragContext, retx, rety);
 
     // http://www.whatwg.org/specs/web-apps/current-work/multipage/dnd.html#drag-and-drop-processing-model
     // (as at 27 December 2010) indicates that a "drop" event should only be
@@ -3603,22 +3602,6 @@ nsWindow::OnDragLeave(void)
     }
 }
 
-void
-nsWindow::OnDragEnter(nscoord aX, nscoord aY)
-{
-    // XXX Do we want to pass this on only if the event's subwindow is null?
-
-    LOGDRAG(("nsWindow::OnDragEnter(%p)\n", (void*)this));
-
-    nsDragEvent event(true, NS_DRAGDROP_ENTER, this);
-
-    event.refPoint.x = aX;
-    event.refPoint.y = aY;
-
-    nsEventStatus status;
-    DispatchEvent(&event, status);
-}
-
 static void
 GetBrandName(nsXPIDLString& brandName)
 {

widget/gtk2/nsWindow.h

@@ -261,7 +261,6 @@ public:
                                                guint            aTime,
                                                gpointer         aData);
     void               OnDragLeave(void);
-    void               OnDragEnter(nscoord aX, nscoord aY);
 
 private:
     void               NativeResize(PRInt32 aWidth,
@@ -297,10 +296,10 @@ public:
 
     void               ThemeChanged(void);
 
-    void CheckNeedDragLeaveEnter(nsWindow* aInnerMostWidget,
-                                 nsIDragService* aDragService,
-                                 GdkDragContext *aDragContext,
-                                 nscoord aX, nscoord aY);
+    void CheckNeedDragLeave(nsWindow* aInnerMostWidget,
+                            nsIDragService* aDragService,
+                            GdkDragContext *aDragContext,
+                            nscoord aX, nscoord aY);
 
 #ifdef MOZ_X11
     Window             mOldFocusWindow;