Organize internal properties of cc/ layer types

cc/layer_tree_host_impl_unittest.cc

Index: cc/layer_tree_host_impl_unittest.cc
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index 58e361ed2b31a7329f6e984d15184d1123061e68..dec26850b289979d9e3c6b03565dd3b427ebe871 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -118,8 +118,8 @@ public:
         root->setPosition(gfx::PointF(0, 0));
         root->setBounds(gfx::Size(10, 10));
         root->setContentBounds(gfx::Size(10, 10));
-        root->setVisibleContentRect(gfx::Rect(0, 0, 10, 10));
         root->setDrawsContent(true);
+        root->drawProperties().visibleContentRect = gfx::Rect(0, 0, 10, 10);
         myHostImpl->setRootLayer(root.Pass());
         return myHostImpl.Pass();
     }
@@ -905,7 +905,7 @@ protected:
         setContentBounds(gfx::Size(10, 10));
         setDrawsContent(true);
         setSkipsDraw(false);
-        setVisibleContentRect(gfx::Rect(0, 0, 10, 10));
+        drawProperties().visibleContentRect = gfx::Rect(0, 0, 10, 10);
 
         scoped_ptr<LayerTilingData> tiler = LayerTilingData::create(gfx::Size(100, 100), LayerTilingData::HasBorderTexels);
         tiler->setBounds(contentBounds());
@@ -2378,7 +2378,7 @@ static scoped_ptr<LayerTreeHostImpl> setupLayersForOpacity(bool partialSwap, Lay
     root->setPosition(gfx::PointF(rootRect.x(), rootRect.y()));
     root->setBounds(gfx::Size(rootRect.width(), rootRect.height()));
     root->setContentBounds(root->bounds());
-    root->setVisibleContentRect(rootRect);
+    root->drawProperties().visibleContentRect = rootRect;
     root->setDrawsContent(false);
     root->renderSurface()->setContentRect(gfx::Rect(gfx::Point(), gfx::Size(rootRect.width(), rootRect.height())));
 
@@ -2387,7 +2387,7 @@ static scoped_ptr<LayerTreeHostImpl> setupLayersForOpacity(bool partialSwap, Lay
     child->setOpacity(0.5f);
     child->setBounds(gfx::Size(childRect.width(), childRect.height()));
     child->setContentBounds(child->bounds());
-    child->setVisibleContentRect(childRect);
+    child->drawProperties().visibleContentRect = childRect;
     child->setDrawsContent(false);
     child->setForceRenderSurface(true);
 
@@ -2395,7 +2395,7 @@ static scoped_ptr<LayerTreeHostImpl> setupLayersForOpacity(bool partialSwap, Lay
     grandChild->setPosition(gfx::Point(grandChildRect.x(), grandChildRect.y()));
     grandChild->setBounds(gfx::Size(grandChildRect.width(), grandChildRect.height()));
     grandChild->setContentBounds(grandChild->bounds());
-    grandChild->setVisibleContentRect(grandChildRect);
+    grandChild->drawProperties().visibleContentRect = grandChildRect;
     grandChild->setDrawsContent(true);
 
     child->addChild(grandChild.Pass());