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

Unified Diff: ui/gl/gpu_timing.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 | « ui/gl/gpu_timing.h ('k') | ui/gl/gpu_timing_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gpu_timing.cc
diff --git a/ui/gl/gpu_timing.cc b/ui/gl/gpu_timing.cc
index f5d9ae0da4e506263af510fb379b97c2bb6074d6..abe39925f850bd27369535e17de94c7d75b8ae26 100644
--- a/ui/gl/gpu_timing.cc
+++ b/ui/gl/gpu_timing.cc
@@ -5,6 +5,7 @@
#include "ui/gl/gpu_timing.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/time/time.h"
#include "ui/gl/gl_bindings.h"
#include "ui/gl/gl_context.h"
@@ -604,12 +605,13 @@ GPUTimingClient::GPUTimingClient(GPUTimingImpl* gpu_timing)
}
}
-scoped_ptr<GPUTimer> GPUTimingClient::CreateGPUTimer(bool prefer_elapsed_time) {
+std::unique_ptr<GPUTimer> GPUTimingClient::CreateGPUTimer(
+ bool prefer_elapsed_time) {
prefer_elapsed_time |= (timer_type_ == GPUTiming::kTimerTypeEXT);
if (gpu_timing_)
prefer_elapsed_time |= gpu_timing_->IsForceTimeElapsedQuery();
- return make_scoped_ptr(new GPUTimer(this, prefer_elapsed_time));
+ return base::WrapUnique(new GPUTimer(this, prefer_elapsed_time));
}
bool GPUTimingClient::IsAvailable() {
« no previous file with comments | « ui/gl/gpu_timing.h ('k') | ui/gl/gpu_timing_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698