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

Unified Diff: cc/debug/frame_timing_tracker.cc

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/frame_timing_tracker.h ('k') | cc/debug/frame_timing_tracker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/debug/frame_timing_tracker.cc
diff --git a/cc/debug/frame_timing_tracker.cc b/cc/debug/frame_timing_tracker.cc
index dda2e311e51da758a65908b029bdf2db8925d254..d0b9a9b0e8b87338f58720ad159cf95fdc838f54 100644
--- a/cc/debug/frame_timing_tracker.cc
+++ b/cc/debug/frame_timing_tracker.cc
@@ -9,6 +9,7 @@
#include <algorithm>
#include <limits>
+#include "base/memory/ptr_util.h"
#include "base/metrics/histogram.h"
#include "cc/trees/layer_tree_host_impl.h"
#include "cc/trees/proxy.h"
@@ -38,9 +39,9 @@ FrameTimingTracker::MainFrameTimingEvent::~MainFrameTimingEvent() {
}
// static
-scoped_ptr<FrameTimingTracker> FrameTimingTracker::Create(
+std::unique_ptr<FrameTimingTracker> FrameTimingTracker::Create(
LayerTreeHostImpl* layer_tree_host_impl) {
- return make_scoped_ptr(new FrameTimingTracker(layer_tree_host_impl));
+ return base::WrapUnique(new FrameTimingTracker(layer_tree_host_impl));
}
FrameTimingTracker::FrameTimingTracker(LayerTreeHostImpl* layer_tree_host_impl)
@@ -82,10 +83,10 @@ void FrameTimingTracker::SaveMainFrameTimeStamps(
post_events_notifier_.Schedule();
}
-scoped_ptr<FrameTimingTracker::CompositeTimingSet>
+std::unique_ptr<FrameTimingTracker::CompositeTimingSet>
FrameTimingTracker::GroupCompositeCountsByRectId() {
if (!composite_events_)
- return make_scoped_ptr(new CompositeTimingSet);
+ return base::WrapUnique(new CompositeTimingSet);
for (auto& infos : *composite_events_) {
std::sort(
infos.second.begin(), infos.second.end(),
@@ -96,10 +97,10 @@ FrameTimingTracker::GroupCompositeCountsByRectId() {
return std::move(composite_events_);
}
-scoped_ptr<FrameTimingTracker::MainFrameTimingSet>
+std::unique_ptr<FrameTimingTracker::MainFrameTimingSet>
FrameTimingTracker::GroupMainFrameCountsByRectId() {
if (!main_frame_events_)
- return make_scoped_ptr(new MainFrameTimingSet);
+ return base::WrapUnique(new MainFrameTimingSet);
for (auto& infos : *main_frame_events_) {
std::sort(
infos.second.begin(), infos.second.end(),
« no previous file with comments | « cc/debug/frame_timing_tracker.h ('k') | cc/debug/frame_timing_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698