Diff
Modified: branches/chromium/1229/Source/WebCore/html/PluginDocument.cpp (127632 => 127633)
--- branches/chromium/1229/Source/WebCore/html/PluginDocument.cpp 2012-09-05 19:35:43 UTC (rev 127632)
+++ branches/chromium/1229/Source/WebCore/html/PluginDocument.cpp 2012-09-05 19:37:24 UTC (rev 127633)
@@ -168,6 +168,8 @@
{
// Release the plugin node so that we don't have a circular reference.
m_pluginNode = 0;
+ if (FrameLoader* loader = frame()->loader())
+ loader->client()->redirectDataToPlugin(0);
HTMLDocument::detach();
}
Modified: branches/chromium/1229/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (127632 => 127633)
--- branches/chromium/1229/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-09-05 19:35:43 UTC (rev 127632)
+++ branches/chromium/1229/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-09-05 19:37:24 UTC (rev 127633)
@@ -346,9 +346,9 @@
void FrameLoaderClientBlackBerry::redirectDataToPlugin(Widget* pluginWidget)
{
- ASSERT(!m_pluginView);
m_pluginView = static_cast<PluginView*>(pluginWidget);
- m_hasSentResponseToPlugin = false;
+ if (pluginWidget)
+ m_hasSentResponseToPlugin = false;
}
void FrameLoaderClientBlackBerry::receivedData(const char* data, int length, const String& textEncoding)
Modified: branches/chromium/1229/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp (127632 => 127633)
--- branches/chromium/1229/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2012-09-05 19:35:43 UTC (rev 127632)
+++ branches/chromium/1229/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2012-09-05 19:37:24 UTC (rev 127633)
@@ -1491,9 +1491,8 @@
// (e.g., acrobat reader).
void FrameLoaderClientImpl::redirectDataToPlugin(Widget* pluginWidget)
{
- if (pluginWidget->isPluginContainer())
- m_pluginWidget = static_cast<WebPluginContainerImpl*>(pluginWidget);
- ASSERT(m_pluginWidget);
+ ASSERT(!pluginWidget || pluginWidget->isPluginContainer());
+ m_pluginWidget = static_cast<WebPluginContainerImpl*>(pluginWidget);
}
PassRefPtr<Widget> FrameLoaderClientImpl::createJavaAppletWidget(
Modified: branches/chromium/1229/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp (127632 => 127633)
--- branches/chromium/1229/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp 2012-09-05 19:35:43 UTC (rev 127632)
+++ branches/chromium/1229/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp 2012-09-05 19:37:24 UTC (rev 127633)
@@ -371,9 +371,9 @@
void FrameLoaderClientEfl::redirectDataToPlugin(Widget* pluginWidget)
{
- ASSERT(!m_pluginView);
m_pluginView = static_cast<PluginView*>(pluginWidget);
- m_hasSentResponseToPlugin = false;
+ if (pluginWidget)
+ m_hasSentResponseToPlugin = false;
}
PassRefPtr<Widget> FrameLoaderClientEfl::createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL& baseURL,
Modified: branches/chromium/1229/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (127632 => 127633)
--- branches/chromium/1229/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp 2012-09-05 19:35:43 UTC (rev 127632)
+++ branches/chromium/1229/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp 2012-09-05 19:37:24 UTC (rev 127633)
@@ -534,9 +534,9 @@
void FrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget)
{
- ASSERT(!m_pluginView);
m_pluginView = static_cast<PluginView*>(pluginWidget);
- m_hasSentResponseToPlugin = false;
+ if (pluginWidget)
+ m_hasSentResponseToPlugin = false;
}
PassRefPtr<Widget> FrameLoaderClient::createJavaAppletWidget(const IntSize& pluginSize, HTMLAppletElement* element, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues)
Modified: branches/chromium/1229/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (127632 => 127633)
--- branches/chromium/1229/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp 2012-09-05 19:35:43 UTC (rev 127632)
+++ branches/chromium/1229/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp 2012-09-05 19:37:24 UTC (rev 127633)
@@ -1633,9 +1633,9 @@
void FrameLoaderClientQt::redirectDataToPlugin(Widget* pluginWidget)
{
- ASSERT(!m_pluginView);
m_pluginView = static_cast<PluginView*>(pluginWidget);
- m_hasSentResponseToPlugin = false;
+ if (pluginWidget)
+ m_hasSentResponseToPlugin = false;
}
PassRefPtr<Widget> FrameLoaderClientQt::createJavaAppletWidget(const IntSize& pluginSize, HTMLAppletElement* element, const KURL& url,
Modified: branches/chromium/1229/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (127632 => 127633)
--- branches/chromium/1229/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2012-09-05 19:35:43 UTC (rev 127632)
+++ branches/chromium/1229/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2012-09-05 19:37:24 UTC (rev 127633)
@@ -885,8 +885,7 @@
void WebFrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget)
{
// Ideally, this function shouldn't be necessary, see <rdar://problem/4852889>
-
- if (pluginWidget->isPluginView())
+ if (!pluginWidget || pluginWidget->isPluginView())
m_manualLoader = static_cast<PluginView*>(pluginWidget);
else
m_manualLoader = static_cast<EmbeddedWidget*>(pluginWidget);
Modified: branches/chromium/1229/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp (127632 => 127633)
--- branches/chromium/1229/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp 2012-09-05 19:35:43 UTC (rev 127632)
+++ branches/chromium/1229/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp 2012-09-05 19:37:24 UTC (rev 127633)
@@ -174,9 +174,9 @@
void FrameLoaderClientWinCE::redirectDataToPlugin(Widget* pluginWidget)
{
- ASSERT(!m_pluginView);
m_pluginView = static_cast<PluginView*>(pluginWidget);
- m_hasSentResponseToPlugin = false;
+ if (pluginWidget)
+ m_hasSentResponseToPlugin = false;
}
PassRefPtr<Widget> FrameLoaderClientWinCE::createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL&, const Vector<String>&, const Vector<String>&)
Modified: branches/chromium/1229/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp (127632 => 127633)
--- branches/chromium/1229/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp 2012-09-05 19:35:43 UTC (rev 127632)
+++ branches/chromium/1229/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp 2012-09-05 19:37:24 UTC (rev 127633)
@@ -904,9 +904,9 @@
void FrameLoaderClientWx::redirectDataToPlugin(Widget* pluginWidget)
{
- ASSERT(!m_pluginView);
m_pluginView = static_cast<PluginView*>(pluginWidget);
- m_hasSentResponseToPlugin = false;
+ if (pluginWidget)
+ m_hasSentResponseToPlugin = false;
}
ResourceError FrameLoaderClientWx::pluginWillHandleLoadError(const ResourceResponse& response)
Modified: branches/chromium/1229/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (127632 => 127633)
--- branches/chromium/1229/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2012-09-05 19:35:43 UTC (rev 127632)
+++ branches/chromium/1229/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2012-09-05 19:37:24 UTC (rev 127633)
@@ -1356,9 +1356,6 @@
void WebFrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget)
{
- ASSERT(!m_pluginView);
- ASSERT(pluginWidget);
-
m_pluginView = static_cast<PluginView*>(pluginWidget);
}
