Index: chrome/plugin/webplugin_delegate_stub.cc |
=================================================================== |
--- chrome/plugin/webplugin_delegate_stub.cc (revision 76392) |
+++ chrome/plugin/webplugin_delegate_stub.cc (working copy) |
@@ -23,10 +23,6 @@ |
#include "webkit/plugins/npapi/webplugin_delegate_impl.h" |
#include "webkit/glue/webcursor.h" |
-#if defined(ENABLE_GPU) |
-#include "app/gfx/gl/gl_context.h" |
-#endif |
- |
using WebKit::WebBindings; |
using WebKit::WebCursorInfo; |
using webkit::npapi::WebPlugin; |
@@ -67,13 +63,6 @@ |
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. |
@@ -139,14 +128,6 @@ |
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) |
-#endif |
IPC_MESSAGE_UNHANDLED(handled = false) |
IPC_END_MESSAGE_MAP() |
@@ -410,29 +391,6 @@ |
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, |
@@ -474,10 +432,3 @@ |
webplugin_->OnResourceCreated(resource_id, resource_client); |
} |
-#if defined(OS_MACOSX) |
-void WebPluginDelegateStub::OnSetFakeAcceleratedSurfaceWindowHandle( |
- gfx::PluginWindowHandle window) { |
- delegate_->set_windowed_handle(window); |
-} |
-#endif |
- |