| Index: cc/trees/proxy_main.h
|
| diff --git a/cc/trees/proxy_main.h b/cc/trees/proxy_main.h
|
| index 1b627dda42cb8e2179b7a0aae2f6b467802d2bed..29a7113209ea9235a7920b4a03cc04080329b27c 100644
|
| --- a/cc/trees/proxy_main.h
|
| +++ b/cc/trees/proxy_main.h
|
| @@ -28,11 +28,11 @@ class LayerTreeHost;
|
| // The class is created and lives on the main thread.
|
| class CC_EXPORT ProxyMain : public Proxy {
|
| public:
|
| - static scoped_ptr<ProxyMain> CreateThreaded(
|
| + static std::unique_ptr<ProxyMain> CreateThreaded(
|
| LayerTreeHost* layer_tree_host,
|
| TaskRunnerProvider* task_runner_provider);
|
|
|
| - static scoped_ptr<ProxyMain> CreateRemote(
|
| + static std::unique_ptr<ProxyMain> CreateRemote(
|
| RemoteProtoChannel* remote_proto_channel,
|
| LayerTreeHost* layer_tree_host,
|
| TaskRunnerProvider* task_runner_provider);
|
| @@ -55,7 +55,7 @@ class CC_EXPORT ProxyMain : public Proxy {
|
| const RendererCapabilities& capabilities);
|
| virtual void BeginMainFrameNotExpectedSoon();
|
| virtual void DidCommitAndDrawFrame();
|
| - virtual void SetAnimationEvents(scoped_ptr<AnimationEvents> events);
|
| + virtual void SetAnimationEvents(std::unique_ptr<AnimationEvents> events);
|
| virtual void DidLoseOutputSurface();
|
| virtual void RequestNewOutputSurface();
|
| virtual void DidInitializeOutputSurface(
|
| @@ -63,10 +63,11 @@ class CC_EXPORT ProxyMain : public Proxy {
|
| const RendererCapabilities& capabilities);
|
| virtual void DidCompletePageScaleAnimation();
|
| virtual void PostFrameTimingEventsOnMain(
|
| - 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);
|
| virtual void BeginMainFrame(
|
| - scoped_ptr<BeginMainFrameAndCommitState> begin_main_frame_state);
|
| + std::unique_ptr<BeginMainFrameAndCommitState> begin_main_frame_state);
|
|
|
| ChannelMain* channel_main() const { return channel_main_.get(); }
|
| CommitPipelineStage max_requested_pipeline_stage() const {
|
| @@ -103,7 +104,8 @@ class CC_EXPORT ProxyMain : public Proxy {
|
| bool CommitRequested() const override;
|
| bool BeginMainFrameRequested() const override;
|
| void MainThreadHasStoppedFlinging() override;
|
| - void Start(scoped_ptr<BeginFrameSource> external_begin_frame_source) override;
|
| + void Start(
|
| + std::unique_ptr<BeginFrameSource> external_begin_frame_source) override;
|
| void Stop() override;
|
| bool SupportsImplScrolling() const override;
|
| bool MainFrameWillHappenForTesting() override;
|
| @@ -116,7 +118,7 @@ class CC_EXPORT ProxyMain : public Proxy {
|
| void SetOutputIsSecure(bool output_is_secure) override;
|
|
|
| // This sets the channel used by ProxyMain to communicate with ProxyImpl.
|
| - void SetChannel(scoped_ptr<ChannelMain> channel_main);
|
| + void SetChannel(std::unique_ptr<ChannelMain> channel_main);
|
|
|
| // Returns |true| if the request was actually sent, |false| if one was
|
| // already outstanding.
|
| @@ -150,7 +152,7 @@ class CC_EXPORT ProxyMain : public Proxy {
|
|
|
| RendererCapabilities renderer_capabilities_;
|
|
|
| - scoped_ptr<ChannelMain> channel_main_;
|
| + std::unique_ptr<ChannelMain> channel_main_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ProxyMain);
|
| };
|
|
|