Index: cc/trees/layer_tree_host.cc |
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc |
index 3e5c74c8a0468e749abab471af6554cb7a7770e8..64cdc0022817782049f6be5e8327ca5ab0b9244a 100644 |
--- a/cc/trees/layer_tree_host.cc |
+++ b/cc/trees/layer_tree_host.cc |
@@ -32,6 +32,7 @@ |
#include "cc/layers/render_surface.h" |
#include "cc/resources/prioritized_resource_manager.h" |
#include "cc/resources/ui_resource_request.h" |
+#include "cc/scheduler/begin_frame_source.h" |
#include "cc/trees/layer_tree_host_client.h" |
#include "cc/trees/layer_tree_host_common.h" |
#include "cc/trees/layer_tree_host_impl.h" |
@@ -70,12 +71,15 @@ scoped_ptr<LayerTreeHost> LayerTreeHost::CreateThreaded( |
SharedBitmapManager* manager, |
const LayerTreeSettings& settings, |
scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, |
- scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner) { |
+ scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner, |
+ scoped_ptr<ExternalBeginFrameSource> external_begin_frame_source) { |
DCHECK(main_task_runner.get()); |
DCHECK(impl_task_runner.get()); |
scoped_ptr<LayerTreeHost> layer_tree_host( |
new LayerTreeHost(client, manager, settings)); |
- layer_tree_host->InitializeThreaded(main_task_runner, impl_task_runner); |
+ layer_tree_host->InitializeThreaded(main_task_runner, |
+ impl_task_runner, |
+ external_begin_frame_source.Pass()); |
return layer_tree_host.Pass(); |
} |
@@ -84,11 +88,13 @@ scoped_ptr<LayerTreeHost> LayerTreeHost::CreateSingleThreaded( |
LayerTreeHostSingleThreadClient* single_thread_client, |
SharedBitmapManager* manager, |
const LayerTreeSettings& settings, |
- scoped_refptr<base::SingleThreadTaskRunner> main_task_runner) { |
+ scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, |
+ scoped_ptr<ExternalBeginFrameSource> external_begin_frame_source) { |
scoped_ptr<LayerTreeHost> layer_tree_host( |
new LayerTreeHost(client, manager, settings)); |
layer_tree_host->InitializeSingleThreaded(single_thread_client, |
- main_task_runner); |
+ main_task_runner, |
+ external_begin_frame_source.Pass()); |
return layer_tree_host.Pass(); |
} |
@@ -132,16 +138,23 @@ LayerTreeHost::LayerTreeHost(LayerTreeHostClient* client, |
void LayerTreeHost::InitializeThreaded( |
scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, |
- scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner) { |
- InitializeProxy( |
- ThreadProxy::Create(this, main_task_runner, impl_task_runner)); |
+ scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner, |
+ scoped_ptr<ExternalBeginFrameSource> external_begin_frame_source) { |
+ InitializeProxy(ThreadProxy::Create(this, |
+ main_task_runner, |
+ impl_task_runner, |
+ external_begin_frame_source.Pass())); |
} |
void LayerTreeHost::InitializeSingleThreaded( |
LayerTreeHostSingleThreadClient* single_thread_client, |
- scoped_refptr<base::SingleThreadTaskRunner> main_task_runner) { |
- InitializeProxy( |
- SingleThreadProxy::Create(this, single_thread_client, main_task_runner)); |
+ scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, |
+ scoped_ptr<ExternalBeginFrameSource> external_begin_frame_source) { |
+ InitializeProxy(SingleThreadProxy::Create( |
+ this, |
+ single_thread_client, |
+ main_task_runner, |
+ external_begin_frame_source.Pass())); |
} |
void LayerTreeHost::InitializeForTesting(scoped_ptr<Proxy> proxy_for_testing) { |