Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
	src/qml/qml/qqmlbinding.cpp
	src/qml/jsruntime/qv4arraybuffer.cpp
	src/qml/jsruntime/qv4functionobject.cpp

Change-Id: Ic752e9dfd69b282093651c9234c110a49762f06d

1 files changed, 26 insertions, 0 deletions

diff --git a/src/qml/jsruntime/qv4arraybuffer.cpp b/src/qml/jsruntime/qv4arraybuffer.cpp
index 432d70f151..145e400c20 100644
--- a/src/qml/jsruntime/qv4arraybuffer.cpp
+++ b/src/qml/jsruntime/qv4arraybuffer.cpp
@@ -95,6 +95,13 @@ Heap::ArrayBuffer::ArrayBuffer(ExecutionEngine *e, size_t length)
     memset(data->data(), 0, length + 1);
 }
 
+Heap::ArrayBuffer::ArrayBuffer(ExecutionEngine *e, const QByteArray& array)
+    : Heap::Object(e->emptyClass, e->arrayBufferPrototype.as<QV4::Object>())
+    , data(const_cast<QByteArray&>(array).data_ptr())
+{
+    data->ref.ref();
+}
+
 Heap::ArrayBuffer::~ArrayBuffer()
 {
     if (!data->ref.deref())
@@ -108,6 +115,25 @@ QByteArray ArrayBuffer::asByteArray() const
     return QByteArray(ba);
 }
 
+void ArrayBuffer::detach() {
+    if (!d()->data->ref.isShared())
+        return;
+
+    QTypedArrayData<char> *oldData = d()->data;
+
+    d()->data = QTypedArrayData<char>::allocate(oldData->size + 1);
+    if (!d()->data) {
+        engine()->throwRangeError(QStringLiteral("ArrayBuffer: out of memory"));
+        return;
+    }
+
+    memcpy(d()->data->data(), oldData->data(), oldData->size + 1);
+
+    if (!oldData->ref.deref())
+        QTypedArrayData<char>::deallocate(oldData);
+}
+
+
 void ArrayBufferPrototype::init(ExecutionEngine *engine, Object *ctor)
 {
     Scope scope(engine);