<!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>[182345] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/182345">182345</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-04-04 12:24:45 -0700 (Sat, 04 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Differentiate between composited scrolling, and async scrolling
https://bugs.webkit.org/show_bug.cgi?id=143291
Reviewed by Sam Weinig.
Source/WebCore:
ScrollableArea::usesCompositedScrolling() meant "uses aysnc scrolling", but
FrameView::contentsInCompositedLayer() covered a related concept, that scrolling
happens by moving compositing layers around.
Make the difference between these more explicit by adding ScrollableArea::usesAsyncScrolling(),
which means that scrolling for that ScrollableArea is asynchronous and managed
by a ScrollingCoordinator. This is the meaning that ScrollingCoordinator::computeNonFastScrollableRegion()
understands.
ScrollableArea::usesCompositedScrolling() is now repurposed to mean "scrolling
occurs by moving layers around, not requiring repaint". FrameView::contentsInCompositedLayer()
is renamed to usesCompositedScrolling(), and overrides the base class function.
This only changes behavior in tests that call setScrollingTreeIncludesFrames(true).
* page/FrameView.cpp:
(WebCore::FrameView::useSlowRepaints):
(WebCore::FrameView::usesCompositedScrolling):
(WebCore::FrameView::usesAsyncScrolling):
(WebCore::FrameView::scrollContentsFastPath):
(WebCore::FrameView::scrollContentsSlowPath):
(WebCore::FrameView::contentsInCompositedLayer): Deleted.
* page/FrameView.h:
* page/scrolling/ScrollingCoordinator.cpp:
(WebCore::ScrollingCoordinator::computeNonFastScrollableRegion):
* platform/ScrollableArea.h:
(WebCore::ScrollableArea::usesAsyncScrolling):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::usesAsyncScrolling):
* rendering/RenderLayer.h:
LayoutTests:
Rebaseline tests that call setScrollingTreeIncludesFrames(true), where those subframes
are now excluded from the non-fast scrollable region.
* platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingframescoordinatedframeexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingframescoordinatedframeinfixedexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingframesfixedinsideframeexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollableAreah">trunk/Source/WebCore/platform/ScrollableArea.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (182344 => 182345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-04 17:16:21 UTC (rev 182344)
+++ trunk/LayoutTests/ChangeLog 2015-04-04 19:24:45 UTC (rev 182345)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-04-04 Simon Fraser <simon.fraser@apple.com>
+
+ Differentiate between composited scrolling, and async scrolling
+ https://bugs.webkit.org/show_bug.cgi?id=143291
+
+ Reviewed by Sam Weinig.
+
+ Rebaseline tests that call setScrollingTreeIncludesFrames(true), where those subframes
+ are now excluded from the non-fast scrollable region.
+
+ * platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt:
+
</ins><span class="cx"> 2015-04-04 Xabier Rodriguez Calvar <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Streams API] Collecting a ReadableStreamReader should not unlock its stream
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingframescoordinatedframeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt (182344 => 182345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt 2015-04-04 17:16:21 UTC (rev 182344)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt 2015-04-04 19:24:45 UTC (rev 182345)
</span><span class="lines">@@ -2,8 +2,7 @@
</span><span class="cx"> (scrollable area size 785 600)
</span><span class="cx"> (contents size 785 1016)
</span><span class="cx"> (non-fast-scrollable region
</span><del>- at (37,39) size 500x300
- at (45,339) size 404x12)
</del><ins>+ at (45,47) size 404x304)
</ins><span class="cx"> (children 1
</span><span class="cx"> (Frame scrolling node
</span><span class="cx"> (scrollable area size 485 300)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingframescoordinatedframeinfixedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt (182344 => 182345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt 2015-04-04 17:16:21 UTC (rev 182344)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt 2015-04-04 19:24:45 UTC (rev 182345)
</span><span class="lines">@@ -2,8 +2,7 @@
</span><span class="cx"> (scrollable area size 785 600)
</span><span class="cx"> (contents size 785 1016)
</span><span class="cx"> (non-fast-scrollable region
</span><del>- at (37,29) size 500x300
- at (45,329) size 404x12)
</del><ins>+ at (45,37) size 404x304)
</ins><span class="cx"> (children 1
</span><span class="cx"> (Fixed node
</span><span class="cx"> (anchor edges: AnchorEdgeLeft AnchorEdgeTop)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingframesfixedinsideframeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt (182344 => 182345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt 2015-04-04 17:16:21 UTC (rev 182344)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt 2015-04-04 19:24:45 UTC (rev 182345)
</span><span class="lines">@@ -2,8 +2,6 @@
</span><span class="cx"> (Frame scrolling node
</span><span class="cx"> (scrollable area size 785 600)
</span><span class="cx"> (contents size 785 657)
</span><del>- (non-fast-scrollable region
- at (110,110) size 480x400)
</del><span class="cx"> (children 1
</span><span class="cx"> (Frame scrolling node
</span><span class="cx"> (scrollable area size 465 400)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182344 => 182345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-04 17:16:21 UTC (rev 182344)
+++ trunk/Source/WebCore/ChangeLog 2015-04-04 19:24:45 UTC (rev 182345)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2015-04-04 Simon Fraser <simon.fraser@apple.com>
+
+ Differentiate between composited scrolling, and async scrolling
+ https://bugs.webkit.org/show_bug.cgi?id=143291
+
+ Reviewed by Sam Weinig.
+
+ ScrollableArea::usesCompositedScrolling() meant "uses aysnc scrolling", but
+ FrameView::contentsInCompositedLayer() covered a related concept, that scrolling
+ happens by moving compositing layers around.
+
+ Make the difference between these more explicit by adding ScrollableArea::usesAsyncScrolling(),
+ which means that scrolling for that ScrollableArea is asynchronous and managed
+ by a ScrollingCoordinator. This is the meaning that ScrollingCoordinator::computeNonFastScrollableRegion()
+ understands.
+
+ ScrollableArea::usesCompositedScrolling() is now repurposed to mean "scrolling
+ occurs by moving layers around, not requiring repaint". FrameView::contentsInCompositedLayer()
+ is renamed to usesCompositedScrolling(), and overrides the base class function.
+
+ This only changes behavior in tests that call setScrollingTreeIncludesFrames(true).
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::useSlowRepaints):
+ (WebCore::FrameView::usesCompositedScrolling):
+ (WebCore::FrameView::usesAsyncScrolling):
+ (WebCore::FrameView::scrollContentsFastPath):
+ (WebCore::FrameView::scrollContentsSlowPath):
+ (WebCore::FrameView::contentsInCompositedLayer): Deleted.
+ * page/FrameView.h:
+ * page/scrolling/ScrollingCoordinator.cpp:
+ (WebCore::ScrollingCoordinator::computeNonFastScrollableRegion):
+ * platform/ScrollableArea.h:
+ (WebCore::ScrollableArea::usesAsyncScrolling):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::usesAsyncScrolling):
+ * rendering/RenderLayer.h:
+
</ins><span class="cx"> 2015-04-04 Xabier Rodriguez Calvar <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Streams API] Collecting a ReadableStreamReader should not unlock its stream
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (182344 => 182345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-04-04 17:16:21 UTC (rev 182344)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-04-04 19:24:45 UTC (rev 182345)
</span><span class="lines">@@ -1489,7 +1489,7 @@
</span><span class="cx"> // m_contentIsOpaque, so don't take the fast path for composited layers
</span><span class="cx"> // if they are a platform widget in order to get painting correctness
</span><span class="cx"> // for transparent layers. See the comment in WidgetMac::paint.
</span><del>- if (contentsInCompositedLayer() && !platformWidget())
</del><ins>+ if (usesCompositedScrolling() && !platformWidget())
</ins><span class="cx"> return mustBeSlow;
</span><span class="cx">
</span><span class="cx"> bool isOverlapped = m_isOverlapped && considerOverlap;
</span><span class="lines">@@ -1516,7 +1516,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool FrameView::contentsInCompositedLayer() const
</del><ins>+bool FrameView::usesCompositedScrolling() const
</ins><span class="cx"> {
</span><span class="cx"> RenderView* renderView = this->renderView();
</span><span class="cx"> if (renderView && renderView->isComposited()) {
</span><span class="lines">@@ -1528,6 +1528,17 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool FrameView::usesAsyncScrolling() const
+{
+#if ENABLE(ASYNC_SCROLLING)
+ if (Page* page = frame().page()) {
+ if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
+ return scrollingCoordinator->coordinatesScrollingForFrameView(*this);
+ }
+#endif
+ return false;
+}
+
</ins><span class="cx"> void FrameView::setCannotBlitToWindow()
</span><span class="cx"> {
</span><span class="cx"> m_cannotBlitToWindow = true;
</span><span class="lines">@@ -1793,7 +1804,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const bool isCompositedContentLayer = contentsInCompositedLayer();
</del><ins>+ const bool isCompositedContentLayer = usesCompositedScrolling();
</ins><span class="cx">
</span><span class="cx"> // Get the rects of the fixed objects visible in the rectToScroll
</span><span class="cx"> Region regionToUpdate;
</span><span class="lines">@@ -1855,7 +1866,7 @@
</span><span class="cx">
</span><span class="cx"> void FrameView::scrollContentsSlowPath(const IntRect& updateRect)
</span><span class="cx"> {
</span><del>- if (contentsInCompositedLayer()) {
</del><ins>+ if (usesCompositedScrolling()) {
</ins><span class="cx"> // FIXME: respect paintsEntireContents()?
</span><span class="cx"> IntRect updateRect = visibleContentRect(LegacyIOSDocumentVisibleRect);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (182344 => 182345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2015-04-04 17:16:21 UTC (rev 182344)
+++ trunk/Source/WebCore/page/FrameView.h 2015-04-04 19:24:45 UTC (rev 182345)
</span><span class="lines">@@ -558,7 +558,6 @@
</span><span class="cx"> bool useSlowRepaints(bool considerOverlap = true) const;
</span><span class="cx"> bool useSlowRepaintsIfNotOverlapped() const;
</span><span class="cx"> void updateCanBlitOnScrollRecursively();
</span><del>- bool contentsInCompositedLayer() const;
</del><span class="cx"> bool shouldLayoutAfterContentsResized() const;
</span><span class="cx">
</span><span class="cx"> bool shouldUpdateCompositingLayersAfterScrolling() const;
</span><span class="lines">@@ -610,6 +609,9 @@
</span><span class="cx"> virtual GraphicsLayer* layerForOverhangAreas() const override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ virtual bool usesCompositedScrolling() const override;
+ virtual bool usesAsyncScrolling() const override;
+
</ins><span class="cx"> // Override scrollbar notifications to update the AXObject cache.
</span><span class="cx"> virtual void didAddScrollbar(Scrollbar*, ScrollbarOrientation) override;
</span><span class="cx"> virtual void willRemoveScrollbar(Scrollbar*, ScrollbarOrientation) override;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (182344 => 182345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2015-04-04 17:16:21 UTC (rev 182344)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2015-04-04 19:24:45 UTC (rev 182345)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> for (FrameView::ScrollableAreaSet::const_iterator it = scrollableAreas->begin(), end = scrollableAreas->end(); it != end; ++it) {
</span><span class="cx"> ScrollableArea* scrollableArea = *it;
</span><span class="cx"> // Composited scrollable areas can be scrolled off the main thread.
</span><del>- if (scrollableArea->usesCompositedScrolling())
</del><ins>+ if (scrollableArea->usesAsyncScrolling())
</ins><span class="cx"> continue;
</span><span class="cx"> IntRect box = scrollableArea->scrollableAreaBoundingBox();
</span><span class="cx"> box.moveBy(offset);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.h (182344 => 182345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.h 2015-04-04 17:16:21 UTC (rev 182344)
+++ trunk/Source/WebCore/platform/ScrollableArea.h 2015-04-04 19:24:45 UTC (rev 182345)
</span><span class="lines">@@ -253,7 +253,11 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual TiledBacking* tiledBacking() const { return 0; }
</span><ins>+
+ // True if scrolling happens by moving compositing layers.
</ins><span class="cx"> virtual bool usesCompositedScrolling() const { return false; }
</span><ins>+ // True if the contents can be scrolled asynchronously (i.e. by a ScrollingCoordinator).
+ virtual bool usesAsyncScrolling() const { return false; }
</ins><span class="cx">
</span><span class="cx"> virtual GraphicsLayer* layerForHorizontalScrollbar() const { return 0; }
</span><span class="cx"> virtual GraphicsLayer* layerForVerticalScrollbar() const { return 0; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (182344 => 182345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-04-04 17:16:21 UTC (rev 182344)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-04-04 19:24:45 UTC (rev 182345)
</span><span class="lines">@@ -2191,6 +2191,11 @@
</span><span class="cx"> return isComposited() && backing()->scrollingLayer();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool RenderLayer::usesAsyncScrolling() const
+{
+ return hasAcceleratedTouchScrolling() && usesCompositedScrolling();
+}
+
</ins><span class="cx"> bool RenderLayer::needsCompositedScrolling() const
</span><span class="cx"> {
</span><span class="cx"> return m_needsCompositedScrolling;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (182344 => 182345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2015-04-04 17:16:21 UTC (rev 182344)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2015-04-04 19:24:45 UTC (rev 182345)
</span><span class="lines">@@ -241,6 +241,9 @@
</span><span class="cx"> bool hasAcceleratedTouchScrolling() const;
</span><span class="cx"> // Returns true when there is actually scrollable overflow (requires layout to be up-to-date).
</span><span class="cx"> bool hasTouchScrollableOverflow() const;
</span><ins>+#else
+ bool hasAcceleratedTouchScrolling() const { return false; }
+ bool hasTouchScrollableOverflow() const { return false; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> int verticalScrollbarWidth(OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize) const;
</span><span class="lines">@@ -601,6 +604,7 @@
</span><span class="cx"> virtual GraphicsLayer* layerForVerticalScrollbar() const override;
</span><span class="cx"> virtual GraphicsLayer* layerForScrollCorner() const override;
</span><span class="cx"> virtual bool usesCompositedScrolling() const override;
</span><ins>+ virtual bool usesAsyncScrolling() const override;
</ins><span class="cx"> WEBCORE_EXPORT bool needsCompositedScrolling() const;
</span><span class="cx">
</span><span class="cx"> bool paintsWithTransparency(PaintBehavior paintBehavior) const
</span></span></pre>
</div>
</div>
</body>
</html>