Merge 68742...

WebCore/history/HistoryItem.h

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 143 matching lines @@
 
     void addChildItem(PassRefPtr<HistoryItem>);
     void setChildItem(PassRefPtr<HistoryItem>);
     HistoryItem* childItemWithTarget(const String&) const;
     HistoryItem* childItemWithDocumentSequenceNumber(long long number) const;
     HistoryItem* targetItem();
     const HistoryItemVector& children() const;
     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.
     void setLastVisitedTime(double);
     void visited(const String& title, double time, VisitCountBehavior);
 
     void addRedirectURL(const String&);
     Vector<String>* redirectURLs() const;
     void setRedirectURLs(PassOwnPtr<Vector<String> >);
 
@@ skipping 35 matching lines @@
     HistoryItem();
     HistoryItem(const String& urlString, const String& title, double lastVisited);
     HistoryItem(const String& urlString, const String& title, const String& alternateTitle, double lastVisited);
     HistoryItem(const KURL& url, const String& frameName, const String& parent, const String& title);
 
     HistoryItem(const HistoryItem&);
 
     void padDailyCountsForNewVisit(double time);
     void collapseDailyVisitsToWeekly();
     void recordVisitAtTime(double, VisitCountBehavior = IncreaseVisitCount);
+    
+    bool hasSameDocumentTree(HistoryItem* otherItem) const;
 
     HistoryItem* findTargetItem();
 
     /* When adding new member variables to this class, please notify the Qt team.
      * qt/HistoryItemQt.cpp contains code to serialize history items.
      */
 
     String m_urlString;
     String m_originalURLString;
     String m_referrer;
@@ skipping 49 matching lines @@
 }; //class HistoryItem
 
 } //namespace WebCore
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 extern "C" int showTree(const WebCore::HistoryItem*);
 #endif
 
 #endif // HISTORYITEM_H