Merge 68742...

WebCore/history/HistoryItem.h

Index: WebCore/history/HistoryItem.h
===================================================================
--- WebCore/history/HistoryItem.h	(revision 69221)
+++ WebCore/history/HistoryItem.h	(working copy)
@@ -161,8 +161,8 @@
     bool hasChildren() const;
     void clearChildren();
     
-    bool hasSameDocuments(HistoryItem* otherItem);
-    bool hasSameFrames(HistoryItem* otherItem);
+    bool shouldDoSameDocumentNavigationTo(HistoryItem* otherItem) const;
+    bool hasSameFrames(HistoryItem* otherItem) const;
 
     // This should not be called directly for HistoryItems that are already included
     // in GlobalHistory. The WebKit api for this is to use -[WebHistory setLastVisitedTimeInterval:forItem:] instead.
@@ -218,6 +218,8 @@
     void padDailyCountsForNewVisit(double time);
     void collapseDailyVisitsToWeekly();
     void recordVisitAtTime(double, VisitCountBehavior = IncreaseVisitCount);
+    
+    bool hasSameDocumentTree(HistoryItem* otherItem) const;
 
     HistoryItem* findTargetItem();