cc: Refactor content scale/bounds into draw properties

cc/test/tiled_layer_test_common.h

 // Copyright 2012 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.
 
 #ifndef CC_TEST_TILED_LAYER_TEST_COMMON_H_
 #define CC_TEST_TILED_LAYER_TEST_COMMON_H_
 
 #include "cc/layer_updater.h"
 #include "cc/prioritized_resource.h"
 #include "cc/region.h"
@@ skipping 81 matching lines @@
 
     virtual void setNeedsDisplayRect(const gfx::RectF&) OVERRIDE;
     const gfx::RectF& lastNeedsDisplayRect() const { return m_lastNeedsDisplayRect; }
 
     virtual void setTexturePriorities(const cc::PriorityCalculator&) OVERRIDE;
 
     virtual cc::PrioritizedResourceManager* resourceManager() const OVERRIDE;
     FakeLayerUpdater* fakeLayerUpdater() { return m_fakeUpdater.get(); }
     gfx::RectF updateRect() { return m_updateRect; }
 
+    // Simulate calcDrawProperties.
+    void updateContentsScale(float idealContentsScale);
+
 protected:
     virtual cc::LayerUpdater* updater() const OVERRIDE;
     virtual void createUpdaterIfNeeded() OVERRIDE { }
     virtual ~FakeTiledLayer();
 
 private:
     scoped_refptr<FakeLayerUpdater> m_fakeUpdater;
     cc::PrioritizedResourceManager* m_resourceManager;
     gfx::RectF m_lastNeedsDisplayRect;
 };
 
 class FakeTiledLayerWithScaledBounds : public FakeTiledLayer {
 public:
     explicit FakeTiledLayerWithScaledBounds(cc::PrioritizedResourceManager*);
 
-    void setContentBounds(const gfx::Size& contentBounds) { m_forcedContentBounds = contentBounds; }
-    virtual gfx::Size contentBounds() const OVERRIDE;
-    virtual float contentsScaleX() const OVERRIDE;
-    virtual float contentsScaleY() const OVERRIDE;
-    virtual void setContentsScale(float) OVERRIDE;
+    void setContentBounds(const gfx::Size& contentBounds);
+    virtual void calculateContentsScale(
+        float idealContentsScale,
+        float* contentsScaleX,
+        float* contentsScaleY,
+        gfx::Size* contentBounds) OVERRIDE;
+    virtual void didUpdateBounds() OVERRIDE;
 
 protected:
     virtual ~FakeTiledLayerWithScaledBounds();
     gfx::Size m_forcedContentBounds;
 };
 
 }
 #endif  // CC_TEST_TILED_LAYER_TEST_COMMON_H_