| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/layer_tree_host_impl.h" | 5 #include "cc/layer_tree_host_impl.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 904 EXPECT_EQ(0.5f, metadata.min_page_scale_factor); | 904 EXPECT_EQ(0.5f, metadata.min_page_scale_factor); |
| 905 EXPECT_EQ(4.0f, metadata.max_page_scale_factor); | 905 EXPECT_EQ(4.0f, metadata.max_page_scale_factor); |
| 906 } | 906 } |
| 907 | 907 |
| 908 // Scrolling should update metadata immediately. | 908 // Scrolling should update metadata immediately. |
| 909 EXPECT_EQ(m_hostImpl->scrollBegin(gfx::Point(0, 0), InputHandlerClient::Whee
l), InputHandlerClient::ScrollStarted); | 909 EXPECT_EQ(m_hostImpl->scrollBegin(gfx::Point(0, 0), InputHandlerClient::Whee
l), InputHandlerClient::ScrollStarted); |
| 910 m_hostImpl->scrollBy(gfx::Point(), gfx::Vector2d(0, 10)); | 910 m_hostImpl->scrollBy(gfx::Point(), gfx::Vector2d(0, 10)); |
| 911 { | 911 { |
| 912 CompositorFrameMetadata metadata = m_hostImpl->makeCompositorFrameMetada
ta(); | 912 CompositorFrameMetadata metadata = m_hostImpl->makeCompositorFrameMetada
ta(); |
| 913 EXPECT_EQ(gfx::Vector2dF(0.0f, 10.0f), metadata.root_scroll_offset); | 913 EXPECT_EQ(gfx::Vector2dF(0.0f, 10.0f), metadata.root_scroll_offset); |
| 914 EXPECT_EQ(gfx::Vector2dF(0.0f, 0.0f), metadata.unused_scroll_delta); |
| 914 } | 915 } |
| 916 // Overscroll should update metadata immediately. |
| 917 m_hostImpl->scrollBy(gfx::Point(), gfx::Vector2d(0, 50)); |
| 918 { |
| 919 CompositorFrameMetadata metadata = m_hostImpl->makeCompositorFrameMetada
ta(); |
| 920 EXPECT_EQ(gfx::Vector2dF(0.0f, 50.0f), metadata.root_scroll_offset); |
| 921 EXPECT_EQ(gfx::Vector2dF(0.0f, 10.0f), metadata.unused_scroll_delta); |
| 922 } |
| 923 m_hostImpl->scrollBy(gfx::Point(), gfx::Vector2d(0, -40)); |
| 915 m_hostImpl->scrollEnd(); | 924 m_hostImpl->scrollEnd(); |
| 916 | 925 |
| 917 { | 926 { |
| 918 CompositorFrameMetadata metadata = m_hostImpl->makeCompositorFrameMetada
ta(); | 927 CompositorFrameMetadata metadata = m_hostImpl->makeCompositorFrameMetada
ta(); |
| 919 EXPECT_EQ(gfx::Vector2dF(0.0f, 10.0f), metadata.root_scroll_offset); | 928 EXPECT_EQ(gfx::Vector2dF(0.0f, 10.0f), metadata.root_scroll_offset); |
| 920 } | 929 } |
| 921 | 930 |
| 922 // Page scale should update metadata correctly (shrinking only the viewport)
. | 931 // Page scale should update metadata correctly (shrinking only the viewport)
. |
| 923 m_hostImpl->pinchGestureBegin(); | 932 m_hostImpl->pinchGestureBegin(); |
| 924 m_hostImpl->pinchGestureUpdate(2.0f, gfx::Point(0, 0)); | 933 m_hostImpl->pinchGestureUpdate(2.0f, gfx::Point(0, 0)); |
| (...skipping 3751 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4676 m_hostImpl->didDrawAllLayers(frame); | 4685 m_hostImpl->didDrawAllLayers(frame); |
| 4677 } | 4686 } |
| 4678 } | 4687 } |
| 4679 | 4688 |
| 4680 INSTANTIATE_TEST_CASE_P(LayerTreeHostImplTests, | 4689 INSTANTIATE_TEST_CASE_P(LayerTreeHostImplTests, |
| 4681 LayerTreeHostImplTest, | 4690 LayerTreeHostImplTest, |
| 4682 ::testing::Values(false, true)); | 4691 ::testing::Values(false, true)); |
| 4683 | 4692 |
| 4684 } // namespace | 4693 } // namespace |
| 4685 } // namespace cc | 4694 } // namespace cc |
| OLD | NEW |