cc/layers/scrollbar_layer_unittest.cc - Issue 13975019: Merge 194269

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/layers/scrollbar_layer_unittest.cc

Issue 13975019: Merge 194269 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1479/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:

Index: cc/layers/scrollbar_layer_unittest.cc

===================================================================

--- cc/layers/scrollbar_layer_unittest.cc (revision 194303)

+++ cc/layers/scrollbar_layer_unittest.cc (working copy)

@@ -139,7 +139,9 @@

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->SavePaintProperties();

content_layer->SetBounds(gfx::Size(100, 200));

+ content_layer->SavePaintProperties();

scoped_ptr<LayerImpl> layer_impl_tree_root =

TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),

@@ -158,7 +160,9 @@

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->SavePaintProperties();

content_layer->SetBounds(gfx::Size(1000, 2000));

+ content_layer->SavePaintProperties();

ScrollbarAnimationController* scrollbar_controller =

layer_impl_tree_root->scrollbar_animation_controller();

@@ -445,7 +449,9 @@

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->SavePaintProperties();

content_layer->SetBounds(gfx::Size(100, 200));

+ content_layer->SavePaintProperties();

scoped_ptr<LayerImpl> layer_impl_tree_root =

TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),

« no previous file with comments | « cc/layers/picture_layer.cc ('k') | cc/layers/tiled_layer.cc » ('j') | no next file with comments »