| Index: trunk/src/cc/trees/thread_proxy.h
|
| ===================================================================
|
| --- trunk/src/cc/trees/thread_proxy.h (revision 220454)
|
| +++ trunk/src/cc/trees/thread_proxy.h (working copy)
|
| @@ -52,7 +52,6 @@
|
| virtual void SetNeedsUpdateLayers() OVERRIDE;
|
| virtual void SetNeedsCommit() OVERRIDE;
|
| virtual void SetNeedsRedraw(gfx::Rect damage_rect) OVERRIDE;
|
| - virtual void SetNextCommitWaitsForActivation() OVERRIDE;
|
| virtual void NotifyInputThrottledUntilCommit() OVERRIDE;
|
| virtual void SetDeferCommits(bool defer_commits) OVERRIDE;
|
| virtual bool CommitRequested() const OVERRIDE;
|
| @@ -204,10 +203,6 @@
|
| // anything else.
|
| scoped_ptr<OutputSurface> first_output_surface_;
|
|
|
| - // Accessed on the main thread, or when main thread is blocked.
|
| - bool commit_waits_for_activation_;
|
| - bool inside_commit_;
|
| -
|
| base::WeakPtrFactory<ThreadProxy> weak_factory_on_impl_thread_;
|
|
|
| base::WeakPtr<ThreadProxy> main_thread_weak_ptr_;
|
|
|