Merge 68742...

WebCore/loader/FrameLoader.cpp

Index: WebCore/loader/FrameLoader.cpp
===================================================================
--- WebCore/loader/FrameLoader.cpp	(revision 69221)
+++ WebCore/loader/FrameLoader.cpp	(working copy)
@@ -3243,12 +3243,8 @@
 // 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