| Index: cc/texture_layer_impl.cc
|
| diff --git a/cc/texture_layer_impl.cc b/cc/texture_layer_impl.cc
|
| index 4c817094416b6351dde76472a4c15f74124906ce..03d53f43dc429d09e20bf667dec1e34a12ab97c1 100644
|
| --- a/cc/texture_layer_impl.cc
|
| +++ b/cc/texture_layer_impl.cc
|
| @@ -13,8 +13,8 @@
|
|
|
| namespace cc {
|
|
|
| -CCTextureLayerImpl::CCTextureLayerImpl(int id)
|
| - : CCLayerImpl(id)
|
| +TextureLayerImpl::TextureLayerImpl(int id)
|
| + : LayerImpl(id)
|
| , m_textureId(0)
|
| , m_externalTextureResource(0)
|
| , m_premultipliedAlpha(true)
|
| @@ -23,11 +23,11 @@ CCTextureLayerImpl::CCTextureLayerImpl(int id)
|
| {
|
| }
|
|
|
| -CCTextureLayerImpl::~CCTextureLayerImpl()
|
| +TextureLayerImpl::~TextureLayerImpl()
|
| {
|
| }
|
|
|
| -void CCTextureLayerImpl::willDraw(CCResourceProvider* resourceProvider)
|
| +void TextureLayerImpl::willDraw(ResourceProvider* resourceProvider)
|
| {
|
| if (!m_textureId)
|
| return;
|
| @@ -35,19 +35,19 @@ void CCTextureLayerImpl::willDraw(CCResourceProvider* resourceProvider)
|
| m_externalTextureResource = resourceProvider->createResourceFromExternalTexture(m_textureId);
|
| }
|
|
|
| -void CCTextureLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appendQuadsData)
|
| +void TextureLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQuadsData)
|
| {
|
| if (!m_externalTextureResource)
|
| return;
|
|
|
| - CCSharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQuadState());
|
| + SharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQuadState());
|
| appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData);
|
|
|
| IntRect quadRect(IntPoint(), contentBounds());
|
| - quadSink.append(CCTextureDrawQuad::create(sharedQuadState, quadRect, m_externalTextureResource, m_premultipliedAlpha, m_uvRect, m_flipped).PassAs<CCDrawQuad>(), appendQuadsData);
|
| + quadSink.append(TextureDrawQuad::create(sharedQuadState, quadRect, m_externalTextureResource, m_premultipliedAlpha, m_uvRect, m_flipped).PassAs<DrawQuad>(), appendQuadsData);
|
| }
|
|
|
| -void CCTextureLayerImpl::didDraw(CCResourceProvider* resourceProvider)
|
| +void TextureLayerImpl::didDraw(ResourceProvider* resourceProvider)
|
| {
|
| if (!m_externalTextureResource)
|
| return;
|
| @@ -59,20 +59,20 @@ void CCTextureLayerImpl::didDraw(CCResourceProvider* resourceProvider)
|
| m_externalTextureResource = 0;
|
| }
|
|
|
| -void CCTextureLayerImpl::dumpLayerProperties(std::string* str, int indent) const
|
| +void TextureLayerImpl::dumpLayerProperties(std::string* str, int indent) const
|
| {
|
| str->append(indentString(indent));
|
| base::StringAppendF(str, "texture layer texture id: %u premultiplied: %d\n", m_textureId, m_premultipliedAlpha);
|
| - CCLayerImpl::dumpLayerProperties(str, indent);
|
| + LayerImpl::dumpLayerProperties(str, indent);
|
| }
|
|
|
| -void CCTextureLayerImpl::didLoseContext()
|
| +void TextureLayerImpl::didLoseContext()
|
| {
|
| m_textureId = 0;
|
| m_externalTextureResource = 0;
|
| }
|
|
|
| -const char* CCTextureLayerImpl::layerTypeAsString() const
|
| +const char* TextureLayerImpl::layerTypeAsString() const
|
| {
|
| return "TextureLayer";
|
| }
|
|
|