| Index: cc/trees/layer_tree_host.h
|
| diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
|
| index 1d23c6c7325698ef78a64aa07711c6539573b74c..080082d30176375fe2ba368f9142be19be082c1d 100644
|
| --- a/cc/trees/layer_tree_host.h
|
| +++ b/cc/trees/layer_tree_host.h
|
| @@ -86,18 +86,22 @@ class CC_EXPORT LayerTreeHost {
|
| LayerTreeHostClient* client,
|
| SharedBitmapManager* manager,
|
| const LayerTreeSettings& settings,
|
| + scoped_refptr<cc::MainThreadTaskRunner> main_task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
|
|
|
| static scoped_ptr<LayerTreeHost> CreateSingleThreaded(
|
| LayerTreeHostClient* client,
|
| LayerTreeHostSingleThreadClient* single_thread_client,
|
| SharedBitmapManager* manager,
|
| - const LayerTreeSettings& settings);
|
| + const LayerTreeSettings& settings,
|
| + scoped_refptr<cc::MainThreadTaskRunner> main_task_runner);
|
| virtual ~LayerTreeHost();
|
|
|
| void SetLayerTreeHostClientReady();
|
|
|
| // LayerTreeHost interface to Proxy.
|
| + void ScheduleBeginMainFrameOnImplThread(
|
| + const base::Closure& begin_main_frame_task);
|
| void WillBeginMainFrame() {
|
| client_->WillBeginMainFrame(source_frame_number_);
|
| }
|
| @@ -302,9 +306,11 @@ class CC_EXPORT LayerTreeHost {
|
| SharedBitmapManager* manager,
|
| const LayerTreeSettings& settings);
|
| void InitializeThreaded(
|
| + scoped_refptr<cc::MainThreadTaskRunner> main_task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
|
| void InitializeSingleThreaded(
|
| - LayerTreeHostSingleThreadClient* single_thread_client);
|
| + LayerTreeHostSingleThreadClient* single_thread_client,
|
| + scoped_refptr<cc::MainThreadTaskRunner> main_task_runner);
|
| void InitializeForTesting(scoped_ptr<Proxy> proxy_for_testing);
|
| void SetOutputSurfaceLostForTesting(bool is_lost) {
|
| output_surface_lost_ = is_lost;
|
|
|