| Index: cc/test/tiled_layer_test_common.h
|
| diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h
|
| index 19928245bc34ba30ae7bc7aaee691cb56e1a230d..b7572de31cf6c5dd0350eab523eebbfaef3b564b 100644
|
| --- a/cc/test/tiled_layer_test_common.h
|
| +++ b/cc/test/tiled_layer_test_common.h
|
| @@ -114,11 +114,9 @@ class FakeTiledLayerWithScaledBounds : public FakeTiledLayer {
|
| public:
|
| explicit FakeTiledLayerWithScaledBounds(cc::PrioritizedResourceManager*);
|
|
|
| - void setContentBounds(const gfx::Size& contentBounds) { m_forcedContentBounds = contentBounds; }
|
| - virtual gfx::Size contentBounds() const OVERRIDE;
|
| - virtual float contentsScaleX() const OVERRIDE;
|
| - virtual float contentsScaleY() const OVERRIDE;
|
| - virtual void setContentsScale(float) OVERRIDE;
|
| + void setContentBounds(const gfx::Size& contentBounds);
|
| + virtual void updateContentsScale(float) OVERRIDE;
|
| + virtual void didUpdateBounds() OVERRIDE;
|
|
|
| protected:
|
| virtual ~FakeTiledLayerWithScaledBounds();
|
|
|