cc: Refactor content scale/bounds into draw properties

cc/layer.cc

 // Copyright 2010 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.h"
 
 #include "cc/active_animation.h"
 #include "cc/animation_events.h"
 #include "cc/layer_animation_controller.h"
 #include "cc/layer_impl.h"
@@ skipping 198 matching lines @@
 
 void Layer::setBounds(const gfx::Size& size)
 {
     if (bounds() == size)
         return;
 
     bool firstResize = bounds().IsEmpty() && !size.IsEmpty();
 
     m_bounds = size;
 
+    didUpdateBounds();
+
     if (firstResize)
         setNeedsDisplay();
     else
         setNeedsCommit();
 }
 
+void Layer::didUpdateBounds()
+{
+    m_drawProperties.content_bounds = bounds();
+}
+
 Layer* Layer::rootLayer()
 {
     Layer* layer = this;
     while (layer->parent())
         layer = layer->parent();
     return layer;
 }
 
 void Layer::removeAllChildren()
 {
@@ skipping 32 matching lines @@
 }
 
 void Layer::setBackgroundColor(SkColor backgroundColor)
 {
     if (m_backgroundColor == backgroundColor)
         return;
     m_backgroundColor = backgroundColor;
     setNeedsCommit();
 }
 
-gfx::Size Layer::contentBounds() const
+void Layer::calculateContentsScale(
+    float idealContentsScale,
+    float* contentsScaleX,
+    float* contentsScaleY,
+    gfx::Size* contentBounds)
 {
-    return bounds();
+    *contentsScaleX = 1;
+    *contentsScaleY = 1;
+    *contentBounds = bounds();
 }
 
 void Layer::setMasksToBounds(bool masksToBounds)
 {
     if (m_masksToBounds == masksToBounds)
         return;
     m_masksToBounds = masksToBounds;
     setNeedsCommit();
 }
 
@@ skipping 336 matching lines @@
 {
     return false;
 }
 
 void Layer::setDebugName(const std::string& debugName)
 {
     m_debugName = debugName;
     setNeedsCommit();
 }
 
-float Layer::contentsScaleX() const
-{
-    return 1.0;
-}
-
-float Layer::contentsScaleY() const
-{
-    return 1.0;
-}
-
 void Layer::setRasterScale(float scale)
 {
     if (m_rasterScale == scale)
         return;
     m_rasterScale = scale;
 
     if (!m_automaticallyComputeRasterScale)
         return;
     setNeedsDisplay();
 }
@@ skipping 164 matching lines @@
 {
     return 0;
 }
 
 void sortLayers(std::vector<scoped_refptr<Layer> >::iterator, std::vector<scoped_refptr<Layer> >::iterator, void*)
 {
     // Currently we don't use z-order to decide what to paint, so there's no need to actually sort Layers.
 }
 
 }  // namespace cc