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

cc/bitmap_canvas_layer_texture_updater.cc

Index: cc/bitmap_canvas_layer_texture_updater.cc
diff --git a/cc/bitmap_canvas_layer_texture_updater.cc b/cc/bitmap_canvas_layer_texture_updater.cc
index 6afc8a3eca56272ae4367a46421ae66e22846f2a..5b7af4df87cf9f7ccc5980cbec997e21577f510c 100644
--- a/cc/bitmap_canvas_layer_texture_updater.cc
+++ b/cc/bitmap_canvas_layer_texture_updater.cc
@@ -49,7 +49,7 @@ PassOwnPtr<LayerTextureUpdater::Texture> BitmapCanvasLayerTextureUpdater::create
     return adoptPtr(new Texture(this, CCPrioritizedTexture::create(manager)));
 }
 
-LayerTextureUpdater::SampledTexelFormat BitmapCanvasLayerTextureUpdater::sampledTexelFormat(GC3Denum textureFormat)
+LayerTextureUpdater::SampledTexelFormat BitmapCanvasLayerTextureUpdater::sampledTexelFormat(GLenum textureFormat)
 {
     // The component order may be bgra if we uploaded bgra pixels to rgba textures.
     return PlatformColor::sameComponentOrder(textureFormat) ?