Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp

Issue 10905105: Merge 125500 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp ('k') | Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
===================================================================
--- Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp (revision 127631)
+++ Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp (working copy)
@@ -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)
« no previous file with comments | « Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp ('k') | Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698