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

Unified Diff: content/renderer/gpu/compositor_output_surface.h

Issue 1873783003: Convert //content/renderer 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
« no previous file with comments | « content/renderer/gpu/compositor_dependencies.h ('k') | content/renderer/gpu/compositor_output_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/gpu/compositor_output_surface.h
diff --git a/content/renderer/gpu/compositor_output_surface.h b/content/renderer/gpu/compositor_output_surface.h
index 97a14c0e783780d9e8764dc1e8e6a4ca2c723cfb..908f045dca93a186db4b1969fd502cae7fb80101 100644
--- a/content/renderer/gpu/compositor_output_surface.h
+++ b/content/renderer/gpu/compositor_output_surface.h
@@ -7,10 +7,11 @@
#include <stdint.h>
+#include <memory>
+
#include "base/compiler_specific.h"
#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/non_thread_safe.h"
#include "base/threading/platform_thread.h"
@@ -50,7 +51,7 @@ class CompositorOutputSurface
#if defined(ENABLE_VULKAN)
const scoped_refptr<cc::VulkanContextProvider>& vulkan_context_provider,
#endif
- scoped_ptr<cc::SoftwareOutputDevice> software,
+ std::unique_ptr<cc::SoftwareOutputDevice> software,
scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue,
bool use_swap_compositor_frame_message);
~CompositorOutputSurface() override;
@@ -62,7 +63,7 @@ class CompositorOutputSurface
protected:
void ShortcutSwapAck(uint32_t output_surface_id,
- scoped_ptr<cc::GLFrameData> gl_frame_data);
+ std::unique_ptr<cc::GLFrameData> gl_frame_data);
virtual void OnSwapAck(uint32_t output_surface_id,
const cc::CompositorFrameAck& ack);
virtual void OnReclaimResources(uint32_t output_surface_id,
@@ -106,7 +107,7 @@ class CompositorOutputSurface
// TODO(danakj): Remove this when crbug.com/311404
bool layout_test_mode_;
- scoped_ptr<cc::CompositorFrameAck> layout_test_previous_frame_ack_;
+ std::unique_ptr<cc::CompositorFrameAck> layout_test_previous_frame_ack_;
base::WeakPtrFactory<CompositorOutputSurface> weak_ptrs_;
};
« no previous file with comments | « content/renderer/gpu/compositor_dependencies.h ('k') | content/renderer/gpu/compositor_output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698