Organize internal properties of cc/ layer types

cc/solid_color_layer_impl_unittest.cc

Index: cc/solid_color_layer_impl_unittest.cc
diff --git a/cc/solid_color_layer_impl_unittest.cc b/cc/solid_color_layer_impl_unittest.cc
index 5cb4ebd64a8f1f8c1c39e4bbf224ee763cf7022f..deba26b35fa947a518e33763f6c1cab8fa896024 100644
--- a/cc/solid_color_layer_impl_unittest.cc
+++ b/cc/solid_color_layer_impl_unittest.cc
@@ -25,11 +25,11 @@ TEST(SolidColorLayerImplTest, verifyTilingCompleteAndNoOverlap)
     gfx::Rect visibleContentRect = gfx::Rect(gfx::Point(), layerSize);
 
     scoped_ptr<SolidColorLayerImpl> layer = SolidColorLayerImpl::create(1);
-    layer->setVisibleContentRect(visibleContentRect);
+    layer->drawProperties().visibleContentRect = visibleContentRect;
     layer->setBounds(layerSize);
     layer->setContentBounds(layerSize);
     layer->createRenderSurface();
-    layer->setRenderTarget(layer.get());
+    layer->drawProperties().renderTarget = layer.get();
 
     AppendQuadsData data;
     layer->appendQuads(quadCuller, data);
@@ -46,12 +46,12 @@ TEST(SolidColorLayerImplTest, verifyCorrectBackgroundColorInQuad)
     gfx::Rect visibleContentRect = gfx::Rect(gfx::Point(), layerSize);
 
     scoped_ptr<SolidColorLayerImpl> layer = SolidColorLayerImpl::create(1);
-    layer->setVisibleContentRect(visibleContentRect);
+    layer->drawProperties().visibleContentRect = visibleContentRect;
     layer->setBounds(layerSize);
     layer->setContentBounds(layerSize);
     layer->setBackgroundColor(testColor);
     layer->createRenderSurface();
-    layer->setRenderTarget(layer.get());
+    layer->drawProperties().renderTarget = layer.get();
 
     AppendQuadsData data;
     layer->appendQuads(quadCuller, data);
@@ -69,12 +69,12 @@ TEST(SolidColorLayerImplTest, verifyCorrectOpacityInQuad)
     gfx::Rect visibleContentRect = gfx::Rect(gfx::Point(), layerSize);
 
     scoped_ptr<SolidColorLayerImpl> layer = SolidColorLayerImpl::create(1);
-    layer->setVisibleContentRect(visibleContentRect);
+    layer->drawProperties().visibleContentRect = visibleContentRect;
     layer->setBounds(layerSize);
     layer->setContentBounds(layerSize);
-    layer->setDrawOpacity(opacity);
+    layer->drawProperties().drawOpacity = opacity;
     layer->createRenderSurface();
-    layer->setRenderTarget(layer.get());
+    layer->drawProperties().renderTarget = layer.get();
 
     AppendQuadsData data;
     layer->appendQuads(quadCuller, data);
@@ -89,10 +89,10 @@ TEST(SolidColorLayerImplTest, verifyOpaqueRect)
     gfx::Size layerSize = gfx::Size(100, 100);
     gfx::Rect visibleContentRect = gfx::Rect(gfx::Point(), layerSize);
 
-    layer->setVisibleContentRect(visibleContentRect);
+    layer->drawProperties().visibleContentRect = visibleContentRect;
     layer->setBounds(layerSize);
     layer->createRenderSurface();
-    layer->setRenderTarget(layer.get());
+    layer->drawProperties().renderTarget = layer.get();
 
     EXPECT_FALSE(layer->contentsOpaque());
     layer->setBackgroundColor(SkColorSetARGBInline(255, 10, 20, 30));
@@ -106,7 +106,7 @@ TEST(SolidColorLayerImplTest, verifyOpaqueRect)
         EXPECT_TRUE(layerImpl->contentsOpaque());
 
         // Impl layer has 1 opacity, and the color is opaque, so the opaqueRect should be the full tile.
-        layerImpl->setDrawOpacity(1);
+        layerImpl->drawProperties().drawOpacity = 1;
 
         MockQuadCuller quadCuller;
         AppendQuadsData data;
@@ -128,7 +128,7 @@ TEST(SolidColorLayerImplTest, verifyOpaqueRect)
         EXPECT_FALSE(layerImpl->contentsOpaque());
 
         // Impl layer has 1 opacity, but the color is not opaque, so the opaque_rect should be empty.
-        layerImpl->setDrawOpacity(1);
+        layerImpl->drawProperties().drawOpacity = 1;
 
         MockQuadCuller quadCuller;
         AppendQuadsData data;