cc/layers/layer_unittest.cc - Issue 23983047: Pinch/Zoom Infrastructure & Plumbing CL

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/layer_unittest.cc

Issue 23983047: Pinch/Zoom Infrastructure & Plumbing CL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Backup 2013.10.29 Created 7 years, 2 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/layer_unittest.cc

diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc

index c66eb8551eed05fb0622ee8ff77f9787436d7b43..69b2339566424d0f1bffbead0ffcf2593ddb51e9 100644

--- a/cc/layers/layer_unittest.cc

+++ b/cc/layers/layer_unittest.cc

@@ -549,7 +549,8 @@ TEST_F(LayerTest, CheckPropertyChangeCausesCorrectBehavior) {

EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetPosition(gfx::PointF(4.f, 9.f)));

EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetSublayerTransform(

gfx::Transform(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)));

- EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetScrollable(true));

+ // We can use any layer pointer here since we aren't syncing for real.

+ EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetScrollable(test_layer.get()));

EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetUserScrollable(true, false));

EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetScrollOffset(

gfx::Vector2d(10, 10)));