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/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp | |
| 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/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp')
| -rw-r--r-- | chromium/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp b/chromium/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp index 5715802c81c..bd2e7d0eb13 100644 --- a/chromium/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp +++ b/chromium/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp @@ -724,8 +724,10 @@ void WebPluginContainerImpl::dispose() for (size_t i = 0; i < m_pluginLoadObservers.size(); ++i) m_pluginLoadObservers[i]->clearPluginContainer(); - if (m_webPlugin) + if (m_webPlugin) { + RELEASE_ASSERT(!m_webPlugin->container() || m_webPlugin->container() == this); m_webPlugin->destroy(); + } m_webPlugin = nullptr; if (m_webLayer) { |