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

Source/WebCore/loader/HistoryController.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * 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 199 matching lines @@
     ASSERT(!cachedPage || cachedPage->document() == m_frame->document());
     if (cachedPage && cachedPage->document() == m_frame->document()) {
         cachedPage->document()->setInPageCache(false);
         cachedPage->clear();
     }
     
     if (cachedPage)
         pageCache()->remove(currentItem());
 }
 
+bool HistoryController::shouldStopLoadingForHistoryItem(HistoryItem* targetItem) const
+{
+    if (!m_currentItem)
+        return false;
+
+    // Don't abort the current load if we're navigating within the current document.
+    if (m_currentItem->shouldDoSameDocumentNavigationTo(targetItem))
+        return false;
+
+    return m_frame->loader()->client()->shouldStopLoadingForHistoryItem(targetItem);
+}
+
 // Main funnel for navigating to a previous location (back/forward, non-search snap-back)
 // This includes recursion to handle loading into framesets properly
 void HistoryController::goToItem(HistoryItem* targetItem, FrameLoadType type)
 {
     ASSERT(!m_frame->tree()->parent());
     
     // shouldGoToHistoryItem is a private delegate method. This is needed to fix:
     // <rdar://problem/3951283> can view pages from the back/forward cache that should be disallowed by Parental Controls
     // Ultimately, history item navigations should go through the policy delegate. That's covered in:
     // <rdar://problem/3979539> back/forward cache navigations should consult policy delegate
@@ skipping 563 matching lines @@
     if (!m_currentItem)
         return;
 
     if (!urlString.isEmpty())
         m_currentItem->setURLString(urlString);
     m_currentItem->setTitle(title);
     m_currentItem->setStateObject(stateObject);
 }
 
 } // namespace WebCore