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"
 #include "cc/layer_sorter.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/math_util.h"
 #include "cc/proxy.h"
 #include "cc/quad_sink.h"
 #include "cc/scrollbar_animation_controller.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/rect_conversions.h"
 
 namespace cc {
 
+

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

extra newline

 LayerImpl::LayerImpl(int id)
     : m_parent(0)
     , m_maskLayerId(-1)
     , m_replicaLayerId(-1)
     , m_layerId(id)
     , m_layerTreeHostImpl(0)
     , m_anchorPoint(0.5, 0.5)
     , m_anchorPointZ(0)
     , m_contentsScaleX(1.0)
     , m_contentsScaleY(1.0)
     , m_scrollable(false)
     , m_shouldScrollOnMainThread(false)
     , m_haveWheelEventHandlers(false)
     , m_backgroundColor(0)
     , m_doubleSided(true)
     , m_layerPropertyChanged(false)
     , m_layerSurfacePropertyChanged(false)
     , m_masksToBounds(false)
     , 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_filter(0)
-    , 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 33 matching lines @@
 
 void LayerImpl::clearChildList()
 {
     m_children.clear();
 }
 
 void LayerImpl::createRenderSurface()
 {
     DCHECK(!m_renderSurface);
     m_renderSurface = make_scoped_ptr(new RenderSurfaceImpl(this));
-    setRenderTarget(this);
+    m_drawProperties.renderTarget = 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.drawTransform, m_drawProperties.visibleContentRect, m_drawProperties.drawableContentRect, m_drawProperties.clipRect, m_drawProperties.isClipped, m_drawProperties.drawOpacity);
   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.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);
     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.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");
 }
 
 void sortLayers(std::vector<LayerImpl*>::iterator first, std::vector<LayerImpl*>::iterator end, LayerSorter* layerSorter)
 {
     TRACE_EVENT0("cc", "LayerImpl::sortLayers");
     layerSorter->sort(first, end);
 }
@@ skipping 399 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