Rasterize at maximum scale for scale animations on CPU-rasterized layers

cc/layers/picture_image_layer_impl.cc

Index: cc/layers/picture_image_layer_impl.cc
diff --git a/cc/layers/picture_image_layer_impl.cc b/cc/layers/picture_image_layer_impl.cc
index b9a57f2b7b0c4f4a9fb87b4051f8c8696df2e31e..65c46956de31f24235f09cd878eb28d4a246bf19 100644
--- a/cc/layers/picture_image_layer_impl.cc
+++ b/cc/layers/picture_image_layer_impl.cc
@@ -31,6 +31,7 @@ void PictureImageLayerImpl::CalculateContentsScale(
     float ideal_contents_scale,
     float device_scale_factor,
     float page_scale_factor,
+    float maximum_animation_scale_factor,
     bool animating_transform_to_screen,
     float* contents_scale_x,
     float* contents_scale_y,
@@ -41,6 +42,7 @@ void PictureImageLayerImpl::CalculateContentsScale(
   PictureLayerImpl::CalculateContentsScale(ideal_contents_scale,
                                            device_scale_factor,
                                            page_scale_factor,
+                                           maximum_animation_scale_factor,
                                            animating_transform_to_screen,
                                            contents_scale_x,
                                            contents_scale_y,
@@ -59,9 +61,11 @@ bool PictureImageLayerImpl::ShouldAdjustRasterScale(
 }
 
 void PictureImageLayerImpl::RecalculateRasterScales(
-    bool animating_transform_to_screen) {
+    bool animating_transform_to_screen,
+    float maximum_animation_scale_factor) {
   // Defaults from PictureLayerImpl.
-  PictureLayerImpl::RecalculateRasterScales(animating_transform_to_screen);
+  PictureLayerImpl::RecalculateRasterScales(animating_transform_to_screen,
+                                            maximum_animation_scale_factor);
 
   // Don't scale images during rastering to ensure image quality, save memory
   // and avoid frequent re-rastering on change of scale.