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

Unified Diff: content/renderer/gpu/render_widget_compositor.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
Index: content/renderer/gpu/render_widget_compositor.h
diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h
index aacbfac858c7ee069428b863f611131b8317360d..a9b0f19015fb8f5cd5368eae5496f5bc5bf88dd6 100644
--- a/content/renderer/gpu/render_widget_compositor.h
+++ b/content/renderer/gpu/render_widget_compositor.h
@@ -53,7 +53,7 @@ class CONTENT_EXPORT RenderWidgetCompositor
public:
// Attempt to construct and initialize a compositor instance for the widget
// with the given settings. Returns NULL if initialization fails.
- static scoped_ptr<RenderWidgetCompositor> Create(
+ static std::unique_ptr<RenderWidgetCompositor> Create(
RenderWidgetCompositorDelegate* delegate,
float device_scale_factor,
CompositorDependencies* compositor_deps);
@@ -74,11 +74,11 @@ class CONTENT_EXPORT RenderWidgetCompositor
// LatencyInfoSwapPromiseMonitor, if SetNeedsCommit() or
// SetNeedsUpdateLayers() is called on LayerTreeHost, the original latency
// info will be turned into a LatencyInfoSwapPromise.
- scoped_ptr<cc::SwapPromiseMonitor> CreateLatencyInfoSwapPromiseMonitor(
+ std::unique_ptr<cc::SwapPromiseMonitor> CreateLatencyInfoSwapPromiseMonitor(
ui::LatencyInfo* latency);
// Calling QueueSwapPromise() to directly queue a SwapPromise into
// LayerTreeHost.
- void QueueSwapPromise(scoped_ptr<cc::SwapPromise> swap_promise);
+ void QueueSwapPromise(std::unique_ptr<cc::SwapPromise> swap_promise);
int GetSourceFrameNumber() const;
void SetNeedsUpdateLayers();
void SetNeedsCommit();
@@ -86,9 +86,9 @@ class CONTENT_EXPORT RenderWidgetCompositor
const cc::Layer* GetRootLayer() const;
int ScheduleMicroBenchmark(
const std::string& name,
- scoped_ptr<base::Value> value,
- const base::Callback<void(scoped_ptr<base::Value>)>& callback);
- bool SendMessageToMicroBenchmark(int id, scoped_ptr<base::Value> value);
+ std::unique_ptr<base::Value> value,
+ const base::Callback<void(std::unique_ptr<base::Value>)>& callback);
+ bool SendMessageToMicroBenchmark(int id, std::unique_ptr<base::Value> value);
void SetSurfaceIdNamespace(uint32_t surface_id_namespace);
void OnHandleCompositorProto(const std::vector<uint8_t>& proto);
cc::ManagedMemoryPolicy GetGpuMemoryPolicy(
@@ -173,9 +173,10 @@ class CONTENT_EXPORT RenderWidgetCompositor
void DidCompleteSwapBuffers() override;
void DidCompletePageScaleAnimation() override;
void RecordFrameTimingEvents(
- scoped_ptr<cc::FrameTimingTracker::CompositeTimingSet> composite_events,
- scoped_ptr<cc::FrameTimingTracker::MainFrameTimingSet> main_frame_events)
- override;
+ std::unique_ptr<cc::FrameTimingTracker::CompositeTimingSet>
+ composite_events,
+ std::unique_ptr<cc::FrameTimingTracker::MainFrameTimingSet>
+ main_frame_events) override;
// cc::LayerTreeHostSingleThreadClient implementation.
void RequestScheduleAnimation() override;
@@ -209,11 +210,11 @@ class CONTENT_EXPORT RenderWidgetCompositor
int num_failed_recreate_attempts_;
RenderWidgetCompositorDelegate* const delegate_;
CompositorDependencies* const compositor_deps_;
- scoped_ptr<cc::LayerTreeHost> layer_tree_host_;
+ std::unique_ptr<cc::LayerTreeHost> layer_tree_host_;
bool never_visible_;
blink::WebLayoutAndPaintAsyncCallback* layout_and_paint_async_callback_;
- scoped_ptr<cc::CopyOutputRequest> temporary_copy_output_request_;
+ std::unique_ptr<cc::CopyOutputRequest> temporary_copy_output_request_;
cc::RemoteProtoChannel::ProtoReceiver* remote_proto_channel_receiver_;
« no previous file with comments | « content/renderer/gpu/queue_message_swap_promise_unittest.cc ('k') | content/renderer/gpu/render_widget_compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698