| Index: cc/trees/layer_tree_host_impl_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
|
| index 06bf669ca947a3811eb77ffa1c5c2b81d994c86a..fa05ab8019d008f8a81b5244426f568b7ef9ec2c 100644
|
| --- a/cc/trees/layer_tree_host_impl_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_impl_unittest.cc
|
| @@ -102,6 +102,7 @@ class LayerTreeHostImplTest : public testing::Test,
|
| settings.impl_side_painting = true;
|
| settings.texture_id_allocation_chunk_size = 1;
|
| settings.report_overscroll_only_for_scrollable_axes = true;
|
| + settings.use_pinch_virtual_viewport = true;
|
| return settings;
|
| }
|
|
|
| @@ -823,9 +824,7 @@ TEST_F(LayerTreeHostImplTest, ScrollVerticallyByPageReturnsCorrectValue) {
|
| gfx::Point(), SCROLL_BACKWARD));
|
| }
|
|
|
| -// The user-scrollability breaks for zoomed-in pages. So disable this.
|
| -// http://crbug.com/322223
|
| -TEST_F(LayerTreeHostImplTest, DISABLED_ScrollWithUserUnscrollableLayers) {
|
| +TEST_F(LayerTreeHostImplTest, ScrollWithUserUnscrollableLayers) {
|
| LayerImpl* scroll_layer = SetupScrollAndContentsLayers(gfx::Size(200, 200));
|
| host_impl_->SetViewportSize(gfx::Size(100, 100));
|
|
|
|
|