Changeset 66666 in webkit

Timestamp:

Sep 2, 2010 6:14:24 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-09-02 Peter Kasting <​pkasting@google.com>

Reviewed by Dimitri Glazkov.

Implement [continuous]MouseScrollBy() on Chromium, and partly on GTK.
​https://bugs.webkit.org/show_bug.cgi?id=45073

• platform/chromium/test_expectations.txt: Unskip tests that should now pass.
• platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html: Convert mouseWheelTo() to mouseScrollBy().

2010-09-02 Peter Kasting <​pkasting@google.com>

Reviewed by Dimitri Glazkov.

Implement [continuous]MouseScrollBy() on Chromium, and partly on GTK.
​https://bugs.webkit.org/show_bug.cgi?id=45073

• DumpRenderTree/chromium/EventSender.cpp: (EventSender::EventSender): (EventSender::mouseScrollBy): (EventSender::continuousMouseScrollBy): (EventSender::sendCurrentTouchEvent): (EventSender::handleMouseWheel):
• DumpRenderTree/chromium/EventSender.h:
• DumpRenderTree/gtk/EventSender.cpp: (mouseScrollByCallback): (continuousMouseScrollByCallback):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• LayoutTests/platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html (modified) (6 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/chromium/EventSender.cpp (modified) (5 diffs)
• WebKitTools/DumpRenderTree/chromium/EventSender.h (modified) (3 diffs)
• WebKitTools/DumpRenderTree/gtk/EventSender.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-02  Peter Kasting  <pkasting@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        Implement [continuous]MouseScrollBy() on Chromium, and partly on GTK.
+        https://bugs.webkit.org/show_bug.cgi?id=45073
+
+        * platform/chromium/test_expectations.txt: Unskip tests that should now pass.
+        * platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html: Convert mouseWheelTo() to mouseScrollBy().
+
 2010-09-01  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -2477 +2477 @@
 BUG38376 WIN : editing/deleting/5390681-2.html = IMAGE+TEXT
 
-// WebKit roll 56004 -> 56026
-BUG38278 : fast/events/continuous-platform-wheelevent-in-scrolling-div.html = TIMEOUT
-BUG38278 : fast/events/platform-wheelevent-in-scrolling-div.html = TIMEOUT
-
 // The touch targeting logic was recently changed.
 BUG36415 : fast/events/touch/touch-target.html = TEXT

trunk/LayoutTests/platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html

@@ -89 +89 @@
     var y = overflow.offsetTop + overflow.offsetHeight - 50;
     eventSender.mouseMoveTo(x, y);
-    eventSender.mouseWheelTo(0, 1);
+    eventSender.mouseScrollBy(0, -1);
 
     if (overflow.scrollTop != 40 || overflow.scrollLeft != 0)
@@ -98 +98 @@
     var y = overflow.offsetTop + overflow.offsetHeight - 6;
     eventSender.mouseMoveTo(x, y);
-    eventSender.mouseWheelTo(0, 1);
+    eventSender.mouseScrollBy(0, -1);
 
     if (overflow.scrollTop != 40 || overflow.scrollLeft != 40)
@@ -107 +107 @@
     var y = overflow.offsetTop + overflow.offsetHeight - 50;
     eventSender.mouseMoveTo(x, y);
-    eventSender.mouseWheelTo(0, 1);
+    eventSender.mouseScrollBy(0, -1);
 
     if (overflow.scrollTop != 80 || overflow.scrollLeft != 40)
@@ -118 +118 @@
     var y = styled.offsetTop + styled.offsetHeight - 50;
     eventSender.mouseMoveTo(x, y);
-    eventSender.mouseWheelTo(0, 1);
+    eventSender.mouseScrollBy(0, -1);
 
     if (styled.scrollTop != 40 || styled.scrollLeft != 0)
@@ -127 +127 @@
     var y = styled.offsetTop + styled.offsetHeight - 6;
     eventSender.mouseMoveTo(x, y);
-    eventSender.mouseWheelTo(0, 1);
+    eventSender.mouseScrollBy(0, -1);
 
     if (styled.scrollTop != 40 || styled.scrollLeft != 40)
@@ -136 +136 @@
     var y = styled.offsetTop + styled.offsetHeight - 50;
     eventSender.mouseMoveTo(x, y);
-    eventSender.mouseWheelTo(0, 1);
+    eventSender.mouseScrollBy(0, -1);
 
     if (styled.scrollTop != 80 || styled.scrollLeft != 40)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-09-02  Peter Kasting  <pkasting@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        Implement [continuous]MouseScrollBy() on Chromium, and partly on GTK.
+        https://bugs.webkit.org/show_bug.cgi?id=45073
+
+        * DumpRenderTree/chromium/EventSender.cpp:
+        (EventSender::EventSender):
+        (EventSender::mouseScrollBy):
+        (EventSender::continuousMouseScrollBy):
+        (EventSender::sendCurrentTouchEvent):
+        (EventSender::handleMouseWheel):
+        * DumpRenderTree/chromium/EventSender.h:
+        * DumpRenderTree/gtk/EventSender.cpp:
+        (mouseScrollByCallback):
+        (continuousMouseScrollByCallback):
+
 2010-09-01  Dirk Pranke  <dpranke@chromium.org>
 

trunk/WebKitTools/DumpRenderTree/chromium/EventSender.cpp

@@ -256 +256 @@
     bindMethod("contextClick", &EventSender::contextClick);
     bindMethod("mouseMoveTo", &EventSender::mouseMoveTo);
-    bindMethod("mouseWheelTo", &EventSender::mouseWheelTo);
     bindMethod("leapForward", &EventSender::leapForward);
     bindMethod("keyDown", &EventSender::keyDown);
@@ -267 +266 @@
     bindMethod("zoomPageIn", &EventSender::zoomPageIn);
     bindMethod("zoomPageOut", &EventSender::zoomPageOut);
+    bindMethod("mouseScrollBy", &EventSender::mouseScrollBy);
+    bindMethod("continuousMouseScrollBy", &EventSender::continuousMouseScrollBy);
     bindMethod("scheduleAsynchronousClick", &EventSender::scheduleAsynchronousClick);
     bindMethod("beginDragWithFiles", &EventSender::beginDragWithFiles);
@@ -471 +472 @@
         doMouseMove(event);
     }
-}
-
-void EventSender::mouseWheelTo(const CppArgumentList& arguments, CppVariant* result)
-{
-    result->setNull();
-
-    if (arguments.size() < 2 || !arguments[0].isNumber() || !arguments[1].isNumber())
-        return;
-
-    // Force a layout here just to make sure every position has been
-    // determined before we send events (as well as all the other methods
-    // that send an event do). The layout test calling this
-    // (scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html, only one
-    // for now) does not rely on this though.
-    webview()->layout();
-
-    int horizontal = arguments[0].toInt32();
-    int vertical = arguments[1].toInt32();
-
-    WebMouseWheelEvent event;
-    initMouseEvent(WebInputEvent::MouseWheel, pressedButton, lastMousePos, &event);
-    event.wheelTicksX = static_cast<float>(horizontal);
-    event.wheelTicksY = static_cast<float>(vertical);
-    event.deltaX = -horizontal * scrollbarPixelsPerTick;
-    event.deltaY = -vertical * scrollbarPixelsPerTick;
-    webview()->handleInputEvent(event);
 }
 
@@ -715 +690 @@
 }
 
+void EventSender::mouseScrollBy(const CppArgumentList& arguments, CppVariant* result)
+{
+    handleMouseWheel(arguments, result, false);
+}
+
+void EventSender::continuousMouseScrollBy(const CppArgumentList& arguments, CppVariant* result)
+{
+    handleMouseWheel(arguments, result, true);
+}
+
 void EventSender::replaySavedEvents()
 {
@@ -890 +875 @@
 }
 
+void EventSender::handleMouseWheel(const CppArgumentList& arguments, CppVariant* result, bool continuous)
+{
+    result->setNull();
+
+    if (arguments.size() < 2 || !arguments[0].isNumber() || !arguments[1].isNumber())
+        return;
+
+    // Force a layout here just to make sure every position has been
+    // determined before we send events (as well as all the other methods
+    // that send an event do).
+    webview()->layout();
+
+    int horizontal = arguments[0].toInt32();
+    int vertical = arguments[1].toInt32();
+
+    WebMouseWheelEvent event;
+    initMouseEvent(WebInputEvent::MouseWheel, pressedButton, lastMousePos, &event);
+    event.wheelTicksX = static_cast<float>(horizontal);
+    event.wheelTicksY = static_cast<float>(vertical);
+    event.deltaX = event.wheelTicksX;
+    event.deltaY = event.wheelTicksY;
+    if (!continuous) {
+        event.deltaX *= scrollbarPixelsPerTick;
+        event.deltaY *= scrollbarPixelsPerTick;
+    }
+    webview()->handleInputEvent(event);
+}
+
 void EventSender::touchEnd(const CppArgumentList&, CppVariant* result)
 {

trunk/WebKitTools/DumpRenderTree/chromium/EventSender.h

@@ -67 +67 @@
     void mouseUp(const CppArgumentList&, CppVariant*);
     void mouseMoveTo(const CppArgumentList&, CppVariant*);
-    void mouseWheelTo(const CppArgumentList&, CppVariant*);
     void leapForward(const CppArgumentList&, CppVariant*);
     void keyDown(const CppArgumentList&, CppVariant*);
@@ -75 +74 @@
     void zoomPageIn(const CppArgumentList&, CppVariant*);
     void zoomPageOut(const CppArgumentList&, CppVariant*);
+    void mouseScrollBy(const CppArgumentList&, CppVariant*);
+    void continuousMouseScrollBy(const CppArgumentList&, CppVariant*);
     void scheduleAsynchronousClick(const CppArgumentList&, CppVariant*);
     void beginDragWithFiles(const CppArgumentList&, CppVariant*);
@@ -138 +139 @@
     void sendCurrentTouchEvent(const WebKit::WebInputEvent::Type);
 
+    // Handle a request to send a wheel event.
+    void handleMouseWheel(const CppArgumentList&, CppVariant*, bool continuous);
+
     ScopedRunnableMethodFactory<EventSender> m_methodFactory;
 

trunk/WebKitTools/DumpRenderTree/gtk/EventSender.cpp

@@ -270 +270 @@
 }
 
-static JSValueRef mouseWheelToCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+static JSValueRef mouseScrollByCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
@@ -295 +295 @@
 
     if (horizontal < 0)
+        event->scroll.direction = GDK_SCROLL_RIGHT;
+    else if (horizontal > 0)
         event->scroll.direction = GDK_SCROLL_LEFT;
-    else if (horizontal > 0)
-        event->scroll.direction = GDK_SCROLL_RIGHT;
     else if (vertical < 0)
+        event->scroll.direction = GDK_SCROLL_DOWN;
+    else if (vertical > 0)
         event->scroll.direction = GDK_SCROLL_UP;
-    else if (vertical > 0)
-        event->scroll.direction = GDK_SCROLL_DOWN;
     else
         g_assert_not_reached();
 
     sendOrQueueEvent(event);
+    return JSValueMakeUndefined(context);
+}
+
+static JSValueRef continuousMouseScrollByCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+    // GTK doesn't support continuous scroll events.
     return JSValueMakeUndefined(context);
 }
@@ -597 +603 @@
 
 static JSStaticFunction staticFunctions[] = {
-    { "mouseWheelTo", mouseWheelToCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+    { "mouseScrollBy", mouseScrollByCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+    { "continuousMouseScrollBy", continuousMouseScrollByCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
     { "contextClick", contextClickCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
     { "mouseDown", mouseDownCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },