Merge 118955

Source/WebCore/bindings/v8/custom/V8ArrayBufferViewCustom.h

 /*
  * Copyright (C) 2009, 2011 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 22 matching lines @@
 
 #include <wtf/ArrayBuffer.h>
 #include "ExceptionCode.h"
 
 #include "V8ArrayBuffer.h"
 #include "V8Binding.h"
 #include "V8Proxy.h"
 
 namespace WebCore {
 
-
-// Check if the JavaScript 'set' method was already installed
-// on the prototype of the given typed array.
-bool fastSetInstalled(v8::Handle<v8::Object> array);
-
-// Install the JavaScript 'set' method on the prototype of
-// the given typed array.
-void installFastSet(v8::Handle<v8::Object> array);
-
-// Copy the elements from the source array to the typed destination array by
-// invoking the 'set' method of the destination array in JS.
-void copyElements(v8::Handle<v8::Object> destArray, v8::Handle<v8::Object> srcArray, uint32_t offset);
+// Copy the elements from the source array to the typed destination array.
+// Returns true if it succeeded, otherwise returns false.
+bool copyElements(v8::Handle<v8::Object> destArray, v8::Handle<v8::Object> srcArray, uint32_t length, uint32_t offset);
 
 
 // Template function used by the ArrayBufferView*Constructor callbacks.
 template<class ArrayClass, class ElementType>
 v8::Handle<v8::Value> constructWebGLArrayWithArrayBufferArgument(const v8::Arguments& args, WrapperTypeInfo* type, v8::ExternalArrayType arrayType, bool hasIndexer)
 {
     ArrayBuffer* buf = V8ArrayBuffer::toNative(args[0]->ToObject());
     if (!buf)
         return throwError("Could not convert argument 0 to a ArrayBuffer");
     bool ok;
@@ skipping 104 matching lines @@
     if (doInstantiation)
         array = ArrayClass::create(len);
     if (!array.get())
         return throwError("ArrayBufferView size is not a small enough positive integer.", V8Proxy::RangeError);
 
 
     // Transform the holder into a wrapper object for the array.
     V8DOMWrapper::setDOMWrapper(args.Holder(), type, array.get());
     args.Holder()->SetIndexedPropertiesToExternalArrayData(array.get()->baseAddress(), arrayType, array.get()->length());
 
-    if (!srcArray.IsEmpty())
-        copyElements(args.Holder(), srcArray, 0);
+    if (!srcArray.IsEmpty()) {
+        bool copied = copyElements(args.Holder(), srcArray, len, 0);
+        if (!copied) {
+            for (unsigned i = 0; i < len; i++)
+                array->set(i, srcArray->Get(i)->NumberValue());
+        }
+    }
 
     v8::Persistent<v8::Object> wrapper = v8::Persistent<v8::Object>::New(args.Holder());
     wrapper.MarkIndependent();
     V8DOMWrapper::setJSWrapperForDOMObject(array.release(), wrapper);
     return args.Holder();
 }
 
 template <class CPlusPlusArrayType, class JavaScriptWrapperArrayType>
 v8::Handle<v8::Value> setWebGLArrayHelper(const v8::Arguments& args)
 {
@@ skipping 21 matching lines @@
         uint32_t offset = 0;
         if (args.Length() == 2)
             offset = toUInt32(args[1]);
         uint32_t length = toUInt32(array->Get(v8::String::New("length")));
         if (offset > impl->length()
             || offset + length > impl->length()
             || offset + length < offset)
             // Out of range offset or overflow
             V8Proxy::setDOMException(INDEX_SIZE_ERR, args.GetIsolate());
         else {
-            if (!fastSetInstalled(args.Holder())) {
-                installFastSet(args.Holder());
-                copyElements(args.Holder(), array, offset);
-            } else {
+            bool copied = copyElements(args.Holder(), array, length, offset);
+            if (!copied) {
                 for (uint32_t i = 0; i < length; i++)
                     impl->set(offset + i, array->Get(i)->NumberValue());
             }
         }
         return v8::Undefined();
     }
 
     V8Proxy::setDOMException(SYNTAX_ERR, args.GetIsolate());
     return notHandledByInterceptor();
 }
 
 }
 
 #endif // V8ArrayBufferViewCustom_h