Merge 68742...

WebCore/loader/FrameLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 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/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 3225 matching lines @@
     
     if (!addedExtraFields)
         addExtraFieldsToRequest(request, m_loadType, true, formData);
 
     loadWithNavigationAction(request, action, false, loadType, 0);
 }
 
 // Loads content into this frame, as specified by history item
 void FrameLoader::loadItem(HistoryItem* item, FrameLoadType loadType)
 {
-    // We do same-document navigation in the following cases:
-    // - The HistoryItem corresponds to the same document (or documents in the case of frames).
-    // - The HistoryItem is not the same as the current item.
     HistoryItem* currentItem = history()->currentItem();
-    bool sameDocumentNavigation = currentItem && item != currentItem
-        && item->hasSameDocuments(currentItem);
+    bool sameDocumentNavigation = currentItem && item->shouldDoSameDocumentNavigationTo(currentItem);
 
 #if ENABLE(WML)
     // All WML decks should go through the real load mechanism, not the scroll-to-anchor code
     // FIXME: Why do WML decks have this different behavior?
     // Are WML decks incompatible with HTML5 pushState/replaceState which require inter-document history navigations?
     // Should this new API be disabled for WML pages, or does WML need to update their mechanism to act like normal loads?
     // If scroll-to-anchor navigations were broken for WML and required them to have different loading behavior, then  
     // state object loads are certainly also broken for them.
     if (frameContainsWMLContent(m_frame))
         sameDocumentNavigation = false;
@@ skipping 263 matching lines @@
         windowRect.setHeight(features.height + (windowRect.height() - pageSize.height()));
     page->chrome()->setWindowRect(windowRect);
 
     page->chrome()->show();
 
     created = true;
     return frame;
 }
 
 } // namespace WebCore