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

Unified Diff: cc/output/output_surface.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/output/output_surface.h ('k') | cc/output/output_surface_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/output_surface.cc
diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc
index b3b18da4fa54b5151e1fae0a50de30dcff06663c..64b1d3bb12b0625b43bf2052a6e0281b5afa97bb 100644
--- a/cc/output/output_surface.cc
+++ b/cc/output/output_surface.cc
@@ -124,7 +124,7 @@ OutputSurface::OutputSurface(
#if defined(ENABLE_VULKAN)
scoped_refptr<VulkanContextProvider> vulkan_context_provider,
#endif
- scoped_ptr<SoftwareOutputDevice> software_device)
+ std::unique_ptr<SoftwareOutputDevice> software_device)
: client_(NULL),
context_provider_(std::move(context_provider)),
worker_context_provider_(std::move(worker_context_provider)),
@@ -168,7 +168,8 @@ OutputSurface::OutputSurface(
nullptr) {}
#endif
-OutputSurface::OutputSurface(scoped_ptr<SoftwareOutputDevice> software_device)
+OutputSurface::OutputSurface(
+ std::unique_ptr<SoftwareOutputDevice> software_device)
: OutputSurface(nullptr,
nullptr,
#if defined(ENABLE_VULKAN)
@@ -177,8 +178,9 @@ OutputSurface::OutputSurface(scoped_ptr<SoftwareOutputDevice> software_device)
std::move(software_device)) {
}
-OutputSurface::OutputSurface(scoped_refptr<ContextProvider> context_provider,
- scoped_ptr<SoftwareOutputDevice> software_device)
+OutputSurface::OutputSurface(
+ scoped_refptr<ContextProvider> context_provider,
+ std::unique_ptr<SoftwareOutputDevice> software_device)
: OutputSurface(std::move(context_provider),
nullptr,
#if defined(ENABLE_VULKAN)
« no previous file with comments | « cc/output/output_surface.h ('k') | cc/output/output_surface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698