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

cc/io_surface_layer_impl.cc

 // Copyright 2012 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 "CCIOSurfaceLayerImpl.h"
 
 #include "base/stringprintf.h"
+#include "third_party/khronos/GLES2/gl2ext.h"
 #include "CCGraphicsContext.h"
 #include "CCIOSurfaceDrawQuad.h"
 #include "CCLayerTreeHostImpl.h"
 #include "CCQuadSink.h"
 #include "CCRendererGL.h" // For the GLC() macro.
-#include "Extensions3D.h"
 #include <public/WebGraphicsContext3D.h>
 
 namespace cc {
 
 CCIOSurfaceLayerImpl::CCIOSurfaceLayerImpl(int id)
     : CCLayerImpl(id)
     , m_ioSurfaceId(0)
     , m_ioSurfaceChanged(false)
     , m_ioSurfaceTextureId(0)
 {
@@ skipping 19 matching lines @@
         WebKit::WebGraphicsContext3D* context3d = resourceProvider->graphicsContext3D();
         if (!context3d) {
             // FIXME: Implement this path for software compositing.
             return;
         }
 
         // FIXME: Do this in a way that we can track memory usage.
         if (!m_ioSurfaceTextureId)
             m_ioSurfaceTextureId = context3d->createTexture();
 
-        GLC(context3d, context3d->activeTexture(GraphicsContext3D::TEXTURE0));
-        GLC(context3d, context3d->bindTexture(Extensions3D::TEXTURE_RECTANGLE_ARB, m_ioSurfaceTextureId));
-        GLC(context3d, context3d->texParameteri(Extensions3D::TEXTURE_RECTANGLE_ARB, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR));
-        GLC(context3d, context3d->texParameteri(Extensions3D::TEXTURE_RECTANGLE_ARB, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::LINEAR));
-        GLC(context3d, context3d->texParameteri(Extensions3D::TEXTURE_RECTANGLE_ARB, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE));
-        GLC(context3d, context3d->texParameteri(Extensions3D::TEXTURE_RECTANGLE_ARB, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE));
-        context3d->texImageIOSurface2DCHROMIUM(Extensions3D::TEXTURE_RECTANGLE_ARB,
+        GLC(context3d, context3d->activeTexture(GL_TEXTURE0));
+        GLC(context3d, context3d->bindTexture(GL_TEXTURE_RECTANGLE_ARB, m_ioSurfaceTextureId));
+        GLC(context3d, context3d->texParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
+        GLC(context3d, context3d->texParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
+        GLC(context3d, context3d->texParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE));
+        GLC(context3d, context3d->texParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE));
+        context3d->texImageIOSurface2DCHROMIUM(GL_TEXTURE_RECTANGLE_ARB,
                                                m_ioSurfaceSize.width(),
                                                m_ioSurfaceSize.height(),
                                                m_ioSurfaceId,
                                                0);
         // Do not check for error conditions. texImageIOSurface2DCHROMIUM is supposed to hold on to
         // the last good IOSurface if the new one is already closed. This is only a possibility
         // during live resizing of plugins. However, it seems that this is not sufficient to
         // completely guard against garbage being drawn. If this is found to be a significant issue,
         // it may be necessary to explicitly tell the embedder when to free the surfaces it has
         // allocated.
@@ skipping 33 matching lines @@
     m_ioSurfaceId = ioSurfaceId;
     m_ioSurfaceSize = size;
 }
 
 const char* CCIOSurfaceLayerImpl::layerTypeAsString() const
 {
     return "IOSurfaceLayer";
 }
 
 }