Backed out changeset 18474e89292a (bug 1161634) for m4 perma failures on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 06 May 2015 17:07:23 +0200
changeset 272460 d4462013432aff6af7be3767b7437a08a99797b2
parent 272459 5eb58823f834f93f0dc3f857c0b1b39b8d01cedb
child 272461 e0a099276fe12ef04bdfdcf74bc2d4fe80cb7de1
push id4830
push userjlund@mozilla.com
push dateMon, 29 Jun 2015 20:18:48 +0000
treeherdermozilla-beta@4c2175bb0420 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1161634
milestone40.0a1
backs out18474e89292a4305c99ad9f8665d43db014306fe
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 18474e89292a (bug 1161634) for m4 perma failures on a CLOSED TREE
widget/gtk/nsWindow.cpp
widget/gtk/nsWindow.h
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -6591,68 +6591,8 @@ nsWindow::SynthesizeNativeMouseEvent(Lay
     // aNativeMessage != GDK_BUTTON_RELEASE we'll synthesize a motion event
     // that will be emitted by gdk_display_warp_pointer().
     GdkScreen* screen = gdk_window_get_screen(mGdkWindow);
     gdk_display_warp_pointer(display, screen, aPoint.x, aPoint.y);
   }
 
   return NS_OK;
 }
-
-nsresult
-nsWindow::SynthesizeNativeMouseScrollEvent(mozilla::LayoutDeviceIntPoint aPoint,
-                                           uint32_t aNativeMessage,
-                                           double aDeltaX,
-                                           double aDeltaY,
-                                           double aDeltaZ,
-                                           uint32_t aModifierFlags,
-                                           uint32_t aAdditionalFlags,
-                                           nsIObserver* aObserver)
-{
-  AutoObserverNotifier notifier(aObserver, "mousescrollevent");
-
-  if (!mGdkWindow) {
-    return NS_OK;
-  }
-
-  GdkEvent event;
-  memset(&event, 0, sizeof(GdkEvent));
-  event.type = GDK_SCROLL;
-  event.scroll.window = mGdkWindow;
-  event.scroll.time = GDK_CURRENT_TIME;
-#if (MOZ_WIDGET_GTK == 3)
-  // Get device for event source
-  GdkDisplay* display = gdk_window_get_display(mGdkWindow);
-  GdkDeviceManager *device_manager = gdk_display_get_device_manager(display);
-  event.scroll.device = gdk_device_manager_get_client_pointer(device_manager);
-#endif
-  event.scroll.x_root = aPoint.x;
-  event.scroll.y_root = aPoint.y;
-
-  LayoutDeviceIntPoint pointInWindow = aPoint - WidgetToScreenOffset();
-  event.scroll.x = pointInWindow.x;
-  event.scroll.y = pointInWindow.y;
-
-  // The delta values are backwards on Linux compared to Windows and Cocoa,
-  // hence the negation.
-#if GTK_CHECK_VERSION(3,4,0)
-  // TODO: is this correct? I don't have GTK 3.4+ so I can't check
-  event.scroll.direction = GDK_SCROLL_SMOOTH;
-  event.scroll.delta_x = -aDeltaX;
-  event.scroll.delta_y = -aDeltaY;
-#else
-  if (aDeltaX < 0) {
-    event.scroll.direction = GDK_SCROLL_RIGHT;
-  } else if (aDeltaX > 0) {
-    event.scroll.direction = GDK_SCROLL_LEFT;
-  } else if (aDeltaY < 0) {
-    event.scroll.direction = GDK_SCROLL_DOWN;
-  } else if (aDeltaY > 0) {
-    event.scroll.direction = GDK_SCROLL_UP;
-  } else {
-    return NS_OK;
-  }
-#endif
-
-  gdk_event_put(&event);
-
-  return NS_OK;
-}
--- a/widget/gtk/nsWindow.h
+++ b/widget/gtk/nsWindow.h
@@ -301,25 +301,16 @@ public:
                                                 uint32_t aNativeMessage,
                                                 uint32_t aModifierFlags,
                                                 nsIObserver* aObserver) override;
 
     virtual nsresult SynthesizeNativeMouseMove(mozilla::LayoutDeviceIntPoint aPoint,
                                                nsIObserver* aObserver) override
     { return SynthesizeNativeMouseEvent(aPoint, GDK_MOTION_NOTIFY, 0, aObserver); }
 
-    virtual nsresult SynthesizeNativeMouseScrollEvent(mozilla::LayoutDeviceIntPoint aPoint,
-                                                      uint32_t aNativeMessage,
-                                                      double aDeltaX,
-                                                      double aDeltaY,
-                                                      double aDeltaZ,
-                                                      uint32_t aModifierFlags,
-                                                      uint32_t aAdditionalFlags,
-                                                      nsIObserver* aObserver) override;
-
 protected:
     virtual ~nsWindow();
 
     // event handling code
     void DispatchActivateEvent(void);
     void DispatchDeactivateEvent(void);
     void DispatchResized(int32_t aWidth, int32_t aHeight);