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

Unified Diff: Source/WebCore/plugins/PluginView.cpp

Issue 6711028: Merge 79897 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 9 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/plugins/PluginView.cpp
===================================================================
--- Source/WebCore/plugins/PluginView.cpp (revision 81428)
+++ Source/WebCore/plugins/PluginView.cpp (working copy)
@@ -956,9 +956,9 @@
return;
ASSERT(m_loadManually);
- ASSERT(m_manualStream);
-
- m_manualStream->didFail(0, error);
+
+ if (m_manualStream)
+ m_manualStream->didFail(0, error);
}
void PluginView::setCallingPlugin(bool b) const
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698