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

Unified Diff: cc/layers/scrollbar_layer_unittest.cc

Issue 13939005: cc: Add strict layer property change checking and handle bounds changes during paint. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months 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 side-by-side diff with in-line comments
Download patch
Index: cc/layers/scrollbar_layer_unittest.cc
diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc
index d1870b302bf37fd6613b624008ad5688cf523c34..909665b76379150637889f88e1c8ec7718e852dd 100644
--- a/cc/layers/scrollbar_layer_unittest.cc
+++ b/cc/layers/scrollbar_layer_unittest.cc
@@ -139,7 +139,9 @@ TEST(ScrollbarLayerTest, ScrollOffsetSynchronization) {
layer_tree_root->SetScrollOffset(gfx::Vector2d(10, 20));
layer_tree_root->SetMaxScrollOffset(gfx::Vector2d(30, 50));
layer_tree_root->SetBounds(gfx::Size(100, 200));
+ layer_tree_root->PrepareToUpdate();
content_layer->SetBounds(gfx::Size(100, 200));
+ content_layer->PrepareToUpdate();
scoped_ptr<LayerImpl> layer_impl_tree_root =
TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
@@ -158,7 +160,9 @@ TEST(ScrollbarLayerTest, ScrollOffsetSynchronization) {
layer_tree_root->SetScrollOffset(gfx::Vector2d(100, 200));
layer_tree_root->SetMaxScrollOffset(gfx::Vector2d(300, 500));
layer_tree_root->SetBounds(gfx::Size(1000, 2000));
+ layer_tree_root->PrepareToUpdate();
content_layer->SetBounds(gfx::Size(1000, 2000));
+ content_layer->PrepareToUpdate();
ScrollbarAnimationController* scrollbar_controller =
layer_impl_tree_root->scrollbar_animation_controller();
@@ -445,7 +449,9 @@ TEST(ScrollbarLayerTest, PinchZoomScrollbarUpdates) {
layer_tree_root->SetScrollOffset(gfx::Vector2d(10, 20));
layer_tree_root->SetMaxScrollOffset(gfx::Vector2d(30, 50));
layer_tree_root->SetBounds(gfx::Size(100, 200));
+ layer_tree_root->PrepareToUpdate();
content_layer->SetBounds(gfx::Size(100, 200));
+ content_layer->PrepareToUpdate();
scoped_ptr<LayerImpl> layer_impl_tree_root =
TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
« cc/layers/layer.cc ('K') | « cc/layers/layer.cc ('k') | cc/trees/layer_tree_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698