Merge 125500

Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. 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
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 867 matching lines @@
         return pluginView;
 
     dispatchDidFailToStartPlugin(pluginView.get());
 
     return 0;
 }
 
 void WebFrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget)
 {
     // Ideally, this function shouldn't be necessary, see <rdar://problem/4852889>
-
-    if (pluginWidget->isPluginView())
+    if (!pluginWidget || pluginWidget->isPluginView())
         m_manualLoader = static_cast<PluginView*>(pluginWidget);
     else 
         m_manualLoader = static_cast<EmbeddedWidget*>(pluginWidget);
 }
 
 WebHistory* WebFrameLoaderClient::webHistory() const
 {
     if (m_webFrame != m_webFrame->webView()->topLevelFrame())
         return 0;
 
     return WebHistory::sharedHistory();
 }
 
 bool WebFrameLoaderClient::shouldUsePluginDocument(const String& mimeType) const
 {
     WebView* webView = m_webFrame->webView();
     if (!webView)
         return false;
 
     return webView->shouldUseEmbeddedView(mimeType);
 }