diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-23 15:05:51 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-23 15:31:48 +0000 |
| commit | 9cb87fa7638e305ef35b04f54ba07ac4fa04adcb (patch) | |
| tree | 2793d80883b7daab67258117755046d428f9978c /chromium/content/renderer/npapi/webplugin_impl.cc | |
| parent | 98ff39cb35ef2bd32bb1af9565628a4a4b0979b2 (diff) | |
| download | qtwebengine-chromium-9cb87fa7638e305ef35b04f54ba07ac4fa04adcb.tar.gz | |
BASELINE: Update Chromium to 47.0.2526.71
Also adds a few missing spellcheck sources.
Change-Id: I300864710316ff3cd3ad456dd7a3d048b45f57d5
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/content/renderer/npapi/webplugin_impl.cc')
| -rw-r--r-- | chromium/content/renderer/npapi/webplugin_impl.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chromium/content/renderer/npapi/webplugin_impl.cc b/chromium/content/renderer/npapi/webplugin_impl.cc index 32e35523121..f02d0d76c18 100644 --- a/chromium/content/renderer/npapi/webplugin_impl.cc +++ b/chromium/content/renderer/npapi/webplugin_impl.cc @@ -258,8 +258,12 @@ bool WebPluginImpl::initialize(WebPluginContainer* container) { blink::WebPlugin* replacement_plugin = GetContentClient()->renderer()->CreatePluginReplacement( render_frame_, file_path_); - if (!replacement_plugin) + if (!replacement_plugin) { + // Maintain invariant that container() returns null when initialize() + // returns false. + SetContainer(nullptr); return false; + } // Disable scripting by this plugin before replacing it with the new // one. This plugin also needs destroying, so use destroy(), which will |