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

cc/video_layer_impl.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 "CCVideoLayerImpl.h"
 
+#include "third_party/khronos/GLES2/gl2ext.h"
+#include "third_party/khronos/GLES2/gl2.h"
 #include "CCIOSurfaceDrawQuad.h"
 #include "CCLayerTreeHostImpl.h"
 #include "CCProxy.h"
 #include "CCQuadSink.h"
 #include "CCResourceProvider.h"
 #include "CCStreamVideoDrawQuad.h"
 #include "CCTextureDrawQuad.h"
 #include "CCYUVVideoDrawQuad.h"
-#include "Extensions3DChromium.h"
-#include "GraphicsContext3D.h"
 #include "NotImplemented.h"
 #include <public/WebVideoFrame.h>
 
 namespace cc {
 
 CCVideoLayerImpl::CCVideoLayerImpl(int id, WebKit::WebVideoFrameProvider* provider)
     : CCLayerImpl(id)
     , m_provider(provider)
     , m_frame(0)
     , m_externalTextureResource(0)
@@ skipping 33 matching lines @@
 void CCVideoLayerImpl::stopUsingProvider()
 {
     // Block the provider from shutting down until this client is done
     // using the frame.
     MutexLocker locker(m_providerMutex);
     ASSERT(!m_frame);
     m_provider = 0;
 }
 
 // Convert WebKit::WebVideoFrame::Format to GraphicsContext3D's format enum values.
-static GC3Denum convertVFCFormatToGC3DFormat(const WebKit::WebVideoFrame& frame)
+static GLenum convertVFCFormatToGC3DFormat(const WebKit::WebVideoFrame& frame)
 {
     switch (frame.format()) {
     case WebKit::WebVideoFrame::FormatYV12:
     case WebKit::WebVideoFrame::FormatYV16:
-        return GraphicsContext3D::LUMINANCE;
+        return GL_LUMINANCE;
     case WebKit::WebVideoFrame::FormatNativeTexture:
         return frame.textureTarget();
     case WebKit::WebVideoFrame::FormatInvalid:
     case WebKit::WebVideoFrame::FormatRGB32:
     case WebKit::WebVideoFrame::FormatEmpty:
     case WebKit::WebVideoFrame::FormatI420:
         notImplemented();
     }
-    return GraphicsContext3D::INVALID_VALUE;
+    return GL_INVALID_VALUE;
 }
 
 void CCVideoLayerImpl::willDraw(CCResourceProvider* resourceProvider)
 {
     ASSERT(CCProxy::isImplThread());
     CCLayerImpl::willDraw(resourceProvider);
 
     // Explicitly lock and unlock the provider mutex so it can be held from
     // willDraw to didDraw. Since the compositor thread is in the middle of
     // drawing, the layer will not be destroyed before didDraw is called.
@@ skipping 20 matching lines @@
         return;
     }
 
     m_frame = m_provider->getCurrentFrame();
 
     if (!m_frame)
         return;
 
     m_format = convertVFCFormatToGC3DFormat(*m_frame);
 
-    if (m_format == GraphicsContext3D::INVALID_VALUE) {
+    if (m_format == GL_INVALID_VALUE) {
         m_provider->putCurrentFrame(m_frame);
         m_frame = 0;
         return;
     }
 
     if (m_frame->planes() > WebKit::WebVideoFrame::maxPlanes) {
         m_provider->putCurrentFrame(m_frame);
         m_frame = 0;
         return;
     }
 
     if (!allocatePlaneData(resourceProvider)) {
         m_provider->putCurrentFrame(m_frame);
         m_frame = 0;
         return;
     }
 
     if (!copyPlaneData(resourceProvider)) {
         m_provider->putCurrentFrame(m_frame);
         m_frame = 0;
         return;
     }
 
-    if (m_format == GraphicsContext3D::TEXTURE_2D)
+    if (m_format == GL_TEXTURE_2D)
         m_externalTextureResource = resourceProvider->createResourceFromExternalTexture(m_frame->textureId());
 }
 
 void CCVideoLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appendQuadsData)
 {
     ASSERT(CCProxy::isImplThread());
 
     if (!m_frame)
         return;
 
     CCSharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQuadState());
     appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData);
 
     // FIXME: When we pass quads out of process, we need to double-buffer, or
     // otherwise synchonize use of all textures in the quad.
 
     IntRect quadRect(IntPoint(), contentBounds());
 
     switch (m_format) {
-    case GraphicsContext3D::LUMINANCE: {
+    case GL_LUMINANCE: {
         // YUV software decoder.
         const FramePlane& yPlane = m_framePlanes[WebKit::WebVideoFrame::yPlane];
         const FramePlane& uPlane = m_framePlanes[WebKit::WebVideoFrame::uPlane];
         const FramePlane& vPlane = m_framePlanes[WebKit::WebVideoFrame::vPlane];
         scoped_ptr<CCYUVVideoDrawQuad> yuvVideoQuad = CCYUVVideoDrawQuad::create(sharedQuadState, quadRect, yPlane, uPlane, vPlane);
         quadSink.append(yuvVideoQuad.PassAs<CCDrawQuad>(), appendQuadsData);
         break;
     }
-    case GraphicsContext3D::RGBA: {
+    case GL_RGBA: {
         // RGBA software decoder.
         const FramePlane& plane = m_framePlanes[WebKit::WebVideoFrame::rgbPlane];
         float widthScaleFactor = static_cast<float>(plane.visibleSize.width()) / plane.size.width();
 
         bool premultipliedAlpha = true;
         FloatRect uvRect(0, 0, widthScaleFactor, 1);
         bool flipped = false;
         scoped_ptr<CCTextureDrawQuad> textureQuad = CCTextureDrawQuad::create(sharedQuadState, quadRect, plane.resourceId, premultipliedAlpha, uvRect, flipped);
         quadSink.append(textureQuad.PassAs<CCDrawQuad>(), appendQuadsData);
         break;
     }
-    case GraphicsContext3D::TEXTURE_2D: {
+    case GL_TEXTURE_2D: {
         // NativeTexture hardware decoder.
         bool premultipliedAlpha = true;
         FloatRect uvRect(0, 0, 1, 1);
         bool flipped = false;
         scoped_ptr<CCTextureDrawQuad> textureQuad = CCTextureDrawQuad::create(sharedQuadState, quadRect, m_externalTextureResource, premultipliedAlpha, uvRect, flipped);
         quadSink.append(textureQuad.PassAs<CCDrawQuad>(), appendQuadsData);
         break;
     }
-    case Extensions3D::TEXTURE_RECTANGLE_ARB: {
+    case GL_TEXTURE_RECTANGLE_ARB: {
         IntSize textureSize(m_frame->width(), m_frame->height()); 
         scoped_ptr<CCIOSurfaceDrawQuad> ioSurfaceQuad = CCIOSurfaceDrawQuad::create(sharedQuadState, quadRect, textureSize, m_frame->textureId(), CCIOSurfaceDrawQuad::Unflipped);
         quadSink.append(ioSurfaceQuad.PassAs<CCDrawQuad>(), appendQuadsData);
         break;
     }
-    case Extensions3DChromium::GL_TEXTURE_EXTERNAL_OES: {
+    case GL_TEXTURE_EXTERNAL_OES: {
         // StreamTexture hardware decoder.
         scoped_ptr<CCStreamVideoDrawQuad> streamVideoQuad = CCStreamVideoDrawQuad::create(sharedQuadState, quadRect, m_frame->textureId(), m_streamTextureMatrix);
         quadSink.append(streamVideoQuad.PassAs<CCDrawQuad>(), appendQuadsData);
         break;
     }
     default:
         CRASH(); // Someone updated convertVFCFormatToGC3DFormat above but update this!
     }
 }
 
 void CCVideoLayerImpl::didDraw(CCResourceProvider* resourceProvider)
 {
     ASSERT(CCProxy::isImplThread());
     CCLayerImpl::didDraw(resourceProvider);
 
     if (!m_frame)
         return;
 
-    if (m_format == GraphicsContext3D::TEXTURE_2D) {
+    if (m_format == GL_TEXTURE_2D) {
         ASSERT(m_externalTextureResource);
         // FIXME: the following assert will not be true when sending resources to a
         // parent compositor. We will probably need to hold on to m_frame for
         // longer, and have several "current frames" in the pipeline.
         ASSERT(!resourceProvider->inUseByConsumer(m_externalTextureResource));
         resourceProvider->deleteResource(m_externalTextureResource);
         m_externalTextureResource = 0;
     }
 
     m_provider->putCurrentFrame(m_frame);
@@ skipping 141 matching lines @@
     str->append("video layer\n");
     CCLayerImpl::dumpLayerProperties(str, indent);
 }
 
 const char* CCVideoLayerImpl::layerTypeAsString() const
 {
     return "VideoLayer";
 }
 
 }