<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196640] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196640">196640</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-16 10:15:37 -0800 (Tue, 16 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] No hover-horizontal scrolling available
https://bugs.webkit.org/show_bug.cgi?id=122859
Reviewed by Michael Catanzaro.
Source/WebCore:
This is a regression of WebKit2, because in WebKit1 we used native
widgets for frame scrollbars that handled this automatically. Now
we need to also check if the mouse is over frame scrollbars to
adjust the wheel event.
Test: platform/gtk/scrollbars/main-frame-scrollbar-horizontal-wheel-scroll.html
* page/EventHandler.cpp:
(WebCore::EventHandler::handleWheelEvent): Pass the adjusted wheel
event to platformCompleteWheelEvent().
* page/gtk/EventHandlerGtk.cpp:
(WebCore::EventHandler::shouldTurnVerticalTicksIntoHorizontal):
Check also frame scrollbars.
LayoutTests:
* platform/gtk/scrollbars/main-frame-scrollbar-horizontal-wheel-scroll-expected.html: Added.
* platform/gtk/scrollbars/main-frame-scrollbar-horizontal-wheel-scroll.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepagegtkEventHandlerGtkcpp">trunk/Source/WebCore/page/gtk/EventHandlerGtk.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformgtkscrollbarsmainframescrollbarhorizontalwheelscrollexpectedhtml">trunk/LayoutTests/platform/gtk/scrollbars/main-frame-scrollbar-horizontal-wheel-scroll-expected.html</a></li>
<li><a href="#trunkLayoutTestsplatformgtkscrollbarsmainframescrollbarhorizontalwheelscrollhtml">trunk/LayoutTests/platform/gtk/scrollbars/main-frame-scrollbar-horizontal-wheel-scroll.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196639 => 196640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-16 18:13:58 UTC (rev 196639)
+++ trunk/LayoutTests/ChangeLog 2016-02-16 18:15:37 UTC (rev 196640)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-02-16 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] No hover-horizontal scrolling available
+ https://bugs.webkit.org/show_bug.cgi?id=122859
+
+ Reviewed by Michael Catanzaro.
+
+ * platform/gtk/scrollbars/main-frame-scrollbar-horizontal-wheel-scroll-expected.html: Added.
+ * platform/gtk/scrollbars/main-frame-scrollbar-horizontal-wheel-scroll.html: Added.
+
</ins><span class="cx"> 2016-02-16 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Factor id mutation style invalidation code into a class
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkscrollbarsmainframescrollbarhorizontalwheelscrollexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/gtk/scrollbars/main-frame-scrollbar-horizontal-wheel-scroll-expected.html (0 => 196640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/scrollbars/main-frame-scrollbar-horizontal-wheel-scroll-expected.html (rev 0)
+++ trunk/LayoutTests/platform/gtk/scrollbars/main-frame-scrollbar-horizontal-wheel-scroll-expected.html 2016-02-16 18:15:37 UTC (rev 196640)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<html>
+<body style="width: 5000px; height: 5000px">
+<p>This is a test for bug <a href="https://bugs.webkit.org/show_bug.cgi?id=122859">122859</a>.
+Scrolling with the mouse wheel over the horizontal main scrollbar should scroll the view horizontally</p>
+<script>
+ document.scrollingElement.scrollLeft = 40;
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformgtkscrollbarsmainframescrollbarhorizontalwheelscrollhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/gtk/scrollbars/main-frame-scrollbar-horizontal-wheel-scroll.html (0 => 196640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/scrollbars/main-frame-scrollbar-horizontal-wheel-scroll.html (rev 0)
+++ trunk/LayoutTests/platform/gtk/scrollbars/main-frame-scrollbar-horizontal-wheel-scroll.html 2016-02-16 18:15:37 UTC (rev 196640)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<html>
+<body style="width: 5000px; height: 5000px">
+<p>This is a test for bug <a href="https://bugs.webkit.org/show_bug.cgi?id=122859">122859</a>.
+Scrolling with the mouse wheel over the horizontal main scrollbar should scroll the view horizontally</p>
+<script>
+ if (window.eventSender) {
+ eventSender.mouseMoveTo(4, window.innerHeight - 4);
+ eventSender.mouseScrollBy(0, -1);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196639 => 196640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-16 18:13:58 UTC (rev 196639)
+++ trunk/Source/WebCore/ChangeLog 2016-02-16 18:15:37 UTC (rev 196640)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-02-16 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] No hover-horizontal scrolling available
+ https://bugs.webkit.org/show_bug.cgi?id=122859
+
+ Reviewed by Michael Catanzaro.
+
+ This is a regression of WebKit2, because in WebKit1 we used native
+ widgets for frame scrollbars that handled this automatically. Now
+ we need to also check if the mouse is over frame scrollbars to
+ adjust the wheel event.
+
+ Test: platform/gtk/scrollbars/main-frame-scrollbar-horizontal-wheel-scroll.html
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleWheelEvent): Pass the adjusted wheel
+ event to platformCompleteWheelEvent().
+ * page/gtk/EventHandlerGtk.cpp:
+ (WebCore::EventHandler::shouldTurnVerticalTicksIntoHorizontal):
+ Check also frame scrollbars.
+
</ins><span class="cx"> 2016-02-16 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Factor id mutation style invalidation code into a class
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (196639 => 196640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2016-02-16 18:13:58 UTC (rev 196639)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2016-02-16 18:15:37 UTC (rev 196640)
</span><span class="lines">@@ -2654,7 +2654,7 @@
</span><span class="cx"> if (scrollableArea)
</span><span class="cx"> scrollableArea->setScrolledProgrammatically(false);
</span><span class="cx">
</span><del>- bool handledEvent = platformCompleteWheelEvent(event, scrollableContainer.get(), scrollableArea);
</del><ins>+ bool handledEvent = platformCompleteWheelEvent(adjustedEvent, scrollableContainer.get(), scrollableArea);
</ins><span class="cx"> platformNotifyIfEndGesture(adjustedEvent, scrollableArea);
</span><span class="cx"> return handledEvent;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagegtkEventHandlerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/gtk/EventHandlerGtk.cpp (196639 => 196640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/gtk/EventHandlerGtk.cpp 2016-02-16 18:13:58 UTC (rev 196639)
+++ trunk/Source/WebCore/page/gtk/EventHandlerGtk.cpp 2016-02-16 18:15:37 UTC (rev 196640)
</span><span class="lines">@@ -129,9 +129,13 @@
</span><span class="cx"> // horizontal scrollbar while scrolling with the wheel; we need to
</span><span class="cx"> // add the deltas and ticks here so that this behavior is consistent
</span><span class="cx"> // for styled scrollbars.
</span><del>-bool EventHandler::shouldTurnVerticalTicksIntoHorizontal(const HitTestResult& result, const PlatformWheelEvent&) const
</del><ins>+bool EventHandler::shouldTurnVerticalTicksIntoHorizontal(const HitTestResult& result, const PlatformWheelEvent& event) const
</ins><span class="cx"> {
</span><del>- return result.scrollbar() && result.scrollbar()->orientation() == HorizontalScrollbar;
</del><ins>+ FrameView* view = m_frame.view();
+ Scrollbar* scrollbar = view ? view->scrollbarAtPoint(event.position()) : nullptr;
+ if (!scrollbar)
+ scrollbar = result.scrollbar();
+ return scrollbar && scrollbar->orientation() == HorizontalScrollbar;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>