<!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>[195580] 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/195580">195580</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-01-25 21:41:44 -0800 (Mon, 25 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>DisplayList items can log paths now
https://bugs.webkit.org/show_bug.cgi?id=153417

Reviewed by Zalan Bujtas.

Now that Path supports TextStream logging, clean up its output a little and
enable dumping of Paths in DisplayListItems.

* platform/graphics/Path.cpp:
(WebCore::operator&lt;&lt;):
* platform/graphics/displaylists/DisplayListItems.cpp:
(WebCore::DisplayList::operator&lt;&lt;):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPathcpp">trunk/Source/WebCore/platform/graphics/Path.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListItemscpp">trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195579 => 195580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-01-26 05:40:28 UTC (rev 195579)
+++ trunk/Source/WebCore/ChangeLog        2016-01-26 05:41:44 UTC (rev 195580)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-01-25  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+        DisplayList items can log paths now
+        https://bugs.webkit.org/show_bug.cgi?id=153417
+
+        Reviewed by Zalan Bujtas.
+
+        Now that Path supports TextStream logging, clean up its output a little and
+        enable dumping of Paths in DisplayListItems.
+
+        * platform/graphics/Path.cpp:
+        (WebCore::operator&lt;&lt;):
+        * platform/graphics/displaylists/DisplayListItems.cpp:
+        (WebCore::DisplayList::operator&lt;&lt;):
+
</ins><span class="cx"> 2016-01-25  Antti Koivisto  &lt;antti@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Fix the comment.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Path.cpp (195579 => 195580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Path.cpp        2016-01-26 05:40:28 UTC (rev 195579)
+++ trunk/Source/WebCore/platform/graphics/Path.cpp        2016-01-26 05:41:44 UTC (rev 195580)
</span><span class="lines">@@ -194,25 +194,26 @@
</span><span class="cx"> 
</span><span class="cx"> TextStream&amp; operator&lt;&lt;(TextStream&amp; stream, const Path&amp; path)
</span><span class="cx"> {
</span><del>-    TextStream::GroupScope group(stream);
-    stream &lt;&lt; &quot;path &quot; &lt;&lt; &amp;path;
-
-    path.apply([&amp;stream](const PathElement&amp; element) {
</del><ins>+    bool isFirst = true;
+    path.apply([&amp;stream, &amp;isFirst](const PathElement&amp; element) {
+        if (!isFirst)
+            stream &lt;&lt; &quot;, &quot;;
+        isFirst = false;
</ins><span class="cx">         switch (element.type) {
</span><span class="cx">         case PathElementMoveToPoint: // The points member will contain 1 value.
</span><del>-            stream &lt;&lt; &quot; move to &quot; &lt;&lt; element.points[0];
</del><ins>+            stream &lt;&lt; &quot;move to &quot; &lt;&lt; element.points[0];
</ins><span class="cx">             break;
</span><span class="cx">         case PathElementAddLineToPoint: // The points member will contain 1 value.
</span><del>-            stream &lt;&lt; &quot; add line to &quot; &lt;&lt; element.points[0];
</del><ins>+            stream &lt;&lt; &quot;add line to &quot; &lt;&lt; element.points[0];
</ins><span class="cx">             break;
</span><span class="cx">         case PathElementAddQuadCurveToPoint: // The points member will contain 2 values.
</span><del>-            stream &lt;&lt; &quot; add quad curve to &quot; &lt;&lt; element.points[0] &lt;&lt; &quot; &quot; &lt;&lt; element.points[1];
</del><ins>+            stream &lt;&lt; &quot;add quad curve to &quot; &lt;&lt; element.points[0] &lt;&lt; &quot; &quot; &lt;&lt; element.points[1];
</ins><span class="cx">             break;
</span><span class="cx">         case PathElementAddCurveToPoint: // The points member will contain 3 values.
</span><del>-            stream &lt;&lt; &quot; add curve to &quot; &lt;&lt; element.points[0] &lt;&lt; &quot; &quot; &lt;&lt; element.points[1] &lt;&lt; &quot; &quot; &lt;&lt; element.points[2];
</del><ins>+            stream &lt;&lt; &quot;add curve to &quot; &lt;&lt; element.points[0] &lt;&lt; &quot; &quot; &lt;&lt; element.points[1] &lt;&lt; &quot; &quot; &lt;&lt; element.points[2];
</ins><span class="cx">             break;
</span><span class="cx">         case PathElementCloseSubpath: // The points member will contain no values.
</span><del>-            stream &lt;&lt; &quot; close subpath&quot;;
</del><ins>+            stream &lt;&lt; &quot;close subpath&quot;;
</ins><span class="cx">             break;
</span><span class="cx">         }
</span><span class="cx">     });
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListItemscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp (195579 => 195580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp        2016-01-26 05:40:28 UTC (rev 195579)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp        2016-01-26 05:41:44 UTC (rev 195580)
</span><span class="lines">@@ -326,9 +326,9 @@
</span><span class="cx">     context.clipOut(m_path);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static TextStream&amp; operator&lt;&lt;(TextStream&amp; ts, const ClipOutToPath&amp;)
</del><ins>+static TextStream&amp; operator&lt;&lt;(TextStream&amp; ts, const ClipOutToPath&amp; item)
</ins><span class="cx"> {
</span><del>-//    ts.dumpProperty(&quot;path&quot;, item.path()); // FIXME: path logging.
</del><ins>+    ts.dumpProperty(&quot;path&quot;, item.path());
</ins><span class="cx">     return ts;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx"> 
</span><span class="cx"> static TextStream&amp; operator&lt;&lt;(TextStream&amp; ts, const ClipPath&amp; item)
</span><span class="cx"> {
</span><del>-//    ts.dumpProperty(&quot;path&quot;, item.path()); // FIXME: path logging.
</del><ins>+    ts.dumpProperty(&quot;path&quot;, item.path());
</ins><span class="cx">     ts.dumpProperty(&quot;wind-rule&quot;, item.windRule());
</span><span class="cx">     return ts;
</span><span class="cx"> }
</span><span class="lines">@@ -809,7 +809,7 @@
</span><span class="cx"> static TextStream&amp; operator&lt;&lt;(TextStream&amp; ts, const FillPath&amp; item)
</span><span class="cx"> {
</span><span class="cx">     ts &lt;&lt; static_cast&lt;const DrawingItem&amp;&gt;(item);
</span><del>-//    ts.dumpProperty(&quot;path&quot;, item.path()); // FIXME: path logging.
</del><ins>+    ts.dumpProperty(&quot;path&quot;, item.path());
</ins><span class="cx">     return ts;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -863,7 +863,7 @@
</span><span class="cx"> static TextStream&amp; operator&lt;&lt;(TextStream&amp; ts, const StrokePath&amp; item)
</span><span class="cx"> {
</span><span class="cx">     ts &lt;&lt; static_cast&lt;const DrawingItem&amp;&gt;(item);
</span><del>-//    ts.dumpProperty(&quot;path&quot;, item.path()); // FIXME: path logging.
</del><ins>+    ts.dumpProperty(&quot;path&quot;, item.path());
</ins><span class="cx">     return ts;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>