cc: Refactor content scale/bounds into draw properties

cc/test/tiled_layer_test_common.cc

Index: cc/test/tiled_layer_test_common.cc
diff --git a/cc/test/tiled_layer_test_common.cc b/cc/test/tiled_layer_test_common.cc
index 80106383c051ff6ea28e5997f04f7bdf083630d8..90c8b90bbf5c33977fab9be87a07e0f122427a43 100644
--- a/cc/test/tiled_layer_test_common.cc
+++ b/cc/test/tiled_layer_test_common.cc
@@ -139,24 +139,22 @@ cc::LayerUpdater* FakeTiledLayer::updater() const
     return m_fakeUpdater.get();
 }
 
-gfx::Size FakeTiledLayerWithScaledBounds::contentBounds() const
+void FakeTiledLayerWithScaledBounds::setContentBounds(const gfx::Size& contentBounds)
 {
-    return m_forcedContentBounds;
+    m_forcedContentBounds = contentBounds;
+    m_drawProperties.content_bounds = m_forcedContentBounds;
 }
 
-float FakeTiledLayerWithScaledBounds::contentsScaleX() const
+void FakeTiledLayerWithScaledBounds::updateContentsScale(float scale)
 {
-    return static_cast<float>(m_forcedContentBounds.width()) / bounds().width();
+    m_drawProperties.contents_scale_x = static_cast<float>(m_forcedContentBounds.width()) / bounds().width();
+    m_drawProperties.contents_scale_y = static_cast<float>(m_forcedContentBounds.height()) / bounds().height();
+    m_drawProperties.content_bounds = m_forcedContentBounds;
 }
 
-float FakeTiledLayerWithScaledBounds::contentsScaleY() const
+void FakeTiledLayerWithScaledBounds::didUpdateBounds()
 {
-    return static_cast<float>(m_forcedContentBounds.height()) / bounds().height();
-}
-
-void FakeTiledLayerWithScaledBounds::setContentsScale(float)
-{
-    NOTREACHED();
+    m_drawProperties.content_bounds = m_forcedContentBounds;
 }
 
 } // namespace