| 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/trees/layer_tree_host_impl.h" | 5 #include "cc/trees/layer_tree_host_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 1826 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1837 DrawFrame(); | 1837 DrawFrame(); |
| 1838 { | 1838 { |
| 1839 CompositorFrameMetadata metadata = | 1839 CompositorFrameMetadata metadata = |
| 1840 host_impl_->MakeCompositorFrameMetadata(); | 1840 host_impl_->MakeCompositorFrameMetadata(); |
| 1841 EXPECT_EQ(gfx::Vector2dF(), metadata.root_scroll_offset); | 1841 EXPECT_EQ(gfx::Vector2dF(), metadata.root_scroll_offset); |
| 1842 EXPECT_EQ(1.f, metadata.page_scale_factor); | 1842 EXPECT_EQ(1.f, metadata.page_scale_factor); |
| 1843 EXPECT_EQ(gfx::SizeF(50.f, 50.f), metadata.scrollable_viewport_size); | 1843 EXPECT_EQ(gfx::SizeF(50.f, 50.f), metadata.scrollable_viewport_size); |
| 1844 EXPECT_EQ(gfx::SizeF(100.f, 100.f), metadata.root_layer_size); | 1844 EXPECT_EQ(gfx::SizeF(100.f, 100.f), metadata.root_layer_size); |
| 1845 EXPECT_EQ(0.5f, metadata.min_page_scale_factor); | 1845 EXPECT_EQ(0.5f, metadata.min_page_scale_factor); |
| 1846 EXPECT_EQ(4.f, metadata.max_page_scale_factor); | 1846 EXPECT_EQ(4.f, metadata.max_page_scale_factor); |
| 1847 EXPECT_FALSE(metadata.root_overflow_x_hidden); |
| 1848 EXPECT_FALSE(metadata.root_overflow_y_hidden); |
| 1847 } | 1849 } |
| 1848 | 1850 |
| 1849 // Scrolling should update metadata immediately. | 1851 // Scrolling should update metadata immediately. |
| 1850 EXPECT_EQ(InputHandler::ScrollStarted, | 1852 EXPECT_EQ(InputHandler::ScrollStarted, |
| 1851 host_impl_->ScrollBegin(gfx::Point(), InputHandler::Wheel)); | 1853 host_impl_->ScrollBegin(gfx::Point(), InputHandler::Wheel)); |
| 1852 host_impl_->ScrollBy(gfx::Point(), gfx::Vector2d(0, 10)); | 1854 host_impl_->ScrollBy(gfx::Point(), gfx::Vector2d(0, 10)); |
| 1853 { | 1855 { |
| 1854 CompositorFrameMetadata metadata = | 1856 CompositorFrameMetadata metadata = |
| 1855 host_impl_->MakeCompositorFrameMetadata(); | 1857 host_impl_->MakeCompositorFrameMetadata(); |
| 1856 EXPECT_EQ(gfx::Vector2dF(0.f, 10.f), metadata.root_scroll_offset); | 1858 EXPECT_EQ(gfx::Vector2dF(0.f, 10.f), metadata.root_scroll_offset); |
| 1857 } | 1859 } |
| 1858 host_impl_->ScrollEnd(); | 1860 host_impl_->ScrollEnd(); |
| 1859 { | 1861 { |
| 1860 CompositorFrameMetadata metadata = | 1862 CompositorFrameMetadata metadata = |
| 1861 host_impl_->MakeCompositorFrameMetadata(); | 1863 host_impl_->MakeCompositorFrameMetadata(); |
| 1862 EXPECT_EQ(gfx::Vector2dF(0.f, 10.f), metadata.root_scroll_offset); | 1864 EXPECT_EQ(gfx::Vector2dF(0.f, 10.f), metadata.root_scroll_offset); |
| 1863 } | 1865 } |
| 1864 | 1866 |
| 1867 // Root "overflow: hidden" properties should be reflected. |
| 1868 { |
| 1869 host_impl_->active_tree() |
| 1870 ->InnerViewportScrollLayer() |
| 1871 ->set_user_scrollable_horizontal(false); |
| 1872 CompositorFrameMetadata metadata = |
| 1873 host_impl_->MakeCompositorFrameMetadata(); |
| 1874 EXPECT_TRUE(metadata.root_overflow_x_hidden); |
| 1875 EXPECT_FALSE(metadata.root_overflow_y_hidden); |
| 1876 |
| 1877 host_impl_->active_tree() |
| 1878 ->InnerViewportScrollLayer() |
| 1879 ->set_user_scrollable_vertical(false); |
| 1880 metadata = host_impl_->MakeCompositorFrameMetadata(); |
| 1881 EXPECT_TRUE(metadata.root_overflow_x_hidden); |
| 1882 EXPECT_TRUE(metadata.root_overflow_y_hidden); |
| 1883 } |
| 1884 |
| 1865 // Page scale should update metadata correctly (shrinking only the viewport). | 1885 // Page scale should update metadata correctly (shrinking only the viewport). |
| 1866 host_impl_->ScrollBegin(gfx::Point(), InputHandler::Gesture); | 1886 host_impl_->ScrollBegin(gfx::Point(), InputHandler::Gesture); |
| 1867 host_impl_->PinchGestureBegin(); | 1887 host_impl_->PinchGestureBegin(); |
| 1868 host_impl_->PinchGestureUpdate(2.f, gfx::Point()); | 1888 host_impl_->PinchGestureUpdate(2.f, gfx::Point()); |
| 1869 host_impl_->PinchGestureEnd(); | 1889 host_impl_->PinchGestureEnd(); |
| 1870 host_impl_->ScrollEnd(); | 1890 host_impl_->ScrollEnd(); |
| 1871 { | 1891 { |
| 1872 CompositorFrameMetadata metadata = | 1892 CompositorFrameMetadata metadata = |
| 1873 host_impl_->MakeCompositorFrameMetadata(); | 1893 host_impl_->MakeCompositorFrameMetadata(); |
| 1874 EXPECT_EQ(gfx::Vector2dF(0.f, 10.f), metadata.root_scroll_offset); | 1894 EXPECT_EQ(gfx::Vector2dF(0.f, 10.f), metadata.root_scroll_offset); |
| (...skipping 6340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8215 // surface. | 8235 // surface. |
| 8216 EXPECT_EQ(0, num_lost_surfaces_); | 8236 EXPECT_EQ(0, num_lost_surfaces_); |
| 8217 host_impl_->DidLoseOutputSurface(); | 8237 host_impl_->DidLoseOutputSurface(); |
| 8218 EXPECT_EQ(1, num_lost_surfaces_); | 8238 EXPECT_EQ(1, num_lost_surfaces_); |
| 8219 host_impl_->DidLoseOutputSurface(); | 8239 host_impl_->DidLoseOutputSurface(); |
| 8220 EXPECT_LE(1, num_lost_surfaces_); | 8240 EXPECT_LE(1, num_lost_surfaces_); |
| 8221 } | 8241 } |
| 8222 | 8242 |
| 8223 } // namespace | 8243 } // namespace |
| 8224 } // namespace cc | 8244 } // namespace cc |
| OLD | NEW |