Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4692)

Unified Diff: chrome/renderer/webplugin_delegate_proxy.cc

Issue 20515: Fix plugin hang that Earth team found.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/plugin/webplugin_proxy.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/webplugin_delegate_proxy.cc
===================================================================
--- chrome/renderer/webplugin_delegate_proxy.cc (revision 10080)
+++ chrome/renderer/webplugin_delegate_proxy.cc (working copy)
@@ -545,7 +545,8 @@
return NULL;
npobject_ = NPObjectProxy::Create(
- channel_host_.get(), route_id, npobject_ptr, NULL);
+ channel_host_.get(), route_id, npobject_ptr,
+ render_view_->modal_dialog_event());
return NPN_RetainObject(npobject_);
}
@@ -618,8 +619,9 @@
// 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);
+ NPObjectStub* stub = new NPObjectStub(
+ npobject, channel_host_.get(), route_id,
+ render_view_->modal_dialog_event());
window_script_object_ = stub;
window_script_object_->set_proxy(this);
*success = true;
@@ -637,8 +639,9 @@
// 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);
+ NPObjectStub* stub = new NPObjectStub(
+ npobject, channel_host_.get(), route_id,
+ render_view_->modal_dialog_event());
*success = true;
*npobject_ptr = npobject;
}
« no previous file with comments | « chrome/plugin/webplugin_proxy.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698