Index: cc/trees/layer_tree_host_common_unittest.cc |
diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc |
index fa9563fc92aff30e215f09d31ad100e7d07b756a..f2c7caebf96705b88d6aab0b652235f4224b2369 100644 |
--- a/cc/trees/layer_tree_host_common_unittest.cc |
+++ b/cc/trees/layer_tree_host_common_unittest.cc |
@@ -321,7 +321,9 @@ TEST_F(LayerTreeHostCommonTest, TransformsAboutScrollOffset) { |
FakeImplProxy proxy; |
TestSharedBitmapManager shared_bitmap_manager; |
- FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr); |
+ TestTaskGraphRunner task_graph_runner; |
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, |
+ &task_graph_runner); |
gfx::Transform identity_matrix; |
scoped_ptr<LayerImpl> sublayer_scoped_ptr( |
@@ -5824,7 +5826,9 @@ TEST_F(LayerTreeHostCommonTest, TransparentChildRenderSurfaceCreation) { |
TEST_F(LayerTreeHostCommonTest, OpacityAnimatingOnPendingTree) { |
FakeImplProxy proxy; |
TestSharedBitmapManager shared_bitmap_manager; |
- FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr); |
+ TestTaskGraphRunner task_graph_runner; |
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, |
+ &task_graph_runner); |
host_impl.CreatePendingTree(); |
scoped_ptr<LayerImpl> root = LayerImpl::Create(host_impl.pending_tree(), 1); |
@@ -6075,7 +6079,9 @@ INSTANTIATE_TEST_CASE_P(LayerTreeHostCommonTest, |
TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayer) { |
FakeImplProxy proxy; |
TestSharedBitmapManager shared_bitmap_manager; |
- FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr); |
+ TestTaskGraphRunner task_graph_runner; |
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, |
+ &task_graph_runner); |
host_impl.CreatePendingTree(); |
const gfx::Transform identity_matrix; |
@@ -6133,7 +6139,9 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayer) { |
TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayerImpl) { |
FakeImplProxy proxy; |
TestSharedBitmapManager shared_bitmap_manager; |
- FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr); |
+ TestTaskGraphRunner task_graph_runner; |
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, |
+ &task_graph_runner); |
host_impl.CreatePendingTree(); |
const gfx::Transform identity_matrix; |
@@ -6178,7 +6186,9 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayerImpl) { |
TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayers) { |
FakeImplProxy proxy; |
TestSharedBitmapManager shared_bitmap_manager; |
- FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr); |
+ TestTaskGraphRunner task_graph_runner; |
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, |
+ &task_graph_runner); |
host_impl.CreatePendingTree(); |
const gfx::Transform identity_matrix; |
@@ -6235,7 +6245,9 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayers) { |
TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayersImpl) { |
FakeImplProxy proxy; |
TestSharedBitmapManager shared_bitmap_manager; |
- FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr); |
+ TestTaskGraphRunner task_graph_runner; |
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, |
+ &task_graph_runner); |
host_impl.CreatePendingTree(); |
const gfx::Transform identity_matrix; |
@@ -6280,7 +6292,9 @@ void EmptyCopyOutputCallback(scoped_ptr<CopyOutputResult> result) {} |
TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) { |
FakeImplProxy proxy; |
TestSharedBitmapManager shared_bitmap_manager; |
- FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr); |
+ TestTaskGraphRunner task_graph_runner; |
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, |
+ &task_graph_runner); |
host_impl.CreatePendingTree(); |
const gfx::Transform identity_matrix; |
@@ -6429,7 +6443,9 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) { |
TEST_F(LayerTreeHostCommonTest, ClippedOutCopyRequest) { |
FakeImplProxy proxy; |
TestSharedBitmapManager shared_bitmap_manager; |
- FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr); |
+ TestTaskGraphRunner task_graph_runner; |
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, |
+ &task_graph_runner); |
host_impl.CreatePendingTree(); |
const gfx::Transform identity_matrix; |
@@ -6504,7 +6520,9 @@ TEST_F(LayerTreeHostCommonTest, ClippedOutCopyRequest) { |
TEST_F(LayerTreeHostCommonTest, VisibleContentRectInsideSurface) { |
FakeImplProxy proxy; |
TestSharedBitmapManager shared_bitmap_manager; |
- FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr); |
+ TestTaskGraphRunner task_graph_runner; |
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, |
+ &task_graph_runner); |
host_impl.CreatePendingTree(); |
const gfx::Transform identity_matrix; |
@@ -7115,7 +7133,9 @@ TEST_F(LayerTreeHostCommonTest, |
TEST_F(LayerTreeHostCommonTest, CanRenderToSeparateSurface) { |
FakeImplProxy proxy; |
TestSharedBitmapManager shared_bitmap_manager; |
- FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr); |
+ TestTaskGraphRunner task_graph_runner; |
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, |
+ &task_graph_runner); |
scoped_ptr<LayerImpl> root = |
LayerImpl::Create(host_impl.active_tree(), 12345); |
scoped_ptr<LayerImpl> child1 = |
@@ -7857,7 +7877,9 @@ TEST_F(LayerTreeHostCommonTest, ScrollCompensationWithRounding) { |
// |
FakeImplProxy proxy; |
TestSharedBitmapManager shared_bitmap_manager; |
- FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr); |
+ TestTaskGraphRunner task_graph_runner; |
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, |
+ &task_graph_runner); |
host_impl.CreatePendingTree(); |
scoped_ptr<LayerImpl> root = LayerImpl::Create(host_impl.active_tree(), 1); |
scoped_ptr<LayerImpl> container = |
@@ -8001,7 +8023,9 @@ TEST_F(LayerTreeHostCommonTest, |
// |
FakeImplProxy proxy; |
TestSharedBitmapManager shared_bitmap_manager; |
- FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr); |
+ TestTaskGraphRunner task_graph_runner; |
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, |
+ &task_graph_runner); |
host_impl.CreatePendingTree(); |
scoped_ptr<LayerImpl> root = LayerImpl::Create(host_impl.active_tree(), 1); |
scoped_ptr<LayerImpl> container = |
@@ -8095,7 +8119,9 @@ class AnimationScaleFactorTrackingLayerImpl : public LayerImpl { |
TEST_F(LayerTreeHostCommonTest, MaximumAnimationScaleFactor) { |
FakeImplProxy proxy; |
TestSharedBitmapManager shared_bitmap_manager; |
- FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr); |
+ TestTaskGraphRunner task_graph_runner; |
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, |
+ &task_graph_runner); |
gfx::Transform identity_matrix; |
scoped_ptr<AnimationScaleFactorTrackingLayerImpl> grand_parent = |
AnimationScaleFactorTrackingLayerImpl::Create(host_impl.active_tree(), 1); |
@@ -8316,7 +8342,9 @@ static void GatherDrawnLayers(LayerImplList* rsll, |
TEST_F(LayerTreeHostCommonTest, RenderSurfaceLayerListMembership) { |
FakeImplProxy proxy; |
TestSharedBitmapManager shared_bitmap_manager; |
- FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr); |
+ TestTaskGraphRunner task_graph_runner; |
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, |
+ &task_graph_runner); |
gfx::Transform identity_matrix; |
scoped_ptr<LayerImpl> grand_parent = |
@@ -8559,7 +8587,9 @@ TEST_F(LayerTreeHostCommonTest, RenderSurfaceLayerListMembership) { |
TEST_F(LayerTreeHostCommonTest, DrawPropertyScales) { |
FakeImplProxy proxy; |
TestSharedBitmapManager shared_bitmap_manager; |
- FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr); |
+ TestTaskGraphRunner task_graph_runner; |
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, |
+ &task_graph_runner); |
scoped_ptr<LayerImpl> root = LayerImpl::Create(host_impl.active_tree(), 1); |
LayerImpl* root_layer = root.get(); |
@@ -8815,7 +8845,9 @@ TEST_F(LayerTreeHostCommonTest, VisibleContentRectInChildRenderSurface) { |
clip->AddChild(content); |
FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D); |
- scoped_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create(&client); |
+ TestTaskGraphRunner task_graph_runner; |
+ scoped_ptr<FakeLayerTreeHost> host = |
+ FakeLayerTreeHost::Create(&client, &task_graph_runner); |
host->SetRootLayer(root); |
gfx::Size device_viewport_size(768, 582); |
@@ -8839,7 +8871,9 @@ TEST_F(LayerTreeHostCommonTest, VisibleContentRectInChildRenderSurface) { |
TEST_F(LayerTreeHostCommonTest, BoundsDeltaAffectVisibleContentRect) { |
FakeImplProxy proxy; |
TestSharedBitmapManager shared_bitmap_manager; |
- FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr); |
+ TestTaskGraphRunner task_graph_runner; |
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, |
+ &task_graph_runner); |
// Set two layers: the root layer clips it's child, |
// the child draws its content. |
@@ -9446,7 +9480,9 @@ TEST_F(LayerTreeHostCommonTest, SkippingSubtreeMain) { |
TEST_F(LayerTreeHostCommonTest, SkippingSubtreeImpl) { |
FakeImplProxy proxy; |
TestSharedBitmapManager shared_bitmap_manager; |
- FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, nullptr); |
+ TestTaskGraphRunner task_graph_runner; |
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager, |
+ &task_graph_runner); |
gfx::Transform identity; |
scoped_ptr<LayerImpl> root = LayerImpl::Create(host_impl.active_tree(), 1); |