WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/platform/network/FormData.cpp

 /*
  * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 80 matching lines @@
     return adoptRef(new FormData(*this));
 }
 
 PassRefPtr<FormData> FormData::deepCopy() const
 {
     RefPtr<FormData> formData(create());
 
     formData->m_alwaysStream = m_alwaysStream;
 
     size_t n = m_elements.size();
-    formData->m_elements.reserveCapacity(n);
+    formData->m_elements.reserveInitialCapacity(n);
     for (size_t i = 0; i < n; ++i) {
         const FormDataElement& e = m_elements[i];
         switch (e.m_type) {
         case FormDataElement::data:
             formData->m_elements.append(FormDataElement(e.m_data));
             break;
         case FormDataElement::encodedFile:
             formData->m_elements.append(FormDataElement(e.m_filename, e.m_shouldGenerateFile));
             break;
         }
@@ skipping 69 matching lines @@
             String directory = directoryName(e.m_generatedFilename);
             deleteFile(e.m_generatedFilename);
             deleteEmptyDirectory(directory);
             e.m_generatedFilename = String();
         }
     }
     m_hasGeneratedFiles = false;
 }
 
 } // namespace WebCore