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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.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/qt/WebCoreSupport/FrameLoaderClientQt.cpp ('k') | Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
===================================================================
--- Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (revision 127631)
+++ Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (working copy)
@@ -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);
« no previous file with comments | « Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp ('k') | Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698