X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcc%2Flayers%2Flayer_unittest.cc;h=7242baedbf01e915227248644954f43153ffacd2;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=55f5616f93f7a5c3046126dfa6c2301beab79326;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/cc/layers/layer_unittest.cc b/src/cc/layers/layer_unittest.cc index 55f5616..7242bae 100644 --- a/src/cc/layers/layer_unittest.cc +++ b/src/cc/layers/layer_unittest.cc @@ -26,13 +26,13 @@ using ::testing::Mock; using ::testing::StrictMock; using ::testing::_; -#define EXPECT_SET_NEEDS_FULL_TREE_SYNC(expect, code_to_test) do { \ +#define EXPECT_SET_NEEDS_FULL_TREE_SYNC(expect, code_to_test) \ + do { \ EXPECT_CALL(*layer_tree_host_, SetNeedsFullTreeSync()).Times((expect)); \ - code_to_test; \ - Mock::VerifyAndClearExpectations(layer_tree_host_.get()); \ + code_to_test; \ + Mock::VerifyAndClearExpectations(layer_tree_host_.get()); \ } while (false) - namespace cc { namespace { @@ -549,9 +549,9 @@ TEST_F(LayerTest, CheckPropertyChangeCausesCorrectBehavior) { EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetIsRootForIsolatedGroup(true)); EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetContentsOpaque(true)); 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->SetScrollClipLayerId(test_layer->id())); EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetUserScrollable(true, false)); EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetScrollOffset( gfx::Vector2d(10, 10)));