Added JSFloat32ArrayCustom.cpp - not sure if we need this

Author: phoboslab

JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -555,6 +555,8 @@
 		B6D188731672DFE800D1037C /* JSFloat32Array.h in Headers */ = {isa = PBXBuildFile; fileRef = B6D1886F1672DFE700D1037C /* JSFloat32Array.h */; };
 		B6D1888B1673751400D1037C /* GlobalDataHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = B6D188881673751400D1037C /* GlobalDataHelper.h */; };
 		B6D1888C1673751400D1037C /* GlobalDataHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = B6D188881673751400D1037C /* GlobalDataHelper.h */; };
+		B6D1888E167381A400D1037C /* JSFloat32ArrayCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6D1888D167381A300D1037C /* JSFloat32ArrayCustom.cpp */; };
+		B6D1888F167381A400D1037C /* JSFloat32ArrayCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6D1888D167381A300D1037C /* JSFloat32ArrayCustom.cpp */; };
 		B6E69991166BD63D005EF4B1 /* AbstractMacroAssembler.h in Headers */ = {isa = PBXBuildFile; fileRef = 860161DF0F3A83C100F84710 /* AbstractMacroAssembler.h */; };
 		B6E69992166BD63D005EF4B1 /* APICast.h in Headers */ = {isa = PBXBuildFile; fileRef = 1482B78A0A4305AB00517CFC /* APICast.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		B6E69993166BD63D005EF4B1 /* APIShims.h in Headers */ = {isa = PBXBuildFile; fileRef = 865F408710E7D56300947361 /* APIShims.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1831,6 +1833,7 @@
 		B6D1886E1672DFE700D1037C /* JSFloat32Array.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFloat32Array.cpp; sourceTree = "<group>"; };
 		B6D1886F1672DFE700D1037C /* JSFloat32Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFloat32Array.h; sourceTree = "<group>"; };
 		B6D188881673751400D1037C /* GlobalDataHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlobalDataHelper.h; sourceTree = "<group>"; };
+		B6D1888D167381A300D1037C /* JSFloat32ArrayCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFloat32ArrayCustom.cpp; sourceTree = "<group>"; };
 		B6E69BC4166BD63D005EF4B1 /* libJavaScriptCore.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libJavaScriptCore.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		B6E69BDB166BD6C1005EF4B1 /* libJSCLLIntOffsetsExtractor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libJSCLLIntOffsetsExtractor.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		B6E69BFD166BDCE7005EF4B1 /* libWTF.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libWTF.a; path = ../Build/libWTF.a; sourceTree = "<group>"; };
@@ -2886,6 +2889,7 @@
 				B6D18817166FA73400D1037C /* JSArrayBufferView.cpp */,
 				B6D18818166FA73400D1037C /* JSArrayBufferView.h */,
 				B6D18819166FA73400D1037C /* JSArrayBufferViewHelper.h */,
+				B6D1888D167381A300D1037C /* JSFloat32ArrayCustom.cpp */,
 				B6D1886E1672DFE700D1037C /* JSFloat32Array.cpp */,
 				B6D1886F1672DFE700D1037C /* JSFloat32Array.h */,
 				B6D188881673751400D1037C /* GlobalDataHelper.h */,
@@ -4354,6 +4358,7 @@
 				B6D18830166FA73400D1037C /* JSArrayBufferCustom.cpp in Sources */,
 				B6D18832166FA73400D1037C /* JSArrayBufferView.cpp in Sources */,
 				B6D188701672DFE800D1037C /* JSFloat32Array.cpp in Sources */,
+				B6D1888E167381A400D1037C /* JSFloat32ArrayCustom.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4582,6 +4587,7 @@
 				B6D18831166FA73400D1037C /* JSArrayBufferCustom.cpp in Sources */,
 				B6D18833166FA73400D1037C /* JSArrayBufferView.cpp in Sources */,
 				B6D188711672DFE800D1037C /* JSFloat32Array.cpp in Sources */,
+				B6D1888F167381A400D1037C /* JSFloat32ArrayCustom.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

JavaScriptCore/runtime/TypedArrays/JSArrayBufferViewHelper.h

@@ -27,17 +27,15 @@
 #ifndef JSArrayBufferViewHelper_h
 #define JSArrayBufferViewHelper_h
 
-#include "ExceptionCode.h"
 #include "JSArrayBuffer.h"
-#include "JSDOMBinding.h"
 #include <interpreter/CallFrame.h>
 #include <runtime/ArgList.h>
 #include <runtime/Error.h>
 #include <runtime/JSObject.h>
 #include <runtime/JSValue.h>
 #include <wtf/ArrayBufferView.h>
 
-namespace JSC {
+namespace WebCore {
 
 template <class T>
 JSC::JSValue setWebGLArrayHelper(JSC::ExecState* exec, T* impl, T* (*conversionFunc)(JSC::JSValue))
@@ -52,7 +50,7 @@ JSC::JSValue setWebGLArrayHelper(JSC::ExecState* exec, T* impl, T* (*conversionF
         if (exec->argumentCount() == 2)
             offset = exec->argument(1).toInt32(exec);
         if (!impl->set(array, offset))
-            setDOMException(exec, INDEX_SIZE_ERR);
+			throwTypeError(exec);
 
         return JSC::jsUndefined();
     }
@@ -67,7 +65,7 @@ JSC::JSValue setWebGLArrayHelper(JSC::ExecState* exec, T* impl, T* (*conversionF
         if (offset > impl->length()
             || offset + length > impl->length()
             || offset + length < offset)
-            setDOMException(exec, INDEX_SIZE_ERR);
+            throwTypeError(exec);
         else {
             for (uint32_t i = 0; i < length; i++) {
                 JSC::JSValue v = array->get(exec, i);
@@ -105,7 +103,7 @@ PassRefPtr<C> constructArrayBufferViewWithArrayBufferArgument(JSC::ExecState* ex
     }
     RefPtr<C> array = C::create(buffer, offset, length);
     if (!array)
-        setDOMException(exec, INDEX_SIZE_ERR);
+		throwTypeError(exec);
     return array;
 }
 
@@ -142,7 +140,7 @@ PassRefPtr<C> constructArrayBufferView(JSC::ExecState* exec)
         uint32_t length = srcArray->get(exec, JSC::Identifier(exec, "length")).toUInt32(exec);
         RefPtr<C> array = C::create(length);
         if (!array) {
-            setDOMException(exec, INDEX_SIZE_ERR);
+			throwTypeError(exec);
             return array;
         }
 
@@ -163,16 +161,15 @@ PassRefPtr<C> constructArrayBufferView(JSC::ExecState* exec)
 }
 
 template <typename JSType, typename WebCoreType>
-static JSC::JSValue toJSArrayBufferView(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, WebCoreType* object)
+static JSC::JSValue toJSArrayBufferView(JSC::ExecState* exec, JSC::JSGlobalObject* globalObject, WebCoreType* object)
 {
+	ASSERT_UNUSED(globalObject, globalObject);
     if (!object)
         return JSC::jsNull();
-
-    if (JSDOMWrapper* wrapper = getCachedWrapper(currentWorld(exec), object))
-        return wrapper;
-
-    exec->heap()->reportExtraMemoryCost(object->byteLength());
-    return createWrapper<JSType>(exec, globalObject, object);
+	
+	exec->heap()->reportExtraMemoryCost(object->byteLength());
+	JSC::JSCell* jsCell = reinterpret_cast<JSC::JSCell*>(object);
+	return jsCell;
 }
 
 } // namespace WebCore

JavaScriptCore/runtime/TypedArrays/JSFloat32ArrayCustom.cpp

@@ -0,0 +1,61 @@
+/*
+ * 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
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#include "config.h"
+#include "JSFloat32Array.h"
+
+#include "JSArrayBufferViewHelper.h"
+#include <wtf/Float32Array.h>
+
+using namespace JSC;
+
+namespace WebCore {
+
+void JSFloat32Array::indexSetter(JSC::ExecState* exec, unsigned index, JSC::JSValue value)
+{
+    impl()->set(index, static_cast<float>(value.toNumber(exec)));
+}
+
+JSC::JSValue toJS(JSC::ExecState* exec, JSGlobalObject* globalObject, Float32Array* object)
+{
+    return toJSArrayBufferView<JSFloat32Array>(exec, globalObject, object);
+}
+
+JSC::JSValue JSFloat32Array::set(JSC::ExecState* exec)
+{
+    return setWebGLArrayHelper(exec, impl(), toFloat32Array);
+}
+
+EncodedJSValue JSC_HOST_CALL JSFloat32ArrayConstructor::constructJSFloat32Array(ExecState* exec)
+{
+    JSFloat32ArrayConstructor* jsConstructor = jsCast<JSFloat32ArrayConstructor*>(exec->callee());
+    RefPtr<Float32Array> array = constructArrayBufferView<Float32Array, float>(exec);
+    if (!array.get())
+        // Exception has already been thrown.
+        return JSValue::encode(JSValue());
+    return JSValue::encode(asObject(toJS(exec, jsConstructor->globalObject(), array.get())));
+}
+
+} // namespace WebCore