| Index: cc/texture_layer_impl.h
|
| diff --git a/cc/texture_layer_impl.h b/cc/texture_layer_impl.h
|
| index ff88ff36db2b8a8e2e9f9229b7205f08aac586a6..5d1f8ddefa40a1a49c2531b529aa6794880a24e2 100644
|
| --- a/cc/texture_layer_impl.h
|
| +++ b/cc/texture_layer_impl.h
|
| @@ -9,17 +9,17 @@
|
|
|
| namespace cc {
|
|
|
| -class CCTextureLayerImpl : public CCLayerImpl {
|
| +class TextureLayerImpl : public LayerImpl {
|
| public:
|
| - static scoped_ptr<CCTextureLayerImpl> create(int id)
|
| + static scoped_ptr<TextureLayerImpl> create(int id)
|
| {
|
| - return make_scoped_ptr(new CCTextureLayerImpl(id));
|
| + return make_scoped_ptr(new TextureLayerImpl(id));
|
| }
|
| - virtual ~CCTextureLayerImpl();
|
| + virtual ~TextureLayerImpl();
|
|
|
| - virtual void willDraw(CCResourceProvider*) OVERRIDE;
|
| - virtual void appendQuads(CCQuadSink&, CCAppendQuadsData&) OVERRIDE;
|
| - virtual void didDraw(CCResourceProvider*) OVERRIDE;
|
| + virtual void willDraw(ResourceProvider*) OVERRIDE;
|
| + virtual void appendQuads(QuadSink&, AppendQuadsData&) OVERRIDE;
|
| + virtual void didDraw(ResourceProvider*) OVERRIDE;
|
|
|
| virtual void didLoseContext() OVERRIDE;
|
|
|
| @@ -32,12 +32,12 @@ public:
|
| void setUVRect(const FloatRect& rect) { m_uvRect = rect; }
|
|
|
| private:
|
| - explicit CCTextureLayerImpl(int);
|
| + explicit TextureLayerImpl(int);
|
|
|
| virtual const char* layerTypeAsString() const OVERRIDE;
|
|
|
| unsigned m_textureId;
|
| - CCResourceProvider::ResourceId m_externalTextureResource;
|
| + ResourceProvider::ResourceId m_externalTextureResource;
|
| bool m_premultipliedAlpha;
|
| bool m_flipped;
|
| FloatRect m_uvRect;
|
|
|