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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/input/scrollbar_animation_controller_linear_fade_unittest.cc

Issue 2692243005: Merge Compositor's ScrollbarAnimationControllers into single class (Closed)
Patch Set: fix confict constant Created 3 years, 10 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_linear_fade.cc ('k') | cc/input/scrollbar_animation_controller_thinning.h » ('j') | content/renderer/gpu/render_widget_compositor.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
deleted file mode 100644
index cc79c3761e9b270d0e6d9a0c9d4f61b0a8869962..0000000000000000000000000000000000000000
--- a/cc/input/scrollbar_animation_controller_linear_fade_unittest.cc
+++ /dev/null
@@ -1,505 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "cc/input/scrollbar_animation_controller_linear_fade.h"
-
-#include "cc/layers/solid_color_scrollbar_layer_impl.h"
-#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/test_task_graph_runner.h"
-#include "cc/trees/layer_tree_impl.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace cc {
-namespace {
-
-class ScrollbarAnimationControllerLinearFadeTest
- : public testing::Test,
- public ScrollbarAnimationControllerClient {
- public:
- ScrollbarAnimationControllerLinearFadeTest()
- : host_impl_(&task_runner_provider_,
- &task_graph_runner_),
- did_request_redraw_(false),
- did_request_animate_(false) {}
-
- void PostDelayedScrollbarAnimationTask(const base::Closure& start_fade,
- base::TimeDelta delay) override {
- start_fade_ = start_fade;
- delay_ = delay;
- }
- void SetNeedsRedrawForScrollbarAnimation() override {
- did_request_redraw_ = true;
- }
- void SetNeedsAnimateForScrollbarAnimation() override {
- did_request_animate_ = true;
- }
- ScrollbarSet ScrollbarsFor(int scroll_layer_id) const override {
- return host_impl_.ScrollbarsFor(scroll_layer_id);
- }
- void DidChangeScrollbarVisibility() override {}
-
- protected:
- void SetUp() override {
- const int kThumbThickness = 10;
- const int kTrackStart = 0;
- const bool kIsLeftSideVerticalScrollbar = false;
- const bool kIsOverlayScrollbar = true; // Allow opacity animations.
-
- std::unique_ptr<LayerImpl> scroll_layer =
- LayerImpl::Create(host_impl_.active_tree(), 1);
- std::unique_ptr<SolidColorScrollbarLayerImpl> scrollbar =
- SolidColorScrollbarLayerImpl::Create(
- host_impl_.active_tree(), 2, orientation(), kThumbThickness,
- kTrackStart, kIsLeftSideVerticalScrollbar, kIsOverlayScrollbar);
- scrollbar_layer_ = scrollbar.get();
- scrollbar_layer_->test_properties()->opacity_can_animate = true;
- std::unique_ptr<LayerImpl> clip =
- LayerImpl::Create(host_impl_.active_tree(), 3);
- clip_layer_ = clip.get();
- scroll_layer->SetScrollClipLayer(clip_layer_->id());
- LayerImpl* scroll_layer_ptr = scroll_layer.get();
- scroll_layer->test_properties()->AddChild(std::move(scrollbar));
- clip->test_properties()->AddChild(std::move(scroll_layer));
- host_impl_.active_tree()->SetRootLayerForTesting(std::move(clip));
-
- scrollbar_layer_->SetScrollLayerId(scroll_layer_ptr->id());
- clip_layer_->SetBounds(gfx::Size(100, 100));
- scroll_layer_ptr->SetBounds(gfx::Size(200, 200));
- host_impl_.active_tree()->BuildLayerListAndPropertyTreesForTesting();
-
- scrollbar_controller_ = ScrollbarAnimationControllerLinearFade::Create(
- scroll_layer_ptr->id(), this, base::TimeDelta::FromSeconds(2),
- base::TimeDelta::FromSeconds(5), base::TimeDelta::FromSeconds(3));
- }
-
- virtual ScrollbarOrientation orientation() const { return HORIZONTAL; }
-
- FakeImplTaskRunnerProvider task_runner_provider_;
- TestTaskGraphRunner task_graph_runner_;
- FakeLayerTreeHostImpl host_impl_;
- std::unique_ptr<ScrollbarAnimationControllerLinearFade> scrollbar_controller_;
- LayerImpl* clip_layer_;
- SolidColorScrollbarLayerImpl* scrollbar_layer_;
-
- base::Closure start_fade_;
- base::TimeDelta delay_;
- bool did_request_redraw_;
- bool did_request_animate_;
-};
-
-class VerticalScrollbarAnimationControllerLinearFadeTest
- : public ScrollbarAnimationControllerLinearFadeTest {
- protected:
- ScrollbarOrientation orientation() const override { return VERTICAL; }
-};
-
-TEST_F(ScrollbarAnimationControllerLinearFadeTest, DelayAnimationOnResize) {
- 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();
- // Normal Animation delay of 2 seconds.
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
- EXPECT_EQ(delay_, base::TimeDelta::FromSeconds(2));
-
- 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());
- EXPECT_EQ(delay_, base::TimeDelta::FromSeconds(5));
-}
-
-TEST_F(ScrollbarAnimationControllerLinearFadeTest, HiddenInBegin) {
- 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_->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;
- time += base::TimeDelta::FromSeconds(100);
- scrollbar_controller_->Animate(time);
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->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());
-}
-
-TEST_F(ScrollbarAnimationControllerLinearFadeTest, HideOnResize) {
- LayerImpl* scroll_layer = host_impl_.active_tree()->LayerById(1);
- ASSERT_TRUE(scroll_layer);
- EXPECT_EQ(gfx::Size(200, 200), scroll_layer->bounds());
-
- EXPECT_EQ(HORIZONTAL, scrollbar_layer_->orientation());
-
- // Shrink along X axis, horizontal scrollbar should appear.
- clip_layer_->SetBounds(gfx::Size(100, 200));
- EXPECT_EQ(gfx::Size(100, 200), clip_layer_->bounds());
-
- scrollbar_controller_->DidScrollBegin();
-
- scrollbar_controller_->DidScrollUpdate(false);
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
-
- scrollbar_controller_->DidScrollEnd();
-
- // Shrink along Y axis and expand along X, horizontal scrollbar
- // should disappear.
- clip_layer_->SetBounds(gfx::Size(200, 100));
- EXPECT_EQ(gfx::Size(200, 100), clip_layer_->bounds());
-
- scrollbar_controller_->DidScrollBegin();
-
- scrollbar_controller_->DidScrollUpdate(false);
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
-
- scrollbar_controller_->DidScrollEnd();
-}
-
-TEST_F(VerticalScrollbarAnimationControllerLinearFadeTest, HideOnResize) {
- LayerImpl* scroll_layer = host_impl_.active_tree()->LayerById(1);
- ASSERT_TRUE(scroll_layer);
- EXPECT_EQ(gfx::Size(200, 200), scroll_layer->bounds());
-
- EXPECT_EQ(VERTICAL, scrollbar_layer_->orientation());
-
- // Shrink along X axis, vertical scrollbar should remain invisible.
- clip_layer_->SetBounds(gfx::Size(100, 200));
- EXPECT_EQ(gfx::Size(100, 200), clip_layer_->bounds());
-
- scrollbar_controller_->DidScrollBegin();
-
- scrollbar_controller_->DidScrollUpdate(false);
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
-
- scrollbar_controller_->DidScrollEnd();
-
- // Shrink along Y axis and expand along X, vertical scrollbar should appear.
- clip_layer_->SetBounds(gfx::Size(200, 100));
- EXPECT_EQ(gfx::Size(200, 100), clip_layer_->bounds());
-
- scrollbar_controller_->DidScrollBegin();
-
- scrollbar_controller_->DidScrollUpdate(false);
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
-
- scrollbar_controller_->DidScrollEnd();
-}
-
-TEST_F(ScrollbarAnimationControllerLinearFadeTest,
- HideOnUserNonScrollableHorz) {
- EXPECT_EQ(HORIZONTAL, scrollbar_layer_->orientation());
-
- LayerImpl* scroll_layer = host_impl_.active_tree()->LayerById(1);
- ASSERT_TRUE(scroll_layer);
- scroll_layer->set_user_scrollable_horizontal(false);
-
- scrollbar_controller_->DidScrollBegin();
-
- scrollbar_controller_->DidScrollUpdate(false);
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
-
- scrollbar_controller_->DidScrollEnd();
-}
-
-TEST_F(ScrollbarAnimationControllerLinearFadeTest,
- ShowOnUserNonScrollableVert) {
- EXPECT_EQ(HORIZONTAL, scrollbar_layer_->orientation());
-
- LayerImpl* scroll_layer = host_impl_.active_tree()->LayerById(1);
- ASSERT_TRUE(scroll_layer);
- scroll_layer->set_user_scrollable_vertical(false);
-
- scrollbar_controller_->DidScrollBegin();
-
- scrollbar_controller_->DidScrollUpdate(false);
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
-
- scrollbar_controller_->DidScrollEnd();
-}
-
-TEST_F(VerticalScrollbarAnimationControllerLinearFadeTest,
- HideOnUserNonScrollableVert) {
- EXPECT_EQ(VERTICAL, scrollbar_layer_->orientation());
-
- LayerImpl* scroll_layer = host_impl_.active_tree()->LayerById(1);
- ASSERT_TRUE(scroll_layer);
- scroll_layer->set_user_scrollable_vertical(false);
-
- scrollbar_controller_->DidScrollBegin();
-
- scrollbar_controller_->DidScrollUpdate(false);
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
-
- scrollbar_controller_->DidScrollEnd();
-}
-
-TEST_F(VerticalScrollbarAnimationControllerLinearFadeTest,
- ShowOnUserNonScrollableHorz) {
- EXPECT_EQ(VERTICAL, scrollbar_layer_->orientation());
-
- LayerImpl* scroll_layer = host_impl_.active_tree()->LayerById(1);
- ASSERT_TRUE(scroll_layer);
- scroll_layer->set_user_scrollable_horizontal(false);
-
- scrollbar_controller_->DidScrollBegin();
-
- scrollbar_controller_->DidScrollUpdate(false);
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
-
- scrollbar_controller_->DidScrollEnd();
-}
-
-TEST_F(ScrollbarAnimationControllerLinearFadeTest, AwakenByScrollingGesture) {
- base::TimeTicks time;
- time += base::TimeDelta::FromSeconds(1);
- scrollbar_controller_->DidScrollBegin();
- EXPECT_FALSE(did_request_animate_);
-
- scrollbar_controller_->DidScrollUpdate(false);
- EXPECT_FALSE(did_request_animate_);
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
-
- EXPECT_TRUE(start_fade_.Equals(base::Closure()));
-
- time += base::TimeDelta::FromSeconds(100);
-
- scrollbar_controller_->Animate(time);
- EXPECT_FALSE(did_request_animate_);
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
- scrollbar_controller_->DidScrollEnd();
- EXPECT_FALSE(did_request_animate_);
- start_fade_.Run();
- EXPECT_TRUE(did_request_animate_);
- did_request_animate_ = false;
-
- time += base::TimeDelta::FromSeconds(2);
- scrollbar_controller_->Animate(time);
- EXPECT_TRUE(did_request_animate_);
- did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
-
- 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());
-
- 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());
-
- time += base::TimeDelta::FromSeconds(1);
-
- scrollbar_controller_->DidScrollBegin();
- scrollbar_controller_->DidScrollUpdate(false);
- scrollbar_controller_->DidScrollEnd();
-
- start_fade_.Run();
- EXPECT_TRUE(did_request_animate_);
- did_request_animate_ = false;
-
- time += base::TimeDelta::FromSeconds(2);
- scrollbar_controller_->Animate(time);
- EXPECT_TRUE(did_request_animate_);
- did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
-
- 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());
-
- 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());
-
- time += base::TimeDelta::FromSeconds(1);
- scrollbar_controller_->Animate(time);
- EXPECT_FALSE(did_request_animate_);
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
-}
-
-TEST_F(ScrollbarAnimationControllerLinearFadeTest, AwakenByProgrammaticScroll) {
- base::TimeTicks time;
- time += base::TimeDelta::FromSeconds(1);
- scrollbar_controller_->DidScrollUpdate(false);
- EXPECT_FALSE(did_request_animate_);
-
- start_fade_.Run();
- EXPECT_TRUE(did_request_animate_);
- did_request_animate_ = false;
- scrollbar_controller_->Animate(time);
- EXPECT_TRUE(did_request_animate_);
- did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
-
- 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());
- scrollbar_controller_->DidScrollUpdate(false);
- EXPECT_FALSE(did_request_animate_);
-
- start_fade_.Run();
- EXPECT_TRUE(did_request_animate_);
- did_request_animate_ = false;
- time += base::TimeDelta::FromSeconds(2);
- scrollbar_controller_->Animate(time);
- EXPECT_TRUE(did_request_animate_);
- did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
-
- 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());
-
- 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());
-
- time += base::TimeDelta::FromSeconds(1);
- scrollbar_controller_->DidScrollUpdate(false);
- start_fade_.Run();
- time += base::TimeDelta::FromSeconds(1);
- scrollbar_controller_->Animate(time);
- EXPECT_TRUE(did_request_animate_);
- did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
-
- 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());
-
- 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());
-
- time += base::TimeDelta::FromSeconds(1);
- scrollbar_controller_->Animate(time);
- EXPECT_FALSE(did_request_animate_);
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
-}
-
-TEST_F(ScrollbarAnimationControllerLinearFadeTest,
- AnimationPreservedByNonScrollingGesture) {
- base::TimeTicks time;
- time += base::TimeDelta::FromSeconds(1);
- scrollbar_controller_->DidScrollUpdate(false);
- start_fade_.Run();
- EXPECT_TRUE(did_request_animate_);
- did_request_animate_ = false;
- scrollbar_controller_->Animate(time);
- EXPECT_TRUE(did_request_animate_);
- did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
-
- 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());
-
- scrollbar_controller_->DidScrollBegin();
- EXPECT_FALSE(did_request_animate_);
- EXPECT_FLOAT_EQ(2.0f / 3.0f, scrollbar_layer_->Opacity());
-
- 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());
-
- scrollbar_controller_->DidScrollEnd();
- EXPECT_FALSE(did_request_animate_);
- EXPECT_FLOAT_EQ(1.0f / 3.0f, scrollbar_layer_->Opacity());
-
- time += base::TimeDelta::FromSeconds(1);
- scrollbar_controller_->Animate(time);
- EXPECT_FALSE(did_request_animate_);
- EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->Opacity());
-}
-
-TEST_F(ScrollbarAnimationControllerLinearFadeTest,
- AnimationOverriddenByScrollingGesture) {
- base::TimeTicks time;
- time += base::TimeDelta::FromSeconds(1);
- scrollbar_controller_->DidScrollUpdate(false);
- EXPECT_FALSE(did_request_animate_);
- start_fade_.Run();
- EXPECT_TRUE(did_request_animate_);
- did_request_animate_ = false;
- scrollbar_controller_->Animate(time);
- EXPECT_TRUE(did_request_animate_);
- did_request_animate_ = false;
- EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->Opacity());
-
- 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());
-
- scrollbar_controller_->DidScrollBegin();
- EXPECT_FLOAT_EQ(2.0f / 3.0f, scrollbar_layer_->Opacity());
-
- 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());
-
- time += base::TimeDelta::FromSeconds(1);
- scrollbar_controller_->DidScrollUpdate(false);
- EXPECT_FALSE(did_request_animate_);
- EXPECT_FLOAT_EQ(1, scrollbar_layer_->Opacity());
-
- time += base::TimeDelta::FromSeconds(1);
- scrollbar_controller_->DidScrollEnd();
- EXPECT_FALSE(did_request_animate_);
- EXPECT_FLOAT_EQ(1, scrollbar_layer_->Opacity());
-}
-
-} // namespace
-} // namespace cc
« no previous file with comments | « cc/input/scrollbar_animation_controller_linear_fade.cc ('k') | cc/input/scrollbar_animation_controller_thinning.h » ('j') | content/renderer/gpu/render_widget_compositor.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698