| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index 6fff58230004154fcaf5234ae25772f38226a97e..35db6fc3a7a65f5aabb75ceb65ee5aa8b319e6e3 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -155,7 +155,7 @@
|
| void FinishAllRendering() override;
|
| bool IsStarted() const override;
|
| bool CommitToActiveTree() const override;
|
| - void SetOutputSurface(OutputSurface* output_surface) override;
|
| + void SetOutputSurface(scoped_ptr<OutputSurface>) override;
|
| void SetLayerTreeHostClientReady() override;
|
| void SetVisible(bool visible) override;
|
| void SetThrottleFrameProduction(bool throttle) override;
|
| @@ -272,7 +272,8 @@
|
| CompletionEvent* completion,
|
| bool* has_initialized_output_surface);
|
| void DeleteContentsTexturesOnImplThread(CompletionEvent* completion);
|
| - void InitializeOutputSurfaceOnImplThread(OutputSurface* output_surface);
|
| + void InitializeOutputSurfaceOnImplThread(
|
| + scoped_ptr<OutputSurface> output_surface);
|
| void FinishGLOnImplThread(CompletionEvent* completion);
|
| void LayerTreeHostClosedOnImplThread(CompletionEvent* completion);
|
| DrawResult DrawSwapInternal(bool forced_draw);
|
|
|