Oilpan: fix build after r176651

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 516 matching lines @@
     if (a.x() != b.x())
         return a.x() > b.x();
     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 PassRefPtrWillBeRawPtr<JSONArray> pointAsJSONArray(const T& point)
+static PassRefPtr<JSONArray> pointAsJSONArray(const T& point)
 {
-    RefPtrWillBeRawPtr<JSONArray> array = adoptRefWillBeNoop(new JSONArray);
+    RefPtr<JSONArray> array = adoptRef(new JSONArray);
     array->pushNumber(point.x());
     array->pushNumber(point.y());
     return array;
 }
 
 template <typename T>
-static PassRefPtrWillBeRawPtr<JSONArray> sizeAsJSONArray(const T& size)
+static PassRefPtr<JSONArray> sizeAsJSONArray(const T& size)
 {
-    RefPtrWillBeRawPtr<JSONArray> array = adoptRefWillBeNoop(new JSONArray);
+    RefPtr<JSONArray> array = adoptRef(new JSONArray);
     array->pushNumber(size.width());
     array->pushNumber(size.height());
     return array;
 }
 
 template <typename T>
-static PassRefPtrWillBeRawPtr<JSONArray> rectAsJSONArray(const T& rect)
+static PassRefPtr<JSONArray> rectAsJSONArray(const T& rect)
 {
-    RefPtrWillBeRawPtr<JSONArray> array = adoptRefWillBeNoop(new JSONArray);
+    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 PassRefPtrWillBeRawPtr<JSONArray> transformAsJSONArray(const TransformationMatrix& t)
+static PassRefPtr<JSONArray> transformAsJSONArray(const TransformationMatrix& t)
 {
-    RefPtrWillBeRawPtr<JSONArray> array = adoptRefWillBeNoop(new JSONArray);
+    RefPtr<JSONArray> array = adoptRef(new JSONArray);
     {
-        RefPtrWillBeRawPtr<JSONArray> row = adoptRefWillBeNoop(new JSONArray);
+        RefPtr<JSONArray> row = adoptRef(new JSONArray);
         row->pushNumber(t.m11());
         row->pushNumber(t.m12());
         row->pushNumber(t.m13());
         row->pushNumber(t.m14());
         array->pushArray(row);
     }
     {
-        RefPtrWillBeRawPtr<JSONArray> row = adoptRefWillBeNoop(new JSONArray);
+        RefPtr<JSONArray> row = adoptRef(new JSONArray);
         row->pushNumber(t.m21());
         row->pushNumber(t.m22());
         row->pushNumber(t.m23());
         row->pushNumber(t.m24());
         array->pushArray(row);
     }
     {
-        RefPtrWillBeRawPtr<JSONArray> row = adoptRefWillBeNoop(new JSONArray);
+        RefPtr<JSONArray> row = adoptRef(new JSONArray);
         row->pushNumber(t.m31());
         row->pushNumber(t.m32());
         row->pushNumber(t.m33());
         row->pushNumber(t.m34());
         array->pushArray(row);
     }
     {
-        RefPtrWillBeRawPtr<JSONArray> row = adoptRefWillBeNoop(new JSONArray);
+        RefPtr<JSONArray> row = adoptRef(new JSONArray);
         row->pushNumber(t.m41());
         row->pushNumber(t.m42());
         row->pushNumber(t.m43());
         row->pushNumber(t.m44());
         array->pushArray(row);
     }
     return array;
 }
 
 static String pointerAsString(const void* ptr)
 {
     TextStream ts;
     ts << ptr;
     return ts.release();
 }
 
-PassRefPtrWillBeRawPtr<JSONObject> GraphicsLayer::layerTreeAsJSON(LayerTreeFlags flags, RenderingContextMap& renderingContextMap) const
+PassRefPtr<JSONObject> GraphicsLayer::layerTreeAsJSON(LayerTreeFlags flags, RenderingContextMap& renderingContextMap) const
 {
-    RefPtrWillBeRawPtr<JSONObject> json = adoptRefWillBeNoop(new JSONObject);
+    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_boundsOrigin != FloatPoint())
@@ skipping 51 matching lines @@
 
     if (m_replicaLayer)
         json->setObject("replicaLayer", m_replicaLayer->layerTreeAsJSON(flags, renderingContextMap));
 
     if (m_replicatedLayer)
         json->setString("replicatedLayer", flags & LayerTreeIncludesDebugInfo ? pointerAsString(m_replicatedLayer) : "");
 
     if ((flags & LayerTreeIncludesRepaintRects) && repaintRectMap().contains(this) && !repaintRectMap().get(this).isEmpty()) {
         Vector<FloatRect> repaintRectsCopy = repaintRectMap().get(this);
         std::sort(repaintRectsCopy.begin(), repaintRectsCopy.end(), &compareFloatRects);
-        RefPtrWillBeRawPtr<JSONArray> repaintRectsJSON = adoptRefWillBeNoop(new JSONArray);
+        RefPtr<JSONArray> repaintRectsJSON = adoptRef(new JSONArray);
         for (size_t i = 0; i < repaintRectsCopy.size(); ++i) {
             if (repaintRectsCopy[i].isEmpty())
                 continue;
             repaintRectsJSON->pushArray(rectAsJSONArray(repaintRectsCopy[i]));
         }
         json->setArray("repaintRects", repaintRectsJSON);
     }
 
     if ((flags & LayerTreeIncludesPaintingPhases) && m_paintingPhase) {
-        RefPtrWillBeRawPtr<JSONArray> paintingPhasesJSON = adoptRefWillBeNoop(new JSONArray);
+        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) {
-        RefPtrWillBeRawPtr<JSONArray> compositingReasonsJSON = adoptRefWillBeNoop(new JSONArray);
+        RefPtr<JSONArray> compositingReasonsJSON = adoptRef(new JSONArray);
         for (size_t i = 0; i < WTF_ARRAY_LENGTH(compositingReasonStringMap); ++i) {
             if (m_debugInfo.compositingReasons() & compositingReasonStringMap[i].reason)
                 compositingReasonsJSON->pushString(compositingReasonStringMap[i].description);
         }
         json->setArray("compositingReasons", compositingReasonsJSON);
     }
 
     if (m_children.size()) {
-        RefPtrWillBeRawPtr<JSONArray> childrenJSON = adoptRefWillBeNoop(new JSONArray);
+        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
 {
     RenderingContextMap renderingContextMap;
-    RefPtrWillBeRawPtr<JSONObject> json = layerTreeAsJSON(flags, renderingContextMap);
+    RefPtr<JSONObject> json = layerTreeAsJSON(flags, renderingContextMap);
     return json->toPrettyJSONString();
 }
 
 String GraphicsLayer::debugName(blink::WebLayer* webLayer) const
 {
     String name;
     if (!m_client)
         return name;
 
     String highlightDebugName;
@@ skipping 459 matching lines @@
 #ifndef NDEBUG
 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer)
 {
     if (!layer)
         return;
 
     String output = layer->layerTreeAsText(WebCore::LayerTreeIncludesDebugInfo);
     fprintf(stderr, "%s\n", output.utf8().data());
 }
 #endif