OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/animation/scrollbar_animation_controller_thinning.h" | 5 #include "cc/animation/scrollbar_animation_controller_thinning.h" |
6 | 6 |
7 #include "cc/layers/solid_color_scrollbar_layer_impl.h" | 7 #include "cc/layers/solid_color_scrollbar_layer_impl.h" |
8 #include "cc/test/fake_impl_proxy.h" | 8 #include "cc/test/fake_impl_proxy.h" |
9 #include "cc/test/fake_layer_tree_host_impl.h" | 9 #include "cc/test/fake_layer_tree_host_impl.h" |
10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
11 | 11 |
12 namespace cc { | 12 namespace cc { |
13 namespace { | 13 namespace { |
14 | 14 |
15 class ScrollbarAnimationControllerThinningTest : public testing::Test { | 15 class ScrollbarAnimationControllerThinningTest : public testing::Test { |
16 public: | 16 public: |
17 ScrollbarAnimationControllerThinningTest() : host_impl_(&proxy_) {} | 17 ScrollbarAnimationControllerThinningTest() : host_impl_(&proxy_) {} |
18 | 18 |
19 protected: | 19 protected: |
20 virtual void SetUp() { | 20 virtual void SetUp() { |
21 scroll_layer_ = LayerImpl::Create(host_impl_.active_tree(), 1); | 21 scoped_ptr<LayerImpl> scroll_layer = |
| 22 LayerImpl::Create(host_impl_.active_tree(), 1); |
| 23 clip_layer_ = LayerImpl::Create(host_impl_.active_tree(), 3); |
| 24 scroll_layer->SetScrollClipLayer(clip_layer_->id()); |
| 25 LayerImpl* scroll_layer_ptr = scroll_layer.get(); |
| 26 clip_layer_->AddChild(scroll_layer.Pass()); |
| 27 |
22 const int kId = 2; | 28 const int kId = 2; |
23 const int kThumbThickness = 10; | 29 const int kThumbThickness = 10; |
24 const bool kIsLeftSideVerticalScrollbar = false; | 30 const bool kIsLeftSideVerticalScrollbar = false; |
25 scrollbar_layer_ = SolidColorScrollbarLayerImpl::Create( | 31 const bool kIsOverlayScrollbar = true; |
26 host_impl_.active_tree(), kId, HORIZONTAL, kThumbThickness, | 32 scrollbar_layer_ = |
27 kIsLeftSideVerticalScrollbar); | 33 SolidColorScrollbarLayerImpl::Create(host_impl_.active_tree(), |
| 34 kId, |
| 35 HORIZONTAL, |
| 36 kThumbThickness, |
| 37 kIsLeftSideVerticalScrollbar, |
| 38 kIsOverlayScrollbar); |
28 | 39 |
29 scroll_layer_->SetMaxScrollOffset(gfx::Vector2d(50, 50)); | 40 scrollbar_layer_->SetClipLayerById(clip_layer_->id()); |
30 scroll_layer_->SetBounds(gfx::Size(50, 50)); | 41 scrollbar_layer_->SetScrollLayerById(scroll_layer_ptr->id()); |
31 scroll_layer_->SetHorizontalScrollbarLayer(scrollbar_layer_.get()); | 42 clip_layer_->SetBounds(gfx::Size(100, 100)); |
| 43 scroll_layer_ptr->SetBounds(gfx::Size(50, 50)); |
32 | 44 |
33 scrollbar_controller_ = ScrollbarAnimationControllerThinning::CreateForTest( | 45 scrollbar_controller_ = ScrollbarAnimationControllerThinning::CreateForTest( |
34 scroll_layer_.get(), | 46 scroll_layer_ptr, |
35 base::TimeDelta::FromSeconds(2), | 47 base::TimeDelta::FromSeconds(2), |
36 base::TimeDelta::FromSeconds(3)); | 48 base::TimeDelta::FromSeconds(3)); |
37 } | 49 } |
38 | 50 |
39 FakeImplProxy proxy_; | 51 FakeImplProxy proxy_; |
40 FakeLayerTreeHostImpl host_impl_; | 52 FakeLayerTreeHostImpl host_impl_; |
41 scoped_ptr<ScrollbarAnimationControllerThinning> scrollbar_controller_; | 53 scoped_ptr<ScrollbarAnimationControllerThinning> scrollbar_controller_; |
42 scoped_ptr<LayerImpl> scroll_layer_; | 54 scoped_ptr<LayerImpl> clip_layer_; |
43 scoped_ptr<SolidColorScrollbarLayerImpl> scrollbar_layer_; | 55 scoped_ptr<SolidColorScrollbarLayerImpl> scrollbar_layer_; |
44 }; | 56 }; |
45 | 57 |
46 // Check initialization of scrollbar. | 58 // Check initialization of scrollbar. |
47 TEST_F(ScrollbarAnimationControllerThinningTest, Idle) { | 59 TEST_F(ScrollbarAnimationControllerThinningTest, Idle) { |
48 scrollbar_controller_->Animate(base::TimeTicks()); | 60 scrollbar_controller_->Animate(base::TimeTicks()); |
49 EXPECT_FLOAT_EQ(0.7f, scrollbar_layer_->opacity()); | 61 EXPECT_FLOAT_EQ(0.7f, scrollbar_layer_->opacity()); |
50 EXPECT_FLOAT_EQ(0.4f, scrollbar_layer_->thumb_thickness_scale_factor()); | 62 EXPECT_FLOAT_EQ(0.4f, scrollbar_layer_->thumb_thickness_scale_factor()); |
51 } | 63 } |
52 | 64 |
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
323 | 335 |
324 time += base::TimeDelta::FromSeconds(1); | 336 time += base::TimeDelta::FromSeconds(1); |
325 scrollbar_controller_->Animate(time); | 337 scrollbar_controller_->Animate(time); |
326 EXPECT_FLOAT_EQ(0.7f, scrollbar_layer_->opacity()); | 338 EXPECT_FLOAT_EQ(0.7f, scrollbar_layer_->opacity()); |
327 // The thickness now gets big again. | 339 // The thickness now gets big again. |
328 EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->thumb_thickness_scale_factor()); | 340 EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->thumb_thickness_scale_factor()); |
329 } | 341 } |
330 | 342 |
331 } // namespace | 343 } // namespace |
332 } // namespace cc | 344 } // namespace cc |
OLD | NEW |