Revert 162654 - gpu: Add support for GLX_EXT_texture_from_pixmap extension.

Implement CHROMIUM_texture_from_image. This extension behaves just like
EXT_texture_from_pixmap but uses chromium specific image identifiers rather
than platform specific pixmap IDs.

Add IPC message for creating an image identifier using a
gfx::PluginWindowHandle. Each GPU channel maintains a different set of
images and deleting an image will cause the internal image representation
to be freed once it's no longer bound to a texture.

BUG=132342
TEST=gpu_unittests --gtest_filter=TextureInfoTest.GetLevelImage:GLES2DecoderTest.BindTexImage2DCHROMIUM:GLES2DecoderTest.ReleaseTexImage2DCHROMIUM and manual

Review URL: https://chromiumcodereview.appspot.com/10543125

TBR=reveman@chromium.org
Review URL: https://codereview.chromium.org/11188053

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162656 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 1 insertions, 23 deletions

diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
index 46403d7..e766332 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
@@ -414,8 +414,7 @@ bool GLInProcessContext::Initialize(const gfx::Size& size,
   bool bind_generates_resource = false;
   decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group ?
       context_group->decoder_->GetContextGroup() :
-          new ::gpu::gles2::ContextGroup(
-              NULL, NULL, NULL, bind_generates_resource)));
+          new ::gpu::gles2::ContextGroup(NULL, NULL, bind_generates_resource)));
 
   gpu_scheduler_.reset(new GpuScheduler(command_buffer_.get(),
                                         decoder_.get(),
@@ -1638,11 +1637,6 @@ void WebGraphicsContext3DInProcessCommandBufferImpl::pushGroupMarkerEXT(
 
 DELEGATE_TO_GL(popGroupMarkerEXT, PopGroupMarkerEXT);
 
-DELEGATE_TO_GL_2(bindTexImage2DCHROMIUM, BindTexImage2DCHROMIUM,
-                 WGC3Denum, WGC3Dint)
-DELEGATE_TO_GL_2(releaseTexImage2DCHROMIUM, ReleaseTexImage2DCHROMIUM,
-                 WGC3Denum, WGC3Dint)
-
 GrGLInterface* WebGraphicsContext3DInProcessCommandBufferImpl::
     onCreateGrGLInterface() {
   return webkit_glue::CreateCommandBufferSkiaGLBinding();
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
index d4b0b3a..6dd92aa 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
@@ -461,9 +461,6 @@ class WebGraphicsContext3DInProcessCommandBufferImpl
       WGC3Denum target, WGC3Dint width, WGC3Dint height,
       WGC3Duint ioSurfaceId, WGC3Duint plane);
 
-  virtual void bindTexImage2DCHROMIUM(WGC3Denum target, WGC3Dint imageId);
-  virtual void releaseTexImage2DCHROMIUM(WGC3Denum target, WGC3Dint imageId);
-
   virtual void texStorage2DEXT(
       WGC3Denum target, WGC3Dint levels, WGC3Duint internalformat,
       WGC3Dint width, WGC3Dint height);
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
index ff11852..6decabf 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
@@ -1698,16 +1698,6 @@ void WebGraphicsContext3DInProcessImpl::copyTextureCHROMIUM(
   NOTIMPLEMENTED();
 }
 
-void WebGraphicsContext3DInProcessImpl::bindTexImage2DCHROMIUM(
-    WGC3Denum target, WGC3Dint imageId) {
-  NOTIMPLEMENTED();
-}
-
-void WebGraphicsContext3DInProcessImpl::releaseTexImage2DCHROMIUM(
-    WGC3Denum target, WGC3Dint imageId) {
-  NOTIMPLEMENTED();
-}
-
 GrGLInterface* WebGraphicsContext3DInProcessImpl::onCreateGrGLInterface() {
   return gfx::CreateInProcessSkiaGLBinding();
 }
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_impl.h
index eb0ed57..0b248ce 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_impl.h
+++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.h
@@ -489,9 +489,6 @@ class WebGraphicsContext3DInProcessImpl : public WebGraphicsContext3D {
   virtual void consumeTextureCHROMIUM(WGC3Denum target,
                                       const WGC3Dbyte* mailbox);
 
-  virtual void bindTexImage2DCHROMIUM(WGC3Denum target, WGC3Dint imageId);
-  virtual void releaseTexImage2DCHROMIUM(WGC3Denum target, WGC3Dint imageId);
-
  protected:
   virtual GrGLInterface* onCreateGrGLInterface();