Merge 92413

Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp

 /*
  * Copyright (C) 2009 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 368 matching lines @@
 }
 
 template<typename T, size_t inlineCapacity>
 bool toVector(JSC::ExecState* exec, JSC::JSValue value, Vector<T, inlineCapacity>& vector)
 {
     if (!value.isObject())
         return false;
 
     JSC::JSObject* object = asObject(value);
     int32_t length = object->get(exec, JSC::Identifier(exec, "length")).toInt32(exec);
+
+    if (!vector.tryReserveCapacity(length))
+        return false;
     vector.resize(length);
 
     for (int32_t i = 0; i < length; ++i) {
         JSC::JSValue v = object->get(exec, i);
         if (exec->hadException())
             return false;
         vector[i] = static_cast<T>(v.toNumber(exec));
     }
 
     return true;
@@ skipping 306 matching lines @@
 }
 
 JSC::JSValue JSWebGLRenderingContext::vertexAttrib4fv(JSC::ExecState* exec)
 {
     return dataFunctionf(f_vertexAttrib4v, exec, static_cast<WebGLRenderingContext*>(impl()));
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WEBGL)