cc: Refactor content scale/bounds into draw properties

cc/image_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/image_layer.h"
 
 #include "base/compiler_specific.h"
 #include "cc/image_layer_updater.h"
 #include "cc/layer_updater.h"
 #include "cc/layer_tree_host.h"
@@ skipping 18 matching lines @@
 void ImageLayer::setBitmap(const SkBitmap& bitmap)
 {
     // setBitmap() currently gets called whenever there is any
     // style change that affects the layer even if that change doesn't
     // affect the actual contents of the image (e.g. a CSS animation).
     // With this check in place we avoid unecessary texture uploads.
     if (bitmap.pixelRef() && bitmap.pixelRef() == m_bitmap.pixelRef())
         return;
 
     m_bitmap = bitmap;
+    didUpdateBounds();
     setNeedsDisplay();
 }
 
 void ImageLayer::setTexturePriorities(const PriorityCalculator& priorityCalc)
 {
     // Update the tile data before creating all the layer's tiles.
     updateTileSizeAndTilingOption();
 
     TiledLayer::setTexturePriorities(priorityCalc);
 }
@@ skipping 18 matching lines @@
     m_updater = ImageLayerUpdater::create();
     GLenum textureFormat = layerTreeHost()->rendererCapabilities().bestTextureFormat;
     setTextureFormat(textureFormat);
 }
 
 LayerUpdater* ImageLayer::updater() const
 {
     return m_updater.get();
 }
 
-gfx::Size ImageLayer::contentBounds() const
+void ImageLayer::setIdealContentsScale(float ideal_contents_scale)
 {
-    return gfx::Size(m_bitmap.width(), m_bitmap.height());
+    m_drawProperties.ideal_contents_scale = ideal_contents_scale;
+    m_drawProperties.contents_scale_x = contentsScaleX();
+    m_drawProperties.contents_scale_y = contentsScaleY();
+    m_drawProperties.content_bounds = gfx::Size(m_bitmap.width(), m_bitmap.height());
 }
 
 bool ImageLayer::drawsContent() const
 {
     return !m_bitmap.isNull() && TiledLayer::drawsContent();
 }
 
 float ImageLayer::contentsScaleX() const
 {
-    if (bounds().IsEmpty() || contentBounds().IsEmpty())
+    if (bounds().IsEmpty() || m_bitmap.width() == 0)
         return 1;
     return static_cast<float>(m_bitmap.width()) / bounds().width();
 }
 
 float ImageLayer::contentsScaleY() const
 {
-    if (bounds().IsEmpty() || contentBounds().IsEmpty())
+    if (bounds().IsEmpty() || m_bitmap.height() == 0)
         return 1;
     return static_cast<float>(m_bitmap.height()) / bounds().height();
 }
 
 }  // namespace cc