| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index 9a585ad2dfdc151d85fddc0dd44c12dd96195892..d2fc405e934f5652e25daafef07e8665b4a22c84 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -58,7 +58,7 @@ class ThreadProxy : public Proxy,
|
| virtual bool CommitRequested() const OVERRIDE;
|
| virtual bool BeginMainFrameRequested() const OVERRIDE;
|
| virtual void MainThreadHasStoppedFlinging() OVERRIDE;
|
| - virtual void Start(scoped_ptr<OutputSurface> first_output_surface) OVERRIDE;
|
| + virtual void Start() OVERRIDE;
|
| virtual void Stop() OVERRIDE;
|
| virtual size_t MaxPartialTextureUpdates() const OVERRIDE;
|
| virtual void AcquireLayerTextures() OVERRIDE;
|
| @@ -222,9 +222,6 @@ class ThreadProxy : public Proxy,
|
| bool manage_tiles_pending_;
|
| // Weak pointer to use when posting tasks to the impl thread.
|
| base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_;
|
| - // Holds the first output surface passed from Start. Should not be used for
|
| - // anything else.
|
| - scoped_ptr<OutputSurface> first_output_surface_;
|
|
|
| // Accessed on the main thread, or when main thread is blocked.
|
| bool commit_waits_for_activation_;
|
|
|