From 9cb87fa7638e305ef35b04f54ba07ac4fa04adcb Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 23 Nov 2015 15:05:51 +0100 Subject: BASELINE: Update Chromium to 47.0.2526.71 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also adds a few missing spellcheck sources. Change-Id: I300864710316ff3cd3ad456dd7a3d048b45f57d5 Reviewed-by: Michal Klocek Reviewed-by: Michael Brüning --- chromium/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'chromium/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp') 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) { -- cgit v1.2.1