| Index: cc/tiled_layer_impl.h
|
| diff --git a/cc/tiled_layer_impl.h b/cc/tiled_layer_impl.h
|
| index aedcb1847c180ed886656352b5c4bf05e93beb98..80f7d20a86a9d9d0724c1dd9c65d808ffe73ee7f 100644
|
| --- a/cc/tiled_layer_impl.h
|
| +++ b/cc/tiled_layer_impl.h
|
| @@ -10,26 +10,26 @@
|
|
|
| namespace cc {
|
|
|
| -class CCLayerTilingData;
|
| +class LayerTilingData;
|
| class DrawableTile;
|
|
|
| -class CCTiledLayerImpl : public CCLayerImpl {
|
| +class TiledLayerImpl : public LayerImpl {
|
| public:
|
| - static scoped_ptr<CCTiledLayerImpl> create(int id)
|
| + static scoped_ptr<TiledLayerImpl> create(int id)
|
| {
|
| - return make_scoped_ptr(new CCTiledLayerImpl(id));
|
| + return make_scoped_ptr(new TiledLayerImpl(id));
|
| }
|
| - virtual ~CCTiledLayerImpl();
|
| + virtual ~TiledLayerImpl();
|
|
|
| - virtual void appendQuads(CCQuadSink&, CCAppendQuadsData&) OVERRIDE;
|
| + virtual void appendQuads(QuadSink&, AppendQuadsData&) OVERRIDE;
|
|
|
| - virtual CCResourceProvider::ResourceId contentsResourceId() const OVERRIDE;
|
| + virtual ResourceProvider::ResourceId contentsResourceId() const OVERRIDE;
|
|
|
| virtual void dumpLayerProperties(std::string*, int indent) const OVERRIDE;
|
|
|
| void setSkipsDraw(bool skipsDraw) { m_skipsDraw = skipsDraw; }
|
| - void setTilingData(const CCLayerTilingData& tiler);
|
| - void pushTileProperties(int, int, CCResourceProvider::ResourceId, const IntRect& opaqueRect);
|
| + void setTilingData(const LayerTilingData& tiler);
|
| + void pushTileProperties(int, int, ResourceProvider::ResourceId, const IntRect& opaqueRect);
|
| void pushInvalidTile(int, int);
|
|
|
| void setContentsSwizzled(bool contentsSwizzled) { m_contentsSwizzled = contentsSwizzled; }
|
| @@ -39,7 +39,7 @@ public:
|
| virtual void didLoseContext() OVERRIDE;
|
|
|
| protected:
|
| - explicit CCTiledLayerImpl(int id);
|
| + explicit TiledLayerImpl(int id);
|
| // Exposed for testing.
|
| bool hasTileAt(int, int) const;
|
| bool hasResourceIdForTileAt(int, int) const;
|
| @@ -54,7 +54,7 @@ private:
|
| bool m_skipsDraw;
|
| bool m_contentsSwizzled;
|
|
|
| - scoped_ptr<CCLayerTilingData> m_tiler;
|
| + scoped_ptr<LayerTilingData> m_tiler;
|
| };
|
|
|
| }
|
|
|