<!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>[160944] trunk/Source</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/160944">160944</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2013-12-20 16:35:44 -0800 (Fri, 20 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change "threaded scrolling" terminology to "asynchronous scrolling"
https://bugs.webkit.org/show_bug.cgi?id=126094
Source/WebCore:
Reviewed by Tim Horton.
Rename ENABLE_THREADED_SCROLLING to ENABLE_ASYNC_SCROLLING, and change
references to "main thread scrolling" to "synchronous scrolling".
In a few places, functions with names like shouldUpdateScrollLayerPositionOnMainThread()
were actually returning SynchronousScrollingReasons, so rename them appropriately.
* WebCore.exp.in:
* page/FrameView.cpp:
(WebCore::FrameView::shouldUpdateCompositingLayersAfterScrolling):
(WebCore::FrameView::isRubberBandInProgress):
(WebCore::FrameView::requestScrollPositionUpdate):
(WebCore::FrameView::updatesScrollLayerPositionOnMainThread):
(WebCore::FrameView::wheelEvent):
* page/Page.cpp:
(WebCore::Page::synchronousScrollingReasonsAsText):
* page/Page.h:
* page/scrolling/ScrollingCoordinator.cpp:
(WebCore::ScrollingCoordinator::create):
(WebCore::ScrollingCoordinator::ScrollingCoordinator):
(WebCore::ScrollingCoordinator::frameViewHasSlowRepaintObjectsDidChange):
(WebCore::ScrollingCoordinator::frameViewFixedObjectsDidChange):
(WebCore::ScrollingCoordinator::frameViewRootLayerDidChange):
(WebCore::ScrollingCoordinator::synchronousScrollingReasons):
(WebCore::ScrollingCoordinator::updateSynchronousScrollingReasons):
(WebCore::ScrollingCoordinator::setForceSynchronousScrollLayerPositionUpdates):
(WebCore::ScrollingCoordinator::synchronousScrollingReasonsAsText):
* page/scrolling/ScrollingCoordinator.h:
(WebCore::ScrollingCoordinator::shouldUpdateScrollLayerPositionSynchronously):
(WebCore::ScrollingCoordinator::setSynchronousScrollingReasons):
* page/scrolling/ScrollingStateFixedNode.cpp:
* page/scrolling/ScrollingStateFixedNode.h:
* page/scrolling/ScrollingStateNode.cpp:
* page/scrolling/ScrollingStateNode.h:
* page/scrolling/ScrollingStateScrollingNode.cpp:
(WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):
(WebCore::ScrollingStateScrollingNode::setSynchronousScrollingReasons):
(WebCore::ScrollingStateScrollingNode::dumpProperties):
* page/scrolling/ScrollingStateScrollingNode.h: Awkward "ReasonsForSynchronousScrolling" to avoid
conflict with the enum called SynchronousScrollingReasons.
* page/scrolling/ScrollingStateStickyNode.cpp:
* page/scrolling/ScrollingStateStickyNode.h:
* page/scrolling/ScrollingStateTree.cpp:
* page/scrolling/ScrollingStateTree.h:
* page/scrolling/ScrollingThread.cpp:
* page/scrolling/ScrollingThread.h:
* page/scrolling/ScrollingTree.cpp:
* page/scrolling/ScrollingTree.h:
* page/scrolling/ScrollingTreeNode.cpp:
* page/scrolling/ScrollingTreeNode.h:
* page/scrolling/ScrollingTreeScrollingNode.cpp:
(WebCore::ScrollingTreeScrollingNode::ScrollingTreeScrollingNode):
(WebCore::ScrollingTreeScrollingNode::updateBeforeChildren):
* page/scrolling/ScrollingTreeScrollingNode.h:
(WebCore::ScrollingTreeScrollingNode::synchronousScrollingReasons):
(WebCore::ScrollingTreeScrollingNode::shouldUpdateScrollLayerPositionSynchronously):
* page/scrolling/mac/ScrollingCoordinatorMac.h:
* page/scrolling/mac/ScrollingCoordinatorMac.mm:
(WebCore::ScrollingCoordinatorMac::setSynchronousScrollingReasons):
(WebCore::ScrollingCoordinatorMac::commitTreeState):
* page/scrolling/mac/ScrollingStateNodeMac.mm:
* page/scrolling/mac/ScrollingStateScrollingNodeMac.mm:
* page/scrolling/mac/ScrollingThreadMac.mm:
* page/scrolling/mac/ScrollingTreeFixedNode.h:
* page/scrolling/mac/ScrollingTreeFixedNode.mm:
* page/scrolling/mac/ScrollingTreeScrollingNodeMac.h:
* page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:
(WebCore::ScrollingTreeScrollingNodeMac::updateBeforeChildren):
(WebCore::ScrollingTreeScrollingNodeMac::scrollPosition):
(WebCore::ScrollingTreeScrollingNodeMac::setScrollPositionWithoutContentEdgeConstraints):
(WebCore::ScrollingTreeScrollingNodeMac::setScrollLayerPosition):
(WebCore::logThreadedScrollingMode):
* page/scrolling/mac/ScrollingTreeStickyNode.h:
* page/scrolling/mac/ScrollingTreeStickyNode.mm:
* platform/Scrollbar.cpp:
(WebCore::Scrollbar::supportsUpdateOnSecondaryThread):
* platform/graphics/TiledBacking.h:
* platform/graphics/ca/mac/TileController.mm:
(WebCore::TileController::TileController):
(WebCore::TileController::updateTileCoverageMap):
* platform/mac/MemoryPressureHandlerMac.mm:
(WebCore::MemoryPressureHandler::releaseMemory):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::setupFontSubpixelQuantization):
* rendering/RenderLayerBacking.cpp:
(WebCore::computeTileCoverage):
* testing/Internals.cpp:
(WebCore::Internals::mainThreadScrollingReasons):
* testing/Internals.idl:
Source/WebKit2:
Reviewed by Tim Horton.
Rename ENABLE_THREADED_SCROLLING to ENABLE_ASYNC_SCROLLING, and change
references to "main thread scrolling" to "synchronous scrolling".
* WebProcess/WebPage/EventDispatcher.cpp:
(WebKit::EventDispatcher::wheelEvent):
* WebProcess/WebPage/EventDispatcher.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
(WebKit::WebPage::~WebPage):
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::didInstallPageOverlay):
(WebKit::TiledCoreAnimationDrawingArea::didUninstallPageOverlay):
(WebKit::TiledCoreAnimationDrawingArea::updatePreferences):
(WebKit::TiledCoreAnimationDrawingArea::dispatchAfterEnsuringUpdatedScrollPosition):
Source/WTF:
Reviewed by Tim Horton.
Rename ENABLE_THREADED_SCROLLING to ENABLE_ASYNC_SCROLLING.
* wtf/FeatureDefines.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingCoordinatorh">trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateFixedNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateFixedNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateScrollingNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateScrollingNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateStickyNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateStickyNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateTreecpp">trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateTreeh">trunk/Source/WebCore/page/scrolling/ScrollingStateTree.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingThreadcpp">trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingThreadh">trunk/Source/WebCore/page/scrolling/ScrollingThread.h</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="#trunkSourceWebCorepagescrollingScrollingTreeNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeNodeh">trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeScrollingNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeScrollingNodeh">trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingCoordinatorMach">trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingStateNodeMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingStateNodeMac.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingStateScrollingNodeMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingStateScrollingNodeMac.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingThreadMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingThreadMac.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodeh">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodemm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMach">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodeh">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodemm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollbarcpp">trunk/Source/WebCore/platform/Scrollbar.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTiledBackingh">trunk/Source/WebCore/platform/graphics/TiledBacking.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacTileControllermm">trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacMemoryPressureHandlerMacmm">trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageEventDispatchercpp">trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageEventDispatcherh">trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WTF/ChangeLog 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-12-20 Simon Fraser <simon.fraser@apple.com>
+
+ Change "threaded scrolling" terminology to "asynchronous scrolling"
+ https://bugs.webkit.org/show_bug.cgi?id=126094
+
+ Reviewed by Tim Horton.
+
+ Rename ENABLE_THREADED_SCROLLING to ENABLE_ASYNC_SCROLLING.
+
+ * wtf/FeatureDefines.h:
+
</ins><span class="cx"> 2013-12-20 Tamas Gergely <tgergely.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Build fails in debug mode after r160834.
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -198,8 +198,8 @@
</span><span class="cx"> #define ENABLE_SMOOTH_SCROLLING 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_THREADED_SCROLLING)
-#define ENABLE_THREADED_SCROLLING 1
</del><ins>+#if !defined(ENABLE_ASYNC_SCROLLING)
+#define ENABLE_ASYNC_SCROLLING 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="lines">@@ -804,8 +804,8 @@
</span><span class="cx"> #define ENABLE_THREADED_HTML_PARSER 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_THREADED_SCROLLING)
-#define ENABLE_THREADED_SCROLLING 0
</del><ins>+#if !defined(ENABLE_ASYNC_SCROLLING)
+#define ENABLE_ASYNC_SCROLLING 0
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_TOUCH_EVENTS)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/ChangeLog 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -1,3 +1,99 @@
</span><ins>+2013-12-20 Simon Fraser <simon.fraser@apple.com>
+
+ Change "threaded scrolling" terminology to "asynchronous scrolling"
+ https://bugs.webkit.org/show_bug.cgi?id=126094
+
+ Reviewed by Tim Horton.
+
+ Rename ENABLE_THREADED_SCROLLING to ENABLE_ASYNC_SCROLLING, and change
+ references to "main thread scrolling" to "synchronous scrolling".
+
+ In a few places, functions with names like shouldUpdateScrollLayerPositionOnMainThread()
+ were actually returning SynchronousScrollingReasons, so rename them appropriately.
+
+ * WebCore.exp.in:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::shouldUpdateCompositingLayersAfterScrolling):
+ (WebCore::FrameView::isRubberBandInProgress):
+ (WebCore::FrameView::requestScrollPositionUpdate):
+ (WebCore::FrameView::updatesScrollLayerPositionOnMainThread):
+ (WebCore::FrameView::wheelEvent):
+ * page/Page.cpp:
+ (WebCore::Page::synchronousScrollingReasonsAsText):
+ * page/Page.h:
+ * page/scrolling/ScrollingCoordinator.cpp:
+ (WebCore::ScrollingCoordinator::create):
+ (WebCore::ScrollingCoordinator::ScrollingCoordinator):
+ (WebCore::ScrollingCoordinator::frameViewHasSlowRepaintObjectsDidChange):
+ (WebCore::ScrollingCoordinator::frameViewFixedObjectsDidChange):
+ (WebCore::ScrollingCoordinator::frameViewRootLayerDidChange):
+ (WebCore::ScrollingCoordinator::synchronousScrollingReasons):
+ (WebCore::ScrollingCoordinator::updateSynchronousScrollingReasons):
+ (WebCore::ScrollingCoordinator::setForceSynchronousScrollLayerPositionUpdates):
+ (WebCore::ScrollingCoordinator::synchronousScrollingReasonsAsText):
+ * page/scrolling/ScrollingCoordinator.h:
+ (WebCore::ScrollingCoordinator::shouldUpdateScrollLayerPositionSynchronously):
+ (WebCore::ScrollingCoordinator::setSynchronousScrollingReasons):
+ * page/scrolling/ScrollingStateFixedNode.cpp:
+ * page/scrolling/ScrollingStateFixedNode.h:
+ * page/scrolling/ScrollingStateNode.cpp:
+ * page/scrolling/ScrollingStateNode.h:
+ * page/scrolling/ScrollingStateScrollingNode.cpp:
+ (WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):
+ (WebCore::ScrollingStateScrollingNode::setSynchronousScrollingReasons):
+ (WebCore::ScrollingStateScrollingNode::dumpProperties):
+ * page/scrolling/ScrollingStateScrollingNode.h: Awkward "ReasonsForSynchronousScrolling" to avoid
+ conflict with the enum called SynchronousScrollingReasons.
+ * page/scrolling/ScrollingStateStickyNode.cpp:
+ * page/scrolling/ScrollingStateStickyNode.h:
+ * page/scrolling/ScrollingStateTree.cpp:
+ * page/scrolling/ScrollingStateTree.h:
+ * page/scrolling/ScrollingThread.cpp:
+ * page/scrolling/ScrollingThread.h:
+ * page/scrolling/ScrollingTree.cpp:
+ * page/scrolling/ScrollingTree.h:
+ * page/scrolling/ScrollingTreeNode.cpp:
+ * page/scrolling/ScrollingTreeNode.h:
+ * page/scrolling/ScrollingTreeScrollingNode.cpp:
+ (WebCore::ScrollingTreeScrollingNode::ScrollingTreeScrollingNode):
+ (WebCore::ScrollingTreeScrollingNode::updateBeforeChildren):
+ * page/scrolling/ScrollingTreeScrollingNode.h:
+ (WebCore::ScrollingTreeScrollingNode::synchronousScrollingReasons):
+ (WebCore::ScrollingTreeScrollingNode::shouldUpdateScrollLayerPositionSynchronously):
+ * page/scrolling/mac/ScrollingCoordinatorMac.h:
+ * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+ (WebCore::ScrollingCoordinatorMac::setSynchronousScrollingReasons):
+ (WebCore::ScrollingCoordinatorMac::commitTreeState):
+ * page/scrolling/mac/ScrollingStateNodeMac.mm:
+ * page/scrolling/mac/ScrollingStateScrollingNodeMac.mm:
+ * page/scrolling/mac/ScrollingThreadMac.mm:
+ * page/scrolling/mac/ScrollingTreeFixedNode.h:
+ * page/scrolling/mac/ScrollingTreeFixedNode.mm:
+ * page/scrolling/mac/ScrollingTreeScrollingNodeMac.h:
+ * page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:
+ (WebCore::ScrollingTreeScrollingNodeMac::updateBeforeChildren):
+ (WebCore::ScrollingTreeScrollingNodeMac::scrollPosition):
+ (WebCore::ScrollingTreeScrollingNodeMac::setScrollPositionWithoutContentEdgeConstraints):
+ (WebCore::ScrollingTreeScrollingNodeMac::setScrollLayerPosition):
+ (WebCore::logThreadedScrollingMode):
+ * page/scrolling/mac/ScrollingTreeStickyNode.h:
+ * page/scrolling/mac/ScrollingTreeStickyNode.mm:
+ * platform/Scrollbar.cpp:
+ (WebCore::Scrollbar::supportsUpdateOnSecondaryThread):
+ * platform/graphics/TiledBacking.h:
+ * platform/graphics/ca/mac/TileController.mm:
+ (WebCore::TileController::TileController):
+ (WebCore::TileController::updateTileCoverageMap):
+ * platform/mac/MemoryPressureHandlerMac.mm:
+ (WebCore::MemoryPressureHandler::releaseMemory):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::setupFontSubpixelQuantization):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::computeTileCoverage):
+ * testing/Internals.cpp:
+ (WebCore::Internals::mainThreadScrollingReasons):
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2013-12-20 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Revert r160327, r160273, and r160260.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -997,7 +997,7 @@
</span><span class="cx"> __ZN7WebCore4Page25suspendScriptedAnimationsEv
</span><span class="cx"> __ZN7WebCore4Page31setCustomHTMLTokenizerChunkSizeEi
</span><span class="cx"> __ZN7WebCore4Page31setCustomHTMLTokenizerTimeDelayEd
</span><del>-__ZN7WebCore4Page32mainThreadScrollingReasonsAsTextEv
</del><ins>+__ZN7WebCore4Page33synchronousScrollingReasonsAsTextEv
</ins><span class="cx"> __ZN7WebCore4Page32setMemoryCacheClientCallsEnabledEb
</span><span class="cx"> __ZN7WebCore4Page35resumeActiveDOMObjectsAndAnimationsEv
</span><span class="cx"> __ZN7WebCore4Page36setShouldSuppressScrollbarAnimationsEb
</span><span class="lines">@@ -2861,14 +2861,14 @@
</span><span class="cx"> __ZN7WebCore8Document19accessSVGExtensionsEv
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> __ZN7WebCore13ScrollingTree21setCanRubberBandStateEbbbb
</span><span class="cx"> __ZN7WebCore13ScrollingTree21tryToHandleWheelEventERKNS_18PlatformWheelEventE
</span><span class="cx"> __ZN7WebCore13ScrollingTree37setScrollingPerformanceLoggingEnabledEb
</span><span class="cx"> __ZN7WebCore13ScrollingTreeD1Ev
</span><span class="cx"> __ZN7WebCore15ScrollingThread15dispatchBarrierERKN3WTF8FunctionIFvvEEE
</span><span class="cx"> __ZN7WebCore15ScrollingThread8dispatchERKN3WTF8FunctionIFvvEEE
</span><del>-__ZN7WebCore20ScrollingCoordinator44setForceMainThreadScrollLayerPositionUpdatesEb
</del><ins>+__ZN7WebCore20ScrollingCoordinator45setForceSynchronousScrollLayerPositionUpdatesEb
</ins><span class="cx"> __ZN7WebCore4Page20scrollingCoordinatorEv
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/FrameView.cpp 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -1974,7 +1974,7 @@
</span><span class="cx">
</span><span class="cx"> bool FrameView::shouldUpdateCompositingLayersAfterScrolling() const
</span><span class="cx"> {
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> // If the scrolling thread is updating the fixed elements, then the FrameView should not update them as well.
</span><span class="cx">
</span><span class="cx"> Page* page = frame().page();
</span><span class="lines">@@ -1991,7 +1991,7 @@
</span><span class="cx"> if (!scrollingCoordinator->supportsFixedPositionLayers())
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (scrollingCoordinator->shouldUpdateScrollLayerPositionOnMainThread())
</del><ins>+ if (scrollingCoordinator->shouldUpdateScrollLayerPositionSynchronously())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if (inProgrammaticScroll())
</span><span class="lines">@@ -2024,7 +2024,7 @@
</span><span class="cx"> // ScrollingCoordinator::isRubberBandInProgress().
</span><span class="cx"> if (Page* page = frame().page()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator()) {
</span><del>- if (!scrollingCoordinator->shouldUpdateScrollLayerPositionOnMainThread())
</del><ins>+ if (!scrollingCoordinator->shouldUpdateScrollLayerPositionSynchronously())
</ins><span class="cx"> return scrollingCoordinator->isRubberBandInProgress();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2039,7 +2039,7 @@
</span><span class="cx">
</span><span class="cx"> bool FrameView::requestScrollPositionUpdate(const IntPoint& position)
</span><span class="cx"> {
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> if (TiledBacking* tiledBacking = this->tiledBacking()) {
</span><span class="cx"> IntRect visibleRect = visibleContentRect();
</span><span class="cx"> visibleRect.setLocation(position);
</span><span class="lines">@@ -2989,7 +2989,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (Page* page = frame().page()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
</span><del>- return scrollingCoordinator->shouldUpdateScrollLayerPositionOnMainThread();
</del><ins>+ return scrollingCoordinator->shouldUpdateScrollLayerPositionSynchronously();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -4003,7 +4003,7 @@
</span><span class="cx"> if (platformWidget())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> if (Page* page = frame().page()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator()) {
</span><span class="cx"> if (scrollingCoordinator->coordinatesScrollingForFrameView(this))
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/Page.cpp 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -279,13 +279,13 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String Page::mainThreadScrollingReasonsAsText()
</del><ins>+String Page::synchronousScrollingReasonsAsText()
</ins><span class="cx"> {
</span><span class="cx"> if (Document* document = m_mainFrame->document())
</span><span class="cx"> document->updateLayout();
</span><span class="cx">
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
</span><del>- return scrollingCoordinator->mainThreadScrollingReasonsAsText();
</del><ins>+ return scrollingCoordinator->synchronousScrollingReasonsAsText();
</ins><span class="cx">
</span><span class="cx"> return String();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/Page.h 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> ScrollingCoordinator* scrollingCoordinator();
</span><span class="cx">
</span><span class="cx"> String scrollingStateTreeAsText();
</span><del>- String mainThreadScrollingReasonsAsText();
</del><ins>+ String synchronousScrollingReasonsAsText();
</ins><span class="cx"> PassRefPtr<ClientRectList> nonFastScrollableRects(const Frame*);
</span><span class="cx">
</span><span class="cx"> Settings& settings() const { return *m_settings; }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> #include "RenderLayerCompositor.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> #include "ScrollingCoordinatorMac.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<ScrollingCoordinator> ScrollingCoordinator::create(Page* page)
</span><span class="cx"> {
</span><del>-#if USE(ACCELERATED_COMPOSITING) && ENABLE(THREADED_SCROLLING)
</del><ins>+#if USE(ACCELERATED_COMPOSITING) && ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> return adoptRef(new ScrollingCoordinatorMac(page));
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> , m_updateMainFrameScrollPositionTimer(this, &ScrollingCoordinator::updateMainFrameScrollPositionTimerFired)
</span><span class="cx"> , m_scheduledUpdateIsProgrammaticScroll(false)
</span><span class="cx"> , m_scheduledScrollingLayerPositionAction(SyncScrollingLayerPosition)
</span><del>- , m_forceMainThreadScrollLayerPositionUpdates(false)
</del><ins>+ , m_forceSynchronousScrollLayerPositionUpdates(false)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> if (!coordinatesScrollingForFrameView(frameView))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- updateShouldUpdateScrollLayerPositionOnMainThread();
</del><ins>+ updateSynchronousScrollingReasons();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollingCoordinator::frameViewFixedObjectsDidChange(FrameView* frameView)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> if (!coordinatesScrollingForFrameView(frameView))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- updateShouldUpdateScrollLayerPositionOnMainThread();
</del><ins>+ updateSynchronousScrollingReasons();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx">
</span><span class="cx"> frameViewLayoutUpdated(frameView);
</span><span class="cx"> recomputeWheelEventHandlerCountForFrameView(frameView);
</span><del>- updateShouldUpdateScrollLayerPositionOnMainThread();
</del><ins>+ updateSynchronousScrollingReasons();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollingCoordinator::scheduleUpdateMainFrameScrollPosition(const IntPoint& scrollPosition, bool programmaticScroll, SetOrSyncScrollingLayerPosition scrollingLayerPositionAction)
</span><span class="lines">@@ -392,40 +392,40 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MainThreadScrollingReasons ScrollingCoordinator::mainThreadScrollingReasons() const
</del><ins>+SynchronousScrollingReasons ScrollingCoordinator::synchronousScrollingReasons() const
</ins><span class="cx"> {
</span><span class="cx"> FrameView* frameView = m_page->mainFrame().view();
</span><span class="cx"> if (!frameView)
</span><del>- return static_cast<MainThreadScrollingReasons>(0);
</del><ins>+ return static_cast<SynchronousScrollingReasons>(0);
</ins><span class="cx">
</span><del>- MainThreadScrollingReasons mainThreadScrollingReasons = (MainThreadScrollingReasons)0;
</del><ins>+ SynchronousScrollingReasons synchronousScrollingReasons = (SynchronousScrollingReasons)0;
</ins><span class="cx">
</span><del>- if (m_forceMainThreadScrollLayerPositionUpdates)
- mainThreadScrollingReasons |= ForcedOnMainThread;
</del><ins>+ if (m_forceSynchronousScrollLayerPositionUpdates)
+ synchronousScrollingReasons |= ForcedOnMainThread;
</ins><span class="cx"> if (frameView->hasSlowRepaintObjects())
</span><del>- mainThreadScrollingReasons |= HasSlowRepaintObjects;
</del><ins>+ synchronousScrollingReasons |= HasSlowRepaintObjects;
</ins><span class="cx"> if (!supportsFixedPositionLayers() && frameView->hasViewportConstrainedObjects())
</span><del>- mainThreadScrollingReasons |= HasViewportConstrainedObjectsWithoutSupportingFixedLayers;
</del><ins>+ synchronousScrollingReasons |= HasViewportConstrainedObjectsWithoutSupportingFixedLayers;
</ins><span class="cx"> if (supportsFixedPositionLayers() && hasVisibleSlowRepaintViewportConstrainedObjects(frameView))
</span><del>- mainThreadScrollingReasons |= HasNonLayerViewportConstrainedObjects;
</del><ins>+ synchronousScrollingReasons |= HasNonLayerViewportConstrainedObjects;
</ins><span class="cx"> if (m_page->mainFrame().document() && m_page->mainFrame().document()->isImageDocument())
</span><del>- mainThreadScrollingReasons |= IsImageDocument;
</del><ins>+ synchronousScrollingReasons |= IsImageDocument;
</ins><span class="cx">
</span><del>- return mainThreadScrollingReasons;
</del><ins>+ return synchronousScrollingReasons;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingCoordinator::updateShouldUpdateScrollLayerPositionOnMainThread()
</del><ins>+void ScrollingCoordinator::updateSynchronousScrollingReasons()
</ins><span class="cx"> {
</span><del>- setShouldUpdateScrollLayerPositionOnMainThread(mainThreadScrollingReasons());
</del><ins>+ setSynchronousScrollingReasons(synchronousScrollingReasons());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingCoordinator::setForceMainThreadScrollLayerPositionUpdates(bool forceMainThreadScrollLayerPositionUpdates)
</del><ins>+void ScrollingCoordinator::setForceSynchronousScrollLayerPositionUpdates(bool forceSynchronousScrollLayerPositionUpdates)
</ins><span class="cx"> {
</span><del>- if (m_forceMainThreadScrollLayerPositionUpdates == forceMainThreadScrollLayerPositionUpdates)
</del><ins>+ if (m_forceSynchronousScrollLayerPositionUpdates == forceSynchronousScrollLayerPositionUpdates)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_forceMainThreadScrollLayerPositionUpdates = forceMainThreadScrollLayerPositionUpdates;
- updateShouldUpdateScrollLayerPositionOnMainThread();
</del><ins>+ m_forceSynchronousScrollLayerPositionUpdates = forceSynchronousScrollLayerPositionUpdates;
+ updateSynchronousScrollingReasons();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScrollingNodeID ScrollingCoordinator::uniqueScrollLayerID()
</span><span class="lines">@@ -439,7 +439,7 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String ScrollingCoordinator::mainThreadScrollingReasonsAsText(MainThreadScrollingReasons reasons)
</del><ins>+String ScrollingCoordinator::synchronousScrollingReasonsAsText(SynchronousScrollingReasons reasons)
</ins><span class="cx"> {
</span><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx">
</span><span class="lines">@@ -459,9 +459,9 @@
</span><span class="cx"> return stringBuilder.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String ScrollingCoordinator::mainThreadScrollingReasonsAsText() const
</del><ins>+String ScrollingCoordinator::synchronousScrollingReasonsAsText() const
</ins><span class="cx"> {
</span><del>- return mainThreadScrollingReasonsAsText(mainThreadScrollingReasons());
</del><ins>+ return synchronousScrollingReasonsAsText(synchronousScrollingReasons());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-typedef unsigned MainThreadScrollingReasons;
</del><ins>+typedef unsigned SynchronousScrollingReasons;
</ins><span class="cx"> typedef uint64_t ScrollingNodeID;
</span><span class="cx">
</span><span class="cx"> enum ScrollingNodeType { ScrollingNode, FixedNode, StickyNode };
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> class ScrollableArea;
</span><span class="cx"> class ViewportConstraints;
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> class ScrollingTree;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void pageDestroyed();
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> virtual ScrollingTree* scrollingTree() const { return 0; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Force all scroll layer position updates to happen on the main thread.
</span><del>- void setForceMainThreadScrollLayerPositionUpdates(bool);
</del><ins>+ void setForceSynchronousScrollLayerPositionUpdates(bool);
</ins><span class="cx">
</span><span class="cx"> // These virtual functions are currently unique to the threaded scrolling architecture.
</span><span class="cx"> // Their meaningful implementations are in ScrollingCoordinatorMac.
</span><span class="lines">@@ -172,16 +172,16 @@
</span><span class="cx"> IsImageDocument = 1 << 4
</span><span class="cx"> };
</span><span class="cx">
</span><del>- MainThreadScrollingReasons mainThreadScrollingReasons() const;
- bool shouldUpdateScrollLayerPositionOnMainThread() const { return mainThreadScrollingReasons() != 0; }
</del><ins>+ SynchronousScrollingReasons synchronousScrollingReasons() const;
+ bool shouldUpdateScrollLayerPositionSynchronously() const { return synchronousScrollingReasons(); }
</ins><span class="cx">
</span><span class="cx"> virtual void willDestroyScrollableArea(ScrollableArea*) { }
</span><span class="cx"> virtual void scrollableAreaScrollLayerDidChange(ScrollableArea*) { }
</span><span class="cx"> virtual void scrollableAreaScrollbarLayerDidChange(ScrollableArea*, ScrollbarOrientation) { }
</span><span class="cx"> virtual void setLayerIsContainerForFixedPositionLayers(GraphicsLayer*, bool) { }
</span><span class="cx">
</span><del>- static String mainThreadScrollingReasonsAsText(MainThreadScrollingReasons);
- String mainThreadScrollingReasonsAsText() const;
</del><ins>+ static String synchronousScrollingReasonsAsText(SynchronousScrollingReasons);
+ String synchronousScrollingReasonsAsText() const;
</ins><span class="cx">
</span><span class="cx"> Region computeNonFastScrollableRegion(const Frame*, const IntPoint& frameLocation) const;
</span><span class="cx">
</span><span class="lines">@@ -204,10 +204,10 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void recomputeWheelEventHandlerCountForFrameView(FrameView*) { }
</span><del>- virtual void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScrollingReasons) { }
</del><ins>+ virtual void setSynchronousScrollingReasons(SynchronousScrollingReasons) { }
</ins><span class="cx">
</span><span class="cx"> virtual bool hasVisibleSlowRepaintViewportConstrainedObjects(FrameView*) const;
</span><del>- void updateShouldUpdateScrollLayerPositionOnMainThread();
</del><ins>+ void updateSynchronousScrollingReasons();
</ins><span class="cx">
</span><span class="cx"> void updateMainFrameScrollPositionTimerFired(Timer<ScrollingCoordinator>*);
</span><span class="cx">
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> bool m_scheduledUpdateIsProgrammaticScroll;
</span><span class="cx"> SetOrSyncScrollingLayerPosition m_scheduledScrollingLayerPositionAction;
</span><span class="cx">
</span><del>- bool m_forceMainThreadScrollLayerPositionUpdates;
</del><ins>+ bool m_forceSynchronousScrollLayerPositionUpdates;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateFixedNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "TextStream.h"
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -113,4 +113,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateFixedNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef ScrollingStateFixedNode_h
</span><span class="cx"> #define ScrollingStateFixedNode_h
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins><span class="cx">
</span><span class="cx"> #include "ScrollingConstraints.h"
</span><span class="cx"> #include "ScrollingStateNode.h"
</span><span class="lines">@@ -69,6 +69,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins><span class="cx">
</span><span class="cx"> #endif // ScrollingStateFixedNode_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ScrollingStateNode.h"
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins><span class="cx">
</span><span class="cx"> #include "ScrollingStateFixedNode.h"
</span><span class="cx"> #include "ScrollingStateTree.h"
</span><span class="lines">@@ -156,4 +156,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef ScrollingStateNode_h
</span><span class="cx"> #define ScrollingStateNode_h
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins><span class="cx">
</span><span class="cx"> #include "PlatformLayer.h"
</span><span class="cx"> #include "ScrollingCoordinator.h"
</span><span class="lines">@@ -119,6 +119,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins><span class="cx">
</span><span class="cx"> #endif // ScrollingStateNode_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateScrollingNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ScrollingStateScrollingNode.h"
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins><span class="cx">
</span><span class="cx"> #include "ScrollingStateTree.h"
</span><span class="cx"> #include "TextStream.h"
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_frameScaleFactor(1)
</span><span class="cx"> , m_wheelEventHandlerCount(0)
</span><del>- , m_shouldUpdateScrollLayerPositionOnMainThread(0)
</del><ins>+ , m_synchronousScrollingReasons(0)
</ins><span class="cx"> , m_behaviorForFixed(StickToDocumentBounds)
</span><span class="cx"> , m_headerHeight(0)
</span><span class="cx"> , m_footerHeight(0)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> , m_nonFastScrollableRegion(stateNode.nonFastScrollableRegion())
</span><span class="cx"> , m_frameScaleFactor(stateNode.frameScaleFactor())
</span><span class="cx"> , m_wheelEventHandlerCount(stateNode.wheelEventHandlerCount())
</span><del>- , m_shouldUpdateScrollLayerPositionOnMainThread(stateNode.shouldUpdateScrollLayerPositionOnMainThread())
</del><ins>+ , m_synchronousScrollingReasons(stateNode.synchronousScrollingReasons())
</ins><span class="cx"> , m_behaviorForFixed(stateNode.scrollBehaviorForFixedElements())
</span><span class="cx"> , m_headerHeight(stateNode.headerHeight())
</span><span class="cx"> , m_footerHeight(stateNode.footerHeight())
</span><span class="lines">@@ -163,13 +163,13 @@
</span><span class="cx"> m_scrollingStateTree->setHasChangedProperties(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingStateScrollingNode::setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScrollingReasons reasons)
</del><ins>+void ScrollingStateScrollingNode::setSynchronousScrollingReasons(SynchronousScrollingReasons reasons)
</ins><span class="cx"> {
</span><del>- if (m_shouldUpdateScrollLayerPositionOnMainThread == reasons)
</del><ins>+ if (m_synchronousScrollingReasons == reasons)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_shouldUpdateScrollLayerPositionOnMainThread = reasons;
- setPropertyChanged(ShouldUpdateScrollLayerPositionOnMainThread);
</del><ins>+ m_synchronousScrollingReasons = reasons;
+ setPropertyChanged(ReasonsForSynchronousScrolling);
</ins><span class="cx"> m_scrollingStateTree->setHasChangedProperties(true);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -230,9 +230,9 @@
</span><span class="cx"> ts << "(frame scale factor " << m_frameScaleFactor << ")\n";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_shouldUpdateScrollLayerPositionOnMainThread) {
</del><ins>+ if (m_synchronousScrollingReasons) {
</ins><span class="cx"> writeIndent(ts, indent + 1);
</span><del>- ts << "(Scrolling on main thread because: " << ScrollingCoordinator::mainThreadScrollingReasonsAsText(m_shouldUpdateScrollLayerPositionOnMainThread) << ")\n";
</del><ins>+ ts << "(Scrolling on main thread because: " << ScrollingCoordinator::synchronousScrollingReasonsAsText(m_synchronousScrollingReasons) << ")\n";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_requestedScrollPosition != IntPoint()) {
</span><span class="lines">@@ -248,4 +248,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef ScrollingStateScrollingNode_h
</span><span class="cx"> #define ScrollingStateScrollingNode_h
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins><span class="cx">
</span><span class="cx"> #include "IntRect.h"
</span><span class="cx"> #include "Region.h"
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> FrameScaleFactor,
</span><span class="cx"> NonFastScrollableRegion,
</span><span class="cx"> WheelEventHandlerCount,
</span><del>- ShouldUpdateScrollLayerPositionOnMainThread,
</del><ins>+ ReasonsForSynchronousScrolling,
</ins><span class="cx"> RequestedScrollPosition,
</span><span class="cx"> CounterScrollingLayer,
</span><span class="cx"> HeaderHeight,
</span><span class="lines">@@ -85,8 +85,8 @@
</span><span class="cx"> unsigned wheelEventHandlerCount() const { return m_wheelEventHandlerCount; }
</span><span class="cx"> void setWheelEventHandlerCount(unsigned);
</span><span class="cx">
</span><del>- MainThreadScrollingReasons shouldUpdateScrollLayerPositionOnMainThread() const { return m_shouldUpdateScrollLayerPositionOnMainThread; }
- void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScrollingReasons);
</del><ins>+ SynchronousScrollingReasons synchronousScrollingReasons() const { return m_synchronousScrollingReasons; }
+ void setSynchronousScrollingReasons(SynchronousScrollingReasons);
</ins><span class="cx">
</span><span class="cx"> const ScrollableAreaParameters& scrollableAreaParameters() const { return m_scrollableAreaParameters; }
</span><span class="cx"> void setScrollableAreaParameters(const ScrollableAreaParameters& params);
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> Region m_nonFastScrollableRegion;
</span><span class="cx"> float m_frameScaleFactor;
</span><span class="cx"> unsigned m_wheelEventHandlerCount;
</span><del>- MainThreadScrollingReasons m_shouldUpdateScrollLayerPositionOnMainThread;
</del><ins>+ SynchronousScrollingReasons m_synchronousScrollingReasons;
</ins><span class="cx"> ScrollBehaviorForFixedElements m_behaviorForFixed;
</span><span class="cx"> int m_headerHeight;
</span><span class="cx"> int m_footerHeight;
</span><span class="lines">@@ -165,6 +165,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins><span class="cx">
</span><span class="cx"> #endif // ScrollingStateScrollingNode_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateStickyNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ScrollingStateStickyNode.h"
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins><span class="cx">
</span><span class="cx"> #include "GraphicsLayer.h"
</span><span class="cx"> #include "ScrollingStateTree.h"
</span><span class="lines">@@ -132,4 +132,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateStickyNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef ScrollingStateStickyNode_h
</span><span class="cx"> #define ScrollingStateStickyNode_h
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins><span class="cx">
</span><span class="cx"> #include "ScrollingConstraints.h"
</span><span class="cx"> #include "ScrollingStateNode.h"
</span><span class="lines">@@ -69,6 +69,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins><span class="cx">
</span><span class="cx"> #endif // ScrollingStateStickyNode_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ScrollingStateTree.h"
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins><span class="cx">
</span><span class="cx"> #include "ScrollingStateFixedNode.h"
</span><span class="cx"> #include "ScrollingStateScrollingNode.h"
</span><span class="lines">@@ -186,4 +186,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateTree.h (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateTree.h 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateTree.h 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef ScrollingStateTree_h
</span><span class="cx"> #define ScrollingStateTree_h
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins><span class="cx">
</span><span class="cx"> #include "ScrollingStateScrollingNode.h"
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="lines">@@ -82,6 +82,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</ins><span class="cx">
</span><span class="cx"> #endif // ScrollingStateTree_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ScrollingThread.h"
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="lines">@@ -119,4 +119,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingThread.h (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingThread.h 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingThread.h 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef ScrollingThread_h
</span><span class="cx"> #define ScrollingThread_h
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #include <wtf/Functional.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="lines">@@ -85,6 +85,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #endif // ScrollingThread_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ScrollingTree.h"
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #include "PlatformWheelEvent.h"
</span><span class="cx"> #include "ScrollingCoordinator.h"
</span><span class="lines">@@ -361,4 +361,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef ScrollingTree_h
</span><span class="cx"> #define ScrollingTree_h
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #include "PlatformWheelEvent.h"
</span><span class="cx"> #include "Region.h"
</span><span class="lines">@@ -145,6 +145,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #endif // ScrollingTree_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ScrollingTreeNode.h"
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #include "ScrollingStateTree.h"
</span><span class="cx">
</span><span class="lines">@@ -74,4 +74,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef ScrollingTreeNode_h
</span><span class="cx"> #define ScrollingTreeNode_h
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #include "IntRect.h"
</span><span class="cx"> #include "ScrollTypes.h"
</span><span class="lines">@@ -73,6 +73,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #endif // ScrollingTreeNode_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeScrollingNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ScrollingTreeScrollingNode.h"
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #include "ScrollingStateTree.h"
</span><span class="cx"> #include "ScrollingTree.h"
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> , m_frameScaleFactor(1)
</span><span class="cx"> , m_headerHeight(0)
</span><span class="cx"> , m_footerHeight(0)
</span><del>- , m_shouldUpdateScrollLayerPositionOnMainThread(0)
</del><ins>+ , m_synchronousScrollingReasons(0)
</ins><span class="cx"> , m_behaviorForFixed(StickToDocumentBounds)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -71,8 +71,8 @@
</span><span class="cx"> if (state->hasChangedProperty(ScrollingStateScrollingNode::FrameScaleFactor))
</span><span class="cx"> m_frameScaleFactor = state->frameScaleFactor();
</span><span class="cx">
</span><del>- if (state->hasChangedProperty(ScrollingStateScrollingNode::ShouldUpdateScrollLayerPositionOnMainThread))
- m_shouldUpdateScrollLayerPositionOnMainThread = state->shouldUpdateScrollLayerPositionOnMainThread();
</del><ins>+ if (state->hasChangedProperty(ScrollingStateScrollingNode::ReasonsForSynchronousScrolling))
+ m_synchronousScrollingReasons = state->synchronousScrollingReasons();
</ins><span class="cx">
</span><span class="cx"> if (state->hasChangedProperty(ScrollingStateScrollingNode::HeaderHeight))
</span><span class="cx"> m_headerHeight = state->headerHeight();
</span><span class="lines">@@ -86,4 +86,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef ScrollingTreeScrollingNode_h
</span><span class="cx"> #define ScrollingTreeScrollingNode_h
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #include "IntRect.h"
</span><span class="cx"> #include "ScrollTypes.h"
</span><span class="lines">@@ -53,7 +53,8 @@
</span><span class="cx"> virtual void handleWheelEvent(const PlatformWheelEvent&) = 0;
</span><span class="cx"> virtual void setScrollPosition(const IntPoint&) = 0;
</span><span class="cx">
</span><del>- MainThreadScrollingReasons shouldUpdateScrollLayerPositionOnMainThread() const { return m_shouldUpdateScrollLayerPositionOnMainThread; }
</del><ins>+ SynchronousScrollingReasons synchronousScrollingReasons() const { return m_synchronousScrollingReasons; }
+ bool shouldUpdateScrollLayerPositionSynchronously() const { return m_synchronousScrollingReasons; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> ScrollingTreeScrollingNode(ScrollingTree&, ScrollingNodeID);
</span><span class="lines">@@ -96,12 +97,12 @@
</span><span class="cx"> int m_headerHeight;
</span><span class="cx"> int m_footerHeight;
</span><span class="cx">
</span><del>- MainThreadScrollingReasons m_shouldUpdateScrollLayerPositionOnMainThread;
</del><ins>+ SynchronousScrollingReasons m_synchronousScrollingReasons;
</ins><span class="cx"> ScrollBehaviorForFixedElements m_behaviorForFixed;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #endif // ScrollingTreeScrollingNode_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingCoordinatorMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef ScrollingCoordinatorMac_h
</span><span class="cx"> #define ScrollingCoordinatorMac_h
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #include "ScrollingCoordinator.h"
</span><span class="cx">
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> virtual void syncChildPositions(const LayoutRect& viewportRect) OVERRIDE;
</span><span class="cx">
</span><span class="cx"> virtual void recomputeWheelEventHandlerCountForFrameView(FrameView*);
</span><del>- virtual void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScrollingReasons);
</del><ins>+ virtual void setSynchronousScrollingReasons(SynchronousScrollingReasons);
</ins><span class="cx">
</span><span class="cx"> virtual bool hasVisibleSlowRepaintViewportConstrainedObjects(FrameView*) const { return false; }
</span><span class="cx">
</span><span class="lines">@@ -120,6 +120,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #endif // ScrollingCoordinatorMac_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #import "ScrollingCoordinatorMac.h"
</span><span class="cx">
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> scheduleTreeStateCommit();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingCoordinatorMac::setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScrollingReasons reasons)
</del><ins>+void ScrollingCoordinatorMac::setSynchronousScrollingReasons(SynchronousScrollingReasons reasons)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_scrollingStateTree->rootStateNode())
</span><span class="cx"> return;
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> // in order to avoid layer positioning bugs.
</span><span class="cx"> if (reasons)
</span><span class="cx"> updateMainFrameScrollLayerPosition();
</span><del>- m_scrollingStateTree->rootStateNode()->setShouldUpdateScrollLayerPositionOnMainThread(reasons);
</del><ins>+ m_scrollingStateTree->rootStateNode()->setSynchronousScrollingReasons(reasons);
</ins><span class="cx"> scheduleTreeStateCommit();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -427,12 +427,12 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ScrollingModeIndication indicatorMode;
</span><del>- if (shouldUpdateScrollLayerPositionOnMainThread())
- indicatorMode = MainThreadScrollingBecauseOfStyleIndication;
</del><ins>+ if (shouldUpdateScrollLayerPositionSynchronously())
+ indicatorMode = SynchronousScrollingBecauseOfStyleIndication;
</ins><span class="cx"> else if (m_scrollingStateTree->rootStateNode() && m_scrollingStateTree->rootStateNode()->wheelEventHandlerCount())
</span><del>- indicatorMode = MainThreadScrollingBecauseOfEventHandlersIndication;
</del><ins>+ indicatorMode = SynchronousScrollingBecauseOfEventHandlersIndication;
</ins><span class="cx"> else
</span><del>- indicatorMode = ThreadedScrollingIndication;
</del><ins>+ indicatorMode = AsyncScrollingIndication;
</ins><span class="cx">
</span><span class="cx"> tiledBacking->setScrollingModeIndication(indicatorMode);
</span><span class="cx"> }
</span><span class="lines">@@ -447,4 +447,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingStateNodeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingStateNodeMac.mm (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingStateNodeMac.mm 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingStateNodeMac.mm 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "GraphicsLayer.h"
</span><span class="cx"> #include "ScrollingStateTree.h"
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -59,4 +59,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingStateScrollingNodeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingStateScrollingNodeMac.mm (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingStateScrollingNodeMac.mm 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingStateScrollingNodeMac.mm 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "ScrollbarThemeMac.h"
</span><span class="cx"> #include "ScrollingStateTree.h"
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -117,4 +117,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingThreadMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingThreadMac.mm (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingThreadMac.mm 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingThreadMac.mm 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ScrollingThread.h"
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -70,4 +70,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef ScrollingTreeFixedNode_h
</span><span class="cx"> #define ScrollingTreeFixedNode_h
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #include "ScrollingConstraints.h"
</span><span class="cx"> #include "ScrollingTreeNode.h"
</span><span class="lines">@@ -56,6 +56,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #endif // ScrollingTreeFixedNode_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ScrollingTreeFixedNode.h"
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #include "ScrollingStateFixedNode.h"
</span><span class="cx"> #include "ScrollingTree.h"
</span><span class="lines">@@ -85,4 +85,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef ScrollingTreeScrollingNodeMac_h
</span><span class="cx"> #define ScrollingTreeScrollingNodeMac_h
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #include "ScrollElasticityController.h"
</span><span class="cx"> #include "ScrollbarThemeMac.h"
</span><span class="lines">@@ -94,6 +94,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #endif // ScrollingTreeScrollingNodeMac_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "ScrollingTreeScrollingNodeMac.h"
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #import "FrameView.h"
</span><span class="cx"> #import "NSScrollerImpDetails.h"
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static void logThreadedScrollingMode(unsigned mainThreadScrollingReasons);
</del><ins>+static void logThreadedScrollingMode(unsigned synchronousScrollingReasons);
</ins><span class="cx"> static void logWheelEventHandlerCountChanged(unsigned);
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -92,10 +92,8 @@
</span><span class="cx"> m_horizontalScrollbarPainter = scrollingStateNode->horizontalScrollbarPainter();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateScrollingNode::ShouldUpdateScrollLayerPositionOnMainThread)) {
- unsigned mainThreadScrollingReasons = this->shouldUpdateScrollLayerPositionOnMainThread();
-
- if (mainThreadScrollingReasons) {
</del><ins>+ if (scrollingStateNode->hasChangedProperty(ScrollingStateScrollingNode::ReasonsForSynchronousScrolling)) {
+ if (shouldUpdateScrollLayerPositionSynchronously()) {
</ins><span class="cx"> // We're transitioning to the slow "update scroll layer position on the main thread" mode.
</span><span class="cx"> // Initialize the probable main thread scroll position with the current scroll layer position.
</span><span class="cx"> if (scrollingStateNode->hasChangedProperty(ScrollingStateScrollingNode::RequestedScrollPosition))
</span><span class="lines">@@ -107,7 +105,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (scrollingTree().scrollingPerformanceLoggingEnabled())
</span><del>- logThreadedScrollingMode(mainThreadScrollingReasons);
</del><ins>+ logThreadedScrollingMode(synchronousScrollingReasons());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (scrollingStateNode->hasChangedProperty(ScrollingStateScrollingNode::WheelEventHandlerCount)) {
</span><span class="lines">@@ -292,7 +290,7 @@
</span><span class="cx">
</span><span class="cx"> IntPoint ScrollingTreeScrollingNodeMac::scrollPosition() const
</span><span class="cx"> {
</span><del>- if (shouldUpdateScrollLayerPositionOnMainThread())
</del><ins>+ if (shouldUpdateScrollLayerPositionSynchronously())
</ins><span class="cx"> return m_probableMainThreadScrollPosition;
</span><span class="cx">
</span><span class="cx"> CGPoint scrollLayerPosition = m_scrollLayer.get().position;
</span><span class="lines">@@ -315,7 +313,7 @@
</span><span class="cx"> {
</span><span class="cx"> updateMainFramePinState(scrollPosition);
</span><span class="cx">
</span><del>- if (shouldUpdateScrollLayerPositionOnMainThread()) {
</del><ins>+ if (shouldUpdateScrollLayerPositionSynchronously()) {
</ins><span class="cx"> m_probableMainThreadScrollPosition = scrollPosition;
</span><span class="cx"> scrollingTree().updateMainFrameScrollPosition(scrollPosition, SetScrollingLayerPosition);
</span><span class="cx"> return;
</span><span class="lines">@@ -327,7 +325,7 @@
</span><span class="cx">
</span><span class="cx"> void ScrollingTreeScrollingNodeMac::setScrollLayerPosition(const IntPoint& position)
</span><span class="cx"> {
</span><del>- ASSERT(!shouldUpdateScrollLayerPositionOnMainThread());
</del><ins>+ ASSERT(!shouldUpdateScrollLayerPositionSynchronously());
</ins><span class="cx"> m_scrollLayer.get().position = CGPointMake(-position.x() + scrollOrigin().x(), -position.y() + scrollOrigin().y());
</span><span class="cx">
</span><span class="cx"> ScrollBehaviorForFixedElements behaviorForFixed = scrollBehaviorForFixedElements();
</span><span class="lines">@@ -460,20 +458,20 @@
</span><span class="cx"> m_lastScrollHadUnfilledPixels = unfilledArea;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void logThreadedScrollingMode(unsigned mainThreadScrollingReasons)
</del><ins>+static void logThreadedScrollingMode(unsigned synchronousScrollingReasons)
</ins><span class="cx"> {
</span><del>- if (mainThreadScrollingReasons) {
</del><ins>+ if (synchronousScrollingReasons) {
</ins><span class="cx"> StringBuilder reasonsDescription;
</span><span class="cx">
</span><del>- if (mainThreadScrollingReasons & ScrollingCoordinator::ForcedOnMainThread)
</del><ins>+ if (synchronousScrollingReasons & ScrollingCoordinator::ForcedOnMainThread)
</ins><span class="cx"> reasonsDescription.append("forced,");
</span><del>- if (mainThreadScrollingReasons & ScrollingCoordinator::HasSlowRepaintObjects)
</del><ins>+ if (synchronousScrollingReasons & ScrollingCoordinator::HasSlowRepaintObjects)
</ins><span class="cx"> reasonsDescription.append("slow-repaint objects,");
</span><del>- if (mainThreadScrollingReasons & ScrollingCoordinator::HasViewportConstrainedObjectsWithoutSupportingFixedLayers)
</del><ins>+ if (synchronousScrollingReasons & ScrollingCoordinator::HasViewportConstrainedObjectsWithoutSupportingFixedLayers)
</ins><span class="cx"> reasonsDescription.append("viewport-constrained objects,");
</span><del>- if (mainThreadScrollingReasons & ScrollingCoordinator::HasNonLayerViewportConstrainedObjects)
</del><ins>+ if (synchronousScrollingReasons & ScrollingCoordinator::HasNonLayerViewportConstrainedObjects)
</ins><span class="cx"> reasonsDescription.append("non-layer viewport-constrained objects,");
</span><del>- if (mainThreadScrollingReasons & ScrollingCoordinator::IsImageDocument)
</del><ins>+ if (synchronousScrollingReasons & ScrollingCoordinator::IsImageDocument)
</ins><span class="cx"> reasonsDescription.append("image document,");
</span><span class="cx">
</span><span class="cx"> // Strip the trailing comma.
</span><span class="lines">@@ -491,4 +489,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef ScrollingTreeStickyNode_h
</span><span class="cx"> #define ScrollingTreeStickyNode_h
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #include "ScrollingConstraints.h"
</span><span class="cx"> #include "ScrollingTreeNode.h"
</span><span class="lines">@@ -56,6 +56,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #endif // ScrollingTreeStickyNode_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ScrollingTreeStickyNode.h"
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">
</span><span class="cx"> #include "ScrollingStateStickyNode.h"
</span><span class="cx"> #include "ScrollingTree.h"
</span><span class="lines">@@ -89,4 +89,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(THREADED_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Scrollbar.cpp (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Scrollbar.cpp 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/platform/Scrollbar.cpp 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -547,7 +547,7 @@
</span><span class="cx"> {
</span><span class="cx"> // It's unfortunate that this needs to be done with an ifdef. Ideally there would be able to feature-detect
</span><span class="cx"> // the necessary support within AppKit.
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000 && ENABLE(THREADED_SCROLLING)
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000 && ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> return m_scrollableArea ? !m_scrollableArea->updatesScrollLayerPositionOnMainThread() : false;
</span><span class="cx"> #else
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTiledBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TiledBacking.h (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TiledBacking.h 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/platform/graphics/TiledBacking.h 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -34,9 +34,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> enum ScrollingModeIndication {
</span><del>- MainThreadScrollingBecauseOfStyleIndication,
- MainThreadScrollingBecauseOfEventHandlersIndication,
- ThreadedScrollingIndication
</del><ins>+ SynchronousScrollingBecauseOfStyleIndication,
+ SynchronousScrollingBecauseOfEventHandlersIndication,
+ AsyncScrollingIndication
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class TiledBacking {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacTileControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> , m_clipsToExposedRect(false)
</span><span class="cx"> , m_hasTilesWithTemporaryScaleFactor(false)
</span><span class="cx"> , m_tileDebugBorderWidth(0)
</span><del>- , m_indicatorMode(ThreadedScrollingIndication)
</del><ins>+ , m_indicatorMode(AsyncScrollingIndication)
</ins><span class="cx"> {
</span><span class="cx"> m_tileContainerLayer = m_tileCacheLayer->createCompatibleLayer(PlatformCALayer::LayerTypeLayer, nullptr);
</span><span class="cx"> #ifndef NDEBUG
</span><span class="lines">@@ -963,13 +963,13 @@
</span><span class="cx">
</span><span class="cx"> Color visibleRectIndicatorColor;
</span><span class="cx"> switch (m_indicatorMode) {
</span><del>- case MainThreadScrollingBecauseOfStyleIndication:
</del><ins>+ case SynchronousScrollingBecauseOfStyleIndication:
</ins><span class="cx"> visibleRectIndicatorColor = Color(255, 0, 0);
</span><span class="cx"> break;
</span><del>- case MainThreadScrollingBecauseOfEventHandlersIndication:
</del><ins>+ case SynchronousScrollingBecauseOfEventHandlersIndication:
</ins><span class="cx"> visibleRectIndicatorColor = Color(255, 255, 0);
</span><span class="cx"> break;
</span><del>- case ThreadedScrollingIndication:
</del><ins>+ case AsyncScrollingIndication:
</ins><span class="cx"> visibleRectIndicatorColor = Color(0, 200, 0);
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacMemoryPressureHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> // FastMalloc has lock-free thread specific caches that can only be cleared from the thread itself.
</span><span class="cx"> StorageThread::releaseFastMallocFreeMemoryInAllThreads();
</span><span class="cx"> WorkerThread::releaseFastMallocFreeMemoryInAllThreads();
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> ScrollingThread::dispatch(bind(WTF::releaseFastMallocFreeMemory));
</span><span class="cx"> #endif
</span><span class="cx"> WTF::releaseFastMallocFreeMemory();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -3898,10 +3898,10 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool scrollingOnMainThread = true;
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> if (Page* page = renderer().frame().page()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
</span><del>- scrollingOnMainThread = scrollingCoordinator->shouldUpdateScrollLayerPositionOnMainThread();
</del><ins>+ scrollingOnMainThread = scrollingCoordinator->shouldUpdateScrollLayerPositionSynchronously();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = scrollingCoordinatorFromLayer(backing->owningLayer())) {
</span><span class="cx"> // Ask our TiledBacking for large tiles unless the only reason we're main-thread-scrolling
</span><span class="cx"> // is a page overlay (find-in-page, the Web Inspector highlight mechanism, etc.).
</span><del>- if (scrollingCoordinator->mainThreadScrollingReasons() & ~ScrollingCoordinator::ForcedOnMainThread)
</del><ins>+ if (scrollingCoordinator->synchronousScrollingReasons() & ~ScrollingCoordinator::ForcedOnMainThread)
</ins><span class="cx"> tileCoverage |= TiledBacking::CoverageForSlowScrolling;
</span><span class="cx"> }
</span><span class="cx"> return tileCoverage;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/testing/Internals.cpp 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -1704,7 +1704,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return String();
</span><span class="cx">
</span><del>- return page->mainThreadScrollingReasonsAsText();
</del><ins>+ return page->synchronousScrollingReasonsAsText();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<ClientRectList> Internals::nonFastScrollableRects(ExceptionCode& ec) const
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebCore/testing/Internals.idl 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> [RaisesException] DOMString layerTreeAsText(Document document, optional unsigned short flags);
</span><span class="cx">
</span><span class="cx"> [RaisesException] DOMString scrollingStateTreeAsText();
</span><del>- [RaisesException] DOMString mainThreadScrollingReasons();
</del><ins>+ [RaisesException] DOMString mainThreadScrollingReasons(); // FIXME: rename to synchronousScrollingReasons().
</ins><span class="cx"> [RaisesException] ClientRectList nonFastScrollableRects();
</span><span class="cx">
</span><span class="cx"> [RaisesException] DOMString repaintRectsAsText();
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2013-12-20 Simon Fraser <simon.fraser@apple.com>
+
+ Change "threaded scrolling" terminology to "asynchronous scrolling"
+ https://bugs.webkit.org/show_bug.cgi?id=126094
+
+ Reviewed by Tim Horton.
+
+ Rename ENABLE_THREADED_SCROLLING to ENABLE_ASYNC_SCROLLING, and change
+ references to "main thread scrolling" to "synchronous scrolling".
+
+ * WebProcess/WebPage/EventDispatcher.cpp:
+ (WebKit::EventDispatcher::wheelEvent):
+ * WebProcess/WebPage/EventDispatcher.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::~WebPage):
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::didInstallPageOverlay):
+ (WebKit::TiledCoreAnimationDrawingArea::didUninstallPageOverlay):
+ (WebKit::TiledCoreAnimationDrawingArea::updatePreferences):
+ (WebKit::TiledCoreAnimationDrawingArea::dispatchAfterEnsuringUpdatedScrollPosition):
+
</ins><span class="cx"> 2013-12-20 Ricky Mondello <rmondello@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename PlugInAutoStartProvider's ...EntriesAddedBeforeTime facility to ...EntriesAddedAfterTime
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageEventDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> #include <WebCore/ScrollingCoordinator.h>
</span><span class="cx"> #include <WebCore/ScrollingThread.h>
</span><span class="cx"> #include <WebCore/ScrollingTree.h>
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> void EventDispatcher::addScrollingTreeForPage(WebPage* webPage)
</span><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_scrollingTreesMutex);
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> void EventDispatcher::wheelEvent(uint64_t pageID, const WebWheelEvent& wheelEvent, bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom)
</span><span class="cx"> {
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> MutexLocker locker(m_scrollingTreesMutex);
</span><span class="cx"> if (ScrollingTree* scrollingTree = m_scrollingTrees.get(pageID)) {
</span><span class="cx"> PlatformWheelEvent platformWheelEvent = platform(wheelEvent);
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> webPage->wheelEvent(wheelEvent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> void EventDispatcher::sendDidReceiveEvent(uint64_t pageID, const WebEvent& event, bool didHandleEvent)
</span><span class="cx"> {
</span><span class="cx"> WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(event.type()), didHandleEvent), pageID);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageEventDispatcherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> static PassRefPtr<EventDispatcher> create();
</span><span class="cx"> ~EventDispatcher();
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> void addScrollingTreeForPage(WebPage*);
</span><span class="cx"> void removeScrollingTreeForPage(WebPage*);
</span><span class="cx"> #endif
</span><span class="lines">@@ -66,13 +66,13 @@
</span><span class="cx"> // This is called on the main thread.
</span><span class="cx"> void dispatchWheelEvent(uint64_t pageID, const WebWheelEvent&);
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> void sendDidReceiveEvent(uint64_t pageID, const WebEvent&, bool didHandleEvent);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RefPtr<WorkQueue> m_queue;
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> Mutex m_scrollingTreesMutex;
</span><span class="cx"> HashMap<uint64_t, RefPtr<WebCore::ScrollingTree>> m_scrollingTrees;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> m_drawingArea = DrawingArea::create(this, parameters);
</span><span class="cx"> m_drawingArea->setPaintingEnabled(false);
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> m_useThreadedScrolling = parameters.store.getBoolValueForKey(WebPreferencesKey::threadedScrollingEnabledKey());
</span><span class="cx"> if (!m_drawingArea->supportsThreadedScrolling())
</span><span class="cx"> m_useThreadedScrolling = false;
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx"> webPageCounter.increment();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> if (m_useThreadedScrolling)
</span><span class="cx"> WebProcess::shared().eventDispatcher().addScrollingTreeForPage(this);
</span><span class="cx"> #endif
</span><span class="lines">@@ -436,7 +436,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_page);
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> if (m_useThreadedScrolling)
</span><span class="cx"> WebProcess::shared().eventDispatcher().removeScrollingTreeForPage(this);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (160943 => 160944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2013-12-21 00:26:49 UTC (rev 160943)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2013-12-21 00:35:44 UTC (rev 160944)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> #import <WebCore/TiledBacking.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> #import <WebCore/ScrollingCoordinator.h>
</span><span class="cx"> #import <WebCore/ScrollingThread.h>
</span><span class="cx"> #import <WebCore/ScrollingTree.h>
</span><span class="lines">@@ -187,9 +187,9 @@
</span><span class="cx">
</span><span class="cx"> void TiledCoreAnimationDrawingArea::didInstallPageOverlay(PageOverlay* pageOverlay)
</span><span class="cx"> {
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = m_webPage->corePage()->scrollingCoordinator())
</span><del>- scrollingCoordinator->setForceMainThreadScrollLayerPositionUpdates(true);
</del><ins>+ scrollingCoordinator->setForceSynchronousScrollLayerPositionUpdates(true);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> createPageOverlayLayer(pageOverlay);
</span><span class="lines">@@ -203,10 +203,10 @@
</span><span class="cx"> if (m_pageOverlayLayers.size())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> if (Page* page = m_webPage->corePage()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
</span><del>- scrollingCoordinator->setForceMainThreadScrollLayerPositionUpdates(false);
</del><ins>+ scrollingCoordinator->setForceSynchronousScrollLayerPositionUpdates(false);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> {
</span><span class="cx"> Settings& settings = m_webPage->corePage()->settings();
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = m_webPage->corePage()->scrollingCoordinator()) {
</span><span class="cx"> bool scrollingPerformanceLoggingEnabled = m_webPage->scrollingPerformanceLoggingEnabled();
</span><span class="cx"> ScrollingThread::dispatch(bind(&ScrollingTree::setScrollingPerformanceLoggingEnabled, scrollingCoordinator->scrollingTree(), scrollingPerformanceLoggingEnabled));
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> {
</span><span class="cx"> Function<void ()> function = functionRef;
</span><span class="cx">
</span><del>-#if ENABLE(THREADED_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> if (!m_webPage->corePage()->scrollingCoordinator()) {
</span><span class="cx"> function();
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>