Pass accurate contentsScale to LayerImpl.

cc/layer_sorter_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 "config.h"
 
 #include "cc/layer_sorter.h"
 
 #include "cc/layer_impl.h"
 #include "cc/math_util.h"
@@ skipping 197 matching lines @@
     scoped_ptr<LayerImpl> layer3 = LayerImpl::create(3);
     scoped_ptr<LayerImpl> layer4 = LayerImpl::create(4);
     scoped_ptr<LayerImpl> layer5 = LayerImpl::create(5);
 
     WebTransformationMatrix BehindMatrix;
     BehindMatrix.translate3d(0, 0, 2);
     WebTransformationMatrix FrontMatrix;
     FrontMatrix.translate3d(0, 0, 1);
 
     layer1->setBounds(IntSize(10, 10));
-    layer1->setContentBounds(IntSize(10, 10));
     layer1->setDrawTransform(BehindMatrix);
     layer1->setDrawsContent(true);
 
     layer2->setBounds(IntSize(20, 20));
-    layer2->setContentBounds(IntSize(20, 20));
     layer2->setDrawTransform(BehindMatrix);
     layer2->setDrawsContent(true);
 
     layer3->setBounds(IntSize(30, 30));
-    layer3->setContentBounds(IntSize(30, 30));
     layer3->setDrawTransform(FrontMatrix);
     layer3->setDrawsContent(true);
 
     layer4->setBounds(IntSize(40, 40));
-    layer4->setContentBounds(IntSize(40, 40));
     layer4->setDrawTransform(FrontMatrix);
     layer4->setDrawsContent(true);
 
     layer5->setBounds(IntSize(50, 50));
-    layer5->setContentBounds(IntSize(50, 50));
     layer5->setDrawTransform(BehindMatrix);
     layer5->setDrawsContent(true);
 
     std::vector<LayerImpl*> layerList;
     layerList.push_back(layer1.get());
     layerList.push_back(layer2.get());
     layerList.push_back(layer3.get());
     layerList.push_back(layer4.get());
     layerList.push_back(layer5.get());
 
     ASSERT_EQ(static_cast<size_t>(5), layerList.size());
     EXPECT_EQ(1, layerList[0]->id());
     EXPECT_EQ(2, layerList[1]->id());
     EXPECT_EQ(3, layerList[2]->id());
     EXPECT_EQ(4, layerList[3]->id());
     EXPECT_EQ(5, layerList[4]->id());
 
     LayerSorter layerSorter;
     layerSorter.sort(layerList.begin(), layerList.end());
 
     ASSERT_EQ(static_cast<size_t>(5), layerList.size());
     EXPECT_EQ(3, layerList[0]->id());
     EXPECT_EQ(4, layerList[1]->id());
     EXPECT_EQ(1, layerList[2]->id());
     EXPECT_EQ(2, layerList[3]->id());
     EXPECT_EQ(5, layerList[4]->id());
 }
 
 } // namespace