Chromium Code Reviews| Index: cc/trees/channel_main.h |
| diff --git a/cc/trees/channel_main.h b/cc/trees/channel_main.h |
| index 8f8c4ee99ca6e188d001ed5cb2fb4524460bbbb6..0c7996c67a9c48736d985250bf3e2eb2a4c40cac 100644 |
| --- a/cc/trees/channel_main.h |
| +++ b/cc/trees/channel_main.h |
| @@ -9,10 +9,12 @@ |
| #include "cc/base/completion_event.h" |
| #include "cc/input/top_controls_state.h" |
| #include "cc/output/output_surface.h" |
| +#include "cc/scheduler/begin_frame_source.h" |
| #include "cc/scheduler/commit_earlyout_reason.h" |
| #include "cc/trees/proxy_common.h" |
| namespace cc { |
| + |
| // ChannelMain and ChannelImpl provide an abstract communication layer for |
| // the main and impl side of the compositor. |
| // |
| @@ -25,7 +27,7 @@ namespace cc { |
| class CC_EXPORT ChannelMain { |
| public: |
| - // Interface for commands sent to the ProxyImpl |
| + // Interface for commands sent to ProxyImpl |
| virtual void SetThrottleFrameProductionOnImpl(bool throttle) = 0; |
| virtual void UpdateTopControlsStateOnImpl(TopControlsState constraints, |
| TopControlsState current, |
| @@ -37,7 +39,6 @@ class CC_EXPORT ChannelMain { |
| virtual void FinishAllRenderingOnImpl(CompletionEvent* completion) = 0; |
| virtual void SetVisibleOnImpl(bool visible) = 0; |
| virtual void ReleaseOutputSurfaceOnImpl(CompletionEvent* completion) = 0; |
| - virtual void FinishGLOnImpl(CompletionEvent* completion) = 0; |
| virtual void MainFrameWillHappenOnImplForTesting( |
| CompletionEvent* completion, |
| bool* main_frame_will_happen) = 0; |
| @@ -50,9 +51,14 @@ class CC_EXPORT ChannelMain { |
| LayerTreeHost* layer_tree_host, |
| base::TimeTicks main_thread_start_time, |
| bool hold_commit_for_activation) = 0; |
| - virtual void InitializeImplOnImpl(CompletionEvent* completion, |
| - LayerTreeHost* layer_tree_host) = 0; |
| - virtual void LayerTreeHostClosedOnImpl(CompletionEvent* completion) = 0; |
| + |
| + // Must be called before using the channel. |
| + virtual void SynchronouslyInitializeImpl( |
| + LayerTreeHost* layer_tree_host, |
| + scoped_ptr<BeginFrameSource> external_begin_frame_source) = 0; |
| + |
| + // Must be called before deleting the channel. |
| + virtual void SynchronouslyCloseImpl() = 0; |
| virtual ~ChannelMain() {} |
|
Wez
2015/11/21 01:00:29
nit: dtor should be declared before members.
Khushal
2015/11/23 20:07:19
Done.
|
| }; |