WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/platform/graphics/FontCache.cpp

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  *
  * 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. 
@@ skipping 258 matching lines @@
 
     if (it == end) {
         // Removed everything
         gInactiveFontData->clear();
     } else {
         for (int i = 0; i < count; ++i)
             gInactiveFontData->remove(gInactiveFontData->begin());
     }
 
     Vector<FontPlatformDataCacheKey> keysToRemove;
-    keysToRemove.reserveCapacity(gFontPlatformDataCache->size());
+    keysToRemove.reserveInitialCapacity(gFontPlatformDataCache->size());
     FontPlatformDataCache::iterator platformDataEnd = gFontPlatformDataCache->end();
     for (FontPlatformDataCache::iterator platformData = gFontPlatformDataCache->begin(); platformData != platformDataEnd; ++platformData) {
         if (platformData->second && !gFontDataCache->contains(*platformData->second))
             keysToRemove.append(platformData->first);
     }
 
     size_t keysToRemoveCount = keysToRemove.size();
     for (size_t i = 0; i < keysToRemoveCount; ++i)
         delete gFontPlatformDataCache->take(keysToRemove[i]);
 
@@ skipping 99 matching lines @@
     if (gFontPlatformDataCache) {
         deleteAllValues(*gFontPlatformDataCache);
         delete gFontPlatformDataCache;
         gFontPlatformDataCache = new FontPlatformDataCache;
     }
 
     gGeneration++;
 
     Vector<RefPtr<FontSelector> > clients;
     size_t numClients = gClients->size();
-    clients.reserveCapacity(numClients);
+    clients.reserveInitialCapacity(numClients);
     HashSet<FontSelector*>::iterator end = gClients->end();
     for (HashSet<FontSelector*>::iterator it = gClients->begin(); it != end; ++it)
         clients.append(*it);
 
     ASSERT(numClients == clients.size());
     for (size_t i = 0; i < numClients; ++i)
         clients[i]->fontCacheInvalidated();
 
     purgeInactiveFontData();
 }
 
 } // namespace WebCore