diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 18:25:58 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 18:25:58 +0000 |
| commit | c997bc4b4403eb48f7ed1bb76a5392f4232bbdd9 (patch) | |
| tree | e13ce03df198d9548851dd8e8aa02da3d6a978da /content/renderer/npapi | |
| parent | 54ba65aa8b7f842f125f704dfabb589559e9f60d (diff) | |
| download | chromium_src-c997bc4b4403eb48f7ed1bb76a5392f4232bbdd9.zip chromium_src-c997bc4b4403eb48f7ed1bb76a5392f4232bbdd9.tar.gz chromium_src-c997bc4b4403eb48f7ed1bb76a5392f4232bbdd9.tar.bz2 | |
Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux
BUG=297026
Review URL: https://codereview.chromium.org/234533002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/npapi')
| -rw-r--r-- | content/renderer/npapi/webplugin_delegate_proxy.cc | 6 | ||||
| -rw-r--r-- | content/renderer/npapi/webplugin_impl.cc | 14 |
2 files changed, 2 insertions, 18 deletions
diff --git a/content/renderer/npapi/webplugin_delegate_proxy.cc b/content/renderer/npapi/webplugin_delegate_proxy.cc index 1a78e76..e578b27a 100644 --- a/content/renderer/npapi/webplugin_delegate_proxy.cc +++ b/content/renderer/npapi/webplugin_delegate_proxy.cc @@ -4,10 +4,6 @@ #include "content/renderer/npapi/webplugin_delegate_proxy.h" -#if defined(USE_X11) -#include <cairo/cairo.h> -#endif - #include <algorithm> #include "base/auto_reset.h" @@ -652,7 +648,7 @@ bool WebPluginDelegateProxy::CreateSharedBitmap( if (!memory->get()) return false; #endif -#if defined(OS_POSIX) && !defined(TOOLKIT_GTK) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_ANDROID) TransportDIB::Handle handle; IPC::Message* msg = new ViewHostMsg_AllocTransportDIB(size, false, &handle); if (!RenderThreadImpl::current()->Send(msg)) diff --git a/content/renderer/npapi/webplugin_impl.cc b/content/renderer/npapi/webplugin_impl.cc index f9caddc..892309b 100644 --- a/content/renderer/npapi/webplugin_impl.cc +++ b/content/renderer/npapi/webplugin_impl.cc @@ -578,13 +578,6 @@ void WebPluginImpl::SetWindow(gfx::PluginWindowHandle window) { #else accepts_input_events_ = false; -#if defined(USE_X11) - // Tell the view delegate that the plugin window was created, so that it - // can create necessary container widgets. - render_frame_->Send(new ViewHostMsg_CreatePluginContainer( - render_frame_->GetRenderWidget()->routing_id(), window)); -#endif // USE_X11 - #endif // OS_MACOSX } else { DCHECK(!window_); // Make sure not called twice. @@ -600,13 +593,8 @@ void WebPluginImpl::SetAcceptsInputEvents(bool accepts) { void WebPluginImpl::WillDestroyWindow(gfx::PluginWindowHandle window) { DCHECK_EQ(window, window_); window_ = gfx::kNullPluginWindow; - if (render_view_.get()) { -#if defined(USE_X11) - render_frame_->Send(new ViewHostMsg_DestroyPluginContainer( - render_frame_->GetRenderWidget()->routing_id(), window)); -#endif + if (render_view_.get()) render_frame_->GetRenderWidget()->CleanupWindowInPluginMoves(window); - } } GURL WebPluginImpl::CompleteURL(const char* url) { |