| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index f8808f90870e41c9ef4c46ce1e146a9804712cbd..f554b1e9479ee2849002e3bce83e501193b52dc9 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -79,7 +79,6 @@ class CC_EXPORT ThreadProxy : public Proxy,
|
|
|
| RendererCapabilities renderer_capabilities_main_thread_copy;
|
|
|
| - scoped_ptr<BeginMainFrameAndCommitState> pending_deferred_commit;
|
| base::WeakPtrFactory<ThreadProxy> weak_factory;
|
| };
|
|
|
| @@ -281,6 +280,7 @@ class CC_EXPORT ThreadProxy : public Proxy,
|
| void MainThreadHasStoppedFlingingOnImplThread();
|
| void SetInputThrottledUntilCommitOnImplThread(bool is_throttled);
|
| void SetDebugStateOnImplThread(const LayerTreeDebugState& debug_state);
|
| + void SetDeferCommitsOnImplThread(bool defer_commits) const;
|
|
|
| LayerTreeHost* layer_tree_host();
|
| const LayerTreeHost* layer_tree_host() const;
|
|
|