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

cc/texture_copier.cc

Index: cc/texture_copier.cc
diff --git a/cc/texture_copier.cc b/cc/texture_copier.cc
index f60abf6af330f35dcf5c27a418047b12f0aae293..321fc01fd9eecc4161a77dc7d1ad1f75b31b936b 100644
--- a/cc/texture_copier.cc
+++ b/cc/texture_copier.cc
@@ -6,8 +6,8 @@
 
 #include "TextureCopier.h"
 
+#include "third_party/khronos/GLES2/gl2.h"
 #include "CCRendererGL.h" // For the GLC() macro.
-#include "GraphicsContext3D.h"
 #include "TraceEvent.h"
 #include <public/WebGraphicsContext3D.h>
 
@@ -28,9 +28,9 @@ AcceleratedTextureCopier::AcceleratedTextureCopier(WebKit::WebGraphicsContext3D*
         {-1, 1, 0, 1}
     };
 
-    GLC(m_context, m_context->bindBuffer(GraphicsContext3D::ARRAY_BUFFER, m_positionBuffer));
-    GLC(m_context, m_context->bufferData(GraphicsContext3D::ARRAY_BUFFER, sizeof(kPositions), kPositions, GraphicsContext3D::STATIC_DRAW));
-    GLC(m_context, m_context->bindBuffer(GraphicsContext3D::ARRAY_BUFFER, 0));
+    GLC(m_context, m_context->bindBuffer(GL_ARRAY_BUFFER, m_positionBuffer));
+    GLC(m_context, m_context->bufferData(GL_ARRAY_BUFFER, sizeof(kPositions), kPositions, GL_STATIC_DRAW));
+    GLC(m_context, m_context->bindBuffer(GL_ARRAY_BUFFER, 0));
 
     m_blitProgram = adoptPtr(new BlitProgram(m_context));
 }
@@ -50,18 +50,18 @@ void AcceleratedTextureCopier::copyTexture(Parameters parameters)
     TRACE_EVENT0("cc", "TextureCopier::copyTexture");
 
     // Note: this code does not restore the viewport, bound program, 2D texture, framebuffer, buffer or blend enable.
-    GLC(m_context, m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_fbo));
-    GLC(m_context, m_context->framebufferTexture2D(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, GraphicsContext3D::TEXTURE_2D, parameters.destTexture, 0));
+    GLC(m_context, m_context->bindFramebuffer(GL_FRAMEBUFFER, m_fbo));
+    GLC(m_context, m_context->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, parameters.destTexture, 0));
 
 #if OS(ANDROID)
     // Clear destination to improve performance on tiling GPUs.
     // TODO: Use EXT_discard_framebuffer or skip clearing if it isn't available.
-    GLC(m_context, m_context->clear(GraphicsContext3D::COLOR_BUFFER_BIT));
+    GLC(m_context, m_context->clear(GL_COLOR_BUFFER_BIT));
 #endif
 
-    GLC(m_context, m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, parameters.sourceTexture));
-    GLC(m_context, m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::NEAREST));
-    GLC(m_context, m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::NEAREST));
+    GLC(m_context, m_context->bindTexture(GL_TEXTURE_2D, parameters.sourceTexture));
+    GLC(m_context, m_context->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST));
+    GLC(m_context, m_context->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST));
 
     if (!m_blitProgram->initialized())
         m_blitProgram->initialize(m_context, m_usingBindUniforms);
@@ -70,24 +70,24 @@ void AcceleratedTextureCopier::copyTexture(Parameters parameters)
     GLC(m_context, m_context->useProgram(m_blitProgram->program()));
 
     const int kPositionAttribute = 0;
-    GLC(m_context, m_context->bindBuffer(GraphicsContext3D::ARRAY_BUFFER, m_positionBuffer));
-    GLC(m_context, m_context->vertexAttribPointer(kPositionAttribute, 4, GraphicsContext3D::FLOAT, false, 0, 0));
+    GLC(m_context, m_context->bindBuffer(GL_ARRAY_BUFFER, m_positionBuffer));
+    GLC(m_context, m_context->vertexAttribPointer(kPositionAttribute, 4, GL_FLOAT, false, 0, 0));
     GLC(m_context, m_context->enableVertexAttribArray(kPositionAttribute));
-    GLC(m_context, m_context->bindBuffer(GraphicsContext3D::ARRAY_BUFFER, 0));
+    GLC(m_context, m_context->bindBuffer(GL_ARRAY_BUFFER, 0));
 
     GLC(m_context, m_context->viewport(0, 0, parameters.size.width(), parameters.size.height()));
-    GLC(m_context, m_context->disable(GraphicsContext3D::BLEND));
-    GLC(m_context, m_context->drawArrays(GraphicsContext3D::TRIANGLE_FAN, 0, 4));
+    GLC(m_context, m_context->disable(GL_BLEND));
+    GLC(m_context, m_context->drawArrays(GL_TRIANGLE_FAN, 0, 4));
 
-    GLC(m_context, m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR));
-    GLC(m_context, m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::LINEAR));
+    GLC(m_context, m_context->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
+    GLC(m_context, m_context->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
     GLC(m_context, m_context->disableVertexAttribArray(kPositionAttribute));
 
     GLC(m_context, m_context->useProgram(0));
 
-    GLC(m_context, m_context->framebufferTexture2D(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, GraphicsContext3D::TEXTURE_2D, 0, 0));
-    GLC(m_context, m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, 0));
-    GLC(m_context, m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, 0));
+    GLC(m_context, m_context->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0));
+    GLC(m_context, m_context->bindFramebuffer(GL_FRAMEBUFFER, 0));
+    GLC(m_context, m_context->bindTexture(GL_TEXTURE_2D, 0));
 }
 
 void AcceleratedTextureCopier::flush()