Changeset 157163 in webkit

Timestamp:

Oct 9, 2013 6:07:37 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] mouse wheel events are not considered to be mouse events
​https://bugs.webkit.org/show_bug.cgi?id=120648

Reviewed by Gustavo Noronha Silva.

Expose WheelEvent in the GObject DOM bindings API.

• bindings/gobject/GNUmakefile.am: Add new files to compilation.
• bindings/gobject/WebKitDOMPrivate.cpp:

(WebKit::wrap): Create a WebKitDOMWheelEvent when the given Event
is a WheelEvent.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/gobject/GNUmakefile.am (modified) (2 diffs)
• bindings/gobject/WebKitDOMPrivate.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-09  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] mouse wheel events are not considered to be mouse events
+        https://bugs.webkit.org/show_bug.cgi?id=120648
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Expose WheelEvent in the GObject DOM bindings API.
+
+        * bindings/gobject/GNUmakefile.am: Add new files to compilation.
+        * bindings/gobject/WebKitDOMPrivate.cpp:
+        (WebKit::wrap): Create a WebKitDOMWheelEvent when the given Event
+        is a WheelEvent.
+
 2013-10-08  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebCore/bindings/gobject/GNUmakefile.am

@@ -272 +272 @@
         DerivedSources/webkitdom/WebKitDOMWebKitPointPrivate.h \
         DerivedSources/webkitdom/WebKitDOMWebKitNamedFlow.cpp \
+        DerivedSources/webkitdom/WebKitDOMWheelEvent.cpp \
+        DerivedSources/webkitdom/WebKitDOMWheelEventPrivate.h \
         DerivedSources/webkitdom/WebKitDOMXPathExpression.cpp \
         DerivedSources/webkitdom/WebKitDOMXPathExpressionPrivate.h \
@@ -423 +425 @@
         DerivedSources/webkitdom/WebKitDOMPerformanceNavigation.h \
         DerivedSources/webkitdom/WebKitDOMPerformanceTiming.h \
+        DerivedSources/webkitdom/WebKitDOMWheelEvent.h \
         DerivedSources/webkitdom/webkitdom.h \
         DerivedSources/webkitdom/webkitdomdefines.h

trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp

@@ -63 +63 @@
 #include "WebKitDOMTextPrivate.h"
 #include "WebKitDOMUIEventPrivate.h"
+#include "WebKitDOMWheelEventPrivate.h"
 
 namespace WebKit {
@@ -112 +113 @@
     ASSERT(event);
 
-    if (event->isMouseEvent())
-        return WEBKIT_DOM_EVENT(wrapMouseEvent(static_cast<MouseEvent*>(event)));
+    if (event->isUIEvent()) {
+        if (event->isMouseEvent())
+            return WEBKIT_DOM_EVENT(wrapMouseEvent(static_cast<MouseEvent*>(event)));
 
-    if (event->isKeyboardEvent())
-        return WEBKIT_DOM_EVENT(wrapKeyboardEvent(static_cast<KeyboardEvent*>(event)));
+        if (event->isKeyboardEvent())
+            return WEBKIT_DOM_EVENT(wrapKeyboardEvent(static_cast<KeyboardEvent*>(event)));
 
-    if (event->isUIEvent())
+        if (event->eventInterface() == WheelEventInterfaceType)
+            return WEBKIT_DOM_EVENT(wrapWheelEvent(static_cast<WheelEvent*>(event)));
+
         return WEBKIT_DOM_EVENT(wrapUIEvent(static_cast<UIEvent*>(event)));
+    }
 
     return wrapEvent(event);