diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-03 13:42:47 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:27:51 +0000 |
| commit | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (patch) | |
| tree | d29d987c4d7b173cf853279b79a51598f104b403 /chromium/cc/layers/layer_unittest.cc | |
| parent | 830c9e163d31a9180fadca926b3e1d7dfffb5021 (diff) | |
BASELINE: Update Chromium to 66.0.3359.156
Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/cc/layers/layer_unittest.cc')
| -rw-r--r-- | chromium/cc/layers/layer_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chromium/cc/layers/layer_unittest.cc b/chromium/cc/layers/layer_unittest.cc index 2f633b181d5..53e58744d20 100644 --- a/chromium/cc/layers/layer_unittest.cc +++ b/chromium/cc/layers/layer_unittest.cc @@ -1476,9 +1476,9 @@ TEST_F(LayerTest, SetLayerTreeHostNotUsingLayerListsManagesElementId) { AnimationTimeline::Create(AnimationIdProvider::NextTimelineId()); animation_host_->AddAnimationTimeline(timeline); - AddOpacityTransitionToElementWithPlayer(element_id, timeline, 10.0, 1.f, 0.f, - false); - EXPECT_TRUE(animation_host_->HasAnyAnimation(element_id)); + AddOpacityTransitionToElementWithAnimation(element_id, timeline, 10.0, 1.f, + 0.f, false); + EXPECT_TRUE(animation_host_->IsElementAnimating(element_id)); EXPECT_EQ(nullptr, layer_tree_host_->LayerByElementId(element_id)); test_layer->SetLayerTreeHost(layer_tree_host_.get()); @@ -1532,9 +1532,9 @@ TEST_F(LayerTestWithLayerLists, AnimationTimeline::Create(AnimationIdProvider::NextTimelineId()); animation_host_->AddAnimationTimeline(timeline); - AddOpacityTransitionToElementWithPlayer(element_id, timeline, 10.0, 1.f, 0.f, - false); - EXPECT_TRUE(animation_host_->HasAnyAnimation(element_id)); + AddOpacityTransitionToElementWithAnimation(element_id, timeline, 10.0, 1.f, + 0.f, false); + EXPECT_TRUE(animation_host_->IsElementAnimating(element_id)); EXPECT_EQ(nullptr, layer_tree_host_->LayerByElementId(element_id)); test_layer->SetLayerTreeHost(layer_tree_host_.get()); |