1 files changed, 37 insertions, 18 deletions

diff --git a/src/qml/jsruntime/qv4arraybuffer.cpp b/src/qml/jsruntime/qv4arraybuffer.cpp
index d170bde0e8..23075aa78c 100644
--- a/src/qml/jsruntime/qv4arraybuffer.cpp
+++ b/src/qml/jsruntime/qv4arraybuffer.cpp
@@ -46,34 +46,39 @@ using namespace QV4;
 DEFINE_OBJECT_VTABLE(ArrayBufferCtor);
 DEFINE_OBJECT_VTABLE(ArrayBuffer);
 
-Heap::ArrayBufferCtor::ArrayBufferCtor(QV4::ExecutionContext *scope)
-    : Heap::FunctionObject(scope, QStringLiteral("ArrayBuffer"))
+void Heap::ArrayBufferCtor::init(QV4::ExecutionContext *scope)
 {
+    Heap::FunctionObject::init(scope, QStringLiteral("ArrayBuffer"));
 }
 
-ReturnedValue ArrayBufferCtor::construct(const Managed *m, CallData *callData)
+void ArrayBufferCtor::construct(const Managed *m, Scope &scope, CallData *callData)
 {
     ExecutionEngine *v4 = static_cast<const Object *>(m)->engine();
 
-    Scope scope(v4);
     ScopedValue l(scope, callData->argument(0));
     double dl = l->toInteger();
-    if (v4->hasException)
-        return Encode::undefined();
+    if (v4->hasException) {
+        scope.result = Encode::undefined();
+        return;
+    }
     uint len = (uint)qBound(0., dl, (double)UINT_MAX);
-    if (len != dl)
-        return v4->throwRangeError(QLatin1String("ArrayBuffer constructor: invalid length"));
+    if (len != dl) {
+        scope.result = v4->throwRangeError(QLatin1String("ArrayBuffer constructor: invalid length"));
+        return;
+    }
 
     Scoped<ArrayBuffer> a(scope, v4->newArrayBuffer(len));
-    if (scope.engine->hasException)
-        return Encode::undefined();
-    return a.asReturnedValue();
+    if (scope.engine->hasException) {
+        scope.result = Encode::undefined();
+    } else {
+        scope.result = a->asReturnedValue();
+    }
 }
 
 
-ReturnedValue ArrayBufferCtor::call(const Managed *that, CallData *callData)
+void ArrayBufferCtor::call(const Managed *that, Scope &scope, CallData *callData)
 {
-    return construct(that, callData);
+    construct(that, scope, callData);
 }
 
 ReturnedValue ArrayBufferCtor::method_isView(CallContext *ctx)
@@ -89,8 +94,9 @@ ReturnedValue ArrayBufferCtor::method_isView(CallContext *ctx)
 }
 
 
-Heap::ArrayBuffer::ArrayBuffer(size_t length)
+void Heap::ArrayBuffer::init(size_t length)
 {
+    Object::init();
     data = QTypedArrayData<char>::allocate(length + 1);
     if (!data) {
         data = 0;
@@ -101,16 +107,18 @@ Heap::ArrayBuffer::ArrayBuffer(size_t length)
     memset(data->data(), 0, length + 1);
 }
 
-Heap::ArrayBuffer::ArrayBuffer(const QByteArray& array)
-    : data(const_cast<QByteArray&>(array).data_ptr())
+void Heap::ArrayBuffer::init(const QByteArray& array)
 {
+    Object::init();
+    data = const_cast<QByteArray&>(array).data_ptr();
     data->ref.ref();
 }
 
-Heap::ArrayBuffer::~ArrayBuffer()
+void Heap::ArrayBuffer::destroy()
 {
     if (!data->ref.deref())
         QTypedArrayData<char>::deallocate(data);
+    Object::destroy();
 }
 
 QByteArray ArrayBuffer::asByteArray() const
@@ -149,6 +157,7 @@ void ArrayBufferPrototype::init(ExecutionEngine *engine, Object *ctor)
     defineDefaultProperty(engine->id_constructor(), (o = ctor));
     defineAccessorProperty(QStringLiteral("byteLength"), method_get_byteLength, 0);
     defineDefaultProperty(QStringLiteral("slice"), method_slice, 2);
+    defineDefaultProperty(QStringLiteral("toString"), method_toString, 0);
 }
 
 ReturnedValue ArrayBufferPrototype::method_get_byteLength(CallContext *ctx)
@@ -184,7 +193,8 @@ ReturnedValue ArrayBufferPrototype::method_slice(CallContext *ctx)
     ScopedCallData callData(scope, 1);
     double newLen = qMax(final - first, 0.);
     callData->args[0] = QV4::Encode(newLen);
-    QV4::Scoped<ArrayBuffer> newBuffer(scope, constructor->construct(callData));
+    constructor->construct(scope, callData);
+    QV4::Scoped<ArrayBuffer> newBuffer(scope, scope.result.asReturnedValue());
     if (!newBuffer || newBuffer->d()->data->size < (int)newLen)
         return scope.engine->throwTypeError();
 
@@ -192,3 +202,12 @@ ReturnedValue ArrayBufferPrototype::method_slice(CallContext *ctx)
 
     return newBuffer.asReturnedValue();
 }
+
+ReturnedValue ArrayBufferPrototype::method_toString(CallContext *ctx)
+{
+    Scope scope(ctx);
+    Scoped<ArrayBuffer> a(scope, ctx->thisObject());
+    if (!a)
+        return Encode::undefined();
+    return Encode(ctx->engine()->newString(QString::fromUtf8(a->asByteArray())));
+}