WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/css/CSSPrimitiveValue.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple 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 750 matching lines @@
             text = "counter(";
             text += String::number(m_value.num);
             text += ")";
             // FIXME: Add list-style and separator
             break;
         case CSS_RECT: {
             DEFINE_STATIC_LOCAL(const String, rectParen, ("rect("));
 
             Rect* rectVal = getRectValue();
             Vector<UChar> result;
-            result.reserveCapacity(32);
+            result.reserveInitialCapacity(32);
             append(result, rectParen);
 
             append(result, rectVal->top()->cssText());
             result.append(' ');
 
             append(result, rectVal->right()->cssText());
             result.append(' ');
 
             append(result, rectVal->bottom()->cssText());
             result.append(' ');
 
             append(result, rectVal->left()->cssText());
             result.append(')');
 
             return String::adopt(result);
         }
         case CSS_RGBCOLOR:
         case CSS_PARSER_HEXCOLOR: {
             DEFINE_STATIC_LOCAL(const String, commaSpace, (", "));
             DEFINE_STATIC_LOCAL(const String, rgbParen, ("rgb("));
             DEFINE_STATIC_LOCAL(const String, rgbaParen, ("rgba("));
 
             RGBA32 rgbColor = m_value.rgbcolor;
             if (m_type == CSS_PARSER_HEXCOLOR)
                 Color::parseHexColor(m_value.string, rgbColor);
             Color color(rgbColor);
 
             Vector<UChar> result;
-            result.reserveCapacity(32);
+            result.reserveInitialCapacity(32);
             if (color.hasAlpha())
                 append(result, rgbaParen);
             else
                 append(result, rgbParen);
 
             appendNumber(result, static_cast<unsigned char>(color.red()));
             append(result, commaSpace);
 
             appendNumber(result, static_cast<unsigned char>(color.green()));
             append(result, commaSpace);
@@ skipping 136 matching lines @@
 }
 
 void CSSPrimitiveValue::addSubresourceStyleURLs(ListHashSet<KURL>& urls, const CSSStyleSheet* styleSheet)
 {
     if (m_type == CSS_URI)
         addSubresourceURL(urls, styleSheet->completeURL(m_value.string));
 }
 
 } // namespace WebCore