Add tracing for ContentLayerDelegate paintContents and DisplayItemList commit.

Source/platform/graphics/ContentLayerDelegate.cpp

 /*
  * Copyright (C) 2012 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:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 10 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #include "platform/graphics/ContentLayerDelegate.h"
 
 #include "platform/EventTracer.h"
 #include "platform/RuntimeEnabledFeatures.h"
+#include "platform/TraceEvent.h"
+#include "platform/TracedValue.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/DisplayItemList.h"
 #include "platform/transforms/AffineTransform.h"
 #include "platform/transforms/TransformationMatrix.h"
 #include "public/platform/WebDisplayItemList.h"
 #include "public/platform/WebFloatRect.h"
 #include "public/platform/WebRect.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 
 namespace blink {
 
 ContentLayerDelegate::ContentLayerDelegate(GraphicsContextPainter* painter)
     : m_painter(painter)
 {
 }
 
 ContentLayerDelegate::~ContentLayerDelegate()
 {
 }
 
+PassRefPtr<TracedValue> toTracedValue(const WebRect& clip)
+{
+    RefPtr<TracedValue> tracedValue = TracedValue::create();
+    tracedValue->beginArray();
+    tracedValue->pushInteger(clip.x);
+    tracedValue->pushInteger(clip.y);
+    tracedValue->pushInteger(clip.x + clip.width);
+    tracedValue->pushInteger(clip.y + clip.height);

[Xianzhu, 2015/06/23 22:58:54]

The third and fourth values of rect might be ambiguous to readers. It seems that
we use width and height (e.g. GraphicsLayerDebugInfo and rectAsJSONArray in
GraphicsLayer.cpp) more than maxX, maxY in blink. Better to keep the
consistency.

[chrishtr, 2015/06/23 23:05:38]

Done.

+    tracedValue->endArray();
+    return tracedValue;
+}
+
 void ContentLayerDelegate::paintContents(
     SkCanvas* canvas, const WebRect& clip,
     WebContentLayerClient::PaintingControlSetting paintingControl)
 {
+    TRACE_EVENT1("blink,benchmark", "ContentLayerDelegate::paintContents", "clip_rect", toTracedValue(clip));
+
     ASSERT(!RuntimeEnabledFeatures::slimmingPaintEnabled());
 
     GraphicsContext::DisabledMode disabledMode = GraphicsContext::NothingDisabled;
     if (paintingControl == WebContentLayerClient::DisplayListPaintingDisabled
         || paintingControl == WebContentLayerClient::DisplayListConstructionDisabled)
         disabledMode = GraphicsContext::FullyDisabled;
     OwnPtr<GraphicsContext> context = GraphicsContext::deprecatedCreateWithCanvas(canvas, disabledMode);
 
     m_painter->paint(*context, clip);
 }
 
 void ContentLayerDelegate::paintContents(
     WebDisplayItemList* webDisplayItemList, const WebRect& clip,
     WebContentLayerClient::PaintingControlSetting paintingControl)
 {
+    TRACE_EVENT1("blink,benchmark", "ContentLayerDelegate::paintContents", "clip_rect", toTracedValue(clip));
+
     ASSERT(RuntimeEnabledFeatures::slimmingPaintEnabled());
 
     DisplayItemList* displayItemList = m_painter->displayItemList();
     ASSERT(displayItemList);
     displayItemList->setDisplayItemConstructionIsDisabled(
         paintingControl == WebContentLayerClient::DisplayListConstructionDisabled);
 
     // We also disable caching when Painting or Construction are disabled. In both cases we would like
     // to compare assuming the full cost of recording, not the cost of re-using cached content.
     if (paintingControl != WebContentLayerClient::PaintDefaultBehavior)
         displayItemList->invalidateAll();
 
     GraphicsContext::DisabledMode disabledMode = GraphicsContext::NothingDisabled;
     if (paintingControl == WebContentLayerClient::DisplayListPaintingDisabled
         || paintingControl == WebContentLayerClient::DisplayListConstructionDisabled)
         disabledMode = GraphicsContext::FullyDisabled;
     GraphicsContext context(displayItemList, disabledMode);
 
     m_painter->paint(context, clip);
 
     displayItemList->commitNewDisplayItemsAndAppendToWebDisplayItemList(webDisplayItemList);
 }
 
 } // namespace blink