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

Unified Diff: cc/output/output_surface.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/output/gl_renderer_unittest.cc ('k') | cc/output/output_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/output_surface.h
diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
index ccfe1184d9f30d60f57d99f72f374d17bae123af..062fd000f49802b1e1551b99712a9ecf8eff6acd 100644
--- a/cc/output/output_surface.h
+++ b/cc/output/output_surface.h
@@ -6,10 +6,10 @@
#define CC_OUTPUT_OUTPUT_SURFACE_H_
#include <deque>
+#include <memory>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "cc/base/cc_export.h"
@@ -54,7 +54,7 @@ class CC_EXPORT OutputSurface : public base::trace_event::MemoryDumpProvider {
#if defined(ENABLE_VULKAN)
scoped_refptr<VulkanContextProvider> vulkan_context_provider,
#endif
- scoped_ptr<SoftwareOutputDevice> software_device);
+ std::unique_ptr<SoftwareOutputDevice> software_device);
OutputSurface(scoped_refptr<ContextProvider> context_provider,
scoped_refptr<ContextProvider> worker_context_provider);
explicit OutputSurface(scoped_refptr<ContextProvider> context_provider);
@@ -62,10 +62,10 @@ class CC_EXPORT OutputSurface : public base::trace_event::MemoryDumpProvider {
explicit OutputSurface(
scoped_refptr<VulkanContextProvider> vulkan_context_provider);
#endif
- explicit OutputSurface(scoped_ptr<SoftwareOutputDevice> software_device);
+ explicit OutputSurface(std::unique_ptr<SoftwareOutputDevice> software_device);
OutputSurface(scoped_refptr<ContextProvider> context_provider,
- scoped_ptr<SoftwareOutputDevice> software_device);
+ std::unique_ptr<SoftwareOutputDevice> software_device);
~OutputSurface() override;
@@ -193,7 +193,7 @@ class CC_EXPORT OutputSurface : public base::trace_event::MemoryDumpProvider {
#if defined(ENABLE_VULKAN)
scoped_refptr<VulkanContextProvider> vulkan_context_provider_;
#endif
- scoped_ptr<SoftwareOutputDevice> software_device_;
+ std::unique_ptr<SoftwareOutputDevice> software_device_;
gfx::Size surface_size_;
float device_scale_factor_;
bool has_alpha_;
« no previous file with comments | « cc/output/gl_renderer_unittest.cc ('k') | cc/output/output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698