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

Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp

 /*
  * Copyright (C) 2009 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1117 matching lines @@
         return false;
     }
 
     WebViewImpl* webview = m_webFrame->viewImpl();
     if (webview->client())
         webview->client()->navigateBackForwardSoon(offset);
 
     return false;
 }
 
+bool FrameLoaderClientImpl::shouldStopLoadingForHistoryItem(HistoryItem* targetItem) const
+{
+    // Don't stop loading for pseudo-back-forward URLs, since they will get
+    // translated and then pass through again.
+    const KURL& url = targetItem->url();
+    return !url.protocolIs(backForwardNavigationScheme);
+}
+
 void FrameLoaderClientImpl::dispatchDidAddBackForwardItem(HistoryItem*) const
 {
 }
 
 void FrameLoaderClientImpl::dispatchDidRemoveBackForwardItem(HistoryItem*) const
 {
 }
 
 void FrameLoaderClientImpl::dispatchDidChangeBackForwardIndex() const
 {
@@ skipping 404 matching lines @@
     }
     return ds->releasePluginLoadObserver();
 }
 
 PassRefPtr<FrameNetworkingContext> FrameLoaderClientImpl::createNetworkingContext()
 {
     return FrameNetworkingContextImpl::create(m_webFrame->frame());
 }
 
 } // namespace WebKit