Index: cc/trees/proxy_impl.h |
diff --git a/cc/trees/proxy_impl.h b/cc/trees/proxy_impl.h |
index a335d8abe1ac4e75ce7e017221ad6857234c92c6..5aa4655a859c3dfa9d319ee3440470ebb9a55a03 100644 |
--- a/cc/trees/proxy_impl.h |
+++ b/cc/trees/proxy_impl.h |
@@ -5,8 +5,9 @@ |
#ifndef CC_TREES_PROXY_IMPL_H_ |
#define CC_TREES_PROXY_IMPL_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "cc/base/completion_event.h" |
#include "cc/base/delayed_unique_notifier.h" |
#include "cc/input/top_controls_state.h" |
@@ -22,11 +23,11 @@ namespace cc { |
class CC_EXPORT ProxyImpl : public NON_EXPORTED_BASE(LayerTreeHostImplClient), |
public NON_EXPORTED_BASE(SchedulerClient) { |
public: |
- static scoped_ptr<ProxyImpl> Create( |
+ static std::unique_ptr<ProxyImpl> Create( |
ChannelImpl* channel_impl, |
LayerTreeHost* layer_tree_host, |
TaskRunnerProvider* task_runner_provider, |
- scoped_ptr<BeginFrameSource> external_begin_frame_source); |
+ std::unique_ptr<BeginFrameSource> external_begin_frame_source); |
~ProxyImpl() override; |
@@ -60,7 +61,7 @@ class CC_EXPORT ProxyImpl : public NON_EXPORTED_BASE(LayerTreeHostImplClient), |
ProxyImpl(ChannelImpl* channel_impl, |
LayerTreeHost* layer_tree_host, |
TaskRunnerProvider* task_runner_provider, |
- scoped_ptr<BeginFrameSource> external_begin_frame_source); |
+ std::unique_ptr<BeginFrameSource> external_begin_frame_source); |
private: |
// The members of this struct should be accessed on the impl thread only when |
@@ -94,7 +95,7 @@ class CC_EXPORT ProxyImpl : public NON_EXPORTED_BASE(LayerTreeHostImplClient), |
void SetNeedsCommitOnImplThread() override; |
void SetVideoNeedsBeginFrames(bool needs_begin_frames) override; |
void PostAnimationEventsToMainThreadOnImplThread( |
- scoped_ptr<AnimationEvents> events) override; |
+ std::unique_ptr<AnimationEvents> events) override; |
bool IsInsideDraw() override; |
void RenewTreePriority() override; |
void PostDelayedAnimationTaskOnImplThread(const base::Closure& task, |
@@ -106,8 +107,8 @@ class CC_EXPORT ProxyImpl : public NON_EXPORTED_BASE(LayerTreeHostImplClient), |
void OnDrawForOutputSurface(bool resourceless_software_draw) override; |
// This should only be called by LayerTreeHostImpl::PostFrameTimingEvents. |
void PostFrameTimingEventsOnImplThread( |
- scoped_ptr<FrameTimingTracker::CompositeTimingSet> composite_events, |
- scoped_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events) |
+ std::unique_ptr<FrameTimingTracker::CompositeTimingSet> composite_events, |
+ std::unique_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events) |
override; |
// SchedulerClient implementation |
@@ -131,7 +132,7 @@ class CC_EXPORT ProxyImpl : public NON_EXPORTED_BASE(LayerTreeHostImplClient), |
const int layer_tree_host_id_; |
- scoped_ptr<Scheduler> scheduler_; |
+ std::unique_ptr<Scheduler> scheduler_; |
// Set when the main thread is waiting on a pending tree activation. |
bool next_commit_waits_for_activation_; |
@@ -151,9 +152,9 @@ class CC_EXPORT ProxyImpl : public NON_EXPORTED_BASE(LayerTreeHostImplClient), |
DelayedUniqueNotifier smoothness_priority_expiration_notifier_; |
- scoped_ptr<BeginFrameSource> external_begin_frame_source_; |
- scoped_ptr<BeginFrameSource> unthrottled_begin_frame_source_; |
- scoped_ptr<SyntheticBeginFrameSource> synthetic_begin_frame_source_; |
+ std::unique_ptr<BeginFrameSource> external_begin_frame_source_; |
+ std::unique_ptr<BeginFrameSource> unthrottled_begin_frame_source_; |
+ std::unique_ptr<SyntheticBeginFrameSource> synthetic_begin_frame_source_; |
RenderingStatsInstrumentation* rendering_stats_instrumentation_; |
@@ -161,7 +162,7 @@ class CC_EXPORT ProxyImpl : public NON_EXPORTED_BASE(LayerTreeHostImplClient), |
BeginFrameArgs last_begin_main_frame_args_; |
BeginFrameArgs last_processed_begin_main_frame_args_; |
- scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl_; |
+ std::unique_ptr<LayerTreeHostImpl> layer_tree_host_impl_; |
ChannelImpl* channel_impl_; |