| Index: cc/layers/contents_scaling_layer.h
|
| diff --git a/cc/layers/contents_scaling_layer.h b/cc/layers/contents_scaling_layer.h
|
| index 52abc4bc99fdbd9744d8bd3b2eea268a217ea7dd..3e959622d753b8fadfb0435ccc4482cd5a12c528 100644
|
| --- a/cc/layers/contents_scaling_layer.h
|
| +++ b/cc/layers/contents_scaling_layer.h
|
| @@ -14,14 +14,14 @@ namespace cc {
|
| // The content bounds are determined by bounds and scale of the contents.
|
| class CC_EXPORT ContentsScalingLayer : public Layer {
|
| public:
|
| - virtual void CalculateContentsScale(
|
| - float ideal_contents_scale,
|
| - float device_scale_factor,
|
| - float page_scale_factor,
|
| - bool animating_transform_to_screen,
|
| - float* contents_scale_x,
|
| - float* contents_scale_y,
|
| - gfx::Size* content_bounds) OVERRIDE;
|
| + virtual void CalculateContentsScale(float ideal_contents_scale,
|
| + float device_scale_factor,
|
| + float page_scale_factor,
|
| + float maximum_animation_contents_scale,
|
| + bool animating_transform_to_screen,
|
| + float* contents_scale_x,
|
| + float* contents_scale_y,
|
| + gfx::Size* content_bounds) OVERRIDE;
|
|
|
| virtual bool Update(ResourceUpdateQueue* queue,
|
| const OcclusionTracker<Layer>* occlusion) OVERRIDE;
|
|
|