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

cc/texture.cc

Index: cc/texture.cc
diff --git a/cc/texture.cc b/cc/texture.cc
index add842922efefe1b1d9d1a360a2f45289e725aab..beeff6bddbf76b35e7c558ca1c11ee2ba5526aee 100644
--- a/cc/texture.cc
+++ b/cc/texture.cc
@@ -8,7 +8,7 @@
 
 namespace cc {
 
-void CCTexture::setDimensions(const IntSize& size, GC3Denum format)
+void CCTexture::setDimensions(const IntSize& size, GLenum format)
 {
     m_size = size;
     m_format = format;
@@ -22,7 +22,7 @@ size_t CCTexture::bytes() const
     return memorySizeBytes(m_size, m_format);
 }
 
-size_t CCTexture::memorySizeBytes(const IntSize& size, GC3Denum format)
+size_t CCTexture::memorySizeBytes(const IntSize& size, GLenum format)
 {
     unsigned int componentsPerPixel = 4;
     unsigned int bytesPerComponent = 1;