Changeset 61288 in webkit

Timestamp:

Jun 16, 2010 3:26:35 PM (14 years ago)

Author:

Martin Robinson

Message:

2010-06-16 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Gustavo Noronha Silva.

[GTK] Remove the abuse of GDK_CURRENT_TIME in the DRT
​https://bugs.webkit.org/show_bug.cgi?id=40600

• platform/gtk/Skipped: This change exposed some failures which were previously not reported. Skip them.

2010-06-16 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Gustavo Noronha Silva.

[GTK] Remove the abuse of GDK_CURRENT_TIME in the DRT
​https://bugs.webkit.org/show_bug.cgi?id=40600

• WebCoreSupport/DragClientGtk.cpp: (WebKit::DragClient::startDrag): Reset the click count after a drag starts.
• WebCoreSupport/FrameLoaderClientGtk.cpp: (WebKit::postCommitFrameViewSetup): Reset the click count after a load is committed.
• webkit/webkitprivate.h: Move static click counting variables to be per-view.
• webkit/webkitwebview.cpp: (getEventTime): Added. (webkit_web_view_button_press_event): If the event time is zero, use the current time. (webkit_web_view_finalize): Clean up click counting member. (webkit_web_view_init): Initialize click counting member.

2010-06-16 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Gustavo Noronha Silva.

[GTK] Remove the abuse of GDK_CURRENT_TIME in the DRT
​https://bugs.webkit.org/show_bug.cgi?id=40600

• DumpRenderTree/gtk/EventSender.cpp: (prepareMouseButtonEvent): Remove logic adding an offset to GDK_CURRENT_TIME.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/DragClientGtk.cpp (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (modified) (1 diff)
• WebKit/gtk/webkit/webkitprivate.h (modified) (2 diffs)
• WebKit/gtk/webkit/webkitwebview.cpp (modified) (4 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/gtk/EventSender.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-16  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] Remove the abuse of GDK_CURRENT_TIME in the DRT
+        https://bugs.webkit.org/show_bug.cgi?id=40600
+
+        * platform/gtk/Skipped: This change exposed some failures which were previously not reported. Skip them.
+
 2010-06-16  Adam Barth  <abarth@webkit.org>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -5932 +5932 @@
 # https://bugs.webkit.org/show_bug.cgi?id=40664
 inspector/timeline-script-tag-1.html
+
+# Tests failing because the context menu is grabbing mouse events.
+# https://bugs.webkit.org/show_bug.cgi?id=40601
+fast/events/mouse-click-events.html
+fast/events/right-click-focus.html
+editing/selection/5354455-1.html
+editing/selection/5354455-2.html

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-06-16  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] Remove the abuse of GDK_CURRENT_TIME in the DRT
+        https://bugs.webkit.org/show_bug.cgi?id=40600
+
+        * WebCoreSupport/DragClientGtk.cpp: 
+        (WebKit::DragClient::startDrag): Reset the click count after a drag starts.
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::postCommitFrameViewSetup): Reset the click count after a load is committed.
+        * webkit/webkitprivate.h: Move static click counting variables to be per-view.
+        * webkit/webkitwebview.cpp: 
+        (getEventTime): Added.
+        (webkit_web_view_button_press_event): If the event time is zero, use the current time.
+        (webkit_web_view_finalize): Clean up click counting member.
+        (webkit_web_view_init): Initialize click counting member.
+
 2010-06-15  Xan Lopez  <xlopez@igalia.com>
 

trunk/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp

@@ -80 +80 @@
     webView->priv->draggingDataObjects.set(context, dataObject);
 
+    // A drag starting should prevent a double-click from happening. This might
+    // happen if a drag is followed very quickly by another click (like in the DRT).
+    webView->priv->previousClickTime = 0;
+
     if (image)
         gtk_drag_set_icon_pixbuf(context, image, eventPos.x() - dragImageOrigin.x(), eventPos.y() - dragImageOrigin.y());

trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

@@ -1146 +1146 @@
         g_object_unref(menu);
     }
+
+    // Do not allow click counting between main frame loads.
+    priv->previousClickTime = 0;
 }
 

trunk/WebKit/gtk/webkit/webkitprivate.h

@@ -57 +57 @@
 #include "Frame.h"
 #include "InspectorClientGtk.h"
+#include "IntPoint.h"
 #include "FrameLoaderClient.h"
 #include "ResourceHandle.h"
@@ -153 +154 @@
         char* tooltipText;
 
+        int currentClickCount;
+        WebCore::IntPoint* previousClickPoint;
+        guint previousClickButton;
+        guint32 previousClickTime;
+
         HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> > draggingDataObjects;
     };

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -588 +588 @@
 }
 
+static guint32 getEventTime(GdkEvent* event)
+{
+    guint32 time = gdk_event_get_time(event);
+    if (time)
+        return time;
+
+    // Real events always have a non-zero time, but events synthesized
+    // by the DRT do not and we must calculate a time manually. This time
+    // is not calculated in the DRT, because GTK+ does not work well with
+    // anything other than GDK_CURRENT_TIME on synthesized events.
+    GTimeVal timeValue;
+    g_get_current_time(&timeValue);
+    return (timeValue.tv_sec * 1000) + (timeValue.tv_usec / 1000);
+} 
+
 static gboolean webkit_web_view_button_press_event(GtkWidget* widget, GdkEventButton* event)
 {
-    // Eventually it may make sense for these to be per-view and per-device,
-    // but at this time the implementation matches the Windows port.
-    static int currentClickCount = 1;
-    static IntPoint previousPoint;
-    static guint previousButton;
-    static guint32 previousTime;
-
     WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
+    WebKitWebViewPrivate* priv = webView->priv;
 
     // FIXME: need to keep track of subframe focus for key events
@@ -621 +630 @@
     // quadruple clicks, quintuple clicks, ad infinitum. Here, we replicate the
     // GDK logic for counting clicks.
+    guint32 eventTime = getEventTime(reinterpret_cast<GdkEvent*>(event));
     if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS)
-        || ((abs(event->x - previousPoint.x()) < doubleClickDistance)
-            && (abs(event->y - previousPoint.y()) < doubleClickDistance)
-            && (event->time - previousTime < static_cast<guint>(doubleClickTime))
-            && (event->button == previousButton)))
-        currentClickCount++;
+        || ((abs(event->x - priv->previousClickPoint->x()) < doubleClickDistance)
+            && (abs(event->y - priv->previousClickPoint->y()) < doubleClickDistance)
+            && (eventTime - priv->previousClickTime < static_cast<guint>(doubleClickTime))
+            && (event->button == priv->previousClickButton)))
+        priv->currentClickCount++;
     else
-        currentClickCount = 1;
+        priv->currentClickCount = 1;
 
     PlatformMouseEvent platformEvent(event);
-    platformEvent.setClickCount(currentClickCount);
-    previousPoint = platformEvent.pos();
-    previousButton = event->button;
-    previousTime = event->time;
+    platformEvent.setClickCount(priv->currentClickCount);
+    *priv->previousClickPoint = platformEvent.pos();
+    priv->previousClickButton = event->button;
+    priv->previousClickTime = eventTime;
 
     if (event->button == 3)
@@ -1196 +1206 @@
     g_free(priv->customEncoding);
     g_free(priv->iconURI);
+
+    delete priv->previousClickPoint;
 
     G_OBJECT_CLASS(webkit_web_view_parent_class)->finalize(object);
@@ -2913 +2925 @@
 
     priv->tooltipText = 0;
+    priv->currentClickCount = 0;
+    priv->previousClickPoint = new IntPoint(0, 0);
+    priv->previousClickButton = 0;
+    priv->previousClickTime = 0;
 }
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-06-16  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] Remove the abuse of GDK_CURRENT_TIME in the DRT
+        https://bugs.webkit.org/show_bug.cgi?id=40600
+
+        * DumpRenderTree/gtk/EventSender.cpp:
+        (prepareMouseButtonEvent): Remove logic adding an offset to GDK_CURRENT_TIME.
+
 2010-06-16  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/gtk/EventSender.cpp

@@ -149 +149 @@
     event->button.device = gdk_device_get_core_pointer();
     event->button.state = getStateFlags();
-
-    // Mouse up & down events dispatched via g_signal_emit_by_name must offset
-    // their time value, so that WebKit can detect where sequences of mouse
-    // clicks begin and end. This should not interfere with GDK or GTK+ event
-    // processing, because the event is only seen by the widget.
-    event->button.time = GDK_CURRENT_TIME + timeOffset;
+    event->button.time = GDK_CURRENT_TIME;
 
     int xRoot, yRoot;