Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/history/HistoryItem.cpp

 /*
  * Copyright (C) 2005, 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 56 matching lines @@
 HistoryItem::HistoryItem(const String& urlString, const String& title, const String& alternateTitle, double time)
     : m_urlString(urlString)
     , m_originalURLString(urlString)
     , m_title(title)
     , m_displayTitle(alternateTitle)
     , m_lastVisitedTime(time)
     , m_lastVisitWasHTTPNonGet(false)
     , m_lastVisitWasFailure(false)
     , m_isTargetItem(false)
     , m_visitCount(0)
-{
+{    
     iconDatabase()->retainIconForPageURL(m_urlString);
 }
 
 HistoryItem::HistoryItem(const KURL& url, const String& target, const String& parent, const String& title)
     : m_urlString(url.string())
     , m_originalURLString(url.string())
     , m_target(target)
     , m_parent(parent)
     , m_title(title)
     , m_lastVisitedTime(0)
@@ skipping 19 matching lines @@
     , m_target(item.m_target)
     , m_parent(item.m_parent)
     , m_title(item.m_title)
     , m_displayTitle(item.m_displayTitle)
     , m_lastVisitedTime(item.m_lastVisitedTime)
     , m_lastVisitWasHTTPNonGet(item.m_lastVisitWasHTTPNonGet)
     , m_scrollPoint(item.m_scrollPoint)
     , m_lastVisitWasFailure(item.m_lastVisitWasFailure)
     , m_isTargetItem(item.m_isTargetItem)
     , m_visitCount(item.m_visitCount)
-    , m_dailyVisitCounts(item.m_dailyVisitCounts)
-    , m_weeklyVisitCounts(item.m_weeklyVisitCounts)
     , m_formContentType(item.m_formContentType)
 {
     ASSERT(!item.m_cachedPage);
 
     if (item.m_formData)
         m_formData = item.m_formData->copy();
         
     unsigned size = item.m_subItems.size();
     m_subItems.reserveInitialCapacity(size);
     for (unsigned i = 0; i < size; ++i)
@@ skipping 112 matching lines @@
 {
     m_target = target;
     notifyHistoryItemChanged();
 }
 
 void HistoryItem::setParent(const String& parent)
 {
     m_parent = parent;
 }
 
-static inline int timeToDay(double time)
-{
-    static const double secondsPerDay = 60 * 60 * 24;
-    return static_cast<int>(ceil(time / secondsPerDay));
-}
-
-void HistoryItem::padDailyCountsForNewVisit(double time)
-{
-    if (m_dailyVisitCounts.isEmpty())
-        m_dailyVisitCounts.prepend(m_visitCount);
-
-    int daysElapsed = timeToDay(time) - timeToDay(m_lastVisitedTime);
-
-    if (daysElapsed < 0)
-      daysElapsed = 0;
-
-    Vector<int> padding;
-    padding.fill(0, daysElapsed);
-    m_dailyVisitCounts.prepend(padding);
-}
-
-static const size_t daysPerWeek = 7;
-static const size_t maxDailyCounts = 2 * daysPerWeek - 1;
-static const size_t maxWeeklyCounts = 5;
-
-void HistoryItem::collapseDailyVisitsToWeekly()
-{
-    while (m_dailyVisitCounts.size() > maxDailyCounts) {
-        int oldestWeekTotal = 0;
-        for (size_t i = 0; i < daysPerWeek; i++)
-            oldestWeekTotal += m_dailyVisitCounts[m_dailyVisitCounts.size() - daysPerWeek + i];
-        m_dailyVisitCounts.shrink(m_dailyVisitCounts.size() - daysPerWeek);
-        m_weeklyVisitCounts.prepend(oldestWeekTotal);
-    }
-
-    if (m_weeklyVisitCounts.size() > maxWeeklyCounts)
-        m_weeklyVisitCounts.shrink(maxWeeklyCounts);
-}
-
-void HistoryItem::recordVisitAtTime(double time)
-{
-    padDailyCountsForNewVisit(time);
-
-    m_lastVisitedTime = time;
-    m_visitCount++;
-
-    m_dailyVisitCounts[0]++;
-
-    collapseDailyVisitsToWeekly();
-}
-
 void HistoryItem::setLastVisitedTime(double time)
 {
-    if (m_lastVisitedTime != time)
-        recordVisitAtTime(time);
+    if (m_lastVisitedTime != time) {
+        m_lastVisitedTime = time;
+        m_visitCount++;
+    }
 }
 
 void HistoryItem::visited(const String& title, double time)
 {
     m_title = title;
-    recordVisitAtTime(time);
+    m_lastVisitedTime = time;
+    m_visitCount++;
 }
 
 int HistoryItem::visitCount() const
 {
     return m_visitCount;
 }
 
-void HistoryItem::recordInitialVisit()
-{
-    ASSERT(!m_visitCount);
-    recordVisitAtTime(m_lastVisitedTime);
-}
-
 void HistoryItem::setVisitCount(int count)
 {
     m_visitCount = count;
 }
 
-void HistoryItem::adoptVisitCounts(Vector<int>& dailyCounts, Vector<int>& weeklyCounts)
-{
-  m_dailyVisitCounts.clear();
-  m_dailyVisitCounts.swap(dailyCounts);
-  m_weeklyVisitCounts.clear();
-  m_weeklyVisitCounts.swap(weeklyCounts);
-}
-
 const IntPoint& HistoryItem::scrollPoint() const
 {
     return m_scrollPoint;
 }
 
 void HistoryItem::setScrollPoint(const IntPoint& point)
 {
     m_scrollPoint = point;
 }
 
@@ skipping 104 matching lines @@
 }
 
 bool HistoryItem::isCurrentDocument(Document* doc) const
 {
     // FIXME: We should find a better way to check if this is the current document.
     return urlString() == doc->url();
 }
 
 void HistoryItem::mergeAutoCompleteHints(HistoryItem* otherItem)
 {
-    // FIXME: this is broken - we should be merging the daily counts
-    // somehow.  but this is to support API that's not really used in
-    // practice so leave it broken for now.
     ASSERT(otherItem);
     if (otherItem != this)
         m_visitCount += otherItem->m_visitCount;
 }
 
 void HistoryItem::addRedirectURL(const String& url)
 {
     if (!m_redirectURLs)
         m_redirectURLs.set(new Vector<String>);
 
@@ skipping 41 matching lines @@
 
 #ifndef NDEBUG
 
 int showTree(const WebCore::HistoryItem* item)
 {
     return item->showTree();
 }
 
 #endif