Changeset 50871 in webkit

Timestamp:

Nov 12, 2009 1:03:32 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-12 Kinuko Yasuda <​kinuko@google.com>

Reviewed by David Levin.

Support Gtk scrollwheel behavior for horizontal scrollbars on Linux
Chromium too.
​https://bugs.webkit.org/show_bug.cgi?id=31292

No new tests. (Corresponding test for Gtk+ is
platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html)

• page/EventHandler.cpp:
• page/chromium/EventHandlerChromium.cpp:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/EventHandler.cpp (modified) (1 diff)
• page/chromium/EventHandlerChromium.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-12  Kinuko Yasuda  <kinuko@google.com>
+
+        Reviewed by David Levin.
+
+        Support Gtk scrollwheel behavior for horizontal scrollbars on Linux
+        Chromium too.
+        https://bugs.webkit.org/show_bug.cgi?id=31292
+
+        No new tests. (Corresponding test for Gtk+ is
+        platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html)
+
+        * page/EventHandler.cpp:
+        * page/chromium/EventHandlerChromium.cpp:
+
 2009-11-12  Yuta Kitamura  <yutak@chromium.org>
 

trunk/WebCore/page/EventHandler.cpp

@@ -1792 +1792 @@
 }
 
-#if !PLATFORM(GTK)
+#if !PLATFORM(GTK) && !(PLATFORM(CHROMIUM) && PLATFORM(LINUX))
 bool EventHandler::shouldTurnVerticalTicksIntoHorizontal(const HitTestResult&) const
 {

trunk/WebCore/page/chromium/EventHandlerChromium.cpp

@@ -155 +155 @@
 }
 
+#if PLATFORM(LINUX)
+// GTK+ must scroll horizontally if the mouse pointer is on top of the
+// horizontal scrollbar while scrolling with the wheel.
+// This code comes from gtk/EventHandlerGtk.cpp.
+bool EventHandler::shouldTurnVerticalTicksIntoHorizontal(const HitTestResult& result) const
+{
+    return result.scrollbar() && result.scrollbar()->orientation() == HorizontalScrollbar;
+}
+#endif
+
 } // namespace WebCore