Changeset 195580 in webkit

Timestamp:

Jan 25, 2016 9:41:44 PM (8 years ago)

Author:

Simon Fraser

Message:

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<<):

• platform/graphics/displaylists/DisplayListItems.cpp:

(WebCore::DisplayList::operator<<):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Path.cpp (modified) (1 diff)
• platform/graphics/displaylists/DisplayListItems.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-25  Simon Fraser  <simon.fraser@apple.com>
+
+        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<<):
+        * platform/graphics/displaylists/DisplayListItems.cpp:
+        (WebCore::DisplayList::operator<<):
+
 2016-01-25  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/platform/graphics/Path.cpp

@@ -195 +195 @@
 TextStream& operator<<(TextStream& stream, const Path& path)
 {
-    TextStream::GroupScope group(stream);
-    stream << "path " << &path;
-
-    path.apply([&stream](const PathElement& element) {
+    bool isFirst = true;
+    path.apply([&stream, &isFirst](const PathElement& element) {
+        if (!isFirst)
+            stream << ", ";
+        isFirst = false;
         switch (element.type) {
         case PathElementMoveToPoint: // The points member will contain 1 value.
-            stream << " move to " << element.points[0];
+            stream << "move to " << element.points[0];
             break;
         case PathElementAddLineToPoint: // The points member will contain 1 value.
-            stream << " add line to " << element.points[0];
+            stream << "add line to " << element.points[0];
             break;
         case PathElementAddQuadCurveToPoint: // The points member will contain 2 values.
-            stream << " add quad curve to " << element.points[0] << " " << element.points[1];
+            stream << "add quad curve to " << element.points[0] << " " << element.points[1];
             break;
         case PathElementAddCurveToPoint: // The points member will contain 3 values.
-            stream << " add curve to " << element.points[0] << " " << element.points[1] << " " << element.points[2];
+            stream << "add curve to " << element.points[0] << " " << element.points[1] << " " << element.points[2];
             break;
         case PathElementCloseSubpath: // The points member will contain no values.
-            stream << " close subpath";
+            stream << "close subpath";
             break;
         }

trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp

@@ -327 +327 @@
 }
 
-static TextStream& operator<<(TextStream& ts, const ClipOutToPath&)
-{
-//    ts.dumpProperty("path", item.path()); // FIXME: path logging.
+static TextStream& operator<<(TextStream& ts, const ClipOutToPath& item)
+{
+    ts.dumpProperty("path", item.path());
     return ts;
 }
@@ -340 +340 @@
 static TextStream& operator<<(TextStream& ts, const ClipPath& item)
 {
-//    ts.dumpProperty("path", item.path()); // FIXME: path logging.
+    ts.dumpProperty("path", item.path());
     ts.dumpProperty("wind-rule", item.windRule());
     return ts;
@@ -810 +810 @@
 {
     ts << static_cast<const DrawingItem&>(item);
-//    ts.dumpProperty("path", item.path()); // FIXME: path logging.
+    ts.dumpProperty("path", item.path());
     return ts;
 }
@@ -864 +864 @@
 {
     ts << static_cast<const DrawingItem&>(item);
-//    ts.dumpProperty("path", item.path()); // FIXME: path logging.
+    ts.dumpProperty("path", item.path());
     return ts;
 }