| Index: cc/layers/picture_layer_impl.h
|
| diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h
|
| index d93dbcd04f5e332defa5a1037a5d655111c6efb6..29c502441eebdeb68a6df8503086fb2bc5454731 100644
|
| --- a/cc/layers/picture_layer_impl.h
|
| +++ b/cc/layers/picture_layer_impl.h
|
| @@ -74,6 +74,7 @@ class CC_EXPORT PictureLayerImpl
|
| virtual void 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,
|
| @@ -122,14 +123,15 @@ class CC_EXPORT PictureLayerImpl
|
| void RemoveTiling(float contents_scale);
|
| void RemoveAllTilings();
|
| void SyncFromActiveLayer(const PictureLayerImpl* other);
|
| - void ManageTilings(bool animating_transform_to_screen);
|
| + void ManageTilings(bool animating_transform_to_screen,
|
| + float maximum_animation_scale_factor);
|
| bool ShouldHaveLowResTiling() const {
|
| return should_use_low_res_tiling_ && !ShouldUseGpuRasterization();
|
| }
|
| virtual bool ShouldAdjustRasterScale(
|
| bool animating_transform_to_screen) const;
|
| - virtual void RecalculateRasterScales(
|
| - bool animating_transform_to_screen);
|
| + virtual void RecalculateRasterScales(bool animating_transform_to_screen,
|
| + float maximum_animation_scale_factor);
|
| void CleanUpTilingsOnActiveLayer(
|
| std::vector<PictureLayerTiling*> used_tilings);
|
| float MinimumContentsScale() const;
|
|
|