diff options
| -rw-r--r-- | src/qml/jsruntime/qv4arrayobject.cpp | 2 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4typedarray.cpp | 51 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4typedarray_p.h | 1 | ||||
| -rw-r--r-- | tests/auto/qml/ecmascripttests/TestExpectations | 25 |
4 files changed, 53 insertions, 26 deletions
diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp index 450916fbf7..544be06664 100644 --- a/src/qml/jsruntime/qv4arrayobject.cpp +++ b/src/qml/jsruntime/qv4arrayobject.cpp @@ -432,7 +432,7 @@ ReturnedValue ArrayPrototype::method_copyWithin(const FunctionObject *b, const V double len = instance->getLength(); double target = argv[0].toInteger(); - double start = argv[1].toInteger(); + double start = argc > 1 ? argv[1].toInteger() : 0; double end = len; if (argc > 2 && !argv[2].isUndefined()) { diff --git a/src/qml/jsruntime/qv4typedarray.cpp b/src/qml/jsruntime/qv4typedarray.cpp index 625d0f9961..9b55bd26c7 100644 --- a/src/qml/jsruntime/qv4typedarray.cpp +++ b/src/qml/jsruntime/qv4typedarray.cpp @@ -482,6 +482,56 @@ ReturnedValue IntrinsicTypedArrayPrototype::method_get_length(const FunctionObje return Encode(v->d()->byteLength/v->d()->type->bytesPerElement); } +ReturnedValue IntrinsicTypedArrayPrototype::method_copyWithin(const FunctionObject *f, const Value *thisObject, const Value *argv, int argc) +{ + Scope scope(f); + Scoped<TypedArray> O(scope, thisObject); + if (!O || O->d()->buffer->isDetachedBuffer()) + return scope.engine->throwTypeError(); + + if (!argc) + return O->asReturnedValue(); + + qint64 len = static_cast<uint>(O->length()); + + qint64 to = static_cast<qint64>(argv[0].toInteger()); + if (to < 0) + to = qMax(len + to, 0ll); + else + to = qMin(to, len); + + qint64 from = (argc > 1) ? static_cast<qint64>(argv[1].toInteger()) : 0ll; + if (from < 0) + from = qMax(len + from, 0ll); + else + from = qMin(from, len); + + double fend = argv[2].toInteger(); + if (fend > len) + fend = len; + qint64 end = (argc > 2 && !argv[2].isUndefined()) ? static_cast<qint64>(fend) : len; + if (end < 0) + end = qMax(len + end, 0ll); + else + end = qMin(end, len); + + qint64 count = qMin(end - from, len - to); + + if (count <= 0) + return O->asReturnedValue(); + + if (O->d()->buffer->isDetachedBuffer()) + return scope.engine->throwTypeError(); + + if (from != to) { + int elementSize = O->d()->type->bytesPerElement; + char *data = O->d()->buffer->data->data() + O->d()->byteOffset; + memmove(data + to*elementSize, data + from*elementSize, count*elementSize); + } + + return O->asReturnedValue(); +} + ReturnedValue IntrinsicTypedArrayPrototype::method_entries(const FunctionObject *b, const Value *thisObject, const Value *, int) { Scope scope(b); @@ -721,6 +771,7 @@ void IntrinsicTypedArrayPrototype::init(ExecutionEngine *engine, IntrinsicTypedA defineAccessorProperty(QStringLiteral("byteOffset"), method_get_byteOffset, nullptr); defineAccessorProperty(QStringLiteral("length"), method_get_length, nullptr); + defineDefaultProperty(QStringLiteral("copyWithin"), method_copyWithin, 2); defineDefaultProperty(QStringLiteral("entries"), method_entries, 0); defineDefaultProperty(QStringLiteral("keys"), method_keys, 0); defineDefaultProperty(QStringLiteral("set"), method_set, 1); diff --git a/src/qml/jsruntime/qv4typedarray_p.h b/src/qml/jsruntime/qv4typedarray_p.h index 06292b7f8d..8696f5ae4a 100644 --- a/src/qml/jsruntime/qv4typedarray_p.h +++ b/src/qml/jsruntime/qv4typedarray_p.h @@ -174,6 +174,7 @@ struct IntrinsicTypedArrayPrototype : Object static ReturnedValue method_get_byteOffset(const FunctionObject *, const Value *thisObject, const Value *argv, int argc); static ReturnedValue method_get_length(const FunctionObject *, const Value *thisObject, const Value *argv, int argc); + static ReturnedValue method_copyWithin(const FunctionObject *, const Value *thisObject, const Value *argv, int argc); static ReturnedValue method_entries(const FunctionObject *, const Value *thisObject, const Value *argv, int argc); static ReturnedValue method_keys(const FunctionObject *, const Value *thisObject, const Value *argv, int argc); static ReturnedValue method_values(const FunctionObject *, const Value *thisObject, const Value *argv, int argc); diff --git a/tests/auto/qml/ecmascripttests/TestExpectations b/tests/auto/qml/ecmascripttests/TestExpectations index 8214781f5b..ec9c18967d 100644 --- a/tests/auto/qml/ecmascripttests/TestExpectations +++ b/tests/auto/qml/ecmascripttests/TestExpectations @@ -684,31 +684,6 @@ built-ins/TypedArray/from/length.js fails built-ins/TypedArray/from/name.js fails built-ins/TypedArray/from/prop-desc.js fails built-ins/TypedArray/prototype/constructor.js fails -built-ins/TypedArray/prototype/copyWithin/bit-precision.js fails -built-ins/TypedArray/prototype/copyWithin/coerced-values-end.js fails -built-ins/TypedArray/prototype/copyWithin/coerced-values-start.js fails -built-ins/TypedArray/prototype/copyWithin/coerced-values-target.js fails -built-ins/TypedArray/prototype/copyWithin/get-length-ignores-length-prop.js fails -built-ins/TypedArray/prototype/copyWithin/invoked-as-func.js fails -built-ins/TypedArray/prototype/copyWithin/invoked-as-method.js fails -built-ins/TypedArray/prototype/copyWithin/length.js fails -built-ins/TypedArray/prototype/copyWithin/name.js fails -built-ins/TypedArray/prototype/copyWithin/negative-end.js fails -built-ins/TypedArray/prototype/copyWithin/negative-out-of-bounds-end.js fails -built-ins/TypedArray/prototype/copyWithin/negative-out-of-bounds-start.js fails -built-ins/TypedArray/prototype/copyWithin/negative-out-of-bounds-target.js fails -built-ins/TypedArray/prototype/copyWithin/negative-start.js fails -built-ins/TypedArray/prototype/copyWithin/negative-target.js fails -built-ins/TypedArray/prototype/copyWithin/non-negative-out-of-bounds-end.js fails -built-ins/TypedArray/prototype/copyWithin/non-negative-out-of-bounds-target-and-start.js fails -built-ins/TypedArray/prototype/copyWithin/non-negative-target-and-start.js fails -built-ins/TypedArray/prototype/copyWithin/non-negative-target-start-and-end.js fails -built-ins/TypedArray/prototype/copyWithin/prop-desc.js fails -built-ins/TypedArray/prototype/copyWithin/return-abrupt-from-end.js fails -built-ins/TypedArray/prototype/copyWithin/return-abrupt-from-start.js fails -built-ins/TypedArray/prototype/copyWithin/return-abrupt-from-target.js fails -built-ins/TypedArray/prototype/copyWithin/return-this.js fails -built-ins/TypedArray/prototype/copyWithin/undefined-end.js fails built-ins/TypedArray/prototype/every/callbackfn-arguments-with-thisarg.js fails built-ins/TypedArray/prototype/every/callbackfn-arguments-without-thisarg.js fails built-ins/TypedArray/prototype/every/callbackfn-detachbuffer.js fails |