Organize internal properties of cc/ layer types

cc/layer_impl.cc

Index: cc/layer_impl.cc
diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc
index a1dffea69f549bbdd673c81d5076b54092677f23..eba81e4b151551e84cbaf4b8a1b791df49462037 100644
--- a/cc/layer_impl.cc
+++ b/cc/layer_impl.cc
@@ -20,6 +20,7 @@
 
 namespace cc {
 
+

[jamesr, 2012/12/04 06:44:32]

extra newline

 LayerImpl::LayerImpl(int id)
     : m_parent(0)
     , m_maskLayerId(-1)
@@ -48,14 +49,8 @@ LayerImpl::LayerImpl(int id)
     , m_forceRenderSurface(false)
     , m_isContainerForFixedPositionLayers(false)
     , m_fixedToContainerLayer(false)
-    , m_renderTarget(0)
     , m_drawDepth(0)
-    , m_drawOpacity(0)
-    , m_drawOpacityIsAnimating(false)
     , m_filter(0)
-    , m_drawTransformIsAnimating(false)
-    , m_screenSpaceTransformIsAnimating(false)
-    , m_isClipped(false)
 #ifndef NDEBUG
     , m_betweenWillDrawAndDidDraw(false)
 #endif
@@ -109,7 +104,7 @@ void LayerImpl::createRenderSurface()
 {
     DCHECK(!m_renderSurface);
     m_renderSurface = make_scoped_ptr(new RenderSurfaceImpl(this));
-    setRenderTarget(this);
+    m_drawProperties.renderTarget = this;
 }
 
 int LayerImpl::descendantsDrawContent()
@@ -128,7 +123,7 @@ int LayerImpl::descendantsDrawContent()
 scoped_ptr<SharedQuadState> LayerImpl::createSharedQuadState() const
 {
   scoped_ptr<SharedQuadState> state = SharedQuadState::Create();
-  state->SetAll(m_drawTransform, m_visibleContentRect, m_drawableContentRect, m_clipRect, m_isClipped, m_drawOpacity);
+  state->SetAll(m_drawProperties.drawTransform, m_drawProperties.visibleContentRect, m_drawProperties.drawableContentRect, m_drawProperties.clipRect, m_drawProperties.isClipped, m_drawProperties.drawOpacity);
   return state.Pass();
 }
 
@@ -297,9 +292,9 @@ void LayerImpl::dumpLayerProperties(std::string* str, int indent) const
     str->append(indentStr);
     base::StringAppendF(str, "bounds: %d, %d\n", bounds().width(), bounds().height());
 
-    if (m_renderTarget) {
+    if (m_drawProperties.renderTarget) {
         str->append(indentStr);
-        base::StringAppendF(str, "renderTarget: %d\n", m_renderTarget->m_layerId);
+        base::StringAppendF(str, "renderTarget: %d\n", m_drawProperties.renderTarget->m_layerId);
     }
 
     str->append(indentStr);
@@ -309,11 +304,12 @@ void LayerImpl::dumpLayerProperties(std::string* str, int indent) const
     base::StringAppendF(str, "contentsOpaque: %d\n", m_contentsOpaque);
 
     str->append(indentStr);
+    const gfx::Transform& transform = m_drawProperties.drawTransform;
     base::StringAppendF(str, "drawTransform: %f, %f, %f, %f  //  %f, %f, %f, %f  //  %f, %f, %f, %f  //  %f, %f, %f, %f\n",
-        m_drawTransform.matrix().getDouble(0, 0), m_drawTransform.matrix().getDouble(0, 1), m_drawTransform.matrix().getDouble(0, 2), m_drawTransform.matrix().getDouble(0, 3),
-        m_drawTransform.matrix().getDouble(1, 0), m_drawTransform.matrix().getDouble(1, 1), m_drawTransform.matrix().getDouble(1, 2), m_drawTransform.matrix().getDouble(1, 3),
-        m_drawTransform.matrix().getDouble(2, 0), m_drawTransform.matrix().getDouble(2, 1), m_drawTransform.matrix().getDouble(2, 2), m_drawTransform.matrix().getDouble(2, 3),
-        m_drawTransform.matrix().getDouble(3, 0), m_drawTransform.matrix().getDouble(3, 1), m_drawTransform.matrix().getDouble(3, 2), m_drawTransform.matrix().getDouble(3, 3));
+        transform.matrix().getDouble(0, 0), transform.matrix().getDouble(0, 1), transform.matrix().getDouble(0, 2), transform.matrix().getDouble(0, 3),
+        transform.matrix().getDouble(1, 0), transform.matrix().getDouble(1, 1), transform.matrix().getDouble(1, 2), transform.matrix().getDouble(1, 3),
+        transform.matrix().getDouble(2, 0), transform.matrix().getDouble(2, 1), transform.matrix().getDouble(2, 2), transform.matrix().getDouble(2, 3),
+        transform.matrix().getDouble(3, 0), transform.matrix().getDouble(3, 1), transform.matrix().getDouble(3, 2), transform.matrix().getDouble(3, 3));
 
     str->append(indentStr);
     base::StringAppendF(str, "drawsContent: %s\n", m_drawsContent ? "yes" : "no");