1 files changed, 14 insertions, 12 deletions
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index 58d8322675..08f3d35e46 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -1597,10 +1597,12 @@ struct QQmlXMLHttpRequestWrapper : Object {
     QQmlXMLHttpRequest *request;
 };
 
-struct QQmlXMLHttpRequestCtor : FunctionObject {
-    void init(ExecutionEngine *engine);
+#define QQmlXMLHttpRequestCtorMembers(class, Member) \
+    Member(class, Pointer, Object *, proto)
 
-    Pointer<Object> proto;
+DECLARE_HEAP_OBJECT(QQmlXMLHttpRequestCtor, FunctionObject) {
+    DECLARE_MARK_TABLE(QQmlXMLHttpRequestCtor);
+    void init(ExecutionEngine *engine);
 };
 
 }
@@ -1614,12 +1616,7 @@ struct QQmlXMLHttpRequestWrapper : public Object
 struct QQmlXMLHttpRequestCtor : public FunctionObject
 {
     V4_OBJECT2(QQmlXMLHttpRequestCtor, FunctionObject)
-    static void markObjects(Heap::Base *that, ExecutionEngine *e) {
-        QQmlXMLHttpRequestCtor::Data *c = static_cast<QQmlXMLHttpRequestCtor::Data *>(that);
-        if (c->proto)
-            c->proto->mark(e);
-        FunctionObject::markObjects(that, e);
-    }
+
     static void construct(const Managed *that, Scope &scope, QV4::CallData *)
     {
         Scoped<QQmlXMLHttpRequestCtor> ctor(scope, that->as<QQmlXMLHttpRequestCtor>());
@@ -1686,7 +1683,7 @@ void QQmlXMLHttpRequestCtor::setupProto()
     ExecutionEngine *v4 = engine();
     Scope scope(v4);
     ScopedObject p(scope, v4->newObject());
-    d()->proto = p->d();
+    d()->proto.set(scope.engine, p->d());
 
     // Methods
     p->defineDefaultProperty(QStringLiteral("open"), method_open);
@@ -1826,8 +1823,13 @@ void QQmlXMLHttpRequestCtor::method_send(const QV4::BuiltinFunction *, QV4::Scop
         THROW_DOM(DOMEXCEPTION_INVALID_STATE_ERR, "Invalid state");
 
     QByteArray data;
-    if (callData->argc > 0)
-        data = callData->args[0].toQStringNoThrow().toUtf8();
+    if (callData->argc > 0) {
+        if (const ArrayBuffer *buffer = callData->args[0].as<ArrayBuffer>()) {
+            data = buffer->asByteArray();
+        } else {
+            data = callData->args[0].toQStringNoThrow().toUtf8();
+        }
+    }
 
     scope.result = r->send(w, scope.engine->callingQmlContext(), data);
 }