| Index: cc/scrollbar_layer.cc
|
| diff --git a/cc/scrollbar_layer.cc b/cc/scrollbar_layer.cc
|
| index 83152bb34bffb76d147b5bb8fd95627906a53e9a..075b9c29ca30f077e6e0366f6ccf10b634ad95b8 100644
|
| --- a/cc/scrollbar_layer.cc
|
| +++ b/cc/scrollbar_layer.cc
|
| @@ -68,9 +68,10 @@ float ScrollbarLayer::clampScaleToMaxTextureSize(float scale) {
|
| return scale;
|
| }
|
|
|
| -void ScrollbarLayer::setContentsScale(float contentsScale) {
|
| - contentsScale = clampScaleToMaxTextureSize(contentsScale);
|
| - ContentsScalingLayer::setContentsScale(contentsScale);
|
| +void ScrollbarLayer::setIdealContentsScale(float scale)
|
| +{
|
| + float contentsScale = clampScaleToMaxTextureSize(scale);
|
| + ContentsScalingLayer::setIdealContentsScale(contentsScale);
|
| DCHECK_LE(contentBounds().width(), maxTextureSize());
|
| DCHECK_LE(contentBounds().height(), maxTextureSize());
|
| }
|
|
|