| Index: cc/test/layer_test_common.cc
|
| diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc
|
| index f1326a517859de66e58c163f2740bf31071e9adb..2979d5e46f31e8c02b7d75284703603179cdb77f 100644
|
| --- a/cc/test/layer_test_common.cc
|
| +++ b/cc/test/layer_test_common.cc
|
| @@ -18,7 +18,6 @@
|
| #include "cc/quads/render_pass.h"
|
| #include "cc/test/animation_test_common.h"
|
| #include "cc/test/fake_output_surface.h"
|
| -#include "cc/test/layer_tree_settings_for_testing.h"
|
| #include "cc/test/mock_occlusion_tracker.h"
|
| #include "cc/trees/layer_tree_host_common.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -118,7 +117,7 @@ void LayerTestCommon::VerifyQuadsAreOccluded(const QuadList& quads,
|
| }
|
|
|
| LayerTestCommon::LayerImplTest::LayerImplTest()
|
| - : LayerImplTest(LayerTreeSettingsForTesting()) {}
|
| + : LayerImplTest(LayerTreeSettings()) {}
|
|
|
| LayerTestCommon::LayerImplTest::LayerImplTest(const LayerTreeSettings& settings)
|
| : client_(FakeLayerTreeHostClient::DIRECT_3D),
|
| @@ -131,23 +130,19 @@ LayerTestCommon::LayerImplTest::LayerImplTest(const LayerTreeSettings& settings)
|
| host_->host_impl()->SetVisible(true);
|
| host_->host_impl()->InitializeRenderer(output_surface_.get());
|
|
|
| - if (host_->settings().use_compositor_animation_timelines) {
|
| - const int timeline_id = AnimationIdProvider::NextTimelineId();
|
| - timeline_ = AnimationTimeline::Create(timeline_id);
|
| - host_->animation_host()->AddAnimationTimeline(timeline_);
|
| - // Create impl-side instance.
|
| - host_->animation_host()->PushPropertiesTo(
|
| - host_->host_impl()->animation_host());
|
| - timeline_impl_ =
|
| - host_->host_impl()->animation_host()->GetTimelineById(timeline_id);
|
| - }
|
| + const int timeline_id = AnimationIdProvider::NextTimelineId();
|
| + timeline_ = AnimationTimeline::Create(timeline_id);
|
| + host_->animation_host()->AddAnimationTimeline(timeline_);
|
| + // Create impl-side instance.
|
| + host_->animation_host()->PushPropertiesTo(
|
| + host_->host_impl()->animation_host());
|
| + timeline_impl_ =
|
| + host_->host_impl()->animation_host()->GetTimelineById(timeline_id);
|
| }
|
|
|
| LayerTestCommon::LayerImplTest::~LayerImplTest() {
|
| - if (host_->settings().use_compositor_animation_timelines) {
|
| - host_->animation_host()->RemoveAnimationTimeline(timeline_);
|
| - timeline_ = nullptr;
|
| - }
|
| + host_->animation_host()->RemoveAnimationTimeline(timeline_);
|
| + timeline_ = nullptr;
|
| }
|
|
|
| void LayerTestCommon::LayerImplTest::CalcDrawProps(
|
|
|