<!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>[213429] 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/213429">213429</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-03-04 13:49:30 -0800 (Sat, 04 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clarify some terminology in RenderLayerBacking
https://bugs.webkit.org/show_bug.cgi?id=169174
Reviewed by Zalan Bujtas.
Rename some functions related to directly-composited background images and
box decorations for clarify.
Only behavior change is for canDirectlyCompositeBackgroundBackgroundImage() to check
GraphicsLayer::supportsContentsTiling(), which means that RenderLayerBacking::contentChanged()
will no longer trigger a updateGeometry() when it gets BackgroundImageChanged on non-
CoordinateGraphics platforms.
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateConfiguration):
(WebCore::RenderLayerBacking::updateAfterDescendants):
(WebCore::RenderLayerBacking::updateDirectlyCompositedBoxDecorations):
(WebCore::canDirectlyCompositeBackgroundBackgroundImage):
(WebCore::hasPaintedBoxDecorationsOrBackgroundImage):
(WebCore::supportsDirectlyCompositedBoxDecorations):
(WebCore::RenderLayerBacking::paintsBoxDecorations):
(WebCore::RenderLayerBacking::isSimpleContainerCompositingLayer):
(WebCore::RenderLayerBacking::contentChanged):
(WebCore::RenderLayerBacking::updateDirectlyCompositedContents): Deleted.
(WebCore::canCreateTiledImage): Deleted.
(WebCore::hasVisibleBoxDecorationsOrBackgroundImage): Deleted.
(WebCore::supportsDirectBoxDecorationsComposition): Deleted.
* rendering/RenderLayerBacking.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingh">trunk/Source/WebCore/rendering/RenderLayerBacking.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213428 => 213429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-04 21:05:31 UTC (rev 213428)
+++ trunk/Source/WebCore/ChangeLog 2017-03-04 21:49:30 UTC (rev 213429)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2017-03-04 Simon Fraser <simon.fraser@apple.com>
+
+ Clarify some terminology in RenderLayerBacking
+ https://bugs.webkit.org/show_bug.cgi?id=169174
+
+ Reviewed by Zalan Bujtas.
+
+ Rename some functions related to directly-composited background images and
+ box decorations for clarify.
+
+ Only behavior change is for canDirectlyCompositeBackgroundBackgroundImage() to check
+ GraphicsLayer::supportsContentsTiling(), which means that RenderLayerBacking::contentChanged()
+ will no longer trigger a updateGeometry() when it gets BackgroundImageChanged on non-
+ CoordinateGraphics platforms.
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateConfiguration):
+ (WebCore::RenderLayerBacking::updateAfterDescendants):
+ (WebCore::RenderLayerBacking::updateDirectlyCompositedBoxDecorations):
+ (WebCore::canDirectlyCompositeBackgroundBackgroundImage):
+ (WebCore::hasPaintedBoxDecorationsOrBackgroundImage):
+ (WebCore::supportsDirectlyCompositedBoxDecorations):
+ (WebCore::RenderLayerBacking::paintsBoxDecorations):
+ (WebCore::RenderLayerBacking::isSimpleContainerCompositingLayer):
+ (WebCore::RenderLayerBacking::contentChanged):
+ (WebCore::RenderLayerBacking::updateDirectlyCompositedContents): Deleted.
+ (WebCore::canCreateTiledImage): Deleted.
+ (WebCore::hasVisibleBoxDecorationsOrBackgroundImage): Deleted.
+ (WebCore::supportsDirectBoxDecorationsComposition): Deleted.
+ * rendering/RenderLayerBacking.h:
+
</ins><span class="cx"> 2017-03-04 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Cleanup after r213418
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (213428 => 213429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-03-04 21:05:31 UTC (rev 213428)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-03-04 21:49:30 UTC (rev 213429)
</span><span class="lines">@@ -607,12 +607,12 @@
</span><span class="cx"> m_graphicsLayer->setReplicatedByLayer(reflectionLayer);
</span><span class="cx"> }
</span><span class="cx"> } else
</span><del>- m_graphicsLayer->setReplicatedByLayer(0);
</del><ins>+ m_graphicsLayer->setReplicatedByLayer(nullptr);
</ins><span class="cx">
</span><span class="cx"> if (!m_owningLayer.isRootLayer()) {
</span><span class="cx"> bool isSimpleContainer = isSimpleContainerCompositingLayer();
</span><span class="cx"> bool didUpdateContentsRect = false;
</span><del>- updateDirectlyCompositedContents(isSimpleContainer, didUpdateContentsRect);
</del><ins>+ updateDirectlyCompositedBoxDecorations(isSimpleContainer, didUpdateContentsRect);
</ins><span class="cx"> } else
</span><span class="cx"> updateRootLayerConfiguration();
</span><span class="cx">
</span><span class="lines">@@ -1097,7 +1097,7 @@
</span><span class="cx"> bool didUpdateContentsRect = false;
</span><span class="cx"> // FIXME: this duplicates work we did in updateConfiguration().
</span><span class="cx"> isSimpleContainer = isSimpleContainerCompositingLayer();
</span><del>- updateDirectlyCompositedContents(isSimpleContainer, didUpdateContentsRect);
</del><ins>+ updateDirectlyCompositedBoxDecorations(isSimpleContainer, didUpdateContentsRect);
</ins><span class="cx"> if (!didUpdateContentsRect && m_graphicsLayer->usesContentsLayer())
</span><span class="cx"> resetContentsRect();
</span><span class="cx"> }
</span><span class="lines">@@ -1181,7 +1181,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayerBacking::updateDirectlyCompositedContents(bool isSimpleContainer, bool& didUpdateContentsRect)
</del><ins>+void RenderLayerBacking::updateDirectlyCompositedBoxDecorations(bool isSimpleContainer, bool& didUpdateContentsRect)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_owningLayer.hasVisibleContent())
</span><span class="cx"> return;
</span><span class="lines">@@ -1710,8 +1710,11 @@
</span><span class="cx"> return style.hasVisibleBorder() || style.hasBorderRadius() || style.hasOutline() || style.hasAppearance() || style.boxShadow() || style.hasFilter();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool canCreateTiledImage(const RenderStyle& style)
</del><ins>+static bool canDirectlyCompositeBackgroundBackgroundImage(const RenderStyle& style)
</ins><span class="cx"> {
</span><ins>+ if (!GraphicsLayer::supportsContentsTiling())
+ return false;
+
</ins><span class="cx"> auto& fillLayer = style.backgroundLayers();
</span><span class="cx"> if (fillLayer.next())
</span><span class="cx"> return false;
</span><span class="lines">@@ -1739,7 +1742,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool hasVisibleBoxDecorationsOrBackgroundImage(const RenderStyle& style)
</del><ins>+static bool hasPaintedBoxDecorationsOrBackgroundImage(const RenderStyle& style)
</ins><span class="cx"> {
</span><span class="cx"> if (hasVisibleBoxDecorations(style))
</span><span class="cx"> return true;
</span><span class="lines">@@ -1747,7 +1750,7 @@
</span><span class="cx"> if (!style.hasBackgroundImage())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return !GraphicsLayer::supportsContentsTiling() || !canCreateTiledImage(style);
</del><ins>+ return !canDirectlyCompositeBackgroundBackgroundImage(style);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool hasPerspectiveOrPreserves3D(const RenderStyle& style)
</span><span class="lines">@@ -1833,7 +1836,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool supportsDirectBoxDecorationsComposition(const RenderLayerModelObject& renderer)
</del><ins>+static bool supportsDirectlyCompositedBoxDecorations(const RenderLayerModelObject& renderer)
</ins><span class="cx"> {
</span><span class="cx"> if (!GraphicsLayer::supportsBackgroundColorContent())
</span><span class="cx"> return false;
</span><span class="lines">@@ -1842,7 +1845,7 @@
</span><span class="cx"> if (renderer.hasClip())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (hasVisibleBoxDecorationsOrBackgroundImage(style))
</del><ins>+ if (hasPaintedBoxDecorationsOrBackgroundImage(style))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // FIXME: We can't create a directly composited background if this
</span><span class="lines">@@ -1865,7 +1868,7 @@
</span><span class="cx"> if (!m_owningLayer.hasVisibleBoxDecorations())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return !supportsDirectBoxDecorationsComposition(renderer());
</del><ins>+ return !supportsDirectlyCompositedBoxDecorations(renderer());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderLayerBacking::paintsChildRenderers() const
</span><span class="lines">@@ -1927,7 +1930,7 @@
</span><span class="cx">
</span><span class="cx"> // Reject anything that has a border, a border-radius or outline,
</span><span class="cx"> // or is not a simple background (no background, or solid color).
</span><del>- if (hasVisibleBoxDecorationsOrBackgroundImage(rootObject->style()))
</del><ins>+ if (hasPaintedBoxDecorationsOrBackgroundImage(rootObject->style()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Now look at the body's renderer.
</span><span class="lines">@@ -1938,7 +1941,7 @@
</span><span class="cx"> if (!bodyRenderer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (hasVisibleBoxDecorationsOrBackgroundImage(bodyRenderer->style()))
</del><ins>+ if (hasPaintedBoxDecorationsOrBackgroundImage(bodyRenderer->style()))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2050,7 +2053,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ((changeType == BackgroundImageChanged) && canCreateTiledImage(renderer().style()))
</del><ins>+ if ((changeType == BackgroundImageChanged) && canDirectlyCompositeBackgroundBackgroundImage(renderer().style()))
</ins><span class="cx"> updateGeometry();
</span><span class="cx">
</span><span class="cx"> if ((changeType == MaskImageChanged) && m_maskLayer) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (213428 => 213429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2017-03-04 21:05:31 UTC (rev 213428)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2017-03-04 21:49:30 UTC (rev 213429)
</span><span class="lines">@@ -321,9 +321,10 @@
</span><span class="cx"> void updateImageContents();
</span><span class="cx">
</span><span class="cx"> Color rendererBackgroundColor() const;
</span><ins>+
+ void updateDirectlyCompositedBoxDecorations(bool isSimpleContainer, bool& didUpdateContentsRect);
</ins><span class="cx"> void updateDirectlyCompositedBackgroundColor(bool isSimpleContainer, bool& didUpdateContentsRect);
</span><span class="cx"> void updateDirectlyCompositedBackgroundImage(bool isSimpleContainer, bool& didUpdateContentsRect);
</span><del>- void updateDirectlyCompositedContents(bool isSimpleContainer, bool& didUpdateContentsRect);
</del><span class="cx">
</span><span class="cx"> void resetContentsRect();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>