Merge 125500

Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

 /*
  * Copyright (C) 2006 Zack Rusin <zack@kde.org>
  * Copyright (C) 2006, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008 Collabora Ltd. All rights reserved.
  * Coypright (C) 2008 Holger Hans Peter Freyther
  * Coypright (C) 2009, 2010 Girish Ramakrishnan <girish@forwardbias.in>
  *
  * All rights reserved.
  *
@@ skipping 1615 matching lines @@
             params, values, mimeType, loadManually);
         return pluginView;
     }
 #endif // ENABLE(NETSCAPE_PLUGIN_API)
 
     return 0;
 }
 
 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,
                                                     const Vector<String>& paramNames, const Vector<String>& paramValues)
 {
     return createPlugin(pluginSize, element, url, paramNames, paramValues, "application/x-java-applet", true);
 }
 
 String FrameLoaderClientQt::overrideMediaType() const
 {
@@ skipping 29 matching lines @@
 
     QWebPage* webPage = m_webFrame->page();
     if (wasOriginatingLoad && webPage)
         emit webPage->loadFinished(ok);
     emit m_webFrame->loadFinished(ok);
 }
 
 }
 
 #include "moc_FrameLoaderClientQt.cpp"