Introduce builders for tracing event arguments

Source/core/rendering/RenderObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1446 matching lines @@
             paintInvalidationContainer = parentRenderFlowThread;
     }
     return paintInvalidationContainer ? paintInvalidationContainer : view();
 }
 
 bool RenderObject::isPaintInvalidationContainer() const
 {
     return hasLayer() && toRenderLayerModelObject(this)->layer()->isPaintInvalidationContainer();
 }
 
-template<typename T> PassRefPtr<JSONValue> jsonObjectForRect(const T& rect)
+template<typename T> void addJsonObjectForRect(TracedValue& value, const char* name, const T& rect)
 {
-    RefPtr<JSONObject> object = JSONObject::create();
-    object->setNumber("x", rect.x());
-    object->setNumber("y", rect.y());
-    object->setNumber("width", rect.width());
-    object->setNumber("height", rect.height());
-    return object.release();
+    value.beginDictionary(name)
+        .setDouble("x", rect.x())
+        .setDouble("y", rect.y())
+        .setDouble("width", rect.width())
+        .setDouble("height", rect.height())
+        .endDictionary();
 }
 
-static PassRefPtr<JSONValue> jsonObjectForPaintInvalidationInfo(const IntRect& rect, const String& invalidationReason)
+static PassRefPtr<TraceEvent::ConvertableToTraceFormat> jsonObjectForPaintInvalidationInfo(const IntRect& rect, const String& invalidationReason)
 {
-    RefPtr<JSONObject> object = JSONObject::create();
-    object->setValue("rect", jsonObjectForRect(rect));
-    object->setString("invalidation_reason", invalidationReason);
-    return object.release();
+    TracedValue value;
+    addJsonObjectForRect(value, "rect", rect);
+    value.setString("invalidation_reason", invalidationReason);
+    return value.finish();
 }
 
 LayoutRect RenderObject::computePaintInvalidationRect(const RenderLayerModelObject* paintInvalidationContainer) const
 {
     return clippedOverflowRectForPaintInvalidation(paintInvalidationContainer);
 }
 
 void RenderObject::invalidatePaintUsingContainer(const RenderLayerModelObject* paintInvalidationContainer, const IntRect& r, InvalidationReason invalidationReason) const
 {
     if (r.isEmpty())
         return;
 
     // FIXME: This should be an assert, but editing/selection can trigger this case to invalidate
     // the selection. crbug.com/368140.
     if (!isRooted())
         return;
 
     TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject::invalidatePaintUsingContainer()",
         "object", this->debugName().ascii(),
-        "info", TracedValue::fromJSONValue(jsonObjectForPaintInvalidationInfo(r, invalidationReasonToString(invalidationReason))));
+        "info", jsonObjectForPaintInvalidationInfo(r, invalidationReasonToString(invalidationReason)));
 
     // For querying RenderLayer::compositingState()
     DisableCompositingQueryAsserts disabler;
 
     if (paintInvalidationContainer->isRenderFlowThread()) {
         toRenderFlowThread(paintInvalidationContainer)->repaintRectangleInRegions(r);
         return;
     }
 
     if (paintInvalidationContainer->hasFilter() && paintInvalidationContainer->layer()->requiresFullLayerImageForFilters()) {
@@ skipping 97 matching lines @@
         return;
 
     clearPaintInvalidationState();
 
     for (RenderObject* child = slowFirstChild(); child; child = child->nextSibling()) {
         if (!child->isOutOfFlowPositioned())
             child->invalidateTreeAfterLayout(paintInvalidationContainer);
     }
 }
 
-static PassRefPtr<JSONValue> jsonObjectForOldAndNewRects(const LayoutRect& oldRect, const LayoutRect& newRect)
+static PassRefPtr<TraceEvent::ConvertableToTraceFormat> jsonObjectForOldAndNewRects(const LayoutRect& oldRect, const LayoutRect& newRect)
 {
-    RefPtr<JSONObject> object = JSONObject::create();
-
-    object->setValue("old", jsonObjectForRect(oldRect));
-    object->setValue("new", jsonObjectForRect(newRect));
-    return object.release();
+    TracedValue value;
+    addJsonObjectForRect(value, "old", oldRect);
+    addJsonObjectForRect(value, "new", newRect);
+    return value.finish();
 }
 
 bool RenderObject::invalidatePaintAfterLayoutIfNeeded(const RenderLayerModelObject* paintInvalidationContainer, InvalidationReason invalidationReason,
     const LayoutRect& oldBounds, const LayoutPoint& oldLocation, const LayoutRect* newBoundsPtr, const LayoutPoint* newLocationPtr)
 {
     RenderView* v = view();
     if (v->document().printing())
         return false; // Don't invalidate paints if we're printing.
 
     // This ASSERT fails due to animations.  See https://bugs.webkit.org/show_bug.cgi?id=37048
     // ASSERT(!newBoundsPtr || *newBoundsPtr == clippedOverflowRectForPaintInvalidation(paintInvalidationContainer));
     LayoutRect newBounds = newBoundsPtr ? *newBoundsPtr : computePaintInvalidationRect();
     LayoutPoint newLocation = newLocationPtr ? (*newLocationPtr) : RenderLayer::positionFromPaintInvalidationContainer(this, paintInvalidationContainer);
 
     // FIXME: This should use a ConvertableToTraceFormat when they are available in Blink.
     TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject::invalidatePaintAfterLayoutIfNeeded()",
         "object", this->debugName().ascii(),
-        "info", TracedValue::fromJSONValue(jsonObjectForOldAndNewRects(oldBounds, newBounds)));
+        "info", jsonObjectForOldAndNewRects(oldBounds, newBounds));
 
     // Presumably a background or a border exists if border-fit:lines was specified.
     if (invalidationReason == InvalidationIncremental && style()->borderFit() == BorderFitLines)
         invalidationReason = InvalidationBorderFitLines;
 
     if (invalidationReason == InvalidationIncremental && style()->hasBorderRadius()) {
         // If a border-radius exists and width/height is smaller than
         // radius width/height, we cannot use delta-paint-invalidation.
         RoundedRect oldRoundedRect = style()->getRoundedBorderFor(oldBounds);
         RoundedRect newRoundedRect = style()->getRoundedBorderFor(newBounds);
@@ skipping 1861 matching lines @@
 {
     if (object1) {
         const WebCore::RenderObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
     }
 }
 
 #endif