1 files changed, 8 insertions, 14 deletions

diff --git a/src/qml/jsruntime/qv4typedarray.cpp b/src/qml/jsruntime/qv4typedarray.cpp
index 5573a2e57f..a34a8922e1 100644
--- a/src/qml/jsruntime/qv4typedarray.cpp
+++ b/src/qml/jsruntime/qv4typedarray.cpp
@@ -229,8 +229,8 @@ void TypedArrayCtor::construct(const Managed *m, Scope &scope, CallData *callDat
             return;
         }
 
-        Scoped<TypedArray > array(scope, TypedArray::create(scope.engine, that->d()->type));
-        array->d()->buffer = buffer->d();
+        Scoped<TypedArray> array(scope, TypedArray::create(scope.engine, that->d()->type));
+        array->d()->buffer.set(scope.engine, buffer->d());
         array->d()->byteLength = byteLength;
         array->d()->byteOffset = 0;
 
@@ -252,8 +252,8 @@ void TypedArrayCtor::construct(const Managed *m, Scope &scope, CallData *callDat
             return;
         }
 
-        Scoped<TypedArray > array(scope, TypedArray::create(scope.engine, that->d()->type));
-        array->d()->buffer = newBuffer->d();
+        Scoped<TypedArray> array(scope, TypedArray::create(scope.engine, that->d()->type));
+        array->d()->buffer.set(scope.engine, newBuffer->d());
         array->d()->byteLength = destByteLength;
         array->d()->byteOffset = 0;
 
@@ -311,8 +311,8 @@ void TypedArrayCtor::construct(const Managed *m, Scope &scope, CallData *callDat
             byteLength = (uint)l;
         }
 
-        Scoped<TypedArray > array(scope, TypedArray::create(scope.engine, that->d()->type));
-        array->d()->buffer = buffer->d();
+        Scoped<TypedArray> array(scope, TypedArray::create(scope.engine, that->d()->type));
+        array->d()->buffer.set(scope.engine, buffer->d());
         array->d()->byteLength = byteLength;
         array->d()->byteOffset = byteOffset;
         scope.result = array.asReturnedValue();
@@ -335,8 +335,8 @@ void TypedArrayCtor::construct(const Managed *m, Scope &scope, CallData *callDat
         return;
     }
 
-    Scoped<TypedArray > array(scope, TypedArray::create(scope.engine, that->d()->type));
-    array->d()->buffer = newBuffer->d();
+    Scoped<TypedArray> array(scope, TypedArray::create(scope.engine, that->d()->type));
+    array->d()->buffer.set(scope.engine, newBuffer->d());
     array->d()->byteLength = l * elementSize;
     array->d()->byteOffset = 0;
 
@@ -375,12 +375,6 @@ Heap::TypedArray *TypedArray::create(ExecutionEngine *e, Heap::TypedArray::Type
     return e->memoryManager->allocObject<TypedArray>(e->emptyClass, e->typedArrayPrototype + t, t);
 }
 
-void TypedArray::markObjects(Heap::Base *that, ExecutionEngine *e)
-{
-    static_cast<TypedArray::Data *>(that)->buffer->mark(e);
-    Object::markObjects(that, e);
-}
-
 ReturnedValue TypedArray::getIndexed(const Managed *m, uint index, bool *hasProperty)
 {
     Scope scope(static_cast<const Object *>(m)->engine());