| Index: cc/layers/picture_layer_impl.h
|
| diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h
|
| index d10b93f9af0f2e55778dbb9da529732b8273ff6b..ac6b164f1250f09c619f89059a5640cca2e220a0 100644
|
| --- a/cc/layers/picture_layer_impl.h
|
| +++ b/cc/layers/picture_layer_impl.h
|
| @@ -75,10 +75,8 @@ class CC_EXPORT PictureLayerImpl : public LayerImpl,
|
| void RemoveTiling(float contents_scale);
|
| void SyncFromActiveLayer(const PictureLayerImpl* other);
|
| void ManageTilings(bool animating_transform_to_screen);
|
| - virtual void CalculateRasterContentsScale(
|
| - bool animating_transform_to_screen,
|
| - float* raster_contents_scale,
|
| - float* low_res_raster_contents_scale);
|
| + virtual bool ShouldAdjustRasterSourceScale() const;
|
| + virtual void CalculateRasterContentsScale(bool animating_transform_to_screen);
|
| void CleanUpTilingsOnActiveLayer(
|
| std::vector<PictureLayerTiling*> used_tilings);
|
| PictureLayerImpl* PendingTwin() const;
|
| @@ -100,11 +98,11 @@ class CC_EXPORT PictureLayerImpl : public LayerImpl,
|
|
|
| float ideal_page_scale_;
|
| float ideal_device_scale_;
|
| - float ideal_source_scale_;
|
|
|
| float raster_page_scale_;
|
| float raster_device_scale_;
|
| - float raster_source_scale_;
|
| + float raster_contents_scale_;
|
| + float low_res_raster_contents_scale_;
|
| bool raster_source_scale_was_animating_;
|
|
|
| friend class PictureLayer;
|
|
|