WebKit merge 40500:40539 [WebKit side]

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 107 matching lines @@
     , m_lastVisitWasFailure(item.m_lastVisitWasFailure)
     , m_isInPageCache(item.m_isInPageCache)
     , m_isTargetItem(item.m_isTargetItem)
     , m_visitCount(item.m_visitCount)
     , m_formContentType(item.m_formContentType)
 {
     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());
 
     if (item.m_redirectURLs)
         m_redirectURLs.set(new Vector<String>(*item.m_redirectURLs));
 }
 
 PassRefPtr<HistoryItem> HistoryItem::copy() const
 {
     return adoptRef(new HistoryItem(*this));
@@ skipping 262 matching lines @@
     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>);
 
-    m_redirectURLs->append(url);
+    // Our API allows us to store all the URLs in the redirect chain, but for
+    // now we only have a use for the final URL.
+    (*m_redirectURLs).resize(1);
+    (*m_redirectURLs)[0] = url;
 }
 
 Vector<String>* HistoryItem::redirectURLs() const
 {
     return m_redirectURLs.get();
 }
 
 void HistoryItem::setRedirectURLs(std::auto_ptr<Vector<String> > redirectURLs)
 {
     m_redirectURLs.adopt(redirectURLs);
@@ skipping 27 matching lines @@
 
 #ifndef NDEBUG
 
 int showTree(const WebCore::HistoryItem* item)
 {
     return item->showTree();
 }
 
 #endif