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

Unified Diff: content/browser/android/synchronous_compositor_host.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: content/browser/android/synchronous_compositor_host.cc
diff --git a/content/browser/android/synchronous_compositor_host.cc b/content/browser/android/synchronous_compositor_host.cc
index 7f6cdfc5fb3bfc6cb8c9e3dc669cf4eefb752951..f92b294bbc8cb748062bbefaddb510aa4a58e1db 100644
--- a/content/browser/android/synchronous_compositor_host.cc
+++ b/content/browser/android/synchronous_compositor_host.cc
@@ -135,7 +135,7 @@ bool SynchronousCompositorHost::DemandDrawSwInProc(SkCanvas* canvas) {
PopulateCommonParams(&common_browser_params);
SyncCompositorCommonRendererParams common_renderer_params;
bool success = false;
- scoped_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
+ std::unique_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
ScopedSetSkCanvas set_sk_canvas(canvas);
SyncCompositorDemandDrawSwParams params; // Unused.
if (!sender_->Send(new SyncCompositorMsg_DemandDrawSw(
@@ -199,7 +199,7 @@ bool SynchronousCompositorHost::DemandDrawSw(SkCanvas* canvas) {
if (!software_draw_shm_)
return false;
- scoped_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
+ std::unique_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
SyncCompositorCommonBrowserParams common_browser_params;
PopulateCommonParams(&common_browser_params);
SyncCompositorCommonRendererParams common_renderer_params;
@@ -238,7 +238,7 @@ void SynchronousCompositorHost::SetSoftwareDrawSharedMemoryIfNeeded(
software_draw_shm_->buffer_size == buffer_size)
return;
software_draw_shm_.reset();
- scoped_ptr<SharedMemoryWithSize> software_draw_shm(
+ std::unique_ptr<SharedMemoryWithSize> software_draw_shm(
new SharedMemoryWithSize(stride, buffer_size));
{
TRACE_EVENT1("browser", "AllocateSharedMemory", "buffer_size", buffer_size);
« no previous file with comments | « content/browser/android/synchronous_compositor_host.h ('k') | content/browser/android/url_request_content_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698