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

Unified Diff: cc/debug/devtools_instrumentation.h

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 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 | « cc/debug/debug_rect_history.cc ('k') | cc/debug/frame_rate_counter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/debug/devtools_instrumentation.h
diff --git a/cc/debug/devtools_instrumentation.h b/cc/debug/devtools_instrumentation.h
index 5794b8992ee55ad8d37205c63c81828f97077211..127c9a93c2698fd9e6f88e47be2f4423d19edbfa 100644
--- a/cc/debug/devtools_instrumentation.h
+++ b/cc/debug/devtools_instrumentation.h
@@ -7,8 +7,9 @@
#include <stdint.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/trace_event/trace_event.h"
#include "base/trace_event/trace_event_argument.h"
@@ -148,9 +149,9 @@ inline void DidRequestMainThreadFrame(int layer_tree_host_id) {
layer_tree_host_id);
}
-inline scoped_ptr<base::trace_event::ConvertableToTraceFormat>
+inline std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
BeginMainThreadFrameData(int frame_id) {
- scoped_ptr<base::trace_event::TracedValue> value(
+ std::unique_ptr<base::trace_event::TracedValue> value(
new base::trace_event::TracedValue());
value->SetInteger("frameId", frame_id);
return std::move(value);
@@ -163,9 +164,9 @@ inline void WillBeginMainThreadFrame(int layer_tree_host_id, int frame_id) {
internal::kData, BeginMainThreadFrameData(frame_id));
}
-inline scoped_ptr<base::trace_event::ConvertableToTraceFormat>
+inline std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
NeedsBeginFrameData(bool needs_begin_frame) {
- scoped_ptr<base::trace_event::TracedValue> value(
+ std::unique_ptr<base::trace_event::TracedValue> value(
new base::trace_event::TracedValue());
value->SetInteger("needsBeginFrame", needs_begin_frame);
return std::move(value);
« no previous file with comments | « cc/debug/debug_rect_history.cc ('k') | cc/debug/frame_rate_counter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698