summaryrefslogtreecommitdiff
path: root/Source/WebKit/chromium/tests/CCRenderSurfaceTest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/chromium/tests/CCRenderSurfaceTest.cpp')
-rw-r--r--Source/WebKit/chromium/tests/CCRenderSurfaceTest.cpp17
1 files changed, 7 insertions, 10 deletions
diff --git a/Source/WebKit/chromium/tests/CCRenderSurfaceTest.cpp b/Source/WebKit/chromium/tests/CCRenderSurfaceTest.cpp
index b65e6e72b..e9e041749 100644
--- a/Source/WebKit/chromium/tests/CCRenderSurfaceTest.cpp
+++ b/Source/WebKit/chromium/tests/CCRenderSurfaceTest.cpp
@@ -102,12 +102,10 @@ TEST(CCRenderSurfaceTest, sanityCheckSurfaceCreatesCorrectSharedQuadState)
IntRect contentRect = IntRect(IntPoint::zero(), IntSize(50, 50));
IntRect clipRect = IntRect(IntPoint(5, 5), IntSize(40, 40));
- WebTransformationMatrix draw;
WebTransformationMatrix origin;
- draw.translate(30, 40);
+ origin.translate(30, 40);
- renderSurface->setDrawTransform(draw);
renderSurface->setOriginTransform(origin);
renderSurface->setContentRect(contentRect);
renderSurface->setClipRect(clipRect);
@@ -116,13 +114,12 @@ TEST(CCRenderSurfaceTest, sanityCheckSurfaceCreatesCorrectSharedQuadState)
OwnPtr<CCSharedQuadState> sharedQuadState = renderSurface->createSharedQuadState();
- EXPECT_TRUE(sharedQuadState->quadTransform().isIdentity());
- EXPECT_EQ(30, sharedQuadState->layerTransform().m41());
- EXPECT_EQ(40, sharedQuadState->layerTransform().m42());
- EXPECT_EQ(contentRect, sharedQuadState->layerRect());
- EXPECT_EQ(clipRect, sharedQuadState->scissorRect());
- EXPECT_EQ(1, sharedQuadState->opacity());
- EXPECT_FALSE(sharedQuadState->isOpaque());
+ EXPECT_EQ(30, sharedQuadState->quadTransform.m41());
+ EXPECT_EQ(40, sharedQuadState->quadTransform.m42());
+ EXPECT_EQ(contentRect, IntRect(sharedQuadState->visibleContentRect));
+ EXPECT_EQ(clipRect, IntRect(sharedQuadState->scissorRect));
+ EXPECT_EQ(1, sharedQuadState->opacity);
+ EXPECT_FALSE(sharedQuadState->opaque);
}
} // namespace