[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 91b290588a8dec7bb62849092917787e74ab0dfe
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 19 15:05:53 2010 +0000

    2010-07-19  Robin Burchell  <robin.burchell at collabora.co.uk>
    
            Reviewed by Antonio Gomes
    
            [Qt] Use memcpy() instead of qMemCopy()
            This is supposed to be more efficient, as the compiler is able to
            optimise more.
    
            Additionally,  qMemCopy() is only strictly supposed to be used in
            headers (see Qt's src/corelib/qglobal.h for reference)
            See: https://bugs.webkit.org/show_bug.cgi?id=42392
    
            * bridge/qt/qt_runtime.cpp:
            (JSC::Bindings::convertQVariantToValue):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63660 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 47b004a..0e60efc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-19  Robin Burchell  <robin.burchell at collabora.co.uk>
+
+        Reviewed by Antonio Gomes
+
+        [Qt] Use memcpy() instead of qMemCopy()
+        This is supposed to be more efficient, as the compiler is able to
+        optimise more.
+
+        Additionally,  qMemCopy() is only strictly supposed to be used in
+        headers (see Qt's src/corelib/qglobal.h for reference)
+        See: https://bugs.webkit.org/show_bug.cgi?id=42392
+
+        * bridge/qt/qt_runtime.cpp:
+        (JSC::Bindings::convertQVariantToValue):
+
 2010-07-14  Andreas Kling  <andreas.kling at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/bridge/qt/qt_runtime.cpp b/WebCore/bridge/qt/qt_runtime.cpp
index 77a6716..cfab3a2 100644
--- a/WebCore/bridge/qt/qt_runtime.cpp
+++ b/WebCore/bridge/qt/qt_runtime.cpp
@@ -869,7 +869,7 @@ JSValue convertQVariantToValue(ExecState* exec, PassRefPtr<RootObject> root, con
     if (type == QMetaType::QByteArray) {
         QByteArray qtByteArray = variant.value<QByteArray>();
         WTF::RefPtr<WTF::ByteArray> wtfByteArray = WTF::ByteArray::create(qtByteArray.length());
-        qMemCopy(wtfByteArray->data(), qtByteArray.constData(), qtByteArray.length());
+        memcpy(wtfByteArray->data(), qtByteArray.constData(), qtByteArray.length());
         return new (exec) JSC::JSByteArray(exec, JSC::JSByteArray::createStructure(jsNull()), wtfByteArray.get());
     }
 

-- 
WebKit Debian packaging