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

cc/bitmap_canvas_layer_texture_updater.cc

 // 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.
 
 
 #include "config.h"
 
 #include "BitmapCanvasLayerTextureUpdater.h"
 
 #include "CCTextureUpdateQueue.h"
@@ skipping 31 matching lines @@
 
 BitmapCanvasLayerTextureUpdater::~BitmapCanvasLayerTextureUpdater()
 {
 }
 
 PassOwnPtr<LayerTextureUpdater::Texture> BitmapCanvasLayerTextureUpdater::createTexture(CCPrioritizedTextureManager* manager)
 {
     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) ?
             LayerTextureUpdater::SampledTexelFormatRGBA : LayerTextureUpdater::SampledTexelFormatBGRA;
 }
 
 void BitmapCanvasLayerTextureUpdater::prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, float contentsWidthScale, float contentsHeightScale, IntRect& resultingOpaqueRect, CCRenderingStats& stats)
 {
     if (m_canvasSize != contentRect.size()) {
         m_canvasSize = contentRect.size();
@@ skipping 15 matching lines @@
 void BitmapCanvasLayerTextureUpdater::setOpaque(bool opaque)
 {
     if (opaque != m_opaque) {
         m_canvas.clear();
         m_canvasSize = IntSize();
     }
     m_opaque = opaque;
 }
 
 } // namespace cc