Title: [109811] trunk
Revision
109811
Author
[email protected]
Date
2012-03-05 16:13:51 -0800 (Mon, 05 Mar 2012)

Log Message

Tools: Correctly compute the positions of GestureScroll* events on
Chromium.
https://bugs.webkit.org/show_bug.cgi?id=80075

Patch by Robert Kroeger <[email protected]> on 2012-03-05
Reviewed by Adam Barth.

* DumpRenderTree/chromium/EventSender.cpp:
(EventSender::reset):
(EventSender::gestureEvent):
* DumpRenderTree/chromium/EventSender.h:
(EventSender):

LayoutTests: Correct a test to work the same on Gtk and non-Gtk chromium in
the presence of correctly synthesized GestureScroll* events.
https://bugs.webkit.org/show_bug.cgi?id=80075

Patch by Robert Kroeger <[email protected]> on 2012-03-05
Reviewed by Adam Barth.

* fast/events/touch/gesture/gesture-scroll.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (109810 => 109811)


--- trunk/LayoutTests/ChangeLog	2012-03-06 00:11:30 UTC (rev 109810)
+++ trunk/LayoutTests/ChangeLog	2012-03-06 00:13:51 UTC (rev 109811)
@@ -1,3 +1,13 @@
+2012-03-05  Robert Kroeger  <[email protected]>
+
+        Correct a test to work the same on Gtk and non-Gtk chromium in
+        the presence of correctly synthesized GestureScroll* events.
+        https://bugs.webkit.org/show_bug.cgi?id=80075
+
+        Reviewed by Adam Barth.
+
+        * fast/events/touch/gesture/gesture-scroll.html:
+
 2012-03-05  Mihnea Ovidenie  <[email protected]>
 
         [CSSRegions][CSSOM]Prevent creation of NamedFlow object for invalid flow name

Modified: trunk/LayoutTests/fast/events/touch/gesture/gesture-scroll.html (109810 => 109811)


--- trunk/LayoutTests/fast/events/touch/gesture/gesture-scroll.html	2012-03-06 00:11:30 UTC (rev 109810)
+++ trunk/LayoutTests/fast/events/touch/gesture/gesture-scroll.html	2012-03-06 00:13:51 UTC (rev 109811)
@@ -10,6 +10,11 @@
   background: white;
 }
 
+::-webkit-scrollbar {
+    width: 0px;
+    height: 0px;
+}
+
 #movingbox {
   width: 100%;
   height: 100%;

Modified: trunk/Tools/ChangeLog (109810 => 109811)


--- trunk/Tools/ChangeLog	2012-03-06 00:11:30 UTC (rev 109810)
+++ trunk/Tools/ChangeLog	2012-03-06 00:13:51 UTC (rev 109811)
@@ -1,3 +1,17 @@
+2012-03-05  Robert Kroeger  <[email protected]>
+
+        Correctly compute the positions of GestureScroll* events on
+        Chromium.
+        https://bugs.webkit.org/show_bug.cgi?id=80075
+
+        Reviewed by Adam Barth.
+
+        * DumpRenderTree/chromium/EventSender.cpp:
+        (EventSender::reset):
+        (EventSender::gestureEvent):
+        * DumpRenderTree/chromium/EventSender.h:
+        (EventSender):
+
 2012-03-05  Dirk Pranke  <[email protected]>
 
         flakiness dashboard doesn't display baselines for virtual tests correctly

Modified: trunk/Tools/DumpRenderTree/chromium/EventSender.cpp (109810 => 109811)


--- trunk/Tools/DumpRenderTree/chromium/EventSender.cpp	2012-03-06 00:11:30 UTC (rev 109810)
+++ trunk/Tools/DumpRenderTree/chromium/EventSender.cpp	2012-03-06 00:13:51 UTC (rev 109811)
@@ -330,7 +330,7 @@
     touchModifiers = 0;
     touchPoints.clear();
     m_taskList.revokeAll();
-    m_gestureStartLocation = WebPoint(0, 0);
+    m_currentGestureLocation = WebPoint(0, 0);
 }
 
 WebView* EventSender::webview()
@@ -1100,20 +1100,22 @@
     case WebInputEvent::GestureScrollUpdate:
         event.deltaX = static_cast<float>(arguments[0].toDouble());
         event.deltaY = static_cast<float>(arguments[1].toDouble());
-        event.x = m_gestureStartLocation.x + event.deltaX;
-        event.y = m_gestureStartLocation.y + event.deltaY;
+        event.x = m_currentGestureLocation.x;
+        event.y = m_currentGestureLocation.y;
+        m_currentGestureLocation.x = m_currentGestureLocation.x + event.deltaX;
+        m_currentGestureLocation.y = m_currentGestureLocation.y + event.deltaY;
         break;
 
     case WebInputEvent::GestureScrollBegin:
-        m_gestureStartLocation = WebPoint(point.x, point.y);
-        event.x = m_gestureStartLocation.x;
-        event.y = m_gestureStartLocation.y;
+        m_currentGestureLocation = WebPoint(point.x, point.y);
+        event.x = m_currentGestureLocation.x;
+        event.y = m_currentGestureLocation.y;
         break;
     case WebInputEvent::GestureScrollEnd:
         event.deltaX = static_cast<float>(arguments[0].toDouble());
         event.deltaY = static_cast<float>(arguments[1].toDouble());
-        event.x = m_gestureStartLocation.x;
-        event.y = m_gestureStartLocation.y;
+        event.x = m_currentGestureLocation.x;
+        event.y = m_currentGestureLocation.y;
         break;
     case WebInputEvent::GestureTap:
         event.x = point.x;

Modified: trunk/Tools/DumpRenderTree/chromium/EventSender.h (109810 => 109811)


--- trunk/Tools/DumpRenderTree/chromium/EventSender.h	2012-03-06 00:11:30 UTC (rev 109810)
+++ trunk/Tools/DumpRenderTree/chromium/EventSender.h	2012-03-06 00:13:51 UTC (rev 109811)
@@ -162,7 +162,7 @@
     TestShell* m_shell;
 
     // Location of the touch point that initiated a gesture.
-    WebKit::WebPoint m_gestureStartLocation;
+    WebKit::WebPoint m_currentGestureLocation;
 
     // Location of last mouseMoveTo event.
     static WebKit::WebPoint lastMousePos;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to