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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/WebKit/chromium/src/FrameLoaderClientImpl.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/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp ('k') | Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
===================================================================
--- Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp (revision 127631)
+++ Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp (working copy)
@@ -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(
« no previous file with comments | « Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp ('k') | Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698