Index: cc/scrollbar_layer.cc |
diff --git a/cc/scrollbar_layer.cc b/cc/scrollbar_layer.cc |
index 8ebfc89346eba2fa07507f04f4474df47e5a0ff4..9fb96ff616cb500838ffc846af6ad4630dd1410d 100644 |
--- a/cc/scrollbar_layer.cc |
+++ b/cc/scrollbar_layer.cc |
@@ -68,11 +68,19 @@ float ScrollbarLayer::clampScaleToMaxTextureSize(float scale) { |
return scale; |
} |
-void ScrollbarLayer::setContentsScale(float contentsScale) { |
- contentsScale = clampScaleToMaxTextureSize(contentsScale); |
- ContentsScalingLayer::setContentsScale(contentsScale); |
- DCHECK_LE(contentBounds().width(), maxTextureSize()); |
- DCHECK_LE(contentBounds().height(), maxTextureSize()); |
+void ScrollbarLayer::calculateContentsScale( |
+ float idealContentsScale, |
+ float* contentsScaleX, |
+ float* contentsScaleY, |
+ gfx::Size* contentBounds) |
+{ |
+ ContentsScalingLayer::calculateContentsScale( |
+ clampScaleToMaxTextureSize(idealContentsScale), |
+ contentsScaleX, |
+ contentsScaleY, |
+ contentBounds); |
+ DCHECK_LE(contentBounds->width(), maxTextureSize()); |
+ DCHECK_LE(contentBounds->height(), maxTextureSize()); |
} |
void ScrollbarLayer::pushPropertiesTo(LayerImpl* layer) |