diff options
| author | iyengar@google.com <iyengar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-02 03:14:02 +0000 |
|---|---|---|
| committer | iyengar@google.com <iyengar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-02 03:14:02 +0000 |
| commit | 74a422edbf6b455f83931548c5aeee0f454c9520 (patch) | |
| tree | 5e2ba05edfbd5ff8b512ebd02699ca4db72e14f0 /chrome/renderer/webplugin_delegate_proxy.h | |
| parent | 39e7c42137f6036570de9ee2f8ccbf0ecd8c1bf6 (diff) | |
| download | chromium_src-74a422edbf6b455f83931548c5aeee0f454c9520.zip chromium_src-74a422edbf6b455f83931548c5aeee0f454c9520.tar.gz chromium_src-74a422edbf6b455f83931548c5aeee0f454c9520.tar.bz2 | |
This fixes http://b/issue?id=1303133, which was a crash
in the renderer due to the plugin instance getting destroyed
in the context of the ShowModalHTMLDialog request. The fix
is to convert the WebPluginDelegateProxy object in a DeleteLater and to set its channel to NULL in the destructor. This ensures that the reply to the message can be sent out successfully.
Bug=1303133
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/webplugin_delegate_proxy.h')
| -rw-r--r-- | chrome/renderer/webplugin_delegate_proxy.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h index b13cc76..dbb4e6e 100644 --- a/chrome/renderer/webplugin_delegate_proxy.h +++ b/chrome/renderer/webplugin_delegate_proxy.h @@ -113,11 +113,14 @@ class WebPluginDelegateProxy : public WebPluginDelegate, virtual void URLRequestRouted(const std::string&url, bool notify_needed, void* notify_data); + protected: + template<class WebPluginDelegateProxy> friend class DeleteTask; + ~WebPluginDelegateProxy(); + private: WebPluginDelegateProxy(const std::string& mime_type, const std::string& clsid, RenderView* render_view); - ~WebPluginDelegateProxy(); // Message handlers for messages that proxy WebPlugin methods, which // we translate into calls to the real WebPlugin. |