| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index 4734778c8d46e42dec42951706fb6cf55b9dc8ff..5a73344250605218f9ff632dc0390758f03709b6 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -74,7 +74,6 @@ class CC_EXPORT ThreadProxy : public Proxy,
|
|
|
| RendererCapabilities renderer_capabilities_main_thread_copy;
|
|
|
| - scoped_ptr<BeginMainFrameAndCommitState> pending_deferred_commit;
|
| base::WeakPtrFactory<ThreadProxy> weak_factory;
|
| };
|
|
|
| @@ -278,6 +277,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;
|
|
|