Organize internal properties of cc/ layer types

cc/nine_patch_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 <stdio.h>
 
 #include "cc/nine_patch_layer_impl.h"
 
 #include "cc/append_quads_data.h"
 #include "cc/single_thread_proxy.h"
@@ skipping 20 matching lines @@
     // The bounds of the layer are set to 400x400, so the draw quads
     // generated should leave the border width (40) intact.
     MockQuadCuller quadCuller;
     gfx::Size bitmapSize(100, 100);
     gfx::Size layerSize(400, 400);
     gfx::Rect visibleContentRect(gfx::Point(), layerSize);
     gfx::Rect apertureRect(20, 30, 40, 50);
     gfx::Rect scaledApertureNonUniform(20, 30, 340, 350);
 
     scoped_ptr<NinePatchLayerImpl> layer = NinePatchLayerImpl::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();
     layer->setLayout(bitmapSize, apertureRect);
     layer->setResourceId(1);
 
     // This scale should not affect the generated quad geometry, but only
     // the shared draw transform.
     gfx::Transform transform;
     transform.Scale(10, 10);
-    layer->setDrawTransform(transform);
+    layer->drawProperties().drawTransform = transform;
 
     AppendQuadsData data;
     layer->appendQuads(quadCuller, data);
 
     // Verify quad rects
     const QuadList& quads = quadCuller.quadList();
     EXPECT_EQ(8, quads.size());
     Region remaining(visibleContentRect);
     for (size_t i = 0; i < quads.size(); ++i) {
         DrawQuad* quad = quads[i];
@@ skipping 26 matching lines @@
 TEST(NinePatchLayerImplTest, verifyDrawQuadsForSqueezedLayer)
 {
     // Test with a layer much smaller than the bitmap.
     MockQuadCuller quadCuller;
     gfx::Size bitmapSize(101, 101);
     gfx::Size layerSize(51, 51);
     gfx::Rect visibleContentRect(gfx::Point(), layerSize);
     gfx::Rect apertureRect(20, 30, 40, 45); // rightWidth: 40, botHeight: 25
 
     scoped_ptr<NinePatchLayerImpl> layer = NinePatchLayerImpl::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();
     layer->setLayout(bitmapSize, apertureRect);
     layer->setResourceId(1);
 
     AppendQuadsData data;
     layer->appendQuads(quadCuller, data);
 
     // Verify corner rects fill the layer and don't overlap
     const QuadList& quads = quadCuller.quadList();
     EXPECT_EQ(4, quads.size());
     Region filled;
@@ skipping 21 matching lines @@
     Region expectedRemainingRegion = Region(gfx::Rect(bitmapSize));
     expectedRemainingRegion.Subtract(gfx::Rect(0, 0, 17, 28));
     expectedRemainingRegion.Subtract(gfx::Rect(67, 0, 34, 28));
     expectedRemainingRegion.Subtract(gfx::Rect(0, 78, 17, 23));
     expectedRemainingRegion.Subtract(gfx::Rect(67, 78, 34, 23));
     EXPECT_EQ(expectedRemainingRegion, texRemaining);
 }
 
 }  // namespace
 }  // namespace cc