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

Side by Side Diff: cc/layers/layer_impl_unittest.cc

Issue 109343003: cc: Allow 'overflow: hidden' layers to be scrolled again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/layers/layer_impl.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/layers/layer_impl.h" 5 #include "cc/layers/layer_impl.h"
6 6
7 #include "cc/output/filter_operation.h" 7 #include "cc/output/filter_operation.h"
8 #include "cc/output/filter_operations.h" 8 #include "cc/output/filter_operations.h"
9 #include "cc/test/fake_impl_proxy.h" 9 #include "cc/test/fake_impl_proxy.h"
10 #include "cc/test/fake_layer_tree_host_impl.h" 10 #include "cc/test/fake_layer_tree_host_impl.h"
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); 559 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
560 EXPECT_VECTOR_EQ(sent_scroll_delta, layer()->sent_scroll_delta()); 560 EXPECT_VECTOR_EQ(sent_scroll_delta, layer()->sent_scroll_delta());
561 561
562 layer()->ApplySentScrollDeltasFromAbortedCommit(); 562 layer()->ApplySentScrollDeltasFromAbortedCommit();
563 563
564 EXPECT_VECTOR_EQ(scroll_offset + scroll_delta, layer()->TotalScrollOffset()); 564 EXPECT_VECTOR_EQ(scroll_offset + scroll_delta, layer()->TotalScrollOffset());
565 EXPECT_VECTOR_EQ(scroll_offset + sent_scroll_delta, layer()->scroll_offset()); 565 EXPECT_VECTOR_EQ(scroll_offset + sent_scroll_delta, layer()->scroll_offset());
566 EXPECT_VECTOR_EQ(gfx::Vector2d(), layer()->sent_scroll_delta()); 566 EXPECT_VECTOR_EQ(gfx::Vector2d(), layer()->sent_scroll_delta());
567 } 567 }
568 568
569 TEST_F(LayerImplScrollTest, ScrollUserUnscrollableLayer) { 569 // The user-scrollability breaks for zoomed-in pages. So disable this.
570 // http://crbug.com/322223
571 TEST_F(LayerImplScrollTest, DISABLED_ScrollUserUnscrollableLayer) {
570 gfx::Vector2d max_scroll_offset(50, 80); 572 gfx::Vector2d max_scroll_offset(50, 80);
571 gfx::Vector2d scroll_offset(10, 5); 573 gfx::Vector2d scroll_offset(10, 5);
572 gfx::Vector2dF scroll_delta(20.5f, 8.5f); 574 gfx::Vector2dF scroll_delta(20.5f, 8.5f);
573 575
574 layer()->set_user_scrollable_vertical(false); 576 layer()->set_user_scrollable_vertical(false);
575 layer()->SetMaxScrollOffset(max_scroll_offset); 577 layer()->SetMaxScrollOffset(max_scroll_offset);
576 layer()->SetScrollOffset(scroll_offset); 578 layer()->SetScrollOffset(scroll_offset);
577 gfx::Vector2dF unscrolled = layer()->ScrollBy(scroll_delta); 579 gfx::Vector2dF unscrolled = layer()->ScrollBy(scroll_delta);
578 580
579 EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 8.5f), unscrolled); 581 EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 8.5f), unscrolled);
580 EXPECT_VECTOR_EQ(gfx::Vector2dF(30.5f, 5), layer()->TotalScrollOffset()); 582 EXPECT_VECTOR_EQ(gfx::Vector2dF(30.5f, 5), layer()->TotalScrollOffset());
581 } 583 }
582 584
583 } // namespace 585 } // namespace
584 } // namespace cc 586 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/layer_impl.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698