Organize internal properties of cc/ layer types

cc/layer_impl.cc

 // Copyright 2011 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/layer_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "base/stringprintf.h"
 #include "cc/debug_border_draw_quad.h"
 #include "cc/debug_colors.h"
@@ skipping 29 matching lines @@
     , m_contentsOpaque(false)
     , m_opacity(1.0)
     , m_preserves3D(false)
     , m_useParentBackfaceVisibility(false)
     , m_drawCheckerboardForMissingTiles(false)
     , m_useLCDText(false)
     , m_drawsContent(false)
     , m_forceRenderSurface(false)
     , m_isContainerForFixedPositionLayers(false)
     , m_fixedToContainerLayer(false)
-    , m_renderTarget(0)
     , m_drawDepth(0)
-    , m_drawOpacity(0)
-    , m_drawOpacityIsAnimating(false)
-    , m_drawTransformIsAnimating(false)
-    , m_screenSpaceTransformIsAnimating(false)
-    , m_isClipped(false)
 #ifndef NDEBUG
     , m_betweenWillDrawAndDidDraw(false)
 #endif
     , m_layerAnimationController(LayerAnimationController::create(this))
 {
     DCHECK(m_layerId > 0);
 }
 
 LayerImpl::~LayerImpl()
 {
@@ skipping 30 matching lines @@
         m_children[0]->removeFromParent();
 }
 
 void LayerImpl::clearChildList()
 {
     m_children.clear();
 }
 
 void LayerImpl::createRenderSurface()
 {
-    DCHECK(!m_renderSurface);
-    m_renderSurface = make_scoped_ptr(new RenderSurfaceImpl(this));
-    setRenderTarget(this);
+    DCHECK(!m_drawProperties.render_surface);
+    m_drawProperties.render_surface = make_scoped_ptr(new RenderSurfaceImpl(this));
+    m_drawProperties.render_target = this;
 }
 
 int LayerImpl::descendantsDrawContent()
 {
     int result = 0;
     for (size_t i = 0; i < m_children.size(); ++i) {
         if (m_children[i]->drawsContent())
             ++result;
         result += m_children[i]->descendantsDrawContent();
         if (result > 1)
             return result;
     }
     return result;
 }
 
 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.target_space_transform,
+                m_drawProperties.visible_content_rect,
+                m_drawProperties.drawable_content_rect,
+                m_drawProperties.clip_rect,
+                m_drawProperties.is_clipped,
+                m_drawProperties.opacity);
   return state.Pass();
 }
 
 void LayerImpl::willDraw(ResourceProvider*)
 {
 #ifndef NDEBUG
     // willDraw/didDraw must be matched.
     DCHECK(!m_betweenWillDrawAndDidDraw);
     m_betweenWillDrawAndDidDraw = true;
 #endif
@@ skipping 148 matching lines @@
 
 void LayerImpl::dumpLayerProperties(std::string* str, int indent) const
 {
     std::string indentStr = indentString(indent);
     str->append(indentStr);
     base::StringAppendF(str, "layer ID: %d\n", m_layerId);
 
     str->append(indentStr);
     base::StringAppendF(str, "bounds: %d, %d\n", bounds().width(), bounds().height());
 
-    if (m_renderTarget) {
+    if (m_drawProperties.render_target) {
         str->append(indentStr);
-        base::StringAppendF(str, "renderTarget: %d\n", m_renderTarget->m_layerId);
+        base::StringAppendF(str, "renderTarget: %d\n", m_drawProperties.render_target->m_layerId);
     }
 
     str->append(indentStr);
     base::StringAppendF(str, "position: %f, %f\n", m_position.x(), m_position.y());
 
     str->append(indentStr);
     base::StringAppendF(str, "contentsOpaque: %d\n", m_contentsOpaque);
 
     str->append(indentStr);
+    const gfx::Transform& transform = m_drawProperties.target_space_transform;
     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");
 }
 
 void sortLayers(std::vector<LayerImpl*>::iterator first, std::vector<LayerImpl*>::iterator end, LayerSorter* layerSorter)
 {
     TRACE_EVENT0("cc", "LayerImpl::sortLayers");
     layerSorter->sort(first, end);
 }
@@ skipping 35 matching lines @@
 {
     if (m_layerSurfacePropertyChanged)
         return true;
 
     // If this layer's surface property hasn't changed, we want to see if
     // some layer above us has changed this property. This is done for the
     // case when such parent layer does not draw content, and therefore will
     // not be traversed by the damage tracker. We need to make sure that
     // property change on such layer will be caught by its descendants.
     LayerImpl* current = this->m_parent;
-    while (current && !current->m_renderSurface) {
+    while (current && !current->m_drawProperties.render_surface) {
         if (current->m_layerSurfacePropertyChanged)
             return true;
         current = current->m_parent;
     }
 
     return false;
 }
 
 void LayerImpl::noteLayerPropertyChangedForSubtree()
 {
@@ skipping 12 matching lines @@
     return "Layer";
 }
 
 void LayerImpl::resetAllChangeTrackingForSubtree()
 {
     m_layerPropertyChanged = false;
     m_layerSurfacePropertyChanged = false;
 
     m_updateRect = gfx::RectF();
 
-    if (m_renderSurface)
-        m_renderSurface->resetPropertyChangedFlag();
+    if (m_drawProperties.render_surface)
+        m_drawProperties.render_surface->resetPropertyChangedFlag();
 
     if (m_maskLayer)
         m_maskLayer->resetAllChangeTrackingForSubtree();
 
     if (m_replicaLayer)
         m_replicaLayer->resetAllChangeTrackingForSubtree(); // also resets the replica mask, if it exists.
 
     for (size_t i = 0; i < m_children.size(); ++i)
         m_children[i]->resetAllChangeTrackingForSubtree();
 }
@@ skipping 309 matching lines @@
 
 void LayerImpl::setVerticalScrollbarLayer(ScrollbarLayerImpl* scrollbarLayer)
 {
     if (!m_scrollbarAnimationController)
         m_scrollbarAnimationController = ScrollbarAnimationController::create(this);
     m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer);
     m_scrollbarAnimationController->updateScrollOffset(this);
 }
 
 }  // namespace cc