WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/editing/markup.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 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 672 matching lines @@
 
     size_t preCount = preMarkups.size();
     for (size_t i = 0; i < preCount; ++i)
         length += preMarkups[i].length();
 
     size_t postCount = postMarkups.size();
     for (size_t i = 0; i < postCount; ++i)
         length += postMarkups[i].length();
 
     Vector<UChar> result;
-    result.reserveCapacity(length);
+    result.reserveInitialCapacity(length);
 
     for (size_t i = preCount; i > 0; --i)
         append(result, preMarkups[i - 1]);
 
     for (size_t i = 0; i < postCount; ++i)
         append(result, postMarkups[i]);
 
     return String::adopt(result);
 }
 
@@ skipping 513 matching lines @@
     if (!frame)
         return String();
 
     // FIXME: This is always "for interchange". Is that right? See the previous method.
     return frame->documentTypeString() + createMarkup(range, 0, AnnotateForInterchange);        
 }
 
 }