| Index: cc/scrollbar_layer.h
|
| diff --git a/cc/scrollbar_layer.h b/cc/scrollbar_layer.h
|
| index 13341a365cd4163690baf13f7d2955e261b62401..47de62eaf054c62e294aa50ff3adf4727e0a0a84 100644
|
| --- a/cc/scrollbar_layer.h
|
| +++ b/cc/scrollbar_layer.h
|
| @@ -33,7 +33,11 @@ public:
|
| virtual void update(ResourceUpdateQueue&, const OcclusionTracker*, RenderingStats&) OVERRIDE;
|
| virtual void setLayerTreeHost(LayerTreeHost*) OVERRIDE;
|
| virtual void pushPropertiesTo(LayerImpl*) OVERRIDE;
|
| - virtual void setContentsScale(float contentsScale) OVERRIDE;
|
| + virtual void calculateContentsScale(
|
| + float idealContentsScale,
|
| + float* contentsScaleX,
|
| + float* contentsScaleY,
|
| + gfx::Size* contentBounds) OVERRIDE;
|
|
|
| virtual ScrollbarLayer* toScrollbarLayer() OVERRIDE;
|
|
|
|
|