<!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>[171862] trunk/Source/WebCore</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/171862">171862</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-31 10:16:08 -0700 (Thu, 31 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor EventHandler to call ScrollAnimator::handleWheelEvent for overflow scrolling
https://bugs.webkit.org/show_bug.cgi?id=135195
Patch by Wenson Hsieh <wenson_hsieh@apple.com> on 2014-07-31
Reviewed by Beth Dakin.
ScrollableArea::handleWheelEvent is not currently being used to handle wheel events for overflow scrolling; it instead directly invokes ScrollableArea::scroll.
In order to expose wheel phases on Mac, the PlatformWheelEvent itself should propagate down to ScrollableArea, not just the scroll granularity, direction and
multiplier required by ScrollableArea::scroll. With this patch, PlatformWheelEvent will be "shipped" along with the WheelEvent.
No new tests, since behavior should not have changed.
* page/EventHandler.cpp:
(WebCore::didScrollInScrollableAreaForSingleAxis): Calls ScrollableArea::scroll directly using WheelEvent's data. Used to handle programmatic WheelEvents, e.g. from JavaScript.
(WebCore::handleWheelEventInAppropriateEnclosingBoxForSingleAxis): Finds the correct ScrollableArea and attempts to scroll it using the information contained in the WheelEvent via ScrollableArea::handleWheelEvent
(WebCore::EventHandler::defaultWheelEventHandler): Updated to use handleWheelEventInAppropriateEnclosingBoxForSingleAxis instead of scrollNode.
(WebCore::scrollNode): Deleted.
* rendering/RenderListBox.h: Made RenderListBox::scroll public so it can be invoked from EventHandler::handleWheelEventInAppropriateEnclosingBoxForSingleAxis.
* rendering/RenderNamedFlowThread.cpp: Refactored to let EventHandler update nextScrollBlock in the case of isRenderNamedFlowThread().
(WebCore::RenderNamedFlowThread::fragmentFromRenderBoxAsRenderBlock):
* rendering/RenderNamedFlowThread.h:</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCoreplatformScrollTypesh">trunk/Source/WebCore/platform/ScrollTypes.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxh">trunk/Source/WebCore/rendering/RenderListBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowThreadcpp">trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowThreadh">trunk/Source/WebCore/rendering/RenderNamedFlowThread.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171861 => 171862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-07-31 17:15:10 UTC (rev 171861)
+++ trunk/Source/WebCore/ChangeLog        2014-07-31 17:16:08 UTC (rev 171862)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-07-31 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Refactor EventHandler to call ScrollAnimator::handleWheelEvent for overflow scrolling
+ https://bugs.webkit.org/show_bug.cgi?id=135195
+
+ Reviewed by Beth Dakin.
+
+ ScrollableArea::handleWheelEvent is not currently being used to handle wheel events for overflow scrolling; it instead directly invokes ScrollableArea::scroll.
+ In order to expose wheel phases on Mac, the PlatformWheelEvent itself should propagate down to ScrollableArea, not just the scroll granularity, direction and
+ multiplier required by ScrollableArea::scroll. With this patch, PlatformWheelEvent will be "shipped" along with the WheelEvent.
+
+ No new tests, since behavior should not have changed.
+
+ * page/EventHandler.cpp:
+ (WebCore::didScrollInScrollableAreaForSingleAxis): Calls ScrollableArea::scroll directly using WheelEvent's data. Used to handle programmatic WheelEvents, e.g. from JavaScript.
+ (WebCore::handleWheelEventInAppropriateEnclosingBoxForSingleAxis): Finds the correct ScrollableArea and attempts to scroll it using the information contained in the WheelEvent via ScrollableArea::handleWheelEvent
+ (WebCore::EventHandler::defaultWheelEventHandler): Updated to use handleWheelEventInAppropriateEnclosingBoxForSingleAxis instead of scrollNode.
+ (WebCore::scrollNode): Deleted.
+ * rendering/RenderListBox.h: Made RenderListBox::scroll public so it can be invoked from EventHandler::handleWheelEventInAppropriateEnclosingBoxForSingleAxis.
+ * rendering/RenderNamedFlowThread.cpp: Refactored to let EventHandler update nextScrollBlock in the case of isRenderNamedFlowThread().
+ (WebCore::RenderNamedFlowThread::fragmentFromRenderBoxAsRenderBlock):
+ * rendering/RenderNamedFlowThread.h:
+
</ins><span class="cx"> 2014-07-31 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> WebCore part of: Server trust authentication challenges aren’t sent to the navigation delegate
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (171861 => 171862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp        2014-07-31 17:15:10 UTC (rev 171861)
+++ trunk/Source/WebCore/page/EventHandler.cpp        2014-07-31 17:16:08 UTC (rev 171862)
</span><span class="lines">@@ -73,6 +73,7 @@
</span><span class="cx"> #include "RenderFrameSet.h"
</span><span class="cx"> #include "RenderLayer.h"
</span><span class="cx"> #include "RenderListBox.h"
</span><ins>+#include "RenderNamedFlowThread.h"
</ins><span class="cx"> #include "RenderTextControlSingleLine.h"
</span><span class="cx"> #include "RenderView.h"
</span><span class="cx"> #include "RenderWidget.h"
</span><span class="lines">@@ -283,16 +284,50 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool scrollNode(float delta, ScrollGranularity granularity, ScrollDirection positiveDirection, ScrollDirection negativeDirection, Node* node, Element** stopElement, const IntPoint& wheelEventAbsolutePoint)
</del><ins>+static inline bool didScrollInScrollableAreaForSingleAxis(ScrollableArea* scrollableArea, WheelEvent* wheelEvent, ScrollEventAxis axis)
</ins><span class="cx"> {
</span><del>- if (!delta)
</del><ins>+ float delta = axis == ScrollEventAxis::Vertical ? wheelEvent->deltaY() : wheelEvent->deltaX();
+ ScrollDirection negativeDirection = axis == ScrollEventAxis::Vertical ? ScrollUp : ScrollLeft;
+ ScrollDirection positiveDirection = axis == ScrollEventAxis::Vertical ? ScrollDown : ScrollRight;
+ return scrollableArea->scroll(delta < 0 ? negativeDirection : positiveDirection, wheelGranularityToScrollGranularity(wheelEvent->deltaMode()), delta > 0 ? delta : -delta);
+}
+
+static inline bool handleWheelEventInAppropriateEnclosingBoxForSingleAxis(Node* startNode, WheelEvent* wheelEvent, Element** stopElement, ScrollEventAxis axis)
+{
+ if (!startNode->renderer() || (axis == ScrollEventAxis::Vertical && !wheelEvent->deltaY()) || (axis == ScrollEventAxis::Horizontal && !wheelEvent->deltaX()))
</ins><span class="cx"> return false;
</span><del>- if (!node->renderer())
- return false;
- RenderBox& enclosingBox = node->renderer()->enclosingBox();
- float absDelta = delta > 0 ? delta : -delta;
</del><span class="cx">
</span><del>- return enclosingBox.scroll(delta < 0 ? negativeDirection : positiveDirection, granularity, absDelta, stopElement, &enclosingBox, wheelEventAbsolutePoint);
</del><ins>+ RenderBox& initialEnclosingBox = startNode->renderer()->enclosingBox();
+ if (initialEnclosingBox.isListBox())
+ return didScrollInScrollableAreaForSingleAxis(static_cast<RenderListBox*>(&initialEnclosingBox), wheelEvent, axis);
+
+ RenderBox* currentEnclosingBox = &initialEnclosingBox;
+ while (currentEnclosingBox) {
+ if (RenderLayer* boxLayer = currentEnclosingBox->layer()) {
+ const PlatformWheelEvent* platformEvent = wheelEvent->wheelEvent();
+ bool scrollingWasHandled;
+ if (platformEvent != nullptr)
+ scrollingWasHandled = boxLayer->handleWheelEvent(axis == ScrollEventAxis::Vertical ? platformEvent->copyIgnoringHorizontalDelta() : platformEvent->copyIgnoringVerticalDelta());
+ else
+ scrollingWasHandled = didScrollInScrollableAreaForSingleAxis(boxLayer, wheelEvent, axis);
+
+ if (scrollingWasHandled) {
+ if (stopElement)
+ *stopElement = currentEnclosingBox->element();
+ return true;
+ }
+ }
+
+ if (stopElement && *stopElement && *stopElement == currentEnclosingBox->element())
+ return true;
+
+ currentEnclosingBox = currentEnclosingBox->containingBlock();
+ if (currentEnclosingBox && currentEnclosingBox->isRenderNamedFlowThread())
+ currentEnclosingBox = RenderNamedFlowThread::fragmentFromRenderBoxAsRenderBlock(currentEnclosingBox, roundedIntPoint(wheelEvent->absoluteLocation()), initialEnclosingBox);
+ if (!currentEnclosingBox || currentEnclosingBox->isRenderView())
+ return false;
+ }
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if (ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS))
</span><span class="lines">@@ -2631,7 +2666,6 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Element* stopElement = m_previousWheelScrolledElement.get();
</span><del>- ScrollGranularity granularity = wheelGranularityToScrollGranularity(wheelEvent->deltaMode());
</del><span class="cx"> DominantScrollGestureDirection dominantDirection = DominantScrollGestureDirection::None;
</span><span class="cx">
</span><span class="cx"> // Workaround for scrolling issues <rdar://problem/14758615>.
</span><span class="lines">@@ -2642,10 +2676,10 @@
</span><span class="cx">
</span><span class="cx"> // Break up into two scrolls if we need to. Diagonal movement on
</span><span class="cx"> // a MacBook pro is an example of a 2-dimensional mouse wheel event (where both deltaX and deltaY can be set).
</span><del>- if (dominantDirection != DominantScrollGestureDirection::Vertical && scrollNode(wheelEvent->deltaX(), granularity, ScrollRight, ScrollLeft, startNode, &stopElement, roundedIntPoint(wheelEvent->absoluteLocation())))
</del><ins>+ if (dominantDirection != DominantScrollGestureDirection::Vertical && handleWheelEventInAppropriateEnclosingBoxForSingleAxis(startNode, wheelEvent, &stopElement, ScrollEventAxis::Horizontal))
</ins><span class="cx"> wheelEvent->setDefaultHandled();
</span><span class="cx">
</span><del>- if (dominantDirection != DominantScrollGestureDirection::Horizontal && scrollNode(wheelEvent->deltaY(), granularity, ScrollDown, ScrollUp, startNode, &stopElement, roundedIntPoint(wheelEvent->absoluteLocation())))
</del><ins>+ if (dominantDirection != DominantScrollGestureDirection::Horizontal && handleWheelEventInAppropriateEnclosingBoxForSingleAxis(startNode, wheelEvent, &stopElement, ScrollEventAxis::Vertical))
</ins><span class="cx"> wheelEvent->setDefaultHandled();
</span><span class="cx">
</span><span class="cx"> if (!m_latchedWheelEventElement)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollTypes.h (171861 => 171862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollTypes.h        2014-07-31 17:15:10 UTC (rev 171861)
+++ trunk/Source/WebCore/platform/ScrollTypes.h        2014-07-31 17:16:08 UTC (rev 171862)
</span><span class="lines">@@ -123,6 +123,8 @@
</span><span class="cx">
</span><span class="cx"> enum ScrollbarControlSize { RegularScrollbar, SmallScrollbar };
</span><span class="cx">
</span><ins>+ enum class ScrollEventAxis { Horizontal, Vertical };
+
</ins><span class="cx"> typedef unsigned ScrollbarControlState;
</span><span class="cx">
</span><span class="cx"> enum ScrollbarControlStateMask {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.h (171861 => 171862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.h        2014-07-31 17:15:10 UTC (rev 171861)
+++ trunk/Source/WebCore/rendering/RenderListBox.h        2014-07-31 17:16:08 UTC (rev 171862)
</span><span class="lines">@@ -59,6 +59,8 @@
</span><span class="cx">
</span><span class="cx"> int size() const;
</span><span class="cx">
</span><ins>+ virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr, RenderBox* startBox = nullptr, const IntPoint& wheelEventAbsolutePoint = IntPoint()) override;
+
</ins><span class="cx"> virtual bool scrolledToTop() const override;
</span><span class="cx"> virtual bool scrolledToBottom() const override;
</span><span class="cx"> virtual bool scrolledToLeft() const override;
</span><span class="lines">@@ -78,7 +80,6 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isPointInOverflowControl(HitTestResult&, const LayoutPoint& locationInContainer, const LayoutPoint& accumulatedOffset) override;
</span><span class="cx">
</span><del>- virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr, RenderBox* startBox = nullptr, const IntPoint& wheelEventAbsolutePoint = IntPoint()) override;
</del><span class="cx"> virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0) override;
</span><span class="cx">
</span><span class="cx"> virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp (171861 => 171862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp        2014-07-31 17:15:10 UTC (rev 171861)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp        2014-07-31 17:16:08 UTC (rev 171862)
</span><span class="lines">@@ -375,6 +375,11 @@
</span><span class="cx"> return visualOverflowRect;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RenderBlock* RenderNamedFlowThread::fragmentFromRenderBoxAsRenderBlock(RenderBox* renderBox, const IntPoint& absolutePoint, const RenderBox& flowedBox)
+{
+ return toRenderNamedFlowThread(renderBox)->fragmentFromAbsolutePointAndBox(absolutePoint, flowedBox);
+}
+
</ins><span class="cx"> RenderNamedFlowFragment* RenderNamedFlowThread::fragmentFromAbsolutePointAndBox(const IntPoint& absolutePoint, const RenderBox& flowedBox)
</span><span class="cx"> {
</span><span class="cx"> RenderRegion* startRegion = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowThread.h (171861 => 171862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowThread.h        2014-07-31 17:15:10 UTC (rev 171861)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowThread.h        2014-07-31 17:16:08 UTC (rev 171862)
</span><span class="lines">@@ -62,6 +62,8 @@
</span><span class="cx"> bool hasChild(RenderElement& child) const { return m_flowThreadChildList.contains(&child); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ static RenderBlock* fragmentFromRenderBoxAsRenderBlock(RenderBox*, const IntPoint& absolutePoint, const RenderBox& flowedBox);
+
</ins><span class="cx"> void pushDependencies(RenderNamedFlowThreadList&);
</span><span class="cx">
</span><span class="cx"> virtual void addRegionToThread(RenderRegion*) override;
</span></span></pre>
</div>
</div>
</body>
</html>