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 56 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::calculateContentsScale(
+    float ideal_contents_scale,
+    float* contentsScaleX,
+    float* contentsScaleY,
+    gfx::Size* contentBounds)
 {
-    return gfx::Size(m_bitmap.width(), m_bitmap.height());
+    *contentsScaleX = imageContentsScaleX();
+    *contentsScaleY = imageContentsScaleY();
+    *contentBounds = gfx::Size(m_bitmap.width(), m_bitmap.height());
 }
 
 bool ImageLayer::drawsContent() const
 {
     return !m_bitmap.isNull() && TiledLayer::drawsContent();
 }
 
-float ImageLayer::contentsScaleX() const
+float ImageLayer::imageContentsScaleX() 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
+float ImageLayer::imageContentsScaleY() 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