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

Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp

Index: Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
===================================================================
--- Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp	(revision 79367)
+++ Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp	(working copy)
@@ -1135,6 +1135,14 @@
     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
 {
 }