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

Unified Diff: third_party/WebKit/Source/platform/EventTracer.cpp

Issue 1717283003: tracing: Make ConvertableToTraceFormat move-only scoped_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 10 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/platform/EventTracer.cpp
diff --git a/third_party/WebKit/Source/platform/EventTracer.cpp b/third_party/WebKit/Source/platform/EventTracer.cpp
index e7cd5fda72743b9165165a44651ac812141ed849..94015e145f7e75376ea0a55f43d75c8b2c0e9736 100644
--- a/third_party/WebKit/Source/platform/EventTracer.cpp
+++ b/third_party/WebKit/Source/platform/EventTracer.cpp
@@ -76,7 +76,7 @@ TraceEvent::TraceEventHandle EventTracer::addTraceEvent(char phase, const unsign
PassOwnPtr<TracedValue> tracedValue2,
unsigned flags)
{
- scoped_refptr<base::trace_event::ConvertableToTraceFormat> convertables[2];
+ scoped_ptr<base::trace_event::ConvertableToTraceFormat> convertables[2];
ASSERT(numArgs <= 2);
// We move m_tracedValues from TracedValues for thread safety.
// https://crbug.com/478149
@@ -98,7 +98,7 @@ TraceEvent::TraceEventHandle EventTracer::addTraceEvent(char phase, const unsign
TraceEvent::TraceEventHandle EventTracer::addTraceEvent(char phase, const unsigned char* categoryEnabledFlag,
const char* name, const char* scope, unsigned long long id, unsigned long long bindId, double timestamp,
int numArgs, const char** argNames, const unsigned char* argTypes, const unsigned long long* argValues,
- const scoped_refptr<base::trace_event::ConvertableToTraceFormat>* convertables, unsigned flags)
+ scoped_ptr<base::trace_event::ConvertableToTraceFormat>* convertables, unsigned flags)
{
base::TimeTicks timestampTimeTicks = base::TimeTicks() + base::TimeDelta::FromSecondsD(timestamp);
base::trace_event::TraceEventHandle handle = TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP(phase, categoryEnabledFlag, name, scope, id, bindId, base::PlatformThread::CurrentId(), timestampTimeTicks, numArgs, argNames, argTypes, argValues, convertables, flags);

Powered by Google App Engine
This is Rietveld 408576698