<!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>[169096] 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/169096">169096</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-05-19 19:31:17 -0700 (Mon, 19 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correctly maintain the "isInWindow" state for all TiledBackings
https://bugs.webkit.org/show_bug.cgi?id=133095
Reviewed by Tim Horton.
We never updated the "isInWindow" state for TiledBacking that wasn't the RenderView's
backing. Fix it by having RenderLayerCompositor::setIsInWindow() recurse through all
layers (if necessary), updating their state. Also set the state on newly created
TiledBackings.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::layerTiledBackingUsageChanged):
(WebCore::RenderLayerCompositor::setIsInWindowForLayerIncludingDescendants):
(WebCore::RenderLayerCompositor::setIsInWindow):
(WebCore::RenderLayerCompositor::pageTiledBacking): Deleted.
* rendering/RenderLayerCompositor.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorh">trunk/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169095 => 169096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-20 02:22:35 UTC (rev 169095)
+++ trunk/Source/WebCore/ChangeLog 2014-05-20 02:31:17 UTC (rev 169096)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-05-19 Simon Fraser <simon.fraser@apple.com>
+
+ Correctly maintain the "isInWindow" state for all TiledBackings
+ https://bugs.webkit.org/show_bug.cgi?id=133095
+
+ Reviewed by Tim Horton.
+
+ We never updated the "isInWindow" state for TiledBacking that wasn't the RenderView's
+ backing. Fix it by having RenderLayerCompositor::setIsInWindow() recurse through all
+ layers (if necessary), updating their state. Also set the state on newly created
+ TiledBackings.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::layerTiledBackingUsageChanged):
+ (WebCore::RenderLayerCompositor::setIsInWindowForLayerIncludingDescendants):
+ (WebCore::RenderLayerCompositor::setIsInWindow):
+ (WebCore::RenderLayerCompositor::pageTiledBacking): Deleted.
+ * rendering/RenderLayerCompositor.h:
+
</ins><span class="cx"> 2014-05-19 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Use status display for live streams
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (169095 => 169096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-05-20 02:22:35 UTC (rev 169095)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-05-20 02:31:17 UTC (rev 169096)
</span><span class="lines">@@ -584,11 +584,14 @@
</span><span class="cx"> scheduleLayerFlush(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayerCompositor::layerTiledBackingUsageChanged(const GraphicsLayer*, bool usingTiledBacking)
</del><ins>+void RenderLayerCompositor::layerTiledBackingUsageChanged(const GraphicsLayer* graphicsLayer, bool usingTiledBacking)
</ins><span class="cx"> {
</span><del>- if (usingTiledBacking)
</del><ins>+ if (usingTiledBacking) {
</ins><span class="cx"> ++m_layersWithTiledBackingCount;
</span><del>- else {
</del><ins>+
+ if (Page* page = this->page())
+ graphicsLayer->tiledBacking()->setIsInWindow(page->isInWindow());
+ } else {
</ins><span class="cx"> ASSERT(m_layersWithTiledBackingCount > 0);
</span><span class="cx"> --m_layersWithTiledBackingCount;
</span><span class="cx"> }
</span><span class="lines">@@ -1913,17 +1916,23 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-TiledBacking* RenderLayerCompositor::pageTiledBacking() const
</del><ins>+void RenderLayerCompositor::setIsInWindowForLayerIncludingDescendants(RenderLayer& layer, bool isInWindow)
</ins><span class="cx"> {
</span><del>- RenderLayerBacking* renderViewBacking = m_renderView.layer()->backing();
- return renderViewBacking ? renderViewBacking->tiledBacking() : nullptr;
</del><ins>+ if (layer.isComposited() && layer.backing()->usingTiledBacking())
+ layer.backing()->tiledBacking()->setIsInWindow(isInWindow);
+
+ // No need to recurse if we don't have any other tiled layers.
+ if (hasNonMainLayersWithTiledBacking())
+ return;
+
+ for (RenderLayer* childLayer = layer.firstChild(); childLayer; childLayer = childLayer->nextSibling())
+ setIsInWindowForLayerIncludingDescendants(*childLayer, isInWindow);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayerCompositor::setIsInWindow(bool isInWindow)
</span><span class="cx"> {
</span><del>- if (TiledBacking* tiledBacking = pageTiledBacking())
- tiledBacking->setIsInWindow(isInWindow);
-
</del><ins>+ setIsInWindowForLayerIncludingDescendants(*m_renderView.layer(), isInWindow);
+
</ins><span class="cx"> if (!inCompositingMode())
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (169095 => 169096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-05-20 02:22:35 UTC (rev 169095)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-05-20 02:31:17 UTC (rev 169096)
</span><span class="lines">@@ -329,6 +329,7 @@
</span><span class="cx"> bool updateBacking(RenderLayer&, CompositingChangeRepaint shouldRepaint);
</span><span class="cx">
</span><span class="cx"> void clearBackingForLayerIncludingDescendants(RenderLayer&);
</span><ins>+ void setIsInWindowForLayerIncludingDescendants(RenderLayer&, bool isInWindow);
</ins><span class="cx">
</span><span class="cx"> // Repaint the given rect (which is layer's coords), and regions of child layers that intersect that rect.
</span><span class="cx"> void recursiveRepaintLayer(RenderLayer&, const IntRect* = nullptr);
</span><span class="lines">@@ -386,7 +387,6 @@
</span><span class="cx"> bool isFlushingLayers() const { return m_flushingLayers; }
</span><span class="cx">
</span><span class="cx"> Page* page() const;
</span><del>- TiledBacking* pageTiledBacking() const;
</del><span class="cx">
</span><span class="cx"> GraphicsLayerFactory* graphicsLayerFactory() const;
</span><span class="cx"> ScrollingCoordinator* scrollingCoordinator() const;
</span></span></pre>
</div>
</div>
</body>
</html>