| Index: cc/layers/layer.cc
|
| diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
|
| index 8a2b7e408d8d8ee1503bee58831ad6c92cd4899d..a9e59d35ed8007322e6961899eb8ad625c2e9b8a 100644
|
| --- a/cc/layers/layer.cc
|
| +++ b/cc/layers/layer.cc
|
| @@ -422,14 +422,14 @@ SkColor Layer::SafeOpaqueBackgroundColor() const {
|
| return color;
|
| }
|
|
|
| -void Layer::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) {
|
| +void Layer::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) {
|
| DCHECK(layer_tree_host_);
|
|
|
| *contents_scale_x = 1;
|
|
|