summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/webplugin_delegate_proxy.h
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-25 20:50:32 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-25 20:50:32 +0000
commitc0478b0985b9893601125a88a32a648656a75948 (patch)
tree8af9f0dcb303cbcdbf0da4c134f025d4e7ddd238 /chrome/renderer/webplugin_delegate_proxy.h
parentd4eb7120deddccf96ff85ecc393b0757497bb7d6 (diff)
downloadchromium_src-c0478b0985b9893601125a88a32a648656a75948.zip
chromium_src-c0478b0985b9893601125a88a32a648656a75948.tar.gz
chromium_src-c0478b0985b9893601125a88a32a648656a75948.tar.bz2
linux: new socket/plug code for windowed plugins
This CL reworks the GtkSocket/GtkPlug code for windowed plugins on linux. Instead of having the plugin ask the browser to create a socket to plug into, it simply creates a plug and sends it to the browser. The browser creates a socket and attaches the plug when the socket becomes realized This fixes 2 main issues: - we can create windowed plugins in background tabs (Issue 16125) - we can detach tabs with windowed plugins and reattach them (Issue 17110) I reworked the IPCs, so it removes some amount of linux-specific things. We also need less synchronous IPCs to create/destroy plugins, so that should be a bit faster. In particular, I removed the plugin pid map, and instead made sure the renderer always destroys the plugin containers if the plugin process crashes - they will be destroyed if the renderer process crashes. Let me know if you have an issue with that. Also, the intermediate plug/socket creation now happens in webplugin_delegate_impl_gtk. That means test_shell uses it as well. It made the code a lot simpler, and means we're testing it as well, albeit with a bit of extra overhead. Bonus: I found a big bad bug in the GtkPluginContainer that made its width/height alias with some internal gtk structures. That was certainly causing some amounts of bugs. Bonus 2: scrolling now looks more in sync with the rest of the page, though I'm not exactly sure which part caused that. BUG=16125,17110 TEST=a lot of manual testing involving YouTube videos Review URL: http://codereview.chromium.org/174295 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/webplugin_delegate_proxy.h')
-rw-r--r--chrome/renderer/webplugin_delegate_proxy.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h
index 808c06e..5680d9e 100644
--- a/chrome/renderer/webplugin_delegate_proxy.h
+++ b/chrome/renderer/webplugin_delegate_proxy.h
@@ -108,10 +108,6 @@ class WebPluginDelegateProxy : public WebPluginDelegate,
// Message handlers for messages that proxy WebPlugin methods, which
// we translate into calls to the real WebPlugin.
void OnSetWindow(gfx::PluginWindowHandle window);
-#if defined(OS_LINUX)
- void OnCreatePluginContainer(gfx::PluginWindowHandle* container);
- void OnDestroyPluginContainer(gfx::PluginWindowHandle container);
-#endif
#if defined(OS_WIN)
void OnSetWindowlessPumpEvent(HANDLE modal_loop_pump_messages_event);
#endif
@@ -163,6 +159,11 @@ class WebPluginDelegateProxy : public WebPluginDelegate,
bool CreateBitmap(scoped_ptr<TransportDIB>* memory,
scoped_ptr<skia::PlatformCanvas>* canvas);
+ // Called for cleanup during plugin destruction. Normally right before the
+ // plugin window gets destroyed, or when the plugin has crashed (at which
+ // point the window has already been destroyed).
+ void WillDestroyWindow();
+
RenderView* render_view_;
WebPlugin* plugin_;
bool windowless_;