Index: cc/CCLayerTreeHostCommonTest.cpp |
diff --git a/cc/CCLayerTreeHostCommonTest.cpp b/cc/CCLayerTreeHostCommonTest.cpp |
index c23ae328f217cbfbbb50fbba8e57f998036508b6..85fac9710e0d8df07f3427f232443a1ae0815ed9 100644 |
--- a/cc/CCLayerTreeHostCommonTest.cpp |
+++ b/cc/CCLayerTreeHostCommonTest.cpp |
@@ -61,7 +61,6 @@ void executeCalculateDrawTransformsAndVisibility(LayerChromium* rootLayer, float |
// We are probably not testing what is intended if the rootLayer bounds are empty. |
ASSERT(!rootLayer->bounds().isEmpty()); |
CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer, deviceViewportSize, deviceScaleFactor, dummyMaxTextureSize, dummyRenderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(dummyRenderSurfaceLayerList); |
} |
void executeCalculateDrawTransformsAndVisibility(CCLayerImpl* rootLayer, float deviceScaleFactor = 1) |
@@ -76,7 +75,6 @@ void executeCalculateDrawTransformsAndVisibility(CCLayerImpl* rootLayer, float d |
// We are probably not testing what is intended if the rootLayer bounds are empty. |
ASSERT(!rootLayer->bounds().isEmpty()); |
CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer, deviceViewportSize, deviceScaleFactor, 0, dummyMaxTextureSize, dummyRenderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(dummyRenderSurfaceLayerList); |
} |
WebTransformationMatrix remove3DComponentOfMatrix(const WebTransformationMatrix& mat) |
@@ -655,7 +653,6 @@ TEST(CCLayerTreeHostCommonTest, verifyRenderSurfaceListForRenderSurfaceWithClipp |
Vector<RefPtr<LayerChromium> > renderSurfaceLayerList; |
int dummyMaxTextureSize = 512; |
CCLayerTreeHostCommon::calculateDrawTransforms(parent.get(), parent->bounds(), 1, dummyMaxTextureSize, renderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); |
// The child layer's content is entirely outside the parent's clip rect, so the intermediate |
// render surface should not be listed here, even if it was forced to be created. Render surfaces without children or visible |
@@ -683,7 +680,6 @@ TEST(CCLayerTreeHostCommonTest, verifyRenderSurfaceListForTransparentChild) |
Vector<RefPtr<LayerChromium> > renderSurfaceLayerList; |
int dummyMaxTextureSize = 512; |
CCLayerTreeHostCommon::calculateDrawTransforms(parent.get(), parent->bounds(), 1, dummyMaxTextureSize, renderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); |
// Since the layer is transparent, renderSurface1->renderSurface() should not have gotten added anywhere. |
// Also, the drawable content rect should not have been extended by the children. |
@@ -1339,8 +1335,6 @@ TEST(CCLayerTreeHostCommonTest, verifyClipRectCullsRenderSurfaces) |
Vector<RefPtr<LayerChromium> > renderSurfaceLayerList; |
int dummyMaxTextureSize = 512; |
CCLayerTreeHostCommon::calculateDrawTransforms(parent.get(), parent->bounds(), 1, dummyMaxTextureSize, renderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); |
- |
ASSERT_EQ(2U, renderSurfaceLayerList.size()); |
EXPECT_EQ(parent->id(), renderSurfaceLayerList[0]->id()); |
@@ -1452,7 +1446,6 @@ TEST(CCLayerTreeHostCommonTest, verifyDrawableContentRectForLayers) |
Vector<RefPtr<LayerChromium> > renderSurfaceLayerList; |
int dummyMaxTextureSize = 512; |
CCLayerTreeHostCommon::calculateDrawTransforms(parent.get(), parent->bounds(), 1, dummyMaxTextureSize, renderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); |
EXPECT_RECT_EQ(IntRect(IntPoint(5, 5), IntSize(10, 10)), grandChild1->drawableContentRect()); |
EXPECT_RECT_EQ(IntRect(IntPoint(15, 15), IntSize(5, 5)), grandChild3->drawableContentRect()); |
@@ -1518,7 +1511,6 @@ TEST(CCLayerTreeHostCommonTest, verifyClipRectIsPropagatedCorrectlyToSurfaces) |
Vector<RefPtr<LayerChromium> > renderSurfaceLayerList; |
int dummyMaxTextureSize = 512; |
CCLayerTreeHostCommon::calculateDrawTransforms(parent.get(), parent->bounds(), 1, dummyMaxTextureSize, renderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); |
ASSERT_TRUE(grandChild1->renderSurface()); |
ASSERT_TRUE(grandChild2->renderSurface()); |
@@ -2540,7 +2532,6 @@ TEST(CCLayerTreeHostCommonTest, verifyBackFaceCullingWithAnimatingTransforms) |
Vector<RefPtr<LayerChromium> > renderSurfaceLayerList; |
int dummyMaxTextureSize = 512; |
CCLayerTreeHostCommon::calculateDrawTransforms(parent.get(), parent->bounds(), 1, dummyMaxTextureSize, renderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); |
EXPECT_FALSE(child->renderSurface()); |
EXPECT_TRUE(animatingSurface->renderSurface()); |
@@ -2661,7 +2652,6 @@ TEST(CCLayerTreeHostCommonTest, verifyHitTestingForSingleLayer) |
Vector<CCLayerImpl*> renderSurfaceLayerList; |
int dummyMaxTextureSize = 512; |
CCLayerTreeHostCommon::calculateDrawTransforms(root.get(), root->bounds(), 1, 0, dummyMaxTextureSize, renderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); |
// Sanity check the scenario we just created. |
ASSERT_EQ(1u, renderSurfaceLayerList.size()); |
@@ -2711,7 +2701,6 @@ TEST(CCLayerTreeHostCommonTest, verifyHitTestingForUninvertibleTransform) |
Vector<CCLayerImpl*> renderSurfaceLayerList; |
int dummyMaxTextureSize = 512; |
CCLayerTreeHostCommon::calculateDrawTransforms(root.get(), root->bounds(), 1, 0, dummyMaxTextureSize, renderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); |
// Sanity check the scenario we just created. |
ASSERT_EQ(1u, renderSurfaceLayerList.size()); |
@@ -2766,7 +2755,6 @@ TEST(CCLayerTreeHostCommonTest, verifyHitTestingForSinglePositionedLayer) |
Vector<CCLayerImpl*> renderSurfaceLayerList; |
int dummyMaxTextureSize = 512; |
CCLayerTreeHostCommon::calculateDrawTransforms(root.get(), root->bounds(), 1, 0, dummyMaxTextureSize, renderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); |
// Sanity check the scenario we just created. |
ASSERT_EQ(1u, renderSurfaceLayerList.size()); |
@@ -2814,7 +2802,6 @@ TEST(CCLayerTreeHostCommonTest, verifyHitTestingForSingleRotatedLayer) |
Vector<CCLayerImpl*> renderSurfaceLayerList; |
int dummyMaxTextureSize = 512; |
CCLayerTreeHostCommon::calculateDrawTransforms(root.get(), root->bounds(), 1, 0, dummyMaxTextureSize, renderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); |
// Sanity check the scenario we just created. |
ASSERT_EQ(1u, renderSurfaceLayerList.size()); |
@@ -2871,7 +2858,6 @@ TEST(CCLayerTreeHostCommonTest, verifyHitTestingForSinglePerspectiveLayer) |
Vector<CCLayerImpl*> renderSurfaceLayerList; |
int dummyMaxTextureSize = 512; |
CCLayerTreeHostCommon::calculateDrawTransforms(root.get(), root->bounds(), 1, 0, dummyMaxTextureSize, renderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); |
// Sanity check the scenario we just created. |
ASSERT_EQ(1u, renderSurfaceLayerList.size()); |
@@ -2936,7 +2922,6 @@ TEST(CCLayerTreeHostCommonTest, verifyHitTestingForSingleLayerWithScaledContents |
Vector<CCLayerImpl*> renderSurfaceLayerList; |
int dummyMaxTextureSize = 512; |
CCLayerTreeHostCommon::calculateDrawTransforms(root.get(), root->bounds(), 1, 0, dummyMaxTextureSize, renderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); |
// Sanity check the scenario we just created. |
// The visibleContentRect for testLayer is actually 100x100, even though its layout size is 50x50, positioned at 25x25. |
@@ -3001,7 +2986,6 @@ TEST(CCLayerTreeHostCommonTest, verifyHitTestingForSimpleClippedLayer) |
Vector<CCLayerImpl*> renderSurfaceLayerList; |
int dummyMaxTextureSize = 512; |
CCLayerTreeHostCommon::calculateDrawTransforms(root.get(), root->bounds(), 1, 0, dummyMaxTextureSize, renderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); |
// Sanity check the scenario we just created. |
ASSERT_EQ(1u, renderSurfaceLayerList.size()); |
@@ -3092,7 +3076,6 @@ TEST(CCLayerTreeHostCommonTest, verifyHitTestingForMultiClippedRotatedLayer) |
Vector<CCLayerImpl*> renderSurfaceLayerList; |
int dummyMaxTextureSize = 512; |
CCLayerTreeHostCommon::calculateDrawTransforms(root.get(), root->bounds(), 1, 0, dummyMaxTextureSize, renderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); |
// Sanity check the scenario we just created. |
// The grandChild is expected to create a renderSurface because it masksToBounds and is not axis aligned. |
@@ -3175,7 +3158,6 @@ TEST(CCLayerTreeHostCommonTest, verifyHitTestingForNonClippingIntermediateLayer) |
Vector<CCLayerImpl*> renderSurfaceLayerList; |
int dummyMaxTextureSize = 512; |
CCLayerTreeHostCommon::calculateDrawTransforms(root.get(), root->bounds(), 1, 0, dummyMaxTextureSize, renderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); |
// Sanity check the scenario we just created. |
ASSERT_EQ(1u, renderSurfaceLayerList.size()); |
@@ -3256,7 +3238,6 @@ TEST(CCLayerTreeHostCommonTest, verifyHitTestingForMultipleLayers) |
Vector<CCLayerImpl*> renderSurfaceLayerList; |
int dummyMaxTextureSize = 512; |
CCLayerTreeHostCommon::calculateDrawTransforms(root.get(), root->bounds(), 1, 0, dummyMaxTextureSize, renderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); |
// Sanity check the scenario we just created. |
ASSERT_TRUE(child1); |
@@ -3365,7 +3346,6 @@ TEST(CCLayerTreeHostCommonTest, verifyHitTestingForMultipleLayerLists) |
Vector<CCLayerImpl*> renderSurfaceLayerList; |
int dummyMaxTextureSize = 512; |
CCLayerTreeHostCommon::calculateDrawTransforms(root.get(), root->bounds(), 1, 0, dummyMaxTextureSize, renderSurfaceLayerList); |
- CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); |
// Sanity check the scenario we just created. |
ASSERT_TRUE(child1); |