diff options
Diffstat (limited to 'WebCore/history/HistoryItem.cpp')
| -rw-r--r-- | WebCore/history/HistoryItem.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/WebCore/history/HistoryItem.cpp b/WebCore/history/HistoryItem.cpp index 5a059b2..1d05042f 100644 --- a/WebCore/history/HistoryItem.cpp +++ b/WebCore/history/HistoryItem.cpp @@ -50,7 +50,6 @@ HistoryItem::HistoryItem() : m_lastVisitedTime(0) , m_lastVisitWasHTTPNonGet(false) , m_lastVisitWasFailure(false) - , m_isInPageCache(false) , m_isTargetItem(false) , m_visitCount(0) { @@ -63,7 +62,6 @@ HistoryItem::HistoryItem(const String& urlString, const String& title, double ti , m_lastVisitedTime(time) , m_lastVisitWasHTTPNonGet(false) , m_lastVisitWasFailure(false) - , m_isInPageCache(false) , m_isTargetItem(false) , m_visitCount(0) { @@ -78,7 +76,6 @@ HistoryItem::HistoryItem(const String& urlString, const String& title, const Str , m_lastVisitedTime(time) , m_lastVisitWasHTTPNonGet(false) , m_lastVisitWasFailure(false) - , m_isInPageCache(false) , m_isTargetItem(false) , m_visitCount(0) { @@ -94,7 +91,6 @@ HistoryItem::HistoryItem(const KURL& url, const String& target, const String& pa , m_lastVisitedTime(0) , m_lastVisitWasHTTPNonGet(false) , m_lastVisitWasFailure(false) - , m_isInPageCache(false) , m_isTargetItem(false) , m_visitCount(0) { @@ -103,7 +99,7 @@ HistoryItem::HistoryItem(const KURL& url, const String& target, const String& pa HistoryItem::~HistoryItem() { - ASSERT(!m_isInPageCache); + ASSERT(!m_cachedPage); iconDatabase()->releaseIconForPageURL(m_urlString); } @@ -120,18 +116,19 @@ inline HistoryItem::HistoryItem(const HistoryItem& item) , m_lastVisitWasHTTPNonGet(item.m_lastVisitWasHTTPNonGet) , m_scrollPoint(item.m_scrollPoint) , m_lastVisitWasFailure(item.m_lastVisitWasFailure) - , m_isInPageCache(item.m_isInPageCache) , 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.reserveCapacity(size); + m_subItems.reserveInitialCapacity(size); for (unsigned i = 0; i < size; ++i) m_subItems.append(item.m_subItems[i]->copy()); |