Pass accurate contentsScale to LayerImpl.

cc/delegated_renderer_layer_impl_unittest.cc

 // Copyright 2012 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 "cc/delegated_renderer_layer_impl.h"
 
 #include "cc/append_quads_data.h"
 #include "cc/layer_tree_host_impl.h"
@@ skipping 92 matching lines @@
         scoped_ptr<LayerImpl> rootLayer = SolidColorLayerImpl::create(1).PassAs<LayerImpl>();
         scoped_ptr<LayerImpl> layerBefore = SolidColorLayerImpl::create(2).PassAs<LayerImpl>();
         scoped_ptr<LayerImpl> layerAfter = SolidColorLayerImpl::create(3).PassAs<LayerImpl>();
         scoped_ptr<DelegatedRendererLayerImpl> delegatedRendererLayer = DelegatedRendererLayerImpl::create(4);
 
         m_hostImpl->setViewportSize(IntSize(100, 100), IntSize(100, 100));
         rootLayer->setBounds(IntSize(100, 100));
 
         layerBefore->setPosition(IntPoint(20, 20));
         layerBefore->setBounds(IntSize(14, 14));
-        layerBefore->setContentBounds(IntSize(14, 14));
         layerBefore->setDrawsContent(true);
         layerBefore->setForceRenderSurface(true);
 
         layerAfter->setPosition(IntPoint(5, 5));
         layerAfter->setBounds(IntSize(15, 15));
-        layerAfter->setContentBounds(IntSize(15, 15));
         layerAfter->setDrawsContent(true);
         layerAfter->setForceRenderSurface(true);
 
         delegatedRendererLayer->setPosition(IntPoint(3, 3));
         delegatedRendererLayer->setBounds(IntSize(10, 10));
-        delegatedRendererLayer->setContentBounds(IntSize(10, 10));
         delegatedRendererLayer->setDrawsContent(true);
         WebTransformationMatrix transform;
         transform.translate(1, 1);
         delegatedRendererLayer->setTransform(transform);
 
         ScopedPtrVector<RenderPass> delegatedRenderPasses;
         TestRenderPass* pass1 = addRenderPass(delegatedRenderPasses, RenderPass::Id(9, 6), IntRect(6, 6, 6, 6), WebTransformationMatrix());
         addQuad(pass1, IntRect(0, 0, 6, 6), 33u);
         TestRenderPass* pass2 = addRenderPass(delegatedRenderPasses, RenderPass::Id(9, 7), IntRect(7, 7, 7, 7), WebTransformationMatrix());
         addQuad(pass2, IntRect(0, 0, 7, 7), 22u);
@@ skipping 248 matching lines @@
         : DelegatedRendererLayerImplTest()
     {
         scoped_ptr<LayerImpl> rootLayer = LayerImpl::create(1);
         scoped_ptr<DelegatedRendererLayerImpl> delegatedRendererLayer = DelegatedRendererLayerImpl::create(2);
 
         m_hostImpl->setViewportSize(IntSize(100, 100), IntSize(100, 100));
         rootLayer->setBounds(IntSize(100, 100));
 
         delegatedRendererLayer->setPosition(IntPoint(20, 20));
         delegatedRendererLayer->setBounds(IntSize(20, 20));
-        delegatedRendererLayer->setContentBounds(IntSize(20, 20));
         delegatedRendererLayer->setDrawsContent(true);
         WebTransformationMatrix transform;
         transform.translate(10, 10);
         delegatedRendererLayer->setTransform(transform);
 
         ScopedPtrVector<RenderPass> delegatedRenderPasses;
         IntRect passRect(0, 0, 50, 50);
         TestRenderPass* pass = addRenderPass(delegatedRenderPasses, RenderPass::Id(9, 6), passRect, WebTransformationMatrix());
         MockQuadCuller quadSink(pass->quadList(), pass->sharedQuadStateList());
         AppendQuadsData data(pass->id());
@@ skipping 41 matching lines @@
     EXPECT_EQ(sharedState, quadList[3]->sharedQuadState());
 
     // The state should be transformed only once.
     EXPECT_RECT_EQ(IntRect(30, 30, 50, 50), sharedState->clippedRectInTarget);
     WebTransformationMatrix expected;
     expected.translate(30, 30);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, sharedState->quadTransform);
 }
 
 } // namespace