cc: Add trace output for individual DisplayItems

cc/resources/clip_display_item.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/clip_display_item.h"
 
+#include <string>
+
+#include "base/strings/stringprintf.h"
+#include "base/trace_event/trace_event_argument.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "ui/gfx/skia_util.h"
 
 namespace cc {
 
 ClipDisplayItem::ClipDisplayItem(gfx::Rect clip_rect,
                                  const std::vector<SkRRect>& rounded_clip_rects)
     : clip_rect_(clip_rect), rounded_clip_rects_(rounded_clip_rects) {
 }
 
 ClipDisplayItem::~ClipDisplayItem() {
 }
@@ skipping 23 matching lines @@
 }
 
 size_t ClipDisplayItem::PictureMemoryUsage() const {
   size_t total_size = sizeof(gfx::Rect);
   for (size_t i = 0; i < rounded_clip_rects_.size(); ++i) {
     total_size += sizeof(rounded_clip_rects_[i]);
   }
   return total_size;
 }
 
+void ClipDisplayItem::AsValueInto(base::debug::TracedValue* array) const {
+  std::string value = base::StringPrintf("ClipDisplayItem rect: [%s]",
+                                         clip_rect_.ToString().c_str());
+  for (size_t i = 0; i < rounded_clip_rects_.size(); ++i) {

[pdr., 2015/02/02 22:22:16]

You can use a fancy c++11 iterator here to clean up the duplicated
rounded_clip_rects_[i] calls. (here, and elsewhere)

Something like:
for (auto clip_rect : rounded_clip_rects) {
 ...
}

[ajuma, 2015/02/02 23:02:21]

Done.

+    base::StringAppendF(
+        &value, " rounded_rect: [rect: [%s]",
+        gfx::SkRectToRectF(rounded_clip_rects_[i].rect()).ToString().c_str());
+    base::StringAppendF(&value, " radii: [");
+    SkVector upper_left_radius =
+        rounded_clip_rects_[i].radii(SkRRect::kUpperLeft_Corner);
+    base::StringAppendF(&value, "[%f %f]", upper_left_radius.x(),

[pdr., 2015/02/02 22:22:16]

Can you double-check that the output of these is valid json? I think we need a
comma here. (here, and elsewhere)

[ajuma, 2015/02/02 23:02:21]

Added commas.

The overall output for the list is valid json -- each item is outputting a
single string (except for DrawingDIsplayItems, which are outputting a dictionary
since they're including an SkPicture in their output), so the contents of that
string can be arbitrary. If the plan is to parse each item's string (so that
each such string should itself be valid json), then switching it to a dictionary
might be better. What works better with your tracing patch?

+                        upper_left_radius.y());
+    SkVector upper_right_radius =
+        rounded_clip_rects_[i].radii(SkRRect::kUpperRight_Corner);
+    base::StringAppendF(&value, " [%f %f]", upper_right_radius.x(),
+                        upper_right_radius.y());
+    SkVector lower_right_radius =
+        rounded_clip_rects_[i].radii(SkRRect::kLowerRight_Corner);
+    base::StringAppendF(&value, " [%f %f]", lower_right_radius.x(),
+                        lower_right_radius.y());
+    SkVector lower_left_radius =
+        rounded_clip_rects_[i].radii(SkRRect::kLowerLeft_Corner);
+    base::StringAppendF(&value, " [%f %f]]", lower_left_radius.x(),
+                        lower_left_radius.y());
+  }
+  array->AppendString(value);
+}
+
 EndClipDisplayItem::EndClipDisplayItem() {
 }
 
 EndClipDisplayItem::~EndClipDisplayItem() {
 }
 
 void EndClipDisplayItem::Raster(SkCanvas* canvas,
                                 SkDrawPictureCallback* callback) const {
   canvas->restore();
 }
 
 bool EndClipDisplayItem::IsSuitableForGpuRasterization() const {
   return true;
 }
 
 int EndClipDisplayItem::ApproximateOpCount() const {
   return 0;
 }
 
 size_t EndClipDisplayItem::PictureMemoryUsage() const {
   return 0;
 }
 
+void EndClipDisplayItem::AsValueInto(base::debug::TracedValue* array) const {
+  array->AppendString("EndClipDisplayItem");
+}
+
 }  // namespace cc