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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/input/scrollbar_animation_controller_unittest.cc

Issue 2866733002: Remove owning_id from EffectNode and replace it by an opaque stable_id (Closed)
Patch Set: none Created 3 years, 7 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
« no previous file with comments | « cc/input/scrollbar_animation_controller.cc ('k') | cc/layers/effect_tree_layer_list_iterator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/input/scrollbar_animation_controller_unittest.cc
diff --git a/cc/input/scrollbar_animation_controller_unittest.cc b/cc/input/scrollbar_animation_controller_unittest.cc
index 07ae92a47a79fb20b07d551c8e161f3de11b65d5..33236eb4f44736dc0a922773d59a9d3e604a668b 100644
--- a/cc/input/scrollbar_animation_controller_unittest.cc
+++ b/cc/input/scrollbar_animation_controller_unittest.cc
@@ -8,7 +8,9 @@
#include "cc/test/fake_impl_task_runner_provider.h"
#include "cc/test/fake_layer_tree_host_impl.h"
#include "cc/test/geometry_test_utils.h"
+#include "cc/test/layer_test_common.h"
#include "cc/test/test_task_graph_runner.h"
+#include "cc/trees/effect_node.h"
#include "cc/trees/layer_tree_impl.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -65,8 +67,8 @@ class ScrollbarAnimationControllerAuraOverlayTest : public testing::Test {
client_(&host_impl_) {}
void ExpectScrollbarsOpacity(float opacity) {
- EXPECT_FLOAT_EQ(opacity, v_scrollbar_layer_->Opacity());
- EXPECT_FLOAT_EQ(opacity, h_scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(opacity, OpacityForLayer(v_scrollbar_layer_));
+ EXPECT_FLOAT_EQ(opacity, OpacityForLayer(h_scrollbar_layer_));
}
protected:
@@ -207,7 +209,8 @@ TEST_F(ScrollbarAnimationControllerAuraOverlayTest, HideOnResize) {
scrollbar_controller_->DidScrollBegin();
scrollbar_controller_->DidScrollUpdate();
- EXPECT_FLOAT_EQ(1, h_scrollbar_layer_->Opacity());
+
+ EXPECT_FLOAT_EQ(1, OpacityForLayer(h_scrollbar_layer_));
scrollbar_controller_->DidScrollEnd();
@@ -219,7 +222,7 @@ TEST_F(ScrollbarAnimationControllerAuraOverlayTest, HideOnResize) {
scrollbar_controller_->DidScrollBegin();
scrollbar_controller_->DidScrollUpdate();
- EXPECT_FLOAT_EQ(0.0f, h_scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(0.0f, OpacityForLayer(h_scrollbar_layer_));
scrollbar_controller_->DidScrollEnd();
}
@@ -1289,7 +1292,7 @@ class VerticalScrollbarAnimationControllerAndroidTest
TEST_F(ScrollbarAnimationControllerAndroidTest, HiddenInBegin) {
scrollbar_layer_->SetOverlayScrollbarLayerOpacityAnimated(0.f);
scrollbar_controller_->Animate(base::TimeTicks());
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(0.0f, OpacityForLayer(scrollbar_layer_));
}
TEST_F(ScrollbarAnimationControllerAndroidTest,
@@ -1300,14 +1303,19 @@ TEST_F(ScrollbarAnimationControllerAndroidTest,
base::TimeTicks time;
time += base::TimeDelta::FromSeconds(100);
scrollbar_controller_->Animate(time);
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
+
+ float opacity = scrollbar_layer_->layer_tree_impl()
+ ->property_trees()
+ ->effect_tree.Node(scrollbar_layer_->effect_tree_index())
+ ->opacity;
+ EXPECT_FLOAT_EQ(0.0f, opacity);
scrollbar_controller_->DidScrollEnd();
EXPECT_TRUE(start_fade_.Equals(base::Closure()));
time += base::TimeDelta::FromSeconds(100);
scrollbar_controller_->Animate(time);
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(0.0f, OpacityForLayer(scrollbar_layer_));
}
// Confirm the scrollbar does not appear on WillUpdateScroll on Android.
@@ -1317,12 +1325,12 @@ TEST_F(ScrollbarAnimationControllerAndroidTest,
time += base::TimeDelta::FromSeconds(1);
// Scrollbar should be invisible.
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(0.0f, OpacityForLayer(scrollbar_layer_));
EXPECT_TRUE(scrollbar_controller_->ScrollbarsHidden());
// Scrollbar should appear when scroll will update.
scrollbar_controller_->WillUpdateScroll();
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(0.0f, OpacityForLayer(scrollbar_layer_));
EXPECT_TRUE(scrollbar_controller_->ScrollbarsHidden());
// No fade out animation should have been enqueued.
@@ -1343,7 +1351,7 @@ TEST_F(ScrollbarAnimationControllerAndroidTest, HideOnResize) {
scrollbar_controller_->DidScrollBegin();
scrollbar_controller_->DidScrollUpdate();
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f, OpacityForLayer(scrollbar_layer_));
scrollbar_controller_->DidScrollEnd();
@@ -1355,7 +1363,7 @@ TEST_F(ScrollbarAnimationControllerAndroidTest, HideOnResize) {
scrollbar_controller_->DidScrollBegin();
scrollbar_controller_->DidScrollUpdate();
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(0.0f, OpacityForLayer(scrollbar_layer_));
scrollbar_controller_->DidScrollEnd();
}
@@ -1374,7 +1382,7 @@ TEST_F(VerticalScrollbarAnimationControllerAndroidTest, HideOnResize) {
scrollbar_controller_->DidScrollBegin();
scrollbar_controller_->DidScrollUpdate();
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(0.0f, OpacityForLayer(scrollbar_layer_));
scrollbar_controller_->DidScrollEnd();
@@ -1385,7 +1393,7 @@ TEST_F(VerticalScrollbarAnimationControllerAndroidTest, HideOnResize) {
scrollbar_controller_->DidScrollBegin();
scrollbar_controller_->DidScrollUpdate();
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f, OpacityForLayer(scrollbar_layer_));
scrollbar_controller_->DidScrollEnd();
}
@@ -1400,7 +1408,7 @@ TEST_F(ScrollbarAnimationControllerAndroidTest, HideOnUserNonScrollableHorz) {
scrollbar_controller_->DidScrollBegin();
scrollbar_controller_->DidScrollUpdate();
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(0.0f, OpacityForLayer(scrollbar_layer_));
scrollbar_controller_->DidScrollEnd();
}
@@ -1415,7 +1423,7 @@ TEST_F(ScrollbarAnimationControllerAndroidTest, ShowOnUserNonScrollableVert) {
scrollbar_controller_->DidScrollBegin();
scrollbar_controller_->DidScrollUpdate();
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f, OpacityForLayer(scrollbar_layer_));
scrollbar_controller_->DidScrollEnd();
}
@@ -1431,7 +1439,7 @@ TEST_F(VerticalScrollbarAnimationControllerAndroidTest,
scrollbar_controller_->DidScrollBegin();
scrollbar_controller_->DidScrollUpdate();
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(0.0f, OpacityForLayer(scrollbar_layer_));
scrollbar_controller_->DidScrollEnd();
}
@@ -1447,7 +1455,7 @@ TEST_F(VerticalScrollbarAnimationControllerAndroidTest,
scrollbar_controller_->DidScrollBegin();
scrollbar_controller_->DidScrollUpdate();
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f, OpacityForLayer(scrollbar_layer_));
scrollbar_controller_->DidScrollEnd();
}
@@ -1460,7 +1468,7 @@ TEST_F(ScrollbarAnimationControllerAndroidTest, AwakenByScrollingGesture) {
scrollbar_controller_->DidScrollUpdate();
EXPECT_FALSE(did_request_animate_);
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f, OpacityForLayer(scrollbar_layer_));
EXPECT_TRUE(start_fade_.Equals(base::Closure()));
@@ -1468,7 +1476,7 @@ TEST_F(ScrollbarAnimationControllerAndroidTest, AwakenByScrollingGesture) {
scrollbar_controller_->Animate(time);
EXPECT_FALSE(did_request_animate_);
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f, OpacityForLayer(scrollbar_layer_));
scrollbar_controller_->DidScrollEnd();
EXPECT_FALSE(did_request_animate_);
start_fade_.Run();
@@ -1479,19 +1487,19 @@ TEST_F(ScrollbarAnimationControllerAndroidTest, AwakenByScrollingGesture) {
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(2.0f / 3.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(2.0f / 3.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f / 3.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f / 3.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
@@ -1507,24 +1515,24 @@ TEST_F(ScrollbarAnimationControllerAndroidTest, AwakenByScrollingGesture) {
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(2.0f / 3.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(2.0f / 3.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f / 3.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f / 3.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->Animate(time);
EXPECT_FALSE(did_request_animate_);
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(0.0f, OpacityForLayer(scrollbar_layer_));
}
TEST_F(ScrollbarAnimationControllerAndroidTest, AwakenByProgrammaticScroll) {
@@ -1539,13 +1547,13 @@ TEST_F(ScrollbarAnimationControllerAndroidTest, AwakenByProgrammaticScroll) {
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(2.0f / 3.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(2.0f / 3.0f, OpacityForLayer(scrollbar_layer_));
scrollbar_controller_->DidScrollUpdate();
EXPECT_FALSE(did_request_animate_);
@@ -1556,19 +1564,19 @@ TEST_F(ScrollbarAnimationControllerAndroidTest, AwakenByProgrammaticScroll) {
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(2.0f / 3.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(2.0f / 3.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f / 3.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f / 3.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->DidScrollUpdate();
@@ -1577,24 +1585,24 @@ TEST_F(ScrollbarAnimationControllerAndroidTest, AwakenByProgrammaticScroll) {
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(2.0f / 3.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(2.0f / 3.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f / 3.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f / 3.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->Animate(time);
EXPECT_FALSE(did_request_animate_);
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(0.0f, OpacityForLayer(scrollbar_layer_));
}
TEST_F(ScrollbarAnimationControllerAndroidTest,
@@ -1608,32 +1616,32 @@ TEST_F(ScrollbarAnimationControllerAndroidTest,
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(2.0f / 3.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(2.0f / 3.0f, OpacityForLayer(scrollbar_layer_));
scrollbar_controller_->DidScrollBegin();
EXPECT_FALSE(did_request_animate_);
- EXPECT_FLOAT_EQ(2.0f / 3.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(2.0f / 3.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f / 3.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f / 3.0f, OpacityForLayer(scrollbar_layer_));
scrollbar_controller_->DidScrollEnd();
EXPECT_FALSE(did_request_animate_);
- EXPECT_FLOAT_EQ(1.0f / 3.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f / 3.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->Animate(time);
EXPECT_FALSE(did_request_animate_);
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(0.0f, OpacityForLayer(scrollbar_layer_));
}
TEST_F(ScrollbarAnimationControllerAndroidTest,
@@ -1648,32 +1656,32 @@ TEST_F(ScrollbarAnimationControllerAndroidTest,
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(2.0f / 3.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(2.0f / 3.0f, OpacityForLayer(scrollbar_layer_));
scrollbar_controller_->DidScrollBegin();
- EXPECT_FLOAT_EQ(2.0f / 3.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(2.0f / 3.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->Animate(time);
EXPECT_TRUE(did_request_animate_);
did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f / 3.0f, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1.0f / 3.0f, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->DidScrollUpdate();
EXPECT_FALSE(did_request_animate_);
- EXPECT_FLOAT_EQ(1, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1, OpacityForLayer(scrollbar_layer_));
time += base::TimeDelta::FromSeconds(1);
scrollbar_controller_->DidScrollEnd();
EXPECT_FALSE(did_request_animate_);
- EXPECT_FLOAT_EQ(1, scrollbar_layer_->Opacity());
+ EXPECT_FLOAT_EQ(1, OpacityForLayer(scrollbar_layer_));
}
} // namespace
« no previous file with comments | « cc/input/scrollbar_animation_controller.cc ('k') | cc/layers/effect_tree_layer_list_iterator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698