Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(277)

Unified Diff: cc/input/scrollbar_animation_controller_linear_fade_unittest.cc

Issue 2273933002: cc : Delete LayerImpl::OnOpacityAnimated (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/input/scrollbar_animation_controller_linear_fade_unittest.cc
diff --git a/cc/input/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/input/scrollbar_animation_controller_linear_fade_unittest.cc
index 3303d23411217af84b9cd6ae2b12af0727f7a9b5..d4c4df22ac1a76e82fdbdd558f95fbf0d09f3f5d 100644
--- a/cc/input/scrollbar_animation_controller_linear_fade_unittest.cc
+++ b/cc/input/scrollbar_animation_controller_linear_fade_unittest.cc
@@ -99,7 +99,11 @@ class VerticalScrollbarAnimationControllerLinearFadeTest
};
TEST_F(ScrollbarAnimationControllerLinearFadeTest, DelayAnimationOnResize) {
- scrollbar_layer_->OnOpacityAnimated(0.0f);
+ scrollbar_layer_->layer_tree_impl()
+ ->property_trees()
+ ->effect_tree.OnOpacityAnimated(0.0f,
+ scrollbar_layer_->effect_tree_index(),
+ scrollbar_layer_->layer_tree_impl());
scrollbar_controller_->DidScrollBegin();
scrollbar_controller_->DidScrollUpdate(true);
scrollbar_controller_->DidScrollEnd();
@@ -107,7 +111,11 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, DelayAnimationOnResize) {
EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
EXPECT_EQ(delay_, base::TimeDelta::FromSeconds(2));
- scrollbar_layer_->OnOpacityAnimated(0.0f);
+ scrollbar_layer_->layer_tree_impl()
+ ->property_trees()
+ ->effect_tree.OnOpacityAnimated(0.0f,
+ scrollbar_layer_->effect_tree_index(),
+ scrollbar_layer_->layer_tree_impl());
scrollbar_controller_->DidScrollUpdate(true);
// Delay animation on resize to 5 seconds.
EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
@@ -115,14 +123,22 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, DelayAnimationOnResize) {
}
TEST_F(ScrollbarAnimationControllerLinearFadeTest, HiddenInBegin) {
- scrollbar_layer_->OnOpacityAnimated(0.0f);
+ scrollbar_layer_->layer_tree_impl()
+ ->property_trees()
+ ->effect_tree.OnOpacityAnimated(0.0f,
+ scrollbar_layer_->effect_tree_index(),
+ scrollbar_layer_->layer_tree_impl());
scrollbar_controller_->Animate(base::TimeTicks());
EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
}
TEST_F(ScrollbarAnimationControllerLinearFadeTest,
HiddenAfterNonScrollingGesture) {
- scrollbar_layer_->OnOpacityAnimated(0.0f);
+ scrollbar_layer_->layer_tree_impl()
+ ->property_trees()
+ ->effect_tree.OnOpacityAnimated(0.0f,
+ scrollbar_layer_->effect_tree_index(),
+ scrollbar_layer_->layer_tree_impl());
scrollbar_controller_->DidScrollBegin();
base::TimeTicks time;
« no previous file with comments | « cc/input/scrollbar_animation_controller_linear_fade.cc ('k') | cc/input/scrollbar_animation_controller_thinning.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698