| Index: cc/test/layer_tree_test.cc
|
| diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
|
| index f3f20238553d4fb5a703a2312f885058a6c8114f..9653d8dda8a800482072ea12f4e427197f0e01f9 100644
|
| --- a/cc/test/layer_tree_test.cc
|
| +++ b/cc/test/layer_tree_test.cc
|
| @@ -46,6 +46,11 @@ DrawResult TestHooks::PrepareToDrawOnThread(
|
| return draw_result;
|
| }
|
|
|
| +scoped_ptr<Rasterizer> TestHooks::CreateRasterizer(
|
| + LayerTreeHostImpl* host_impl) {
|
| + return host_impl->LayerTreeHostImpl::CreateRasterizer();
|
| +}
|
| +
|
| void TestHooks::CreateResourceAndTileTaskWorkerPool(
|
| LayerTreeHostImpl* host_impl,
|
| scoped_ptr<TileTaskWorkerPool>* tile_task_worker_pool,
|
| @@ -166,6 +171,10 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
|
| block_notify_ready_to_activate_for_testing_(false),
|
| notify_ready_to_activate_was_blocked_(false) {}
|
|
|
| + scoped_ptr<Rasterizer> CreateRasterizer() override {
|
| + return test_hooks_->CreateRasterizer(this);
|
| + }
|
| +
|
| void CreateResourceAndTileTaskWorkerPool(
|
| scoped_ptr<TileTaskWorkerPool>* tile_task_worker_pool,
|
| scoped_ptr<ResourcePool>* resource_pool,
|
| @@ -571,8 +580,7 @@ void LayerTreeTest::DoBeginTest() {
|
| client_ = LayerTreeHostClientForTesting::Create(this);
|
|
|
| scoped_ptr<FakeExternalBeginFrameSource> external_begin_frame_source;
|
| - if (settings_.use_external_begin_frame_source &&
|
| - settings_.throttle_frame_production) {
|
| + if (settings_.use_external_begin_frame_source) {
|
| external_begin_frame_source.reset(new FakeExternalBeginFrameSource(
|
| settings_.renderer_settings.refresh_rate));
|
| external_begin_frame_source_ = external_begin_frame_source.get();
|
| @@ -753,8 +761,7 @@ scoped_ptr<OutputSurface> LayerTreeTest::CreateOutputSurface() {
|
| output_surface->capabilities().delegated_rendering);
|
| output_surface_ = output_surface.get();
|
|
|
| - if (settings_.use_external_begin_frame_source &&
|
| - settings_.throttle_frame_production) {
|
| + if (settings_.use_external_begin_frame_source) {
|
| DCHECK(external_begin_frame_source_);
|
| DCHECK(external_begin_frame_source_->is_ready());
|
| }
|
|
|