Index: third_party/WebKit/Source/core/layout/TracedLayoutObject.cpp |
diff --git a/third_party/WebKit/Source/core/layout/TracedLayoutObject.cpp b/third_party/WebKit/Source/core/layout/TracedLayoutObject.cpp |
index ee60df3dcdedfef88bb996b50d8a887137531a8c..14c8e5eb6daaa46572c846a92c06243bfcadd600 100644 |
--- a/third_party/WebKit/Source/core/layout/TracedLayoutObject.cpp |
+++ b/third_party/WebKit/Source/core/layout/TracedLayoutObject.cpp |
@@ -13,17 +13,17 @@ |
namespace blink { |
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> TracedLayoutObject::create(const LayoutView& view, bool traceGeometry) |
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> TracedLayoutObject::create(const LayoutView& view, bool traceGeometry) |
{ |
- return adoptRef(new TracedLayoutObject(view, traceGeometry)); |
+ return new TracedLayoutObject(view, traceGeometry); |
} |
-String TracedLayoutObject::asTraceFormat() const |
+void TracedLayoutObject::AppendAsTraceFormat(std::string* out) const |
{ |
StringBuilder builder; |
RefPtr<JSONObject> json(toJSON()); |
json->writeJSON(&builder); |
- return builder.toString(); |
+ *out = builder.toString().utf8().data(); |
} |
TracedLayoutObject::TracedLayoutObject(const LayoutObject& object, bool traceGeometry) |
@@ -80,7 +80,7 @@ TracedLayoutObject::TracedLayoutObject(const LayoutObject& object, bool traceGeo |
} |
for (LayoutObject* child = object.slowFirstChild(); child; child = child->nextSibling()) { |
- m_children.append(adoptRef(new TracedLayoutObject(*child, traceGeometry))); |
+ m_children.append(new TracedLayoutObject(*child, traceGeometry)); |
} |
} |