| Index: cc/image_layer.cc
|
| diff --git a/cc/image_layer.cc b/cc/image_layer.cc
|
| index 04694a635f54d9bae342f2efd5eca1bf93ac6dc2..3b9d20928c6e3bcfb7fdc7b9998bb622a6b634c7 100644
|
| --- a/cc/image_layer.cc
|
| +++ b/cc/image_layer.cc
|
| @@ -46,7 +46,7 @@ public:
|
| return scoped_ptr<LayerTextureUpdater::Texture>(new Texture(this, CCPrioritizedTexture::create(manager)));
|
| }
|
|
|
| - virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat) OVERRIDE
|
| + virtual SampledTexelFormat sampledTexelFormat(GLenum textureFormat) OVERRIDE
|
| {
|
| return PlatformColor::sameComponentOrder(textureFormat) ?
|
| LayerTextureUpdater::SampledTexelFormatRGBA : LayerTextureUpdater::SampledTexelFormatBGRA;
|
| @@ -138,7 +138,7 @@ void ImageLayerChromium::createTextureUpdaterIfNeeded()
|
| return;
|
|
|
| m_textureUpdater = ImageLayerTextureUpdater::create();
|
| - GC3Denum textureFormat = layerTreeHost()->rendererCapabilities().bestTextureFormat;
|
| + GLenum textureFormat = layerTreeHost()->rendererCapabilities().bestTextureFormat;
|
| setTextureFormat(textureFormat);
|
| setSampledTexelFormat(textureUpdater()->sampledTexelFormat(textureFormat));
|
| }
|
|
|