Patch from https://codereview.chromium.org/11111005/ without actual file deletes

cc/image_layer.cc

 // Copyright 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "ImageLayerChromium.h"
 
 #include "base/compiler_specific.h"
 #include "CCLayerTreeHost.h"
@@ skipping 30 matching lines @@
     }
 
     virtual ~ImageLayerTextureUpdater() { }
 
     virtual PassOwnPtr<LayerTextureUpdater::Texture> createTexture(
         CCPrioritizedTextureManager* manager) OVERRIDE
     {
         return adoptPtr(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;
     }
 
     void updateTexture(CCTextureUpdateQueue& queue, CCPrioritizedTexture* texture, const IntRect& sourceRect, const IntSize& destOffset, bool partialUpdate)
     {
         // Source rect should never go outside the image pixels, even if this
         // is requested because the texture extends outside the image.
         IntRect clippedSourceRect = sourceRect;
@@ skipping 66 matching lines @@
     }
     TiledLayerChromium::update(queue, occlusion, stats);
 }
 
 void ImageLayerChromium::createTextureUpdaterIfNeeded()
 {
     if (m_textureUpdater)
         return;
 
     m_textureUpdater = ImageLayerTextureUpdater::create();
-    GC3Denum textureFormat = layerTreeHost()->rendererCapabilities().bestTextureFormat;
+    GLenum textureFormat = layerTreeHost()->rendererCapabilities().bestTextureFormat;
     setTextureFormat(textureFormat);
     setSampledTexelFormat(textureUpdater()->sampledTexelFormat(textureFormat));
 }
 
 LayerTextureUpdater* ImageLayerChromium::textureUpdater() const
 {
     return m_textureUpdater.get();
 }
 
 IntSize ImageLayerChromium::contentBounds() const
 {
     return IntSize(m_bitmap.width(), m_bitmap.height());
 }
 
 bool ImageLayerChromium::drawsContent() const
 {
     return !m_bitmap.isNull() && TiledLayerChromium::drawsContent();
 }
 
 bool ImageLayerChromium::needsContentsScale() const
 {
     // Contents scale is not need for image layer because this can be done in compositor more efficiently.
     return false;
 }
 
 }