Merge 125500

Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp

 /*
  * Copyright (C) 2009, 2010, 2011, 2012 Research In Motion Limited. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 328 matching lines @@
 
     // If it's not the plugin type we support, try load directly from browser.
     if (m_frame->loader() && m_frame->loader()->subframeLoader() && !url.isNull())
         m_frame->loader()->subframeLoader()->requestFrame(element, url, String());
 
     return 0;
 }
 
 void FrameLoaderClientBlackBerry::redirectDataToPlugin(Widget* pluginWidget)
 {
-    ASSERT(!m_pluginView);
     m_pluginView = static_cast<PluginView*>(pluginWidget);
-    m_hasSentResponseToPlugin = false;
+    if (pluginWidget)
+        m_hasSentResponseToPlugin = false;
 }
 
 void FrameLoaderClientBlackBerry::receivedData(const char* data, int length, const String& textEncoding)
 {
     if (!m_frame)
         return;
 
     if (m_cancelLoadOnNextData) {
         m_frame->loader()->activeDocumentLoader()->stopLoading();
         m_frame->loader()->documentLoader()->writer()->end();
@@ skipping 880 matching lines @@
 void FrameLoaderClientBlackBerry::dispatchDidLoadFromApplicationCache(const ResourceRequest&)
 {
     ASSERT(isMainFrame());
     if (!isMainFrame())
         return;
 
     m_webPagePrivate->m_client->notifyDidLoadFromApplicationCache();
 }
 
 } // WebCore