Organize internal properties of cc/ layer types

cc/quad_culler_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 "cc/quad_culler.h"
 
 #include "cc/append_quads_data.h"
 #include "cc/layer_tiling_data.h"
 #include "cc/math_util.h"
 #include "cc/occlusion_tracker.h"
@@ skipping 25 matching lines @@
 
 typedef LayerIterator<LayerImpl, std::vector<LayerImpl*>, RenderSurfaceImpl, LayerIteratorActions::FrontToBack> LayerIteratorType;
 
 static scoped_ptr<TiledLayerImpl> makeLayer(TiledLayerImpl* parent, const gfx::Transform& drawTransform, const gfx::Rect& layerRect, float opacity, bool opaque, const gfx::Rect& layerOpaqueRect, std::vector<LayerImpl*>& surfaceLayerList)
 {
     scoped_ptr<TiledLayerImpl> layer = TiledLayerImpl::create(1);
     scoped_ptr<LayerTilingData> tiler = LayerTilingData::create(gfx::Size(100, 100), LayerTilingData::NoBorderTexels);
     tiler->setBounds(layerRect.size());
     layer->setTilingData(*tiler);
     layer->setSkipsDraw(false);
-    layer->setDrawTransform(drawTransform);
-    layer->setScreenSpaceTransform(drawTransform);
-    layer->setVisibleContentRect(layerRect);
-    layer->setDrawOpacity(opacity);
+    layer->drawProperties().target_space_transform = drawTransform;
+    layer->drawProperties().screen_space_transform = drawTransform;
+    layer->drawProperties().visible_content_rect = layerRect;
+    layer->drawProperties().opacity = opacity;
     layer->setContentsOpaque(opaque);
     layer->setBounds(layerRect.size());
     layer->setContentBounds(layerRect.size());
 
     ResourceProvider::ResourceId resourceId = 1;
     for (int i = 0; i < tiler->numTilesX(); ++i)
         for (int j = 0; j < tiler->numTilesY(); ++j) {
           gfx::Rect tileOpaqueRect = opaque ? tiler->tileBounds(i, j) : gfx::IntersectRects(tiler->tileBounds(i, j), layerOpaqueRect);
             layer->pushTileProperties(i, j, resourceId++, tileOpaqueRect, false);
         }
 
     gfx::Rect rectInTarget = MathUtil::mapClippedRect(layer->drawTransform(), layer->visibleContentRect());
     if (!parent) {
         layer->createRenderSurface();
         surfaceLayerList.push_back(layer.get());
         layer->renderSurface()->layerList().push_back(layer.get());
     } else {
-        layer->setRenderTarget(parent->renderTarget());
+        layer->drawProperties().render_target = parent->renderTarget();
         parent->renderSurface()->layerList().push_back(layer.get());
         rectInTarget.Union(MathUtil::mapClippedRect(parent->drawTransform(), parent->visibleContentRect()));
     }
-    layer->setDrawableContentRect(rectInTarget);
+    layer->drawProperties().drawable_content_rect = rectInTarget;
 
     return layer.Pass();
 }
 
 static void appendQuads(QuadList& quadList, SharedQuadStateList& sharedStateList, TiledLayerImpl* layer, LayerIteratorType& it, OcclusionTrackerImpl& occlusionTracker)
 {
     occlusionTracker.enterLayer(it);
     QuadCuller quadCuller(quadList, sharedStateList, layer, occlusionTracker, false, false);
     AppendQuadsData data;
     layer->appendQuads(quadCuller, data);
@@ skipping 375 matching lines @@
     appendQuads(quadList, sharedStateList, childLayer.get(), it, occlusionTracker);
     appendQuads(quadList, sharedStateList, rootLayer.get(), it, occlusionTracker);
     EXPECT_EQ(quadList.size(), 9u);
     EXPECT_NEAR(occlusionTracker.overdrawMetrics().pixelsDrawnOpaque(), 0, 1);
     EXPECT_NEAR(occlusionTracker.overdrawMetrics().pixelsDrawnTranslucent(), 0, 1);
     EXPECT_NEAR(occlusionTracker.overdrawMetrics().pixelsCulledForDrawing(), 0, 1);
 }
 
 }  // namespace
 }  // namespace cc