diff options
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSByteArray.cpp')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSByteArray.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSByteArray.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSByteArray.cpp index 4a19038..2a5e72f 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSByteArray.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSByteArray.cpp @@ -29,6 +29,8 @@ #include "JSGlobalObject.h" #include "PropertyNameArray.h" +using namespace WTF; + namespace JSC { const ClassInfo JSByteArray::s_defaultInfo = { "ByteArray", 0, 0, 0 }; @@ -41,7 +43,7 @@ JSByteArray::JSByteArray(ExecState* exec, PassRefPtr<Structure> structure, ByteA putDirect(exec->globalData().propertyNames->length, jsNumber(exec, m_storage->length()), ReadOnly | DontDelete); } -PassRefPtr<Structure> JSByteArray::createStructure(JSValuePtr prototype) +PassRefPtr<Structure> JSByteArray::createStructure(JSValue prototype) { PassRefPtr<Structure> result = Structure::create(prototype, TypeInfo(ObjectType)); return result; @@ -52,7 +54,7 @@ bool JSByteArray::getOwnPropertySlot(ExecState* exec, const Identifier& property bool ok; unsigned index = propertyName.toUInt32(&ok, false); if (ok && canAccessIndex(index)) { - slot.setValue(getIndex(index)); + slot.setValue(getIndex(exec, index)); return true; } return JSObject::getOwnPropertySlot(exec, propertyName, slot); @@ -61,13 +63,13 @@ bool JSByteArray::getOwnPropertySlot(ExecState* exec, const Identifier& property bool JSByteArray::getOwnPropertySlot(ExecState* exec, unsigned propertyName, PropertySlot& slot) { if (canAccessIndex(propertyName)) { - slot.setValue(getIndex(propertyName)); + slot.setValue(getIndex(exec, propertyName)); return true; } return JSObject::getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot); } -void JSByteArray::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSByteArray::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { bool ok; unsigned index = propertyName.toUInt32(&ok, false); @@ -78,7 +80,7 @@ void JSByteArray::put(ExecState* exec, const Identifier& propertyName, JSValuePt JSObject::put(exec, propertyName, value, slot); } -void JSByteArray::put(ExecState* exec, unsigned propertyName, JSValuePtr value) +void JSByteArray::put(ExecState* exec, unsigned propertyName, JSValue value) { setIndex(exec, propertyName, value); } |