WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/page/SecurityOrigin.cpp

 /*
  * Copyright (C) 2007 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
@@ skipping 203 matching lines @@
     if (isEmpty())
         return "null";
 
     if (m_noAccess)
         return "null";
 
     if (m_protocol == "file")
         return String("file://");
 
     Vector<UChar> result;
-    result.reserveCapacity(m_protocol.length() + m_host.length() + 10);
+    result.reserveInitialCapacity(m_protocol.length() + m_host.length() + 10);
     append(result, m_protocol);
     append(result, "://");
     append(result, m_host);
 
     if (m_port) {
         append(result, ":");
         append(result, String::number(m_port));
     }
 
     return String::adopt(result);
@@ skipping 66 matching lines @@
         return false;
 
     if (m_port != other->m_port)
         return false;
 
     return true;
 }
 
 } // namespace WebCore