Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/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 104 matching lines @@
     void setURLString(const String&);
     void setOriginalURLString(const String&);
     void setReferrer(const String&);
     void setTarget(const String&);
     void setParent(const String&);
     void setTitle(const String&);
     void setIsTargetItem(bool);
     
     void setFormInfoFromRequest(const ResourceRequest&);
 
-    void recordInitialVisit();
 
     void setVisitCount(int);
     void setLastVisitWasFailure(bool wasFailure) { m_lastVisitWasFailure = wasFailure; }
     void setLastVisitWasHTTPNonGet(bool wasNotGet) { m_lastVisitWasHTTPNonGet = wasNotGet; }
 
     void addChildItem(PassRefPtr<HistoryItem>);
     HistoryItem* childItemWithName(const String&) const;
     HistoryItem* targetItem();
     HistoryItem* recurseToFindTargetItem();
     const HistoryItemVector& children() const;
@@ skipping 23 matching lines @@
 #if PLATFORM(QT)
     QVariant userData() const { return m_userData; }
     void setUserData(const QVariant& userData) { m_userData = userData; }
 #endif
 
 #ifndef NDEBUG
     int showTree() const;
     int showTreeWithIndent(unsigned indentLevel) const;
 #endif
 
-    void adoptVisitCounts(Vector<int>& dailyCounts, Vector<int>& weeklyCounts);
-    const Vector<int>& dailyVisitCounts() { return m_dailyVisitCounts; }
-    const Vector<int>& weeklyVisitCounts() { return m_weeklyVisitCounts; }
-
 private:
     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& target, const String& parent, const String& title);
 
     HistoryItem(const HistoryItem&);
 
-    void padDailyCountsForNewVisit(double time);
-    void collapseDailyVisitsToWeekly();
-    void recordVisitAtTime(double);
-
     String m_urlString;
     String m_originalURLString;
     String m_referrer;
     String m_target;
     String m_parent;
     String m_title;
     String m_displayTitle;
     
     double m_lastVisitedTime;
     bool m_lastVisitWasHTTPNonGet;
 
     IntPoint m_scrollPoint;
     Vector<String> m_documentState;
     
     HistoryItemVector m_subItems;
     
     bool m_lastVisitWasFailure;
     bool m_isTargetItem;
     int m_visitCount;
-    Vector<int> m_dailyVisitCounts;
-    Vector<int> m_weeklyVisitCounts;
 
     OwnPtr<Vector<String> > m_redirectURLs;
 
     // info used to repost form data
     RefPtr<FormData> m_formData;
     String m_formContentType;
 
     // PageCache controls these fields.
     HistoryItem* m_next;
     HistoryItem* m_prev;
@@ skipping 11 matching lines @@
 
 } //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