cc: Remove WebCore dependecies from CCRenderPass and CCDrawQuad classes.

cc/CCLayerTreeHostCommonTest.cpp

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "CCLayerTreeHostCommon.h"
 
 #include "CCAnimationTestCommon.h"
 #include "CCGeometryTestUtils.h"
@@ skipping 1930 matching lines @@
     root->addChild(child3);
 
     WebTransformationMatrix identityMatrix;
     setLayerPropertiesForTesting(root.get(), identityMatrix, identityMatrix, FloatPoint(0, 0), FloatPoint(0, 0), IntSize(100, 100), false);
     setLayerPropertiesForTesting(child1.get(), identityMatrix, identityMatrix, FloatPoint(0, 0), FloatPoint(0, 0), IntSize(50, 50), false);
     setLayerPropertiesForTesting(child2.get(), identityMatrix, identityMatrix, FloatPoint(0, 0), FloatPoint(75, 75), IntSize(50, 50), false);
     setLayerPropertiesForTesting(child3.get(), identityMatrix, identityMatrix, FloatPoint(0, 0), FloatPoint(125, 125), IntSize(50, 50), false);
 
     executeCalculateDrawTransformsAndVisibility(root.get());
 
-    EXPECT_RECT_EQ(IntRect(0, 0, 100, 100), root->renderSurface()->drawableContentRect());
+    EXPECT_FLOAT_RECT_EQ(FloatRect(0, 0, 100, 100), root->renderSurface()->drawableContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 100, 100), root->drawableContentRect());
 
     // Layers that do not draw content should have empty visibleContentRects.
     EXPECT_RECT_EQ(IntRect(0, 0, 0, 0), root->visibleContentRect());
 
     // layer visibleContentRects are clipped by their targetSurface
     EXPECT_RECT_EQ(IntRect(0, 0, 50, 50), child1->visibleContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 25, 25), child2->visibleContentRect());
     EXPECT_TRUE(child3->visibleContentRect().isEmpty());
 
@@ skipping 20 matching lines @@
     setLayerPropertiesForTesting(child.get(), identityMatrix, identityMatrix, FloatPoint(0, 0), FloatPoint(0, 0), IntSize(100, 100), false);
     setLayerPropertiesForTesting(grandChild1.get(), identityMatrix, identityMatrix, FloatPoint(0, 0), FloatPoint(5, 5), IntSize(50, 50), false);
     setLayerPropertiesForTesting(grandChild2.get(), identityMatrix, identityMatrix, FloatPoint(0, 0), FloatPoint(75, 75), IntSize(50, 50), false);
     setLayerPropertiesForTesting(grandChild3.get(), identityMatrix, identityMatrix, FloatPoint(0, 0), FloatPoint(125, 125), IntSize(50, 50), false);
 
     child->setMasksToBounds(true);
     executeCalculateDrawTransformsAndVisibility(root.get());
 
     ASSERT_FALSE(child->renderSurface());
 
-    EXPECT_RECT_EQ(IntRect(0, 0, 100, 100), root->renderSurface()->drawableContentRect());
+    EXPECT_FLOAT_RECT_EQ(FloatRect(0, 0, 100, 100), root->renderSurface()->drawableContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 100, 100), root->drawableContentRect());
 
     // Layers that do not draw content should have empty visibleContentRects.
     EXPECT_RECT_EQ(IntRect(0, 0, 0, 0), root->visibleContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 0, 0), child->visibleContentRect());
 
     // All grandchild visibleContentRects should be clipped by child.
     EXPECT_RECT_EQ(IntRect(0, 0, 50, 50), grandChild1->visibleContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 25, 25), grandChild2->visibleContentRect());
     EXPECT_TRUE(grandChild3->visibleContentRect().isEmpty());
@@ skipping 21 matching lines @@
     setLayerPropertiesForTesting(renderSurface1.get(), identityMatrix, identityMatrix, FloatPoint(0, 0), FloatPoint(0, 0), IntSize(3, 4), false);
     setLayerPropertiesForTesting(child1.get(), identityMatrix, identityMatrix, FloatPoint(0, 0), FloatPoint(5, 5), IntSize(50, 50), false);
     setLayerPropertiesForTesting(child2.get(), identityMatrix, identityMatrix, FloatPoint(0, 0), FloatPoint(75, 75), IntSize(50, 50), false);
     setLayerPropertiesForTesting(child3.get(), identityMatrix, identityMatrix, FloatPoint(0, 0), FloatPoint(125, 125), IntSize(50, 50), false);
 
     renderSurface1->setForceRenderSurface(true);
     executeCalculateDrawTransformsAndVisibility(root.get());
 
     ASSERT_TRUE(renderSurface1->renderSurface());
 
-    EXPECT_RECT_EQ(IntRect(0, 0, 100, 100), root->renderSurface()->drawableContentRect());
+    EXPECT_FLOAT_RECT_EQ(FloatRect(0, 0, 100, 100), root->renderSurface()->drawableContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 100, 100), root->drawableContentRect());
 
     // Layers that do not draw content should have empty visibleContentRects.
     EXPECT_RECT_EQ(IntRect(0, 0, 0, 0), root->visibleContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 0, 0), renderSurface1->visibleContentRect());
 
     // An unclipped surface grows its drawableContentRect to include all drawable regions of the subtree.
-    EXPECT_RECT_EQ(IntRect(5, 5, 170, 170), renderSurface1->renderSurface()->drawableContentRect());
+    EXPECT_FLOAT_RECT_EQ(FloatRect(5, 5, 170, 170), renderSurface1->renderSurface()->drawableContentRect());
 
     // All layers that draw content into the unclipped surface are also unclipped.
     EXPECT_RECT_EQ(IntRect(0, 0, 50, 50), child1->visibleContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 50, 50), child2->visibleContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 50, 50), child3->visibleContentRect());
 
     EXPECT_RECT_EQ(IntRect(5, 5, 50, 50), child1->drawableContentRect());
     EXPECT_RECT_EQ(IntRect(75, 75, 50, 50), child2->drawableContentRect());
     EXPECT_RECT_EQ(IntRect(125, 125, 50, 50), child3->drawableContentRect());
 }
@@ skipping 16 matching lines @@
     setLayerPropertiesForTesting(child1.get(), identityMatrix, identityMatrix, FloatPoint(0, 0), FloatPoint(5, 5), IntSize(50, 50), false);
     setLayerPropertiesForTesting(child2.get(), identityMatrix, identityMatrix, FloatPoint(0, 0), FloatPoint(75, 75), IntSize(50, 50), false);
     setLayerPropertiesForTesting(child3.get(), identityMatrix, identityMatrix, FloatPoint(0, 0), FloatPoint(125, 125), IntSize(50, 50), false);
 
     root->setMasksToBounds(true);
     renderSurface1->setForceRenderSurface(true);
     executeCalculateDrawTransformsAndVisibility(root.get());
 
     ASSERT_TRUE(renderSurface1->renderSurface());
 
-    EXPECT_RECT_EQ(IntRect(0, 0, 100, 100), root->renderSurface()->drawableContentRect());
-    EXPECT_RECT_EQ(IntRect(0, 0, 100, 100), root->drawableContentRect());
+    EXPECT_FLOAT_RECT_EQ(FloatRect(0, 0, 100, 100), root->renderSurface()->drawableContentRect());
+    EXPECT_FLOAT_RECT_EQ(FloatRect(0, 0, 100, 100), root->drawableContentRect());
 
     // Layers that do not draw content should have empty visibleContentRects.
     EXPECT_RECT_EQ(IntRect(0, 0, 0, 0), root->visibleContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 0, 0), renderSurface1->visibleContentRect());
 
     // A clipped surface grows its drawableContentRect to include all drawable regions of the subtree,
     // but also gets clamped by the ancestor's clip.
-    EXPECT_RECT_EQ(IntRect(5, 5, 95, 95), renderSurface1->renderSurface()->drawableContentRect());
+    EXPECT_FLOAT_RECT_EQ(FloatRect(5, 5, 95, 95), renderSurface1->renderSurface()->drawableContentRect());
 
     // All layers that draw content into the surface have their visibleContentRect clipped by the surface clipRect.
     EXPECT_RECT_EQ(IntRect(0, 0, 50, 50), child1->visibleContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 25, 25), child2->visibleContentRect());
     EXPECT_TRUE(child3->visibleContentRect().isEmpty());
 
     // But the drawableContentRects are unclipped.
     EXPECT_RECT_EQ(IntRect(5, 5, 50, 50), child1->drawableContentRect());
     EXPECT_RECT_EQ(IntRect(75, 75, 50, 50), child2->drawableContentRect());
     EXPECT_RECT_EQ(IntRect(125, 125, 50, 50), child3->drawableContentRect());
@@ skipping 23 matching lines @@
     setLayerPropertiesForTesting(child3.get(), identityMatrix, identityMatrix, FloatPoint(0, 0), FloatPoint(125, 125), IntSize(50, 50), false);
 
     root->setMasksToBounds(true);
     renderSurface1->setForceRenderSurface(true);
     renderSurface2->setForceRenderSurface(true);
     executeCalculateDrawTransformsAndVisibility(root.get());
 
     ASSERT_TRUE(renderSurface1->renderSurface());
     ASSERT_TRUE(renderSurface2->renderSurface());
 
-    EXPECT_RECT_EQ(IntRect(0, 0, 100, 100), root->renderSurface()->drawableContentRect());
+    EXPECT_FLOAT_RECT_EQ(FloatRect(0, 0, 100, 100), root->renderSurface()->drawableContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 100, 100), root->drawableContentRect());
 
     // Layers that do not draw content should have empty visibleContentRects.
     EXPECT_RECT_EQ(IntRect(0, 0, 0, 0), root->visibleContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 0, 0), renderSurface1->visibleContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 0, 0), renderSurface2->visibleContentRect());
 
     // A clipped surface grows its drawableContentRect to include all drawable regions of the subtree,
     // but also gets clamped by the ancestor's clip.
-    EXPECT_RECT_EQ(IntRect(5, 5, 95, 95), renderSurface1->renderSurface()->drawableContentRect());
+    EXPECT_FLOAT_RECT_EQ(FloatRect(5, 5, 95, 95), renderSurface1->renderSurface()->drawableContentRect());
 
     // renderSurface1 lives in the "unclipped universe" of renderSurface1, and is only
     // implicitly clipped by renderSurface1's contentRect. So, renderSurface2 grows to
     // enclose all drawable content of its subtree.
-    EXPECT_RECT_EQ(IntRect(5, 5, 170, 170), renderSurface2->renderSurface()->drawableContentRect());
+    EXPECT_FLOAT_RECT_EQ(FloatRect(5, 5, 170, 170), renderSurface2->renderSurface()->drawableContentRect());
 
     // All layers that draw content into renderSurface2 think they are unclipped.
     EXPECT_RECT_EQ(IntRect(0, 0, 50, 50), child1->visibleContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 50, 50), child2->visibleContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 50, 50), child3->visibleContentRect());
 
     // drawableContentRects are also unclipped.
     EXPECT_RECT_EQ(IntRect(5, 5, 50, 50), child1->drawableContentRect());
     EXPECT_RECT_EQ(IntRect(75, 75, 50, 50), child2->drawableContentRect());
     EXPECT_RECT_EQ(IntRect(125, 125, 50, 50), child3->drawableContentRect());
@@ skipping 15 matching lines @@
     childRotation.rotate(45);
     setLayerPropertiesForTesting(root.get(), identityMatrix, identityMatrix, FloatPoint(0, 0), FloatPoint(0, 0), IntSize(100, 100), false);
     setLayerPropertiesForTesting(renderSurface1.get(), identityMatrix, identityMatrix, FloatPoint(0, 0), FloatPoint(0, 0), IntSize(3, 4), false);
     setLayerPropertiesForTesting(child1.get(), childRotation, identityMatrix, FloatPoint(0.5, 0.5), FloatPoint(25, 25), IntSize(50, 50), false);
 
     renderSurface1->setForceRenderSurface(true);
     executeCalculateDrawTransformsAndVisibility(root.get());
 
     ASSERT_TRUE(renderSurface1->renderSurface());
 
-    EXPECT_RECT_EQ(IntRect(0, 0, 100, 100), root->renderSurface()->drawableContentRect());
+    EXPECT_FLOAT_RECT_EQ(FloatRect(0, 0, 100, 100), root->renderSurface()->drawableContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 100, 100), root->drawableContentRect());
 
     // Layers that do not draw content should have empty visibleContentRects.
     EXPECT_RECT_EQ(IntRect(0, 0, 0, 0), root->visibleContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 0, 0), renderSurface1->visibleContentRect());
 
     // The unclipped surface grows its drawableContentRect to include all drawable regions of the subtree.
     int diagonalRadius = ceil(sqrt(2.0) * 25);
     IntRect expectedSurfaceDrawableContent = IntRect(50 - diagonalRadius, 50 - diagonalRadius, diagonalRadius * 2, diagonalRadius * 2);
-    EXPECT_RECT_EQ(expectedSurfaceDrawableContent, renderSurface1->renderSurface()->drawableContentRect());
+    EXPECT_FLOAT_RECT_EQ(FloatRect(expectedSurfaceDrawableContent), renderSurface1->renderSurface()->drawableContentRect());
 
     // All layers that draw content into the unclipped surface are also unclipped.
     EXPECT_RECT_EQ(IntRect(0, 0, 50, 50), child1->visibleContentRect());
     EXPECT_RECT_EQ(expectedSurfaceDrawableContent, child1->drawableContentRect());
 }
 
 TEST(CCLayerTreeHostCommonTest, verifyDrawableAndVisibleContentRectsWithTransformOnClippedSurface)
 {
     // Layers that have non-axis aligned bounds (due to transforms) have an expanded,
     // axis-aligned drawableContentRect and visibleContentRect.
@@ skipping 13 matching lines @@
 
     root->setMasksToBounds(true);
     renderSurface1->setForceRenderSurface(true);
     executeCalculateDrawTransformsAndVisibility(root.get());
 
     ASSERT_TRUE(renderSurface1->renderSurface());
 
     // The clipped surface clamps the drawableContentRect that encloses the rotated layer.
     int diagonalRadius = ceil(sqrt(2.0) * 25);
     IntRect unclippedSurfaceContent = IntRect(50 - diagonalRadius, 50 - diagonalRadius, diagonalRadius * 2, diagonalRadius * 2);
-    IntRect expectedSurfaceDrawableContent = intersection(unclippedSurfaceContent, IntRect(0, 0, 50, 50));
-    EXPECT_RECT_EQ(expectedSurfaceDrawableContent, renderSurface1->renderSurface()->drawableContentRect());
+    FloatRect expectedSurfaceDrawableContent = intersection(unclippedSurfaceContent, FloatRect(0, 0, 50, 50));
+    EXPECT_FLOAT_RECT_EQ(expectedSurfaceDrawableContent, renderSurface1->renderSurface()->drawableContentRect());
 
     // On the clipped surface, only a quarter  of the child1 is visible, but when rotating
     // it back to  child1's content space, the actual enclosing rect ends up covering the
     // full left half of child1.
     EXPECT_RECT_EQ(IntRect(0, 0, 26, 50), child1->visibleContentRect());
 
     // The child's drawableContentRect is unclipped.
     EXPECT_RECT_EQ(unclippedSurfaceContent, child1->drawableContentRect());
 }
 
@@ skipping 31 matching lines @@
 
     root->setMasksToBounds(true);
     renderSurface1->setForceRenderSurface(true);
     renderSurface2->setForceRenderSurface(true);
     executeCalculateDrawTransformsAndVisibility(root.get(), deviceScaleFactor);
 
     ASSERT_TRUE(renderSurface1->renderSurface());
     ASSERT_TRUE(renderSurface2->renderSurface());
 
     // DrawableContentRects for all layers and surfaces are scaled by deviceScaleFactor.
-    EXPECT_RECT_EQ(IntRect(0, 0, 200, 200), root->renderSurface()->drawableContentRect());
+    EXPECT_FLOAT_RECT_EQ(FloatRect(0, 0, 200, 200), root->renderSurface()->drawableContentRect());
     EXPECT_RECT_EQ(IntRect(0, 0, 200, 200), root->drawableContentRect());
-    EXPECT_RECT_EQ(IntRect(10, 10, 190, 190), renderSurface1->renderSurface()->drawableContentRect());
+    EXPECT_FLOAT_RECT_EQ(FloatRect(10, 10, 190, 190), renderSurface1->renderSurface()->drawableContentRect());
 
     // renderSurface2 lives in the "unclipped universe" of renderSurface1, and
     // is only implicitly clipped by renderSurface1.
-    EXPECT_RECT_EQ(IntRect(10, 10, 350, 350), renderSurface2->renderSurface()->drawableContentRect());
+    EXPECT_FLOAT_RECT_EQ(FloatRect(10, 10, 350, 350), renderSurface2->renderSurface()->drawableContentRect());
 
     EXPECT_RECT_EQ(IntRect(10, 10, 100, 100), child1->drawableContentRect());
     EXPECT_RECT_EQ(IntRect(150, 150, 100, 100), child2->drawableContentRect());
     EXPECT_RECT_EQ(IntRect(250, 250, 100, 100), child3->drawableContentRect());
 
     // The root layer does not actually draw content of its own.
     EXPECT_RECT_EQ(IntRect(0, 0, 0, 0), root->visibleContentRect());
 
     // All layer visibleContentRects are expressed in content space of each
     // layer, so they are also scaled by the deviceScaleFactor.
@@ skipping 1295 matching lines @@
     int nonexistentId = -1;
     EXPECT_EQ(root, CCLayerTreeHostCommon::findLayerInSubtree(root.get(), root->id()));
     EXPECT_EQ(child, CCLayerTreeHostCommon::findLayerInSubtree(root.get(), child->id()));
     EXPECT_EQ(grandChild, CCLayerTreeHostCommon::findLayerInSubtree(root.get(), grandChild->id()));
     EXPECT_EQ(maskLayer, CCLayerTreeHostCommon::findLayerInSubtree(root.get(), maskLayer->id()));
     EXPECT_EQ(replicaLayer, CCLayerTreeHostCommon::findLayerInSubtree(root.get(), replicaLayer->id()));
     EXPECT_EQ(0, CCLayerTreeHostCommon::findLayerInSubtree(root.get(), nonexistentId));
 }
 
 } // namespace