Merge 79107 - 2011-02-19 Charlie Reis <creis@chromium.org>...

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 584 matching lines @@
             }
         }
     }
 }
 
 bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem*) const
 {
     return true;
 }
 
+bool WebFrameLoaderClient::shouldStopLoadingForHistoryItem(HistoryItem*) const
+{
+    return true;
+}
+
 void WebFrameLoaderClient::dispatchDidAddBackForwardItem(HistoryItem*) const
 {
 }
 
 void WebFrameLoaderClient::dispatchDidRemoveBackForwardItem(HistoryItem*) const
 {
 }
 
 void WebFrameLoaderClient::dispatchDidChangeBackForwardIndex() const
 {
@@ skipping 306 matching lines @@
 }
 
 bool WebFrameLoaderClient::shouldUsePluginDocument(const String& mimeType) const
 {
     WebView* webView = m_webFrame->webView();
     if (!webView)
         return false;
 
     return webView->shouldUseEmbeddedView(mimeType);
 }