Changeset 196256 in webkit

Timestamp:

Feb 8, 2016 10:28:39 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r196253.
​https://bugs.webkit.org/show_bug.cgi?id=153990

Caused several crashes in GTK+ bots (Requested by KaL on
#webkit).

Reverted changeset:

"[GTK] WebKitWebView should send crossing events to the
WebProcess"
​https://bugs.webkit.org/show_bug.cgi?id=153740
​http://trac.webkit.org/changeset/196253

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/EventHandler.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/gtk/WebEventFactory.cpp (modified) (2 diffs)
• WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-02-08  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r196253.
+        https://bugs.webkit.org/show_bug.cgi?id=153990
+
+        Caused several crashes in GTK+ bots (Requested by KaL on
+        #webkit).
+
+        Reverted changeset:
+
+        "[GTK] WebKitWebView should send crossing events to the
+        WebProcess"
+        https://bugs.webkit.org/show_bug.cgi?id=153740
+        http://trac.webkit.org/changeset/196253
+
 2016-02-08  Jeremy Jones  <jeremyj@apple.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -1883 +1883 @@
             scrollbar->mouseMoved(platformMouseEvent); // Handle hover effects on platforms that support visual feedback on scrollbar hovering.
 #endif
-        if (onlyUpdateScrollbars) {
-            updateMouseEventTargetNode(mouseEvent.targetNode(), platformMouseEvent, true);
+        if (onlyUpdateScrollbars)
             return true;
-        }
     }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-02-08  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r196253.
+        https://bugs.webkit.org/show_bug.cgi?id=153990
+
+        Caused several crashes in GTK+ bots (Requested by KaL on
+        #webkit).
+
+        Reverted changeset:
+
+        "[GTK] WebKitWebView should send crossing events to the
+        WebProcess"
+        https://bugs.webkit.org/show_bug.cgi?id=153740
+        http://trac.webkit.org/changeset/196253
+
 2016-02-08  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/Shared/gtk/WebEventFactory.cpp

@@ -73 +73 @@
 
     switch (event->type) {
-    case GDK_ENTER_NOTIFY:
-    case GDK_LEAVE_NOTIFY:
-    case GDK_MOTION_NOTIFY: {
+    case GDK_MOTION_NOTIFY:
         button = WebMouseEvent::NoButton;
-        GdkModifierType state;
-        gdk_event_get_state(event, &state);
-        if (state & GDK_BUTTON1_MASK)
+        if (event->motion.state & GDK_BUTTON1_MASK)
             button = WebMouseEvent::LeftButton;
-        else if (state & GDK_BUTTON2_MASK)
+        else if (event->motion.state & GDK_BUTTON2_MASK)
             button = WebMouseEvent::MiddleButton;
-        else if (state & GDK_BUTTON3_MASK)
+        else if (event->motion.state & GDK_BUTTON3_MASK)
             button = WebMouseEvent::RightButton;
         break;
-    }
     case GDK_BUTTON_PRESS:
     case GDK_2BUTTON_PRESS:
@@ -114 +109 @@
     switch (event->type) {
     case GDK_MOTION_NOTIFY:
-    case GDK_ENTER_NOTIFY:
-    case GDK_LEAVE_NOTIFY:
         type = WebEvent::MouseMove;
         break;

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp

@@ -359 +359 @@
         | GDK_SMOOTH_SCROLL_MASK
         | GDK_POINTER_MOTION_MASK
-        | GDK_ENTER_NOTIFY_MASK
-        | GDK_LEAVE_NOTIFY_MASK
         | GDK_KEY_PRESS_MASK
         | GDK_KEY_RELEASE_MASK
@@ -833 +831 @@
 
     priv->pageProxy->handleMouseEvent(NativeWebMouseEvent(reinterpret_cast<GdkEvent*>(event), 0 /* currentClickCount */));
-
-    return FALSE;
-}
-
-static gboolean webkitWebViewBaseCrossingNotifyEvent(GtkWidget* widget, GdkEventCrossing* crosssingEvent)
-{
-    WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
-    WebKitWebViewBasePrivate* priv = webViewBase->priv;
-
-    if (priv->authenticationDialog)
-        return FALSE;
-
-    // In the case of crossing events, it's very important the actual coordinates the WebProcess receives, because once the mouse leaves
-    // the web view, the WebProcess won't receive more events until the mouse enters again in the web view. So, if the coordinates of the leave
-    // event are not accurate, the WebProcess might not know the mouse left the view. This can happen because of double to integer conversion,
-    // if the coordinates of the leave event are for example (25.2, -0.9), the WebProcess will receive (25, 0) and any hit test will succeed
-    // because those coordinates are inside the web view.
-    GtkAllocation allocation;
-    gtk_widget_get_allocation(widget, &allocation);
-    double width = allocation.width;
-    double height = allocation.height;
-    double x = crosssingEvent->x;
-    double y = crosssingEvent->y;
-    if (x < 0 && x > -1)
-        x = -1;
-    else if (x >= width && x < width + 1)
-        x = width + 1;
-    if (y < 0 && y > -1)
-        y = -1;
-    else if (y >= height && y < height + 1)
-        y = height + 1;
-
-    GdkEvent* event = reinterpret_cast<GdkEvent*>(crosssingEvent);
-    GUniquePtr<GdkEvent> copiedEvent;
-    if (x != crosssingEvent->x || y != crosssingEvent->y) {
-        copiedEvent.reset(gdk_event_copy(event));
-        copiedEvent->crossing.x = x;
-        copiedEvent->crossing.y = y;
-    }
-
-    priv->pageProxy->handleMouseEvent(NativeWebMouseEvent(copiedEvent ? copiedEvent.get() : event, 0 /* currentClickCount */));
 
     return FALSE;
@@ -1122 +1079 @@
     widgetClass->scroll_event = webkitWebViewBaseScrollEvent;
     widgetClass->motion_notify_event = webkitWebViewBaseMotionNotifyEvent;
-    widgetClass->enter_notify_event = webkitWebViewBaseCrossingNotifyEvent;
-    widgetClass->leave_notify_event = webkitWebViewBaseCrossingNotifyEvent;
 #if ENABLE(TOUCH_EVENTS)
     widgetClass->touch_event = webkitWebViewBaseTouchEvent;