Revert of DevTools: simplify JSONValues API, prepare to the OwnPtr migration.

third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp

 /*
  * Copyright (C) 2009 Apple 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 562 matching lines @@
     if (a.y() != b.y())
         return a.y() > b.y();
     if (a.width() != b.width())
         return a.width() > b.width();
     return a.height() > b.height();
 }
 
 template <typename T>
 static PassRefPtr<JSONArray> pointAsJSONArray(const T& point)
 {
-    RefPtr<JSONArray> array = JSONArray::create();
+    RefPtr<JSONArray> array = adoptRef(new JSONArray);
     array->pushNumber(point.x());
     array->pushNumber(point.y());
     return array;
 }
 
 template <typename T>
 static PassRefPtr<JSONArray> sizeAsJSONArray(const T& size)
 {
-    RefPtr<JSONArray> array = JSONArray::create();
+    RefPtr<JSONArray> array = adoptRef(new JSONArray);
     array->pushNumber(size.width());
     array->pushNumber(size.height());
     return array;
 }
 
 template <typename T>
 static PassRefPtr<JSONArray> rectAsJSONArray(const T& rect)
 {
-    RefPtr<JSONArray> array = JSONArray::create();
+    RefPtr<JSONArray> array = adoptRef(new JSONArray);
     array->pushNumber(rect.x());
     array->pushNumber(rect.y());
     array->pushNumber(rect.width());
     array->pushNumber(rect.height());
     return array;
 }
 
 static double roundCloseToZero(double number)
 {
     return std::abs(number) < 1e-7 ? 0 : number;
 }
 
 static PassRefPtr<JSONArray> transformAsJSONArray(const TransformationMatrix& t)
 {
-    RefPtr<JSONArray> array = JSONArray::create();
+    RefPtr<JSONArray> array = adoptRef(new JSONArray);
     {
-        RefPtr<JSONArray> row = JSONArray::create();
+        RefPtr<JSONArray> row = adoptRef(new JSONArray);
         row->pushNumber(roundCloseToZero(t.m11()));
         row->pushNumber(roundCloseToZero(t.m12()));
         row->pushNumber(roundCloseToZero(t.m13()));
         row->pushNumber(roundCloseToZero(t.m14()));
         array->pushArray(row);
     }
     {
-        RefPtr<JSONArray> row = JSONArray::create();
+        RefPtr<JSONArray> row = adoptRef(new JSONArray);
         row->pushNumber(roundCloseToZero(t.m21()));
         row->pushNumber(roundCloseToZero(t.m22()));
         row->pushNumber(roundCloseToZero(t.m23()));
         row->pushNumber(roundCloseToZero(t.m24()));
         array->pushArray(row);
     }
     {
-        RefPtr<JSONArray> row = JSONArray::create();
+        RefPtr<JSONArray> row = adoptRef(new JSONArray);
         row->pushNumber(roundCloseToZero(t.m31()));
         row->pushNumber(roundCloseToZero(t.m32()));
         row->pushNumber(roundCloseToZero(t.m33()));
         row->pushNumber(roundCloseToZero(t.m34()));
         array->pushArray(row);
     }
     {
-        RefPtr<JSONArray> row = JSONArray::create();
+        RefPtr<JSONArray> row = adoptRef(new JSONArray);
         row->pushNumber(roundCloseToZero(t.m41()));
         row->pushNumber(roundCloseToZero(t.m42()));
         row->pushNumber(roundCloseToZero(t.m43()));
         row->pushNumber(roundCloseToZero(t.m44()));
         array->pushArray(row);
     }
     return array;
 }
 
 static String pointerAsString(const void* ptr)
 {
     TextStream ts;
     ts << ptr;
     return ts.release();
 }
 
 PassRefPtr<JSONObject> GraphicsLayer::layerTreeAsJSON(LayerTreeFlags flags, RenderingContextMap& renderingContextMap) const
 {
-    RefPtr<JSONObject> json = JSONObject::create();
+    RefPtr<JSONObject> json = adoptRef(new JSONObject);
 
     if (flags & LayerTreeIncludesDebugInfo) {
         json->setString("this", pointerAsString(this));
         json->setString("debugName", m_client->debugName(this));
     }
 
     if (m_position != FloatPoint())
         json->setArray("position", pointAsJSONArray(m_position));
 
     if (m_hasTransformOrigin && m_transformOrigin != FloatPoint3D(m_size.width() * 0.5f, m_size.height() * 0.5f, 0))
@@ skipping 51 matching lines @@
 
     if (m_replicatedLayer)
         json->setString("replicatedLayer", flags & LayerTreeIncludesDebugInfo ? pointerAsString(m_replicatedLayer) : "");
 
     PaintInvalidationTrackingMap::iterator it = paintInvalidationTrackingMap().find(this);
     if (it != paintInvalidationTrackingMap().end()) {
         if (flags & LayerTreeIncludesPaintInvalidationRects) {
             Vector<FloatRect>& rects = it->value.invalidationRects;
             if (!rects.isEmpty()) {
                 std::sort(rects.begin(), rects.end(), &compareFloatRects);
-                RefPtr<JSONArray> rectsJSON = JSONArray::create();
+                RefPtr<JSONArray> rectsJSON = adoptRef(new JSONArray);
                 for (auto& rect : rects) {
                     if (rect.isEmpty())
                         continue;
                     rectsJSON->pushArray(rectAsJSONArray(rect));
                 }
                 json->setArray("repaintRects", rectsJSON);
             }
         }
 
         if (flags & LayerTreeIncludesPaintInvalidationObjects) {
             Vector<String>& clients = it->value.invalidationObjects;
             if (!clients.isEmpty()) {
-                RefPtr<JSONArray> clientsJSON = JSONArray::create();
+                RefPtr<JSONArray> clientsJSON = adoptRef(new JSONArray);
                 for (auto& clientString : clients)
                     clientsJSON->pushString(clientString);
                 json->setArray("paintInvalidationClients", clientsJSON);
             }
         }
     }
 
     if ((flags & LayerTreeIncludesPaintingPhases) && m_paintingPhase) {
-        RefPtr<JSONArray> paintingPhasesJSON = JSONArray::create();
+        RefPtr<JSONArray> paintingPhasesJSON = adoptRef(new JSONArray);
         if (m_paintingPhase & GraphicsLayerPaintBackground)
             paintingPhasesJSON->pushString("GraphicsLayerPaintBackground");
         if (m_paintingPhase & GraphicsLayerPaintForeground)
             paintingPhasesJSON->pushString("GraphicsLayerPaintForeground");
         if (m_paintingPhase & GraphicsLayerPaintMask)
             paintingPhasesJSON->pushString("GraphicsLayerPaintMask");
         if (m_paintingPhase & GraphicsLayerPaintChildClippingMask)
             paintingPhasesJSON->pushString("GraphicsLayerPaintChildClippingMask");
         if (m_paintingPhase & GraphicsLayerPaintOverflowContents)
             paintingPhasesJSON->pushString("GraphicsLayerPaintOverflowContents");
         if (m_paintingPhase & GraphicsLayerPaintCompositedScroll)
             paintingPhasesJSON->pushString("GraphicsLayerPaintCompositedScroll");
         json->setArray("paintingPhases", paintingPhasesJSON);
     }
 
     if (flags & LayerTreeIncludesClipAndScrollParents) {
         if (m_hasScrollParent)
             json->setBoolean("hasScrollParent", true);
         if (m_hasClipParent)
             json->setBoolean("hasClipParent", true);
     }
 
     if (flags & (LayerTreeIncludesDebugInfo | LayerTreeIncludesCompositingReasons)) {
         bool debug = flags & LayerTreeIncludesDebugInfo;
-        RefPtr<JSONArray> compositingReasonsJSON = JSONArray::create();
+        RefPtr<JSONArray> compositingReasonsJSON = adoptRef(new JSONArray);
         for (size_t i = 0; i < kNumberOfCompositingReasons; ++i) {
             if (m_debugInfo.compositingReasons() & kCompositingReasonStringMap[i].reason)
                 compositingReasonsJSON->pushString(debug ? kCompositingReasonStringMap[i].description : kCompositingReasonStringMap[i].shortName);
         }
         json->setArray("compositingReasons", compositingReasonsJSON);
     }
 
     if (m_children.size()) {
-        RefPtr<JSONArray> childrenJSON = JSONArray::create();
+        RefPtr<JSONArray> childrenJSON = adoptRef(new JSONArray);
         for (size_t i = 0; i < m_children.size(); i++)
             childrenJSON->pushObject(m_children[i]->layerTreeAsJSON(flags, renderingContextMap));
         json->setArray("children", childrenJSON);
     }
 
     return json;
 }
 
 String GraphicsLayer::layerTreeAsText(LayerTreeFlags flags) const
 {
@@ skipping 459 matching lines @@
 {
     if (!layer) {
         fprintf(stderr, "Cannot showGraphicsLayerTree for (nil).\n");
         return;
     }
 
     String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo);
     fprintf(stderr, "%s\n", output.utf8().data());
 }
 #endif