WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/bridge/qt/qt_runtime.cpp

 /*
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *  Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
 
 #include "config.h"
 #include "qt_runtime.h"
 
 #include "DateInstance.h"
 #include "DateMath.h"
 #include "DatePrototype.h"
 #include "FunctionPrototype.h"
+#include "Interpreter.h"
 #include "JSArray.h"
+#include "JSByteArray.h"
 #include "JSDOMBinding.h"
 #include "JSGlobalObject.h"
 #include "JSLock.h"
 #include "JSObject.h"
 #include "ObjectPrototype.h"
 #include "PropertyNameArray.h"
 #include "RegExpConstructor.h"
 #include "RegExpObject.h"
 #include "qdatetime.h"
 #include "qdebug.h"
@@ skipping 50 matching lines @@
     Variant = 0,
     Number,
     Boolean,
     String,
     Date,
     RegExp,
     Array,
     QObj,
     Object,
     Null,
-    RTArray
+    RTArray,
+    JSByteArray
 } JSRealType;
 
 #if defined(QTWK_RUNTIME_CONVERSION_DEBUG) || defined(QTWK_RUNTIME_MATCH_DEBUG)
 QDebug operator<<(QDebug dbg, const JSRealType &c)
 {
      const char *map[] = { "Variant", "Number", "Boolean", "String", "Date",
          "RegExp", "Array", "RTObject", "Object", "Null", "RTArray"};
 
      dbg.nospace() << "JSType(" << ((int)c) << ", " <<  map[c] << ")";
 
      return dbg.space();
 }
 #endif
 
 static JSRealType valueRealType(ExecState* exec, JSValuePtr val)
 {
     if (val.isNumber())
         return Number;
     else if (val.isString())
         return String;
     else if (val.isBoolean())
         return Boolean;
     else if (val.isNull())
         return Null;
+    else if (exec->interpreter()->isJSByteArray(val))
+        return JSByteArray;
     else if (val.isObject()) {
         JSObject *object = val.toObject(exec);
         if (object->inherits(&RuntimeArray::s_info))  // RuntimeArray 'inherits' from Array, but not in C++
             return RTArray;
         else if (object->inherits(&JSArray::info))
             return Array;
         else if (object->inherits(&DateInstance::info))
             return Date;
         else if (object->inherits(&RegExpObject::info))
             return RegExp;
@@ skipping 50 matching lines @@
                 if (object->inherits(&NumberObject::info))
                     hint = QMetaType::Double;
                 else if (object->inherits(&BooleanObject::info))
                     hint = QMetaType::Bool;
                 else
                     hint = QMetaType::QVariantMap;
                 break;
             case QObj:
                 hint = QMetaType::QObjectStar;
                 break;
+            case JSByteArray:
+                hint = QMetaType::QByteArray;
+                break;
             case Array:
             case RTArray:
                 hint = QMetaType::QVariantList;
                 break;
         }
     }
 
     qConvDebug() << "convertValueToQVariant: jstype is " << type << ", hint is" << hint;
 
     if (value == jsNull()
@@ skipping 215 matching lines @@
                 QString qstring = QString::fromUtf16((const ushort*)ustring.rep()->data(),ustring.size());
                 QStringList result;
                 result.append(qstring);
                 ret = QVariant(result);
                 dist = 10;
             }
             break;
         }
 
         case QMetaType::QByteArray: {
-            UString ustring = value.toString(exec);
-            ret = QVariant(QString::fromUtf16((const ushort*)ustring.rep()->data(),ustring.size()).toLatin1());
-            if (type == String)
-                dist = 5;
-            else
-                dist = 10;
+            if (type == JSByteArray) {
+                WTF::ByteArray* arr = asByteArray(value)->storage();
+                ret = QVariant(QByteArray(reinterpret_cast<const char*>(arr->data()), arr->length()));
+                dist = 0;
+            } else {
+                UString ustring = value.toString(exec);
+                ret = QVariant(QString::fromUtf16((const ushort*)ustring.rep()->data(),ustring.size()).toLatin1());
+                if (type == String)
+                    dist = 5;
+                else
+                    dist = 10;
+            }
             break;
         }
 
         case QMetaType::QDateTime:
         case QMetaType::QDate:
         case QMetaType::QTime:
             if (type == Date) {
                 DateInstance* date = static_cast<DateInstance*>(object);
                 GregorianDateTime gdt;
                 date->getUTCTime(gdt);
@@ skipping 371 matching lines @@
         dt.second = time.second();
         dt.isDST = -1;
         double ms = JSC::gregorianDateTimeToMS(dt, time.msec(), /*inputIsUTC*/ false);
 
         DateInstance* instance = new (exec) DateInstance(exec->lexicalGlobalObject()->dateStructure());
         instance->setInternalValue(jsNumber(exec, trunc(ms)));
         return instance;
     }
 
     if (type == QMetaType::QByteArray) {
-        QByteArray ba = variant.value<QByteArray>();
-        UString ustring(ba.constData());
-        return jsString(exec, ustring);
+        QByteArray qtByteArray = variant.value<QByteArray>();
+        WTF::RefPtr<WTF::ByteArray> wtfByteArray = WTF::ByteArray::create(qtByteArray.length());
+        qMemCopy(wtfByteArray->data(), qtByteArray.constData(), qtByteArray.length());
+        return new (exec) JSC::JSByteArray(exec, JSC::JSByteArray::createStructure(jsNull()), wtfByteArray.get());
     }
 
     if (type == QMetaType::QObjectStar || type == QMetaType::QWidgetStar) {
         QObject* obj = variant.value<QObject*>();
         return QtInstance::getQtInstance(obj, root)->createRuntimeObject(exec);
     }
 
     if (type == QMetaType::QVariantMap) {
         // create a new object, and stuff properties into it
         JSObject* ret = constructEmptyObject(exec);
@@ skipping 911 matching lines @@
         return convertQVariantToValue(exec, rootObject(), QVariant::fromValue(val));
     }
 
     return jsUndefined();
 }
 
 // ===============
 
 } }