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

Unified Diff: third_party/WebKit/Source/platform/TracedValue.h

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
« no previous file with comments | « third_party/WebKit/Source/platform/TraceEvent.h ('k') | third_party/WebKit/Source/platform/TracedValue.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/platform/TracedValue.h
diff --git a/third_party/WebKit/Source/platform/TracedValue.h b/third_party/WebKit/Source/platform/TracedValue.h
index 79b877bc4e654c0d378ecba1c6c8a6c2498c0526..05b1b7eb42a7cc074566d93100d161348efa9f50 100644
--- a/third_party/WebKit/Source/platform/TracedValue.h
+++ b/third_party/WebKit/Source/platform/TracedValue.h
@@ -5,7 +5,10 @@
#ifndef TracedValue_h
#define TracedValue_h
+#include "base/trace_event/trace_event.h"
+
#include "platform/EventTracer.h"
+#include "platform/PlatformExport.h"
#include "wtf/PassRefPtr.h"
#include "wtf/text/WTFString.h"
@@ -19,11 +22,11 @@ class InternalValue;
typedef Vector<RefPtr<InternalValue>> TracedValueVector;
typedef HashMap<String, RefPtr<InternalValue>> TracedValueHashMap;
-class PLATFORM_EXPORT TracedValue : public TraceEvent::ConvertableToTraceFormat {
+class PLATFORM_EXPORT TracedValue : public base::trace_event::ConvertableToTraceFormat {
WTF_MAKE_NONCOPYABLE(TracedValue);
public:
- static PassRefPtr<TracedValue> create();
+ static scoped_refptr<TracedValue> create();
void endDictionary();
void endArray();
@@ -42,7 +45,7 @@ public:
void beginArray();
void beginDictionary();
- String asTraceFormat() const override;
+ void AppendAsTraceFormat(std::string* out) const override;
private:
TracedValue();
« no previous file with comments | « third_party/WebKit/Source/platform/TraceEvent.h ('k') | third_party/WebKit/Source/platform/TracedValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698