| Index: webkit/compositor_bindings/WebExternalTextureLayerImpl.cpp
|
| diff --git a/webkit/compositor_bindings/WebExternalTextureLayerImpl.cpp b/webkit/compositor_bindings/WebExternalTextureLayerImpl.cpp
|
| index 165fd636b65736656158b2e248fb81913cd349c9..c10fa25b9c8ec4a3680d92a72adc581e49cb3a35 100644
|
| --- a/webkit/compositor_bindings/WebExternalTextureLayerImpl.cpp
|
| +++ b/webkit/compositor_bindings/WebExternalTextureLayerImpl.cpp
|
| @@ -25,18 +25,18 @@ WebExternalTextureLayer* WebExternalTextureLayer::create(WebExternalTextureLayer
|
| WebExternalTextureLayerImpl::WebExternalTextureLayerImpl(WebExternalTextureLayerClient* client)
|
| : m_client(client)
|
| {
|
| - scoped_refptr<TextureLayerChromium> layer;
|
| + scoped_refptr<TextureLayer> layer;
|
| if (m_client)
|
| - layer = TextureLayerChromium::create(this);
|
| + layer = TextureLayer::create(this);
|
| else
|
| - layer = TextureLayerChromium::create(0);
|
| + layer = TextureLayer::create(0);
|
| layer->setIsDrawable(true);
|
| m_layer.reset(new WebLayerImpl(layer));
|
| }
|
|
|
| WebExternalTextureLayerImpl::~WebExternalTextureLayerImpl()
|
| {
|
| - static_cast<TextureLayerChromium*>(m_layer->layer())->clearClient();
|
| + static_cast<TextureLayer*>(m_layer->layer())->clearClient();
|
| }
|
|
|
| WebLayer* WebExternalTextureLayerImpl::layer()
|
| @@ -46,42 +46,42 @@ WebLayer* WebExternalTextureLayerImpl::layer()
|
|
|
| void WebExternalTextureLayerImpl::setTextureId(unsigned id)
|
| {
|
| - static_cast<TextureLayerChromium*>(m_layer->layer())->setTextureId(id);
|
| + static_cast<TextureLayer*>(m_layer->layer())->setTextureId(id);
|
| }
|
|
|
| void WebExternalTextureLayerImpl::setFlipped(bool flipped)
|
| {
|
| - static_cast<TextureLayerChromium*>(m_layer->layer())->setFlipped(flipped);
|
| + static_cast<TextureLayer*>(m_layer->layer())->setFlipped(flipped);
|
| }
|
|
|
| void WebExternalTextureLayerImpl::setUVRect(const WebFloatRect& rect)
|
| {
|
| - static_cast<TextureLayerChromium*>(m_layer->layer())->setUVRect(convert(rect));
|
| + static_cast<TextureLayer*>(m_layer->layer())->setUVRect(convert(rect));
|
| }
|
|
|
| void WebExternalTextureLayerImpl::setOpaque(bool opaque)
|
| {
|
| - static_cast<TextureLayerChromium*>(m_layer->layer())->setContentsOpaque(opaque);
|
| + static_cast<TextureLayer*>(m_layer->layer())->setContentsOpaque(opaque);
|
| }
|
|
|
| void WebExternalTextureLayerImpl::setPremultipliedAlpha(bool premultipliedAlpha)
|
| {
|
| - static_cast<TextureLayerChromium*>(m_layer->layer())->setPremultipliedAlpha(premultipliedAlpha);
|
| + static_cast<TextureLayer*>(m_layer->layer())->setPremultipliedAlpha(premultipliedAlpha);
|
| }
|
|
|
| void WebExternalTextureLayerImpl::willModifyTexture()
|
| {
|
| - static_cast<TextureLayerChromium*>(m_layer->layer())->willModifyTexture();
|
| + static_cast<TextureLayer*>(m_layer->layer())->willModifyTexture();
|
| }
|
|
|
| void WebExternalTextureLayerImpl::setRateLimitContext(bool rateLimit)
|
| {
|
| - static_cast<TextureLayerChromium*>(m_layer->layer())->setRateLimitContext(rateLimit);
|
| + static_cast<TextureLayer*>(m_layer->layer())->setRateLimitContext(rateLimit);
|
| }
|
|
|
| class WebTextureUpdaterImpl : public WebTextureUpdater {
|
| public:
|
| - explicit WebTextureUpdaterImpl(CCTextureUpdateQueue& queue)
|
| + explicit WebTextureUpdaterImpl(TextureUpdateQueue& queue)
|
| : m_queue(queue)
|
| {
|
| }
|
| @@ -93,10 +93,10 @@ public:
|
| }
|
|
|
| private:
|
| - CCTextureUpdateQueue& m_queue;
|
| + TextureUpdateQueue& m_queue;
|
| };
|
|
|
| -unsigned WebExternalTextureLayerImpl::prepareTexture(CCTextureUpdateQueue& queue)
|
| +unsigned WebExternalTextureLayerImpl::prepareTexture(TextureUpdateQueue& queue)
|
| {
|
| ASSERT(m_client);
|
| WebTextureUpdaterImpl updaterImpl(queue);
|
|
|