<!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>[173226] 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/173226">173226</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-09-03 14:18:05 -0700 (Wed, 03 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Dump SimpleLineLayout info in showRenderTree() output
https://bugs.webkit.org/show_bug.cgi?id=136489
Reviewed by Zalan Bujtas.
Include info about SimpleLineLayout to showRenderTree() output.
Also show RenderText length, and truncate the RenderText contents
to 80 chars (since the string is replicated in inline boxes or simple line layout output).
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::showLineTreeAndMark):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::showRenderObject):
* rendering/SimpleLineLayoutFunctions.cpp:
(WebCore::SimpleLineLayout::printPrefix):
(WebCore::SimpleLineLayout::showLineTreeForFlow):
* rendering/SimpleLineLayoutFunctions.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp">trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFunctionsh">trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173225 => 173226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-03 21:01:43 UTC (rev 173225)
+++ trunk/Source/WebCore/ChangeLog 2014-09-03 21:18:05 UTC (rev 173226)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-09-03 Simon Fraser <simon.fraser@apple.com>
+
+ Dump SimpleLineLayout info in showRenderTree() output
+ https://bugs.webkit.org/show_bug.cgi?id=136489
+
+ Reviewed by Zalan Bujtas.
+
+ Include info about SimpleLineLayout to showRenderTree() output.
+
+ Also show RenderText length, and truncate the RenderText contents
+ to 80 chars (since the string is replicated in inline boxes or simple line layout output).
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::showLineTreeAndMark):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::showRenderObject):
+ * rendering/SimpleLineLayoutFunctions.cpp:
+ (WebCore::SimpleLineLayout::printPrefix):
+ (WebCore::SimpleLineLayout::showLineTreeForFlow):
+ * rendering/SimpleLineLayoutFunctions.h:
+
</ins><span class="cx"> 2014-09-03 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> iOS build fix after r173217
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (173225 => 173226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-09-03 21:01:43 UTC (rev 173225)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-09-03 21:18:05 UTC (rev 173226)
</span><span class="lines">@@ -3507,6 +3507,9 @@
</span><span class="cx"> {
</span><span class="cx"> for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRootBox())
</span><span class="cx"> root->showLineTreeAndMark(markedBox, depth);
</span><ins>+
+ if (auto simpleLineLayout = this->simpleLineLayout())
+ SimpleLineLayout::showLineLayoutForFlow(*this, *simpleLineLayout, depth);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (173225 => 173226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-09-03 21:01:43 UTC (rev 173225)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-09-03 21:18:05 UTC (rev 173226)
</span><span class="lines">@@ -1549,9 +1549,17 @@
</span><span class="cx"> fprintf(stderr, " node->(%p)", node());
</span><span class="cx"> if (node()->isTextNode()) {
</span><span class="cx"> String value = node()->nodeValue();
</span><ins>+ fprintf(stderr, " length->(%u)", value.length());
+
</ins><span class="cx"> value.replaceWithLiteral('\\', "\\\\");
</span><span class="cx"> value.replaceWithLiteral('\n', "\\n");
</span><del>- fprintf(stderr, " \"%s\"", value.utf8().data());
</del><ins>+
+ const int maxPrintedLength = 80;
+ if (value.length() > maxPrintedLength) {
+ String substring = value.substring(0, maxPrintedLength);
+ fprintf(stderr, " \"%s\"...", substring.utf8().data());
+ } else
+ fprintf(stderr, " \"%s\"", value.utf8().data());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (173225 => 173226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2014-09-03 21:01:43 UTC (rev 173225)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2014-09-03 21:18:05 UTC (rev 173226)
</span><span class="lines">@@ -200,5 +200,33 @@
</span><span class="cx"> return quads;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#ifndef NDEBUG
+static void printPrefix(int& printedCharacters, int depth)
+{
+ fprintf(stderr, "------- --");
+ printedCharacters = 0;
+ while (++printedCharacters <= depth * 2)
+ fputc(' ', stderr);
</ins><span class="cx"> }
</span><ins>+
+void showLineLayoutForFlow(const RenderBlockFlow& flow, const Layout& layout, int depth)
+{
+ int printedCharacters = 0;
+ printPrefix(printedCharacters, depth);
+
+ fprintf(stderr, "SimpleLineLayout (%u lines, %u runs) (%p)\n", layout.lineCount(), layout.runCount(), &layout);
+ ++depth;
+
+ auto resolver = runResolver(flow, layout);
+ for (auto it = resolver.begin(), end = resolver.end(); it != end; ++it) {
+ const auto& run = *it;
+ LayoutRect r = run.rect();
+ printPrefix(printedCharacters, depth);
+ fprintf(stderr, "line %u run(%u, %u) (%.2f, %.2f) (%.2f, %.2f) \"%s\"\n", run.lineIndex(), run.start(), run.end(),
+ r.x().toFloat(), r.y().toFloat(), r.width().toFloat(), r.height().toFloat(), run.text().utf8().data());
+ }
</ins><span class="cx"> }
</span><ins>+#endif
+
+}
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h (173225 => 173226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h 2014-09-03 21:01:43 UTC (rev 173225)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h 2014-09-03 21:18:05 UTC (rev 173226)
</span><span class="lines">@@ -63,6 +63,10 @@
</span><span class="cx"> LayoutUnit lineHeightFromFlow(const RenderBlockFlow&);
</span><span class="cx"> LayoutUnit baselineFromFlow(const RenderBlockFlow&);
</span><span class="cx">
</span><ins>+#ifndef NDEBUG
+void showLineLayoutForFlow(const RenderBlockFlow&, const Layout&, int depth);
+#endif
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace SimpleLineLayout {
</span></span></pre>
</div>
</div>
</body>
</html>