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

Source/WebCore/page/Page.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All Rights Reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 320 matching lines @@
 }
 
 void Page::goToItem(HistoryItem* item, FrameLoadType type)
 {
     if (defersLoading())
         return;
 
     // stopAllLoaders may end up running onload handlers, which could cause further history traversals that may lead to the passed in HistoryItem
     // being deref()-ed. Make sure we can still use it with HistoryController::goToItem later.
     RefPtr<HistoryItem> protector(item);
-    
-    // Abort any current load unless we're navigating the current document to a new state object
-    HistoryItem* currentItem = m_mainFrame->loader()->history()->currentItem();
-    if (!item->stateObject() || !currentItem || item->documentSequenceNumber() != currentItem->documentSequenceNumber() || item == currentItem) {
-        // Define what to do with any open database connections. By default we stop them and terminate the database thread.
-        DatabasePolicy databasePolicy = DatabasePolicyStop;
 
-#if ENABLE(DATABASE)
-        // If we're navigating the history via a fragment on the same document, then we do not want to stop databases.
-        const KURL& currentURL = m_mainFrame->loader()->url();
-        const KURL& newURL = item->url();
-    
-        if (newURL.hasFragmentIdentifier() && equalIgnoringFragmentIdentifier(currentURL, newURL))
-            databasePolicy = DatabasePolicyContinue;
-#endif
+    if (m_mainFrame->loader()->history()->shouldStopLoadingForHistoryItem(item))
+        m_mainFrame->loader()->stopAllLoaders();
 
-        m_mainFrame->loader()->stopAllLoaders(databasePolicy);
-    }
-        
     m_mainFrame->loader()->history()->goToItem(item, type);
 }
 
 int Page::getHistoryLength()
 {
     return backForward()->backCount() + 1 + backForward()->forwardCount();
 }
 
 void Page::setGlobalHistoryItem(HistoryItem* item)
 {
@@ skipping 556 matching lines @@
     , deviceOrientationClient(0)
     , speechInputClient(0)
 {
 }
 
 Page::PageClients::~PageClients()
 {
 }
 
 } // namespace WebCore