Paint Profiler: unroll SkPictures

Source/platform/graphics/LoggingCanvas.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 82 matching lines @@
 }
 
 PassRefPtr<JSONArray> arrayForSkPoints(size_t count, const SkPoint points[])
 {
     RefPtr<JSONArray> pointsArrayItem = JSONArray::create();
     for (size_t i = 0; i < count; ++i)
         pointsArrayItem->pushObject(objectForSkPoint(points[i]));
     return pointsArrayItem.release();
 }
 
-PassRefPtr<JSONObject> objectForSkPicture(const SkPicture& picture)
-{
-    const SkIRect bounds = picture.cullRect().roundOut();
-    RefPtr<JSONObject> pictureItem = JSONObject::create();
-    pictureItem->setNumber("width", bounds.width());
-    pictureItem->setNumber("height", bounds.height());
-    return pictureItem.release();
-}
-
 PassRefPtr<JSONObject> objectForRadius(const SkRRect& rrect, SkRRect::Corner corner)
 {
     RefPtr<JSONObject> radiusItem = JSONObject::create();
     SkVector radius = rrect.radii(corner);
     radiusItem->setNumber("xRadius", radius.x());
     radiusItem->setNumber("yRadius", radius.y());
     return radiusItem.release();
 }
 
 String rrectTypeName(SkRRect::Type type)
@@ skipping 656 matching lines @@
 void LoggingCanvas::onClipRegion(const SkRegion& region, SkRegion::Op op)
 {
     AutoLogger logger(this);
     RefPtr<JSONObject> params = logger.logItemWithParams("clipRegion");
     params->setString("op", regionOpName(op));
     this->SkCanvas::onClipRegion(region, op);
 }
 
 void LoggingCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint)
 {
-    AutoLogger logger(this);
-    logger.logItemWithParams("drawPicture")->setObject("picture", objectForSkPicture(*picture));

[f(malita), 2015/06/17 18:20:56]

It would be nice to provide some indication of picture grouping.  For the Skia
debugger, we solved this by injecting pairs of synthetic beginPicture/endPicture
ops in the UI (plus indentation).

Not sure whether that approach is applicable here, and I don't think it needs to
be tied to this CL - just a thought.

[caseq, 2015/06/17 18:29:47]

Yup, I agree. We need to figure out how to present it in the front-end though,
so let's do this in a separate patch.

-    this->SkCanvas::onDrawPicture(picture, matrix, paint);
+    this->unrollDrawPicture(picture, matrix, paint, nullptr);
 }
 
 void LoggingCanvas::didSetMatrix(const SkMatrix& matrix)
 {
     AutoLogger logger(this);
     RefPtr<JSONObject> params = logger.logItemWithParams("setMatrix");
     params->setArray("matrix", arrayForSkMatrix(matrix));
     this->SkCanvas::didSetMatrix(matrix);
 }
 
@@ skipping 66 matching lines @@
     return pictureAsJSON->toPrettyJSONString();
 }
 
 void showSkPicture(const SkPicture* picture)
 {
     WTFLogAlways("%s\n", pictureAsDebugString(picture).utf8().data());
 }
 #endif
 
 } // namespace blink