diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-29 02:18:30 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-29 02:18:30 +0000 |
commit | 8beff076f15f979f9334ad9f962444f57050fe52 (patch) | |
tree | f504f4c35856204e385fa12e2f3c8a45c6bdc6a8 /chrome/renderer/webplugin_delegate_proxy.cc | |
parent | e67efe3af047fdf3ca4e62ed54cadf12b5bbbea2 (diff) | |
download | chromium_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/renderer/webplugin_delegate_proxy.cc')
-rw-r--r-- | chrome/renderer/webplugin_delegate_proxy.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index 4c5e54e..cdf5720 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -271,9 +271,6 @@ bool WebPluginDelegateProxy::Initialize(const GURL& url, } } params.load_manually = load_manually; -#if defined(OS_WIN) - params.modal_dialog_event = render_view_->modal_dialog_event()->handle(); -#endif plugin_ = plugin; @@ -746,8 +743,7 @@ NPObject* WebPluginDelegateProxy::GetPluginScriptableObject() { return NULL; npobject_ = NPObjectProxy::Create( - channel_host_.get(), route_id, npobject_ptr, - render_view_->modal_dialog_event(), page_url_); + channel_host_.get(), route_id, npobject_ptr, 0, page_url_); return WebBindings::retainObject(npobject_); } @@ -833,8 +829,7 @@ void WebPluginDelegateProxy::OnGetWindowScriptNPObject( // The stub will delete itself when the proxy tells it that it's released, or // otherwise when the channel is closed. NPObjectStub* stub = new NPObjectStub( - npobject, channel_host_.get(), route_id, - render_view_->modal_dialog_event(), page_url_); + npobject, channel_host_.get(), route_id, 0, page_url_); window_script_object_ = stub; window_script_object_->set_proxy(this); *success = true; @@ -853,8 +848,7 @@ void WebPluginDelegateProxy::OnGetPluginElement( // The stub will delete itself when the proxy tells it that it's released, or // otherwise when the channel is closed. new NPObjectStub( - npobject, channel_host_.get(), route_id, - render_view_->modal_dialog_event(), page_url_); + npobject, channel_host_.get(), route_id, 0, page_url_); *success = true; *npobject_ptr = reinterpret_cast<intptr_t>(npobject); } |