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

cc/tiled_layer.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 TiledLayerChromium_h
 #define TiledLayerChromium_h
 
 #include "CCLayerTilingData.h"
 #include "LayerChromium.h"
 #include "LayerTextureUpdater.h"
@@ skipping 28 matching lines @@
 
 protected:
     TiledLayerChromium();
     virtual ~TiledLayerChromium();
 
     void updateTileSizeAndTilingOption();
     void updateBounds();
 
     // Exposed to subclasses for testing.
     void setTileSize(const IntSize&);
-    void setTextureFormat(GC3Denum textureFormat) { m_textureFormat = textureFormat; }
+    void setTextureFormat(GLenum textureFormat) { m_textureFormat = textureFormat; }
     void setBorderTexelOption(CCLayerTilingData::BorderTexelOption);
     void setSampledTexelFormat(LayerTextureUpdater::SampledTexelFormat sampledTexelFormat) { m_sampledTexelFormat = sampledTexelFormat; }
     size_t numPaintedTiles() { return m_tiler->tiles().size(); }
 
     virtual LayerTextureUpdater* textureUpdater() const = 0;
     virtual void createTextureUpdaterIfNeeded() = 0;
 
     // Set invalidations to be potentially repainted during update().
     void invalidateContentRect(const IntRect& contentRect);
 
@@ skipping 21 matching lines @@
     void markOcclusionsAndRequestTextures(int left, int top, int right, int bottom, const CCOcclusionTracker*);
 
     bool updateTiles(int left, int top, int right, int bottom, CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&, bool& didPaint);
     bool haveTexturesForTiles(int left, int top, int right, int bottom, bool ignoreOcclusions);
     IntRect markTilesForUpdate(int left, int top, int right, int bottom, bool ignoreOcclusions);
     void updateTileTextures(const IntRect& paintRect, int left, int top, int right, int bottom, CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&);
 
     UpdatableTile* tileAt(int, int) const;
     UpdatableTile* createTile(int, int);
 
-    GC3Denum m_textureFormat;
+    GLenum m_textureFormat;
     bool m_skipsDraw;
     bool m_failedUpdate;
     LayerTextureUpdater::SampledTexelFormat m_sampledTexelFormat;
 
     TilingOption m_tilingOption;
     OwnPtr<CCLayerTilingData> m_tiler;
 };
 
 }
 #endif