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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 7696ae054835bb0f97b0549698d9aeb671e70325
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 19 08:16:03 2010 +0000

    2010-08-19  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Avoid unnecessary string copy in TextCodecQt::decode()
            https://bugs.webkit.org/show_bug.cgi?id=44232
    
            * platform/text/qt/TextCodecQt.cpp:
            (WebCore::TextCodecQt::decode): Use String::append(const UChar*, int)
            to avoid creating a temporary string.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65659 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 948da4a..9934fbf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-19  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Avoid unnecessary string copy in TextCodecQt::decode()
+        https://bugs.webkit.org/show_bug.cgi?id=44232
+
+        * platform/text/qt/TextCodecQt.cpp:
+        (WebCore::TextCodecQt::decode): Use String::append(const UChar*, int)
+        to avoid creating a temporary string.
+
 2010-08-19  Philippe Normand  <pnormand at igalia.com>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebCore/platform/text/qt/TextCodecQt.cpp b/WebCore/platform/text/qt/TextCodecQt.cpp
index 735d773..88c9500 100644
--- a/WebCore/platform/text/qt/TextCodecQt.cpp
+++ b/WebCore/platform/text/qt/TextCodecQt.cpp
@@ -110,7 +110,7 @@ String TextCodecQt::decode(const char* bytes, size_t length, bool flush, bool /*
         int size = end - buf;
         size = qMin(size, MaxInputChunkSize);
         QString decoded = m_codec->toUnicode(buf, size, &m_state);
-        unicode.append(decoded);
+        unicode.append(reinterpret_cast<const UChar*>(decoded.unicode()), decoded.length());
         buf += size;
     }
 

-- 
WebKit Debian packaging