| Index: cc/tiled_layer.h
|
| diff --git a/cc/tiled_layer.h b/cc/tiled_layer.h
|
| index c6cb5412b93b9b31f22f822ddc5ba73c2a18af01..7994d2c33febb4ba95a744b180c388f6f05da655 100644
|
| --- a/cc/tiled_layer.h
|
| +++ b/cc/tiled_layer.h
|
| @@ -5,14 +5,14 @@
|
| #ifndef TiledLayerChromium_h
|
| #define TiledLayerChromium_h
|
|
|
| -#include "cc/layer.h"
|
| +#include "cc/contents_scaling_layer.h"
|
| #include "cc/layer_updater.h"
|
| #include "cc/layer_tiling_data.h"
|
|
|
| namespace cc {
|
| class UpdatableTile;
|
|
|
| -class TiledLayer : public Layer {
|
| +class TiledLayer : public ContentsScalingLayer {
|
| public:
|
| enum TilingOption { AlwaysTile, NeverTile, AutoTile };
|
|
|
| @@ -21,9 +21,6 @@ public:
|
| virtual void pushPropertiesTo(LayerImpl*) OVERRIDE;
|
|
|
| virtual bool drawsContent() const OVERRIDE;
|
| - virtual bool needsContentsScale() const OVERRIDE;
|
| -
|
| - virtual IntSize contentBounds() const OVERRIDE;
|
|
|
| virtual void setNeedsDisplayRect(const FloatRect&) OVERRIDE;
|
|
|
|
|