diff options
| author | pan.deng@intel.com <pan.deng@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 03:24:28 +0000 |
|---|---|---|
| committer | pan.deng@intel.com <pan.deng@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 03:24:28 +0000 |
| commit | 93414abc3d993df9a3a772421c49dfa0d16df885 (patch) | |
| tree | 48069f94fc335a48fafd0f2da2c636ed41772f23 | |
| parent | e9ce881eec41cf6ee6e2633836f3fc0f301f8df9 (diff) | |
| download | chromium_src-93414abc3d993df9a3a772421c49dfa0d16df885.zip chromium_src-93414abc3d993df9a3a772421c49dfa0d16df885.tar.gz chromium_src-93414abc3d993df9a3a772421c49dfa0d16df885.tar.bz2 | |
If we show a replacement plug-in when the real one is not initialized correctly,
we should release the origin WebPluginImpl object,
otherwise memory leak will happen.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10536192
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143138 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | webkit/plugins/npapi/webplugin_impl.cc | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -163,6 +163,7 @@ Eriq Augustine <eriq.augustine@gmail.com> Francois Kritzinger <francoisk777@gmail.com> Erik Hill <erikghill@gmail.com> Mao Yujie <maojie0924@gmail.com> +Pan Deng <pan.deng@intel.com> Aaron Leventhal <aaronlevbugs@gmail.com> Peter Collingbourne <peter@pcc.me.uk> Aaron Randolph <aaron.randolph@gmail.com> diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/plugins/npapi/webplugin_impl.cc index 27ae1c3..7511370 100644 --- a/webkit/plugins/npapi/webplugin_impl.cc +++ b/webkit/plugins/npapi/webplugin_impl.cc @@ -275,6 +275,7 @@ bool WebPluginImpl::initialize(WebPluginContainer* container) { return false; container->setPlugin(replacement_plugin); + destroy(); return true; } |