diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
| commit | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch) | |
| tree | 988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/JavaScriptCore/JSCTypedArrayStubs.h | |
| parent | dd91e772430dc294e3bf478c119ef8d43c0a3358 (diff) | |
| download | qtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz | |
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/JavaScriptCore/JSCTypedArrayStubs.h')
| -rw-r--r-- | Source/JavaScriptCore/JSCTypedArrayStubs.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/Source/JavaScriptCore/JSCTypedArrayStubs.h b/Source/JavaScriptCore/JSCTypedArrayStubs.h index e3546ee65..ca4030186 100644 --- a/Source/JavaScriptCore/JSCTypedArrayStubs.h +++ b/Source/JavaScriptCore/JSCTypedArrayStubs.h @@ -26,19 +26,21 @@ #ifndef JSCTypedArrayStubs_h #define JSCTypedArrayStubs_h -#include "Float32Array.h" -#include "Float64Array.h" -#include "Int16Array.h" -#include "Int32Array.h" -#include "Int8Array.h" #include "JSObject.h" #include "ObjectPrototype.h" -#include "Uint16Array.h" -#include "Uint32Array.h" -#include "Uint8Array.h" +#include <wtf/Float32Array.h> +#include <wtf/Float64Array.h> +#include <wtf/Forward.h> +#include <wtf/Int16Array.h> +#include <wtf/Int32Array.h> +#include <wtf/Int8Array.h> +#include <wtf/Uint16Array.h> +#include <wtf/Uint32Array.h> +#include <wtf/Uint8Array.h> +#include <wtf/Uint8ClampedArray.h> namespace JSC { - + #define TYPED_ARRAY(name, type) \ class JS##name##Array : public JSNonFinalObject { \ public: \ @@ -54,7 +56,7 @@ public: \ static bool getOwnPropertyDescriptor(JSC::JSObject*, JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertyDescriptor&);\ static bool getOwnPropertySlotByIndex(JSC::JSCell*, JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&);\ static void put(JSC::JSCell*, JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&);\ - static void putByIndex(JSC::JSCell*, JSC::ExecState*, unsigned propertyName, JSC::JSValue);\ + static void putByIndex(JSC::JSCell*, JSC::ExecState*, unsigned propertyName, JSC::JSValue, bool);\ static const JSC::ClassInfo s_info;\ \ static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)\ @@ -186,8 +188,8 @@ static EncodedJSValue JSC_HOST_CALL constructJS##name##Array(ExecState* callFram return JSValue::encode(JS##name##Array::create(structure, callFrame->lexicalGlobalObject(), name##Array::create(length)));\ } -#if ENABLE(COMMANDLINE_TYPEDARRAYS) TYPED_ARRAY(Uint8, uint8_t); +TYPED_ARRAY(Uint8Clamped, uint8_t); TYPED_ARRAY(Uint16, uint16_t); TYPED_ARRAY(Uint32, uint32_t); TYPED_ARRAY(Int8, int8_t); @@ -195,7 +197,6 @@ TYPED_ARRAY(Int16, int16_t); TYPED_ARRAY(Int32, int32_t); TYPED_ARRAY(Float32, float); TYPED_ARRAY(Float64, double); -#endif } |