summaryrefslogtreecommitdiffstats
path: root/chrome/plugin/webplugin_delegate_stub.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-29 02:18:30 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-29 02:18:30 +0000
commit8beff076f15f979f9334ad9f962444f57050fe52 (patch)
treef504f4c35856204e385fa12e2f3c8a45c6bdc6a8 /chrome/plugin/webplugin_delegate_stub.cc
parente67efe3af047fdf3ca4e62ed54cadf12b5bbbea2 (diff)
downloadchromium_src-8beff076f15f979f9334ad9f962444f57050fe52.zip
chromium_src-8beff076f15f979f9334ad9f962444f57050fe52.tar.gz
chromium_src-8beff076f15f979f9334ad9f962444f57050fe52.tar.bz2
Get rid of the need for cross process events in order to get plugin processes to run nested message loops when a dialog is shown. Instead use an async message that's broadcast from the renderer to all plugin processes that are connected to it, and which is dispatched on the plugin IO thread to set a process-local waitable event. This fixes showModalDialog on Linux/Mac.
BUG=15891 TEST=covered by UI tests, undef's them for POSIX Review URL: http://codereview.chromium.org/242043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin/webplugin_delegate_stub.cc')
-rw-r--r--chrome/plugin/webplugin_delegate_stub.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc
index cf2c689..ca247f7 100644
--- a/chrome/plugin/webplugin_delegate_stub.cc
+++ b/chrome/plugin/webplugin_delegate_stub.cc
@@ -148,12 +148,8 @@ void WebPluginDelegateStub::OnInit(const PluginMsg_Init_Params& params,
// params.containing_window, &parent));
#endif
- webplugin_ = new WebPluginProxy(channel_, instance_id_, page_url_);
-#if defined(OS_WIN)
- if (!webplugin_->SetModalDialogEvent(params.modal_dialog_event))
- return;
-#endif
-
+ webplugin_ = new WebPluginProxy(
+ channel_, instance_id_, page_url_, params.containing_window);
delegate_ = WebPluginDelegateImpl::Create(path, mime_type_, parent);
if (delegate_) {
webplugin_->set_delegate(delegate_);
@@ -289,7 +285,7 @@ void WebPluginDelegateStub::OnGetPluginScriptableObject(int* route_id,
// The stub will delete itself when the proxy tells it that it's released, or
// otherwise when the channel is closed.
new NPObjectStub(
- object, channel_.get(), *route_id, webplugin_->modal_dialog_event(),
+ object, channel_.get(), *route_id, webplugin_->containing_window(),
page_url_);
// Release ref added by GetPluginScriptableObject (our stub holds its own).