<!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>[186154] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/186154">186154</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-06-30 18:01:13 -0700 (Tue, 30 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename GraphicsLayer's allowsBackingStoreDetachment to isViewportConstrained
https://bugs.webkit.org/show_bug.cgi?id=146483
Reviewed by Tim Horton.
What GraphicsLayer really needs to know is whether some other thread/process
is moving its platform layers around behind its back, and this is is better
expressed as "isViewportConstrained" rather than "allowsBackingStoreDetachment".
The sense of the flag is flipped, and boolean logic adjusted accordingly.
* platform/graphics/GraphicsLayer.h:
(WebCore::GraphicsLayer::setIsViewportConstrained):
(WebCore::GraphicsLayer::isViewportConstrained):
(WebCore::GraphicsLayer::setAllowsBackingStoreDetachment): Deleted.
(WebCore::GraphicsLayer::allowsBackingStoreDetachment): Deleted.
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::GraphicsLayerCA):
(WebCore::GraphicsLayerCA::setVisibleAndCoverageRects):
(WebCore::GraphicsLayerCA::recursiveCommitChanges):
* platform/graphics/ca/GraphicsLayerCA.h:
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::setIsScrollCoordinatedWithViewportConstrainedRole):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerh">trunk/Source/WebCore/platform/graphics/GraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186153 => 186154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-01 00:46:55 UTC (rev 186153)
+++ trunk/Source/WebCore/ChangeLog 2015-07-01 01:01:13 UTC (rev 186154)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-06-30 Simon Fraser <simon.fraser@apple.com>
+
+ Rename GraphicsLayer's allowsBackingStoreDetachment to isViewportConstrained
+ https://bugs.webkit.org/show_bug.cgi?id=146483
+
+ Reviewed by Tim Horton.
+
+ What GraphicsLayer really needs to know is whether some other thread/process
+ is moving its platform layers around behind its back, and this is is better
+ expressed as "isViewportConstrained" rather than "allowsBackingStoreDetachment".
+
+ The sense of the flag is flipped, and boolean logic adjusted accordingly.
+
+ * platform/graphics/GraphicsLayer.h:
+ (WebCore::GraphicsLayer::setIsViewportConstrained):
+ (WebCore::GraphicsLayer::isViewportConstrained):
+ (WebCore::GraphicsLayer::setAllowsBackingStoreDetachment): Deleted.
+ (WebCore::GraphicsLayer::allowsBackingStoreDetachment): Deleted.
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::GraphicsLayerCA):
+ (WebCore::GraphicsLayerCA::setVisibleAndCoverageRects):
+ (WebCore::GraphicsLayerCA::recursiveCommitChanges):
+ * platform/graphics/ca/GraphicsLayerCA.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::setIsScrollCoordinatedWithViewportConstrainedRole):
+
</ins><span class="cx"> 2015-06-30 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> CABackdropFilter should set windowServerAware to false
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (186153 => 186154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2015-07-01 00:46:55 UTC (rev 186153)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2015-07-01 01:01:13 UTC (rev 186154)
</span><span class="lines">@@ -494,9 +494,9 @@
</span><span class="cx"> float pageScaleFactor() const { return m_client.pageScaleFactor(); }
</span><span class="cx"> float deviceScaleFactor() const { return m_client.deviceScaleFactor(); }
</span><span class="cx">
</span><del>- // Whether this layer (and descendants) can detach backing store when outside the coverage area.
- virtual void setAllowsBackingStoreDetachment(bool) { }
- virtual bool allowsBackingStoreDetachment() const { return true; }
</del><ins>+ // Whether this layer is viewport constrained, implying that it's moved around externally from GraphicsLayer (e.g. by the scrolling tree).
+ virtual void setIsViewportConstrained(bool) { }
+ virtual bool isViewportConstrained() const { return false; }
</ins><span class="cx">
</span><span class="cx"> virtual void deviceOrPageScaleFactorChanged() { }
</span><span class="cx"> WEBCORE_EXPORT void noteDeviceOrPageScaleFactorChangedIncludingDescendants();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (186153 => 186154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-07-01 00:46:55 UTC (rev 186153)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-07-01 01:01:13 UTC (rev 186154)
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> : GraphicsLayer(layerType, client)
</span><span class="cx"> , m_needsFullRepaint(false)
</span><span class="cx"> , m_usingBackdropLayerType(false)
</span><del>- , m_allowsBackingStoreDetachment(true)
</del><ins>+ , m_isViewportConstrained(false)
</ins><span class="cx"> , m_intersectsCoverageRect(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -1272,7 +1272,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsLayerCA::setVisibleAndCoverageRects(const VisibleAndCoverageRects& rects, bool allowBackingStoreDetachment)
</del><ins>+void GraphicsLayerCA::setVisibleAndCoverageRects(const VisibleAndCoverageRects& rects, bool isViewportConstrained)
</ins><span class="cx"> {
</span><span class="cx"> bool visibleRectChanged = rects.visibleRect != m_visibleRect;
</span><span class="cx"> bool coverageRectChanged = rects.coverageRect != m_coverageRect;
</span><span class="lines">@@ -1280,7 +1280,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME: we need to take reflections into account when determining whether this layer intersects the coverage rect.
</span><del>- bool intersectsCoverageRect = !allowBackingStoreDetachment || rects.coverageRect.intersects(FloatRect(m_boundsOrigin, size()));
</del><ins>+ bool intersectsCoverageRect = isViewportConstrained || rects.coverageRect.intersects(FloatRect(m_boundsOrigin, size()));
</ins><span class="cx"> if (intersectsCoverageRect != m_intersectsCoverageRect) {
</span><span class="cx"> m_uncommittedChanges |= CoverageRectChanged;
</span><span class="cx"> m_intersectsCoverageRect = intersectsCoverageRect;
</span><span class="lines">@@ -1329,7 +1329,7 @@
</span><span class="cx"> localState.setLastPlanarSecondaryQuad(&secondaryQuad);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- setVisibleAndCoverageRects(rects, m_allowsBackingStoreDetachment && commitState.ancestorsAllowBackingStoreDetachment);
</del><ins>+ setVisibleAndCoverageRects(rects, m_isViewportConstrained || commitState.ancestorIsViewportConstrained);
</ins><span class="cx">
</span><span class="cx"> #ifdef VISIBLE_TILE_WASH
</span><span class="cx"> // Use having a transform as a key to making the tile wash layer. If every layer gets a wash,
</span><span class="lines">@@ -1373,7 +1373,7 @@
</span><span class="cx"> affectedByTransformAnimation = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- childCommitState.ancestorsAllowBackingStoreDetachment &= m_allowsBackingStoreDetachment;
</del><ins>+ childCommitState.ancestorIsViewportConstrained |= m_isViewportConstrained;
</ins><span class="cx">
</span><span class="cx"> if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer))
</span><span class="cx"> maskLayer->commitLayerChangesBeforeSublayers(childCommitState, pageScaleFactor, baseRelativePosition);
</span><span class="lines">@@ -3673,12 +3673,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsLayerCA::setAllowsBackingStoreDetachment(bool allowDetachment)
</del><ins>+void GraphicsLayerCA::setIsViewportConstrained(bool isViewportConstrained)
</ins><span class="cx"> {
</span><del>- if (allowDetachment == m_allowsBackingStoreDetachment)
</del><ins>+ if (isViewportConstrained == m_isViewportConstrained)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_allowsBackingStoreDetachment = allowDetachment;
</del><ins>+ m_isViewportConstrained = isViewportConstrained;
</ins><span class="cx"> noteLayerPropertyChanged(CoverageRectChanged);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (186153 => 186154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2015-07-01 00:46:55 UTC (rev 186153)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2015-07-01 01:01:13 UTC (rev 186154)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> struct CommitState {
</span><span class="cx"> int treeDepth { 0 };
</span><span class="cx"> bool ancestorHasTransformAnimation { false };
</span><del>- bool ancestorsAllowBackingStoreDetachment { true };
</del><ins>+ bool ancestorIsViewportConstrained { false };
</ins><span class="cx"> };
</span><span class="cx"> void recursiveCommitChanges(const CommitState&, const TransformState&, float pageScaleFactor = 1, const FloatPoint& positionRelativeToBase = FloatPoint(), bool affectedByPageScale = false);
</span><span class="cx">
</span><span class="lines">@@ -195,8 +195,8 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isCommittingChanges() const override { return m_isCommittingChanges; }
</span><span class="cx">
</span><del>- WEBCORE_EXPORT virtual void setAllowsBackingStoreDetachment(bool) override;
- virtual bool allowsBackingStoreDetachment() const override { return m_allowsBackingStoreDetachment; }
</del><ins>+ WEBCORE_EXPORT virtual void setIsViewportConstrained(bool) override;
+ virtual bool isViewportConstrained() const override { return m_isViewportConstrained; }
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT virtual double backingStoreMemoryEstimate() const override;
</span><span class="cx">
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx"> const FloatRect& visibleRect() const { return m_visibleRect; }
</span><span class="cx"> const FloatRect& coverageRect() const { return m_coverageRect; }
</span><span class="cx">
</span><del>- void setVisibleAndCoverageRects(const VisibleAndCoverageRects&, bool allowBackingStoreDetachment);
</del><ins>+ void setVisibleAndCoverageRects(const VisibleAndCoverageRects&, bool isViewportConstrained);
</ins><span class="cx">
</span><span class="cx"> static FloatRect adjustTiledLayerVisibleRect(TiledBacking*, const FloatRect& oldVisibleRect, const FloatRect& newVisibleRect, const FloatSize& oldSize, const FloatSize& newSize);
</span><span class="cx">
</span><span class="lines">@@ -513,7 +513,7 @@
</span><span class="cx"> ContentsLayerPurpose m_contentsLayerPurpose { NoContentsLayer };
</span><span class="cx"> bool m_needsFullRepaint : 1;
</span><span class="cx"> bool m_usingBackdropLayerType : 1;
</span><del>- bool m_allowsBackingStoreDetachment : 1;
</del><ins>+ bool m_isViewportConstrained : 1;
</ins><span class="cx"> bool m_intersectsCoverageRect : 1;
</span><span class="cx">
</span><span class="cx"> Color m_contentsSolidColor;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (186153 => 186154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-07-01 00:46:55 UTC (rev 186153)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-07-01 01:01:13 UTC (rev 186154)
</span><span class="lines">@@ -1608,7 +1608,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayerBacking::setIsScrollCoordinatedWithViewportConstrainedRole(bool viewportCoordinated)
</span><span class="cx"> {
</span><del>- m_graphicsLayer->setAllowsBackingStoreDetachment(!viewportCoordinated);
</del><ins>+ m_graphicsLayer->setIsViewportConstrained(viewportCoordinated);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GraphicsLayerPaintingPhase RenderLayerBacking::paintingPhaseForPrimaryLayer() const
</span></span></pre>
</div>
</div>
</body>
</html>