cc: Refactor content scale/bounds into draw properties

cc/layer_tree_host_common_unittest.cc

 // 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 "cc/layer_tree_host_common.h"
 
 #include "cc/content_layer.h"
 #include "cc/content_layer_client.h"
 #include "cc/layer.h"
 #include "cc/layer_animation_controller.h"
@@ skipping 2390 matching lines @@
 
     gfx::Transform identityMatrix;
     setLayerPropertiesForTesting(root.get(), identityMatrix, identityMatrix, gfx::PointF(0, 0), gfx::PointF(0, 0), gfx::Size(100, 100), false);
     setLayerPropertiesForTesting(renderSurface1.get(), identityMatrix, identityMatrix, gfx::PointF(0, 0), gfx::PointF(5, 5), gfx::Size(3, 4), false);
     setLayerPropertiesForTesting(renderSurface2.get(), identityMatrix, identityMatrix, gfx::PointF(0, 0), gfx::PointF(5, 5), gfx::Size(7, 13), false);
     setLayerPropertiesForTesting(child1.get(), identityMatrix, identityMatrix, gfx::PointF(0, 0), gfx::PointF(5, 5), gfx::Size(50, 50), false);
     setLayerPropertiesForTesting(child2.get(), identityMatrix, identityMatrix, gfx::PointF(0, 0), gfx::PointF(75, 75), gfx::Size(50, 50), false);
     setLayerPropertiesForTesting(child3.get(), identityMatrix, identityMatrix, gfx::PointF(0, 0), gfx::PointF(125, 125), gfx::Size(50, 50), false);
 
     const double deviceScaleFactor = 2;
-    root->setContentsScale(deviceScaleFactor);
-    renderSurface1->setContentsScale(deviceScaleFactor);
-    renderSurface2->setContentsScale(deviceScaleFactor);
-    child1->setContentsScale(deviceScaleFactor);
-    child2->setContentsScale(deviceScaleFactor);
-    child3->setContentsScale(deviceScaleFactor);
+    root->setIdealContentsScale(deviceScaleFactor);
+    renderSurface1->setIdealContentsScale(deviceScaleFactor);
+    renderSurface2->setIdealContentsScale(deviceScaleFactor);
+    child1->setIdealContentsScale(deviceScaleFactor);
+    child2->setIdealContentsScale(deviceScaleFactor);
+    child3->setIdealContentsScale(deviceScaleFactor);
 
     root->setMasksToBounds(true);
     renderSurface1->setForceRenderSurface(true);
     renderSurface2->setForceRenderSurface(true);
     executeCalculateDrawProperties(root.get(), deviceScaleFactor);
 
     ASSERT_TRUE(renderSurface1->renderSurface());
     ASSERT_TRUE(renderSurface2->renderSurface());
 
     // DrawableContentRects for all layers and surfaces are scaled by deviceScaleFactor.
@@ skipping 1544 matching lines @@
     resultLayer = LayerTreeHostCommon::findLayerThatIsHitByPointInTouchHandlerRegion(testPoint, renderSurfaceLayerList);
     ASSERT_TRUE(resultLayer);
     EXPECT_EQ(456, resultLayer->id());
 }
 
 class NoScaleContentLayer : public ContentLayer
 {
 public:
     static scoped_refptr<NoScaleContentLayer> create(ContentLayerClient* client) { return make_scoped_refptr(new NoScaleContentLayer(client)); }
 
-    virtual gfx::Size contentBounds() const OVERRIDE { return bounds(); }
-    virtual float contentsScaleX() const OVERRIDE { return 1.0; }
-    virtual float contentsScaleY() const OVERRIDE { return 1.0; }
+    virtual void didUpdateBounds() OVERRIDE
+    {
+        Layer::didUpdateBounds();
+    }
+
+    virtual void setIdealContentsScale(float idealContentsScale) OVERRIDE
+    {
+        Layer::setIdealContentsScale(idealContentsScale);
+    }
 
 protected:
     explicit NoScaleContentLayer(ContentLayerClient* client) : ContentLayer(client) { }
     virtual ~NoScaleContentLayer() { }
 };
 
 scoped_refptr<NoScaleContentLayer> createNoScaleDrawableContentLayer(ContentLayerClient* delegate)
 {
     scoped_refptr<NoScaleContentLayer> toReturn = NoScaleContentLayer::create(delegate);
     toReturn->setIsDrawable(true);
@@ skipping 533 matching lines @@
     setLayerPropertiesForTesting(duplicateChildNonOwner.get(), identityMatrix, identityMatrix, gfx::PointF(0, 0), gfx::PointF(0, 0), gfx::Size(10, 10), true);
 
     parent->addChild(child);
     child->addChild(duplicateChildNonOwner);
     child->setReplicaLayer(replica.get());
 
     std::vector<scoped_refptr<Layer> > renderSurfaceLayerList;
     int dummyMaxTextureSize = 512;
 
     const double deviceScaleFactor = 1.5;
-    parent->setContentsScale(deviceScaleFactor);
-    child->setContentsScale(deviceScaleFactor);
-    duplicateChildNonOwner->setContentsScale(deviceScaleFactor);
-    replica->setContentsScale(deviceScaleFactor);
+    parent->setIdealContentsScale(deviceScaleFactor);
+    child->setIdealContentsScale(deviceScaleFactor);
+    duplicateChildNonOwner->setIdealContentsScale(deviceScaleFactor);
+    replica->setIdealContentsScale(deviceScaleFactor);
 
     LayerTreeHostCommon::calculateDrawProperties(parent.get(), parent->bounds(), deviceScaleFactor, 1, dummyMaxTextureSize, renderSurfaceLayerList);
 
     // We should have two render surfaces. The root's render surface and child's
     // render surface (it needs one because it has a replica layer).
     EXPECT_EQ(2u, renderSurfaceLayerList.size());
 
     gfx::Transform expectedParentTransform;
     EXPECT_TRANSFORMATION_MATRIX_EQ(expectedParentTransform, parent->screenSpaceTransform());
     EXPECT_TRANSFORMATION_MATRIX_EQ(expectedParentTransform, parent->drawTransform());
@@ skipping 59 matching lines @@
     setLayerPropertiesForTesting(duplicateChildNonOwner.get(), identityMatrix, identityMatrix, gfx::PointF(0, 0), gfx::PointF(0, 0), gfx::Size(13, 11), true);
 
     parent->addChild(child);
     child->addChild(duplicateChildNonOwner);
     child->setReplicaLayer(replica.get());
 
     std::vector<scoped_refptr<Layer> > renderSurfaceLayerList;
     int dummyMaxTextureSize = 512;
 
     const float deviceScaleFactor = 1.7f;
-    parent->setContentsScale(deviceScaleFactor);
-    child->setContentsScale(deviceScaleFactor);
-    duplicateChildNonOwner->setContentsScale(deviceScaleFactor);
-    replica->setContentsScale(deviceScaleFactor);
+    parent->setIdealContentsScale(deviceScaleFactor);
+    child->setIdealContentsScale(deviceScaleFactor);
+    duplicateChildNonOwner->setIdealContentsScale(deviceScaleFactor);
+    replica->setIdealContentsScale(deviceScaleFactor);
 
     LayerTreeHostCommon::calculateDrawProperties(parent.get(), parent->bounds(), deviceScaleFactor, 1, dummyMaxTextureSize, renderSurfaceLayerList);
 
     // We should have two render surfaces. The root's render surface and child's
     // render surface (it needs one because it has a replica layer).
     EXPECT_EQ(2u, renderSurfaceLayerList.size());
 
     gfx::Transform identityTransform;
 
     EXPECT_TRANSFORMATION_MATRIX_EQ(identityTransform, parent->screenSpaceTransform());
@@ skipping 55 matching lines @@
     child->addChild(grandChild);
     child->setOpacity(0.5f);
 
     executeCalculateDrawProperties(root.get());
 
     EXPECT_FALSE(child->renderSurface());
 }
 
 }  // namespace
 }  // namespace cc