| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index 3aeef74b83f61e52d4f5c49c2f7aab0441fdb359..9c00bd1aefdb2f5b75dd5469ff1e43851118a3b1 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -155,7 +155,7 @@ class CC_EXPORT ThreadProxy : public Proxy,
|
| void FinishAllRendering() override;
|
| bool IsStarted() const override;
|
| bool CommitToActiveTree() const override;
|
| - void SetOutputSurface(scoped_ptr<OutputSurface>) override;
|
| + void SetOutputSurface(OutputSurface* output_surface) override;
|
| void SetLayerTreeHostClientReady() override;
|
| void SetVisible(bool visible) override;
|
| void SetThrottleFrameProduction(bool throttle) override;
|
| @@ -273,8 +273,7 @@ class CC_EXPORT ThreadProxy : public Proxy,
|
| CompletionEvent* completion,
|
| bool* has_initialized_output_surface);
|
| void DeleteContentsTexturesOnImplThread(CompletionEvent* completion);
|
| - void InitializeOutputSurfaceOnImplThread(
|
| - scoped_ptr<OutputSurface> output_surface);
|
| + void InitializeOutputSurfaceOnImplThread(OutputSurface* output_surface);
|
| void FinishGLOnImplThread(CompletionEvent* completion);
|
| void LayerTreeHostClosedOnImplThread(CompletionEvent* completion);
|
| DrawResult DrawSwapInternal(bool forced_draw);
|
|
|