<!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>[162755] 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/162755">162755</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-01-24 20:33:48 -0800 (Fri, 24 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve latching behavior for wheel events
https://bugs.webkit.org/show_bug.cgi?id=127386
<rdar://problem/12176858>
Reviewed by Simon Fraser.
* page/scrolling/ScrollingTree.cpp:
(WebCore::ScrollingTree::ScrollingTree): Initialize new values used for tracking
scroll latching state.
(WebCore::ScrollingTree::shouldHandleWheelEventSynchronously): Check for an existing
latched node and stay in fast scrolling mode if possible.
(WebCore::ScrollingTree::removeDestroyedNodes): Clear latched node if it's being removed.
(WebCore::ScrollingTree::latchedNode): Added
(WebCore::ScrollingTree::setLatchedNode): Added
(WebCore::ScrollingTree::clearLatchedNode): Added
* page/scrolling/ScrollingTree.h:
(WebCore::ScrollingTree::hasLatchedNode): Added
* page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:
(WebCore::shouldConsiderLatching): Added
(WebCore::ScrollingTreeScrollingNodeMac::handleWheelEvent): Determine latching state
based on wheel event state and position of mouse pointer in the document.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreecpp">trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeh">trunk/Source/WebCore/page/scrolling/ScrollingTree.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162754 => 162755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-25 03:38:35 UTC (rev 162754)
+++ trunk/Source/WebCore/ChangeLog 2014-01-25 04:33:48 UTC (rev 162755)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-01-24 Brent Fulgham <bfulgham@apple.com>
+
+ Improve latching behavior for wheel events
+ https://bugs.webkit.org/show_bug.cgi?id=127386
+ <rdar://problem/12176858>
+
+ Reviewed by Simon Fraser.
+
+ * page/scrolling/ScrollingTree.cpp:
+ (WebCore::ScrollingTree::ScrollingTree): Initialize new values used for tracking
+ scroll latching state.
+ (WebCore::ScrollingTree::shouldHandleWheelEventSynchronously): Check for an existing
+ latched node and stay in fast scrolling mode if possible.
+ (WebCore::ScrollingTree::removeDestroyedNodes): Clear latched node if it's being removed.
+ (WebCore::ScrollingTree::latchedNode): Added
+ (WebCore::ScrollingTree::setLatchedNode): Added
+ (WebCore::ScrollingTree::clearLatchedNode): Added
+ * page/scrolling/ScrollingTree.h:
+ (WebCore::ScrollingTree::hasLatchedNode): Added
+ * page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:
+ (WebCore::shouldConsiderLatching): Added
+ (WebCore::ScrollingTreeScrollingNodeMac::handleWheelEvent): Determine latching state
+ based on wheel event state and position of mouse pointer in the document.
+
</ins><span class="cx"> 2014-01-24 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Another attempted build fix.
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (162754 => 162755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2014-01-25 03:38:35 UTC (rev 162754)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2014-01-25 04:33:48 UTC (rev 162755)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012, 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> , m_mainFramePinnedToTheBottom(false)
</span><span class="cx"> , m_mainFrameIsRubberBanding(false)
</span><span class="cx"> , m_scrollPinningBehavior(DoNotPin)
</span><ins>+ , m_latchedNode(0)
</ins><span class="cx"> , m_scrollingPerformanceLoggingEnabled(false)
</span><span class="cx"> , m_isHandlingProgrammaticScroll(false)
</span><span class="cx"> {
</span><span class="lines">@@ -59,10 +60,14 @@
</span><span class="cx">
</span><span class="cx"> bool ScrollingTree::shouldHandleWheelEventSynchronously(const PlatformWheelEvent& wheelEvent)
</span><span class="cx"> {
</span><ins>+ // This method is invoked by the event handling thread
</ins><span class="cx"> MutexLocker lock(m_mutex);
</span><span class="cx">
</span><span class="cx"> if (m_hasWheelEventHandlers)
</span><span class="cx"> return true;
</span><ins>+
+ if (hasLatchedNode())
+ return false;
</ins><span class="cx">
</span><span class="cx"> if (!m_nonFastScrollableRegion.isEmpty()) {
</span><span class="cx"> // FIXME: This is not correct for non-default scroll origins.
</span><span class="lines">@@ -174,14 +179,18 @@
</span><span class="cx">
</span><span class="cx"> void ScrollingTree::removeDestroyedNodes(const ScrollingStateTree& stateTree)
</span><span class="cx"> {
</span><del>- const Vector<ScrollingNodeID>& removedNodes = stateTree.removedNodes();
- size_t size = removedNodes.size();
- for (size_t i = 0; i < size; ++i) {
- ScrollingTreeNode* node = m_nodeMap.take(removedNodes[i]);
</del><ins>+ for (const auto& removedNode : stateTree.removedNodes()) {
+ ScrollingTreeNode* node = m_nodeMap.take(removedNode);
+ if (!node)
+ continue;
+
</ins><span class="cx"> // Never destroy the root node. There will be a new root node in the state tree, and we will
</span><span class="cx"> // associate it with our existing root node in updateTreeFromStateNode().
</span><del>- if (node && node->parent())
</del><ins>+ if (node->parent())
</ins><span class="cx"> m_rootNode->removeChild(node);
</span><ins>+
+ if (node->scrollingNodeID() == m_latchedNode)
+ clearLatchedNode();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -315,6 +324,24 @@
</span><span class="cx"> return m_scrollingPerformanceLoggingEnabled;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ScrollingNodeID ScrollingTree::latchedNode()
+{
+ MutexLocker locker(m_mutex);
+ return m_latchedNode;
+}
+
+void ScrollingTree::setLatchedNode(ScrollingNodeID node)
+{
+ MutexLocker locker(m_mutex);
+ m_latchedNode = node;
+}
+
+void ScrollingTree::clearLatchedNode()
+{
+ MutexLocker locker(m_mutex);
+ m_latchedNode = 0;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(ASYNC_SCROLLING)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (162754 => 162755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2014-01-25 03:38:35 UTC (rev 162754)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2014-01-25 04:33:48 UTC (rev 162755)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012, 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -99,6 +99,12 @@
</span><span class="cx">
</span><span class="cx"> ScrollingTreeScrollingNode* rootNode() const { return m_rootNode.get(); }
</span><span class="cx">
</span><ins>+ ScrollingNodeID latchedNode();
+ void setLatchedNode(ScrollingNodeID);
+ void clearLatchedNode();
+
+ bool hasLatchedNode() const { return m_latchedNode; }
+
</ins><span class="cx"> protected:
</span><span class="cx"> void setMainFrameScrollPosition(IntPoint);
</span><span class="cx"> virtual void handleWheelEvent(const PlatformWheelEvent&);
</span><span class="lines">@@ -132,6 +138,7 @@
</span><span class="cx"> bool m_mainFramePinnedToTheBottom;
</span><span class="cx"> bool m_mainFrameIsRubberBanding;
</span><span class="cx"> ScrollPinningBehavior m_scrollPinningBehavior;
</span><ins>+ ScrollingNodeID m_latchedNode;
</ins><span class="cx">
</span><span class="cx"> bool m_scrollingPerformanceLoggingEnabled;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm (162754 => 162755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm 2014-01-25 03:38:35 UTC (rev 162754)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm 2014-01-25 04:33:48 UTC (rev 162755)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -128,12 +128,22 @@
</span><span class="cx"> updateMainFramePinState(scrollPosition());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool shouldConsiderLatching(const PlatformWheelEvent& wheelEvent)
+{
+ return wheelEvent.phase() == PlatformWheelEventPhaseBegan
+ || wheelEvent.phase() == PlatformWheelEventPhaseMayBegin;
+}
+
</ins><span class="cx"> void ScrollingTreeScrollingNodeMac::handleWheelEvent(const PlatformWheelEvent& wheelEvent)
</span><span class="cx"> {
</span><span class="cx"> if (!canHaveScrollbars())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_scrollElasticityController.handleWheelEvent(wheelEvent);
</span><ins>+
+ if (shouldConsiderLatching(wheelEvent))
+ scrollingTree().setLatchedNode(scrollingNodeID());
+
</ins><span class="cx"> scrollingTree().handleWheelEventPhase(wheelEvent.phase());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>