Merge 125500

Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp

 /*
  * Copyright (C) 2007 Kevin Ollivier <kevino@theolliviers.com>
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 886 matching lines @@
 #if __WXMSW__ || __WXMAC__
     RefPtr<PluginView> pv = PluginView::create(m_frame, size, element, url, paramNames, paramValues, mimeType, loadManually);
     if (pv->status() == PluginStatusLoadedSuccessfully)
         return pv;
 #endif
     return 0;
 }
 
 void FrameLoaderClientWx::redirectDataToPlugin(Widget* pluginWidget)
 {
-    ASSERT(!m_pluginView);
     m_pluginView = static_cast<PluginView*>(pluginWidget);
-    m_hasSentResponseToPlugin = false;
+    if (pluginWidget)
+        m_hasSentResponseToPlugin = false;
 }
 
 ResourceError FrameLoaderClientWx::pluginWillHandleLoadError(const ResourceResponse& response)
 {
     notImplemented();
     return ResourceError(String(), WebKitErrorCannotLoadPlugIn, response.url().string(), String());
 }
 
 PassRefPtr<Widget> FrameLoaderClientWx::createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL& baseURL,
                                                     const Vector<String>& paramNames, const Vector<String>& paramValues)
@@ skipping 83 matching lines @@
     // not be used for pages with plugins in them.
     return false;
 }
 
 PassRefPtr<FrameNetworkingContext> FrameLoaderClientWx::createNetworkingContext()
 {
     return FrameNetworkingContextWx::create(m_frame);
 }
 
 }