WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/css/CSSStyleSelector.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 736 matching lines @@
     CSSRuleData* elt2 = m_matchedRules[mid];
     
     // Handle the fast common case (of equal specificity).  The list may already
     // be completely sorted.
     if (*elt <= *elt2)
         return;
     
     // We have to merge sort.  Ensure our merge buffer is big enough to hold
     // all the items.
     Vector<CSSRuleData*> rulesMergeBuffer;
-    rulesMergeBuffer.reserveCapacity(end - start); 
+    rulesMergeBuffer.reserveInitialCapacity(end - start); 
 
     unsigned i1 = start;
     unsigned i2 = mid;
     
     elt = m_matchedRules[i1];
     elt2 = m_matchedRules[i2];
     
     while (i1 < mid || i2 < end) {
         if (i1 < mid && (i2 == end || *elt <= *elt2)) {
             rulesMergeBuffer.append(elt);
@@ skipping 5240 matching lines @@
                     ASSERT_NOT_REACHED();
                     break;
             }
         }
     }
     outOperations = operations;
     return true;
 }
 
 } // namespace WebCore