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

cc/bitmap_canvas_layer_texture_updater.h

 // Copyright 2011 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.
 
 
 #ifndef BitmapCanvasLayerTextureUpdater_h
 #define BitmapCanvasLayerTextureUpdater_h
 
 #include "CanvasLayerTextureUpdater.h"
 
@@ skipping 18 matching lines @@
     private:
         BitmapCanvasLayerTextureUpdater* textureUpdater() { return m_textureUpdater; }
 
         BitmapCanvasLayerTextureUpdater* m_textureUpdater;
     };
 
     static PassRefPtr<BitmapCanvasLayerTextureUpdater> create(PassOwnPtr<LayerPainterChromium>);
     virtual ~BitmapCanvasLayerTextureUpdater();
 
     virtual PassOwnPtr<LayerTextureUpdater::Texture> createTexture(CCPrioritizedTextureManager*) OVERRIDE;
-    virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat) OVERRIDE;
+    virtual SampledTexelFormat sampledTexelFormat(GLenum textureFormat) OVERRIDE;
     virtual void prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, float contentsWidthScale, float contentsHeightScale, IntRect& resultingOpaqueRect, CCRenderingStats&) OVERRIDE;
     void updateTexture(CCTextureUpdateQueue&, CCPrioritizedTexture*, const IntRect& sourceRect, const IntSize& destOffset, bool partialUpdate);
 
     virtual void setOpaque(bool) OVERRIDE;
 
 protected:
     explicit BitmapCanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium>);
 
     OwnPtr<SkCanvas> m_canvas;
     IntSize m_canvasSize;
     bool m_opaque;
 };
 
 } // namespace cc
 #endif // BitmapCanvasLayerTextureUpdater_h