Title: [110893] trunk
- Revision
- 110893
- Author
- [email protected]
- Date
- 2012-03-15 15:13:47 -0700 (Thu, 15 Mar 2012)
Log Message
REGRESSION (r110371): broke platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html
https://bugs.webkit.org/show_bug.cgi?id=80825
Patch by Robert Kroeger <[email protected]> on 2012-03-15
Reviewed by James Robinson.
* page/EventHandler.cpp:
(WebCore::EventHandler::handleWheelEvent): Corrected a typo.
Modified Paths
Diff
Modified: trunk/LayoutTests/platform/gtk/Skipped (110892 => 110893)
--- trunk/LayoutTests/platform/gtk/Skipped 2012-03-15 22:09:19 UTC (rev 110892)
+++ trunk/LayoutTests/platform/gtk/Skipped 2012-03-15 22:13:47 UTC (rev 110893)
@@ -1602,9 +1602,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=80534
fast/events/autoscroll-in-textfield.html
-# https://bugs.webkit.org/show_bug.cgi?id=80825
-platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html
-
# https://bugs.webkit.org/show_bug.cgi?id=80466
fast/forms/label/labelable-elements.html
Modified: trunk/Source/WebCore/ChangeLog (110892 => 110893)
--- trunk/Source/WebCore/ChangeLog 2012-03-15 22:09:19 UTC (rev 110892)
+++ trunk/Source/WebCore/ChangeLog 2012-03-15 22:13:47 UTC (rev 110893)
@@ -1,3 +1,13 @@
+2012-03-15 Robert Kroeger <[email protected]>
+
+ REGRESSION (r110371): broke platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html
+ https://bugs.webkit.org/show_bug.cgi?id=80825
+
+ Reviewed by James Robinson.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleWheelEvent): Corrected a typo.
+
2012-03-15 Scott Byer <[email protected]>
Fix crbug 117957 - get settings scrolling with the wheel again.
Modified: trunk/Source/WebCore/page/EventHandler.cpp (110892 => 110893)
--- trunk/Source/WebCore/page/EventHandler.cpp 2012-03-15 22:09:19 UTC (rev 110892)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2012-03-15 22:13:47 UTC (rev 110893)
@@ -2317,7 +2317,7 @@
// Instead, the handlers should know convert vertical scrolls
// appropriately.
PlatformWheelEvent event = e;
- if (m_baseEventType != PlatformEvent::NoType && shouldTurnVerticalTicksIntoHorizontal(result))
+ if (m_baseEventType == PlatformEvent::NoType && shouldTurnVerticalTicksIntoHorizontal(result))
event = event.copyTurningVerticalTicksIntoHorizontalTicks();
if (node) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
