Reland r76840 with fix for webkit_gpu dependencies.

Removed GPU plugin. 

Pepper 3D v2 does not use the GPU plugin. It is integrated with the accelerated compositor. 

TEST=PPAPI 3D v2 still works, trybots 
BUG=none 


Review URL: http://codereview.chromium.org/6635026

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

1 files changed, 0 insertions, 38 deletions

diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc
index 75a3dc8..0624e3e 100644
--- a/chrome/plugin/webplugin_delegate_stub.cc
+++ b/chrome/plugin/webplugin_delegate_stub.cc
@@ -28,10 +28,6 @@
 #include "printing/native_metafile.h"
 #endif  // defined(OS_WIN)
 
-#if defined(ENABLE_GPU)
-#include "app/gfx/gl/gl_context.h"
-#endif
-
 using WebKit::WebBindings;
 using WebKit::WebCursorInfo;
 using webkit::npapi::WebPlugin;
@@ -72,13 +68,6 @@ WebPluginDelegateStub::~WebPluginDelegateStub() {
   in_destructor_ = true;
   child_process_logging::SetActiveURL(page_url_);
 
-#if defined(ENABLE_GPU)
-  // Make sure there is no command buffer before destroying the window handle.
-  // The GPU service code might otherwise asynchronously perform an operation
-  // using the window handle.
-  command_buffer_stub_.reset();
-#endif
-
   if (channel_->in_send()) {
     // The delegate or an npobject is in the callstack, so don't delete it
     // right away.
@@ -144,10 +133,6 @@ bool WebPluginDelegateStub::OnMessageReceived(const IPC::Message& msg) {
                         OnHandleURLRequestReply)
     IPC_MESSAGE_HANDLER(PluginMsg_HTTPRangeRequestReply,
                         OnHTTPRangeRequestReply)
-    IPC_MESSAGE_HANDLER(PluginMsg_CreateCommandBuffer,
-                        OnCreateCommandBuffer)
-    IPC_MESSAGE_HANDLER(PluginMsg_DestroyCommandBuffer,
-                        OnDestroyCommandBuffer)
 #if defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(PluginMsg_SetFakeAcceleratedSurfaceWindowHandle,
                         OnSetFakeAcceleratedSurfaceWindowHandle)
@@ -416,29 +401,6 @@ void WebPluginDelegateStub::OnInstallMissingPlugin() {
   delegate_->InstallMissingPlugin();
 }
 
-void WebPluginDelegateStub::OnCreateCommandBuffer(int* route_id) {
-  *route_id = 0;
-#if defined(ENABLE_GPU)
-  // Fail to create the command buffer if some GL implementation cannot be
-  // initialized.
-  if (!gfx::GLContext::InitializeOneOff())
-    return;
-
-  command_buffer_stub_.reset(new CommandBufferStub(
-      channel_,
-      instance_id_,
-      delegate_->windowed_handle()));
-
-  *route_id = command_buffer_stub_->route_id();
-#endif  // ENABLE_GPU
-}
-
-void WebPluginDelegateStub::OnDestroyCommandBuffer() {
-#if defined(ENABLE_GPU)
-  command_buffer_stub_.reset();
-#endif
-}
-
 void WebPluginDelegateStub::CreateSharedBuffer(
     uint32 size,
     base::SharedMemory* shared_buf,