diff options
Diffstat (limited to 'src/3rdparty/webkit/WebCore/history/HistoryItem.cpp')
-rw-r--r-- | src/3rdparty/webkit/WebCore/history/HistoryItem.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/3rdparty/webkit/WebCore/history/HistoryItem.cpp b/src/3rdparty/webkit/WebCore/history/HistoryItem.cpp index 6156524b6d..e199337284 100644 --- a/src/3rdparty/webkit/WebCore/history/HistoryItem.cpp +++ b/src/3rdparty/webkit/WebCore/history/HistoryItem.cpp @@ -161,8 +161,8 @@ const String& HistoryItem::alternateTitle() const Image* HistoryItem::icon() const { - Image* result = iconDatabase()->iconForPageURL(m_urlString, IntSize(16,16)); - return result ? result : iconDatabase()->defaultIcon(IntSize(16,16)); + Image* result = iconDatabase()->iconForPageURL(m_urlString, IntSize(16, 16)); + return result ? result : iconDatabase()->defaultIcon(IntSize(16, 16)); } double HistoryItem::lastVisitedTime() const @@ -287,14 +287,16 @@ void HistoryItem::collapseDailyVisitsToWeekly() m_weeklyVisitCounts.shrink(maxWeeklyCounts); } -void HistoryItem::recordVisitAtTime(double time) +void HistoryItem::recordVisitAtTime(double time, VisitCountBehavior visitCountBehavior) { padDailyCountsForNewVisit(time); m_lastVisitedTime = time; - m_visitCount++; - m_dailyVisitCounts[0]++; + if (visitCountBehavior == IncreaseVisitCount) { + ++m_visitCount; + ++m_dailyVisitCounts[0]; + } collapseDailyVisitsToWeekly(); } @@ -305,10 +307,10 @@ void HistoryItem::setLastVisitedTime(double time) recordVisitAtTime(time); } -void HistoryItem::visited(const String& title, double time) +void HistoryItem::visited(const String& title, double time, VisitCountBehavior visitCountBehavior) { m_title = title; - recordVisitAtTime(time); + recordVisitAtTime(time, visitCountBehavior); } int HistoryItem::visitCount() const @@ -329,10 +331,10 @@ void HistoryItem::setVisitCount(int count) void HistoryItem::adoptVisitCounts(Vector<int>& dailyCounts, Vector<int>& weeklyCounts) { - m_dailyVisitCounts.clear(); - m_dailyVisitCounts.swap(dailyCounts); - m_weeklyVisitCounts.clear(); - m_weeklyVisitCounts.swap(weeklyCounts); + m_dailyVisitCounts.clear(); + m_dailyVisitCounts.swap(dailyCounts); + m_weeklyVisitCounts.clear(); + m_weeklyVisitCounts.swap(weeklyCounts); } const IntPoint& HistoryItem::scrollPoint() const |