| Index: cc/test/layer_tree_test.cc
|
| diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
|
| index ef6ed71ddff910bc4537052147bc19a62a911b70..d1d196267ffc8c702da95a3fb6ec34401246d297 100644
|
| --- a/cc/test/layer_tree_test.cc
|
| +++ b/cc/test/layer_tree_test.cc
|
| @@ -44,6 +44,15 @@ DrawResult TestHooks::PrepareToDrawOnThread(
|
| return draw_result;
|
| }
|
|
|
| +void TestHooks::CreateResourceAndRasterWorkerPool(
|
| + LayerTreeHostImpl* host_impl,
|
| + scoped_ptr<RasterWorkerPool>* raster_worker_pool,
|
| + scoped_ptr<ResourcePool>* resource_pool,
|
| + scoped_ptr<ResourcePool>* staging_resource_pool) {
|
| + host_impl->LayerTreeHostImpl::CreateResourceAndRasterWorkerPool(
|
| + raster_worker_pool, resource_pool, staging_resource_pool);
|
| +}
|
| +
|
| base::TimeDelta TestHooks::LowFrequencyAnimationInterval() const {
|
| return base::TimeDelta::FromMilliseconds(16);
|
| }
|
| @@ -146,6 +155,14 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
|
| block_notify_ready_to_activate_for_testing_(false),
|
| notify_ready_to_activate_was_blocked_(false) {}
|
|
|
| + void CreateResourceAndRasterWorkerPool(
|
| + scoped_ptr<RasterWorkerPool>* raster_worker_pool,
|
| + scoped_ptr<ResourcePool>* resource_pool,
|
| + scoped_ptr<ResourcePool>* staging_resource_pool) override {
|
| + test_hooks_->CreateResourceAndRasterWorkerPool(
|
| + this, raster_worker_pool, resource_pool, staging_resource_pool);
|
| + }
|
| +
|
| void WillBeginImplFrame(const BeginFrameArgs& args) override {
|
| LayerTreeHostImpl::WillBeginImplFrame(args);
|
| test_hooks_->WillBeginImplFrameOnThread(this, args);
|
| @@ -399,7 +416,8 @@ class LayerTreeHostForTesting : public LayerTreeHost {
|
| };
|
|
|
| LayerTreeTest::LayerTreeTest()
|
| - : beginning_(false),
|
| + : output_surface_(nullptr),
|
| + beginning_(false),
|
| end_when_begin_returns_(false),
|
| timed_out_(false),
|
| scheduled_(false),
|
|
|