Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Unified Diff: third_party/WebKit/Source/core/layout/TracedLayoutObject.cpp

Issue 1381023002: NOCOMMIT: Blink tracing now uses base Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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));
}
}
« no previous file with comments | « third_party/WebKit/Source/core/layout/TracedLayoutObject.h ('k') | third_party/WebKit/Source/modules/modules.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698