<!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>[167246] 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/167246">167246</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-04-14 08:42:28 -0700 (Mon, 14 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Lots of compositing test failures after <a href="http://trac.webkit.org/projects/webkit/changeset/167152">r167152</a>
https://bugs.webkit.org/show_bug.cgi?id=131574
Reviewed by Darin Adler.
* platform/graphics/GraphicsLayer.cpp:
(WebCore::dumpChildren):
(WebCore::GraphicsLayer::dumpProperties):
Make child-dumping recursive so that we can easily skip layers up to any depth.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167245 => 167246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-14 15:35:02 UTC (rev 167245)
+++ trunk/Source/WebCore/ChangeLog 2014-04-14 15:42:28 UTC (rev 167246)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-04-14 Tim Horton <timothy_horton@apple.com>
+
+ Lots of compositing test failures after r167152
+ https://bugs.webkit.org/show_bug.cgi?id=131574
+
+ Reviewed by Darin Adler.
+
+ * platform/graphics/GraphicsLayer.cpp:
+ (WebCore::dumpChildren):
+ (WebCore::GraphicsLayer::dumpProperties):
+ Make child-dumping recursive so that we can easily skip layers up to any depth.
+
</ins><span class="cx"> 2014-04-14 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Fix incorrect indentations in CodeGeneratorJS.pm introduced in r165521
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (167245 => 167246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2014-04-14 15:35:02 UTC (rev 167245)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2014-04-14 15:42:28 UTC (rev 167246)
</span><span class="lines">@@ -589,6 +589,20 @@
</span><span class="cx"> ts << ")\n";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void dumpChildren(TextStream& ts, const Vector<GraphicsLayer*>& children, unsigned& totalChildCount, int indent, LayerTreeAsTextBehavior behavior)
+{
+ totalChildCount += children.size();
+ for (auto* child : children) {
+ if (!child->client()->shouldSkipLayerInDump(child)) {
+ child->dumpLayer(ts, indent + 2, behavior);
+ continue;
+ }
+
+ totalChildCount--;
+ dumpChildren(ts, child->children(), totalChildCount, indent, behavior);
+ }
+}
+
</ins><span class="cx"> void GraphicsLayer::dumpProperties(TextStream& ts, int indent, LayerTreeAsTextBehavior behavior) const
</span><span class="cx"> {
</span><span class="cx"> if (m_position != FloatPoint()) {
</span><span class="lines">@@ -754,20 +768,10 @@
</span><span class="cx">
</span><span class="cx"> if (m_children.size()) {
</span><span class="cx"> TextStream childrenStream;
</span><del>- unsigned totalChildCount = m_children.size();
- for (size_t childIndex = 0; childIndex < m_children.size(); childIndex++) {
- GraphicsLayer* child = m_children[childIndex];
- if (!child->client()->shouldSkipLayerInDump(child)) {
- child->dumpLayer(childrenStream, indent + 2, behavior);
- continue;
- }
-
- const Vector<GraphicsLayer*>& grandChildren = child->children();
- totalChildCount += grandChildren.size() - 1;
- for (size_t grandChildIndex = 0; grandChildIndex < grandChildren.size(); grandChildIndex++)
- grandChildren[grandChildIndex]->dumpLayer(childrenStream, indent + 2, behavior);
- }
</del><span class="cx">
</span><ins>+ unsigned totalChildCount = 0;
+ dumpChildren(childrenStream, m_children, totalChildCount, indent, behavior);
+
</ins><span class="cx"> writeIndent(childrenStream, indent + 1);
</span><span class="cx"> childrenStream << ")\n";
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>