Backed out changeset 23ac0ea522e8 due to old Gtk used on boxes and makes it burn
authorOleg Romashin <romaxa@gmail.com>
Wed, 12 Nov 2008 10:10:55 -0500
changeset 21586 8242c6adbf638ca841b102d555b96c0f00f467a7
parent 21585 23ac0ea522e891f60f356a1aab210ef6ca79a663
child 21587 f57df00a46019d04a1d0a11322a6171e50ea07ef
push id3598
push userromaxa@gmail.com
push dateWed, 12 Nov 2008 08:12:32 +0000
treeherdermozilla-central@8242c6adbf63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.1b2pre
backs out23ac0ea522e891f60f356a1aab210ef6ca79a663
Backed out changeset 23ac0ea522e8 due to old Gtk used on boxes and makes it burn
widget/src/gtk2/mozdrawingarea.c
widget/src/gtk2/nsWindow.cpp
--- a/widget/src/gtk2/mozdrawingarea.c
+++ b/widget/src/gtk2/mozdrawingarea.c
@@ -159,18 +159,17 @@ moz_drawingarea_create_windows (MozDrawi
     /* set the default pixmap to None so that you don't end up with the
        gtk default which is BlackPixel. */
     gdk_window_set_back_pixmap(drawingarea->clip_window, NULL, FALSE);
 
     attributes.event_mask = (GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK |
                              GDK_VISIBILITY_NOTIFY_MASK |
                              GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
                              GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
-                             GDK_POINTER_MOTION_MASK |
-                             GDK_POINTER_MOTION_HINT_MASK);
+                             GDK_POINTER_MOTION_MASK);
     /* create the inner window */
     drawingarea->inner_window = gdk_window_new (drawingarea->clip_window,
                                                 &attributes, attributes_mask);
     gdk_window_set_user_data(drawingarea->inner_window, widget);
 
     /* set the default pixmap to None so that you don't end up with the
        gtk default which is BlackPixel. */
     gdk_window_set_back_pixmap(drawingarea->inner_window, NULL, FALSE);
--- a/widget/src/gtk2/nsWindow.cpp
+++ b/widget/src/gtk2/nsWindow.cpp
@@ -4493,18 +4493,17 @@ nsWindow::GrabPointer(void)
         return;
 
     gint retval;
     retval = gdk_pointer_grab(mDrawingarea->inner_window, TRUE,
                               (GdkEventMask)(GDK_BUTTON_PRESS_MASK |
                                              GDK_BUTTON_RELEASE_MASK |
                                              GDK_ENTER_NOTIFY_MASK |
                                              GDK_LEAVE_NOTIFY_MASK |
-                                             GDK_POINTER_MOTION_MASK |
-                                             GDK_POINTER_MOTION_HINT_MASK),
+                                             GDK_POINTER_MOTION_MASK),
                               (GdkWindow *)NULL, NULL, GDK_CURRENT_TIME);
 
     if (retval != GDK_GRAB_SUCCESS) {
         LOG(("GrabPointer: pointer grab failed\n"));
         mRetryPointerGrab = PR_TRUE;
     }
 }
 
@@ -5324,17 +5323,16 @@ gboolean
 motion_notify_event_cb(GtkWidget *widget, GdkEventMotion *event)
 {
     nsWindow *window = GetFirstNSWindowForGDKWindow(event->window);
     if (!window)
         return FALSE;
 
     window->OnMotionNotifyEvent(widget, event);
 
-    gdk_event_request_motions(event);
     return TRUE;
 }
 
 /* static */
 gboolean
 button_press_event_cb(GtkWidget *widget, GdkEventButton *event)
 {
     nsWindow *window = GetFirstNSWindowForGDKWindow(event->window);