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

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4252d66592bb528b0aaf9333faf1996da28dc05e
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 3 19:47:38 2010 +0000

    2010-12-03  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by David Levin.
    
            Use String::adopt in TextCodecWinCE::decode
            https://bugs.webkit.org/show_bug.cgi?id=50319
    
            * platform/text/wince/TextCodecWinCE.cpp:
            (WebCore::TextCodecWinCE::decode):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73282 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cfe6bc6..f9fde06 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-03  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by David Levin.
+
+        Use String::adopt in TextCodecWinCE::decode
+        https://bugs.webkit.org/show_bug.cgi?id=50319
+
+        * platform/text/wince/TextCodecWinCE.cpp:
+        (WebCore::TextCodecWinCE::decode):
+
 2010-12-03  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/WebCore/platform/text/wince/TextCodecWinCE.cpp b/WebCore/platform/text/wince/TextCodecWinCE.cpp
index da6d5a5..3532e74 100644
--- a/WebCore/platform/text/wince/TextCodecWinCE.cpp
+++ b/WebCore/platform/text/wince/TextCodecWinCE.cpp
@@ -333,8 +333,7 @@ String TextCodecWinCE::decode(const char* bytes, size_t length, bool flush, bool
         result.append(L'?');
         sawError = true;
         if (stopOnError)
-            return String(result.data(), result.size());
-
+            return String::adopt(result);
 
         if (left == 1)
             break;
@@ -351,7 +350,8 @@ String TextCodecWinCE::decode(const char* bytes, size_t length, bool flush, bool
         }
     } else
         m_decodeBuffer.clear();
-    return String(result.data(), result.size());
+
+    return String::adopt(result);
 }
 
 CString TextCodecWinCE::encode(const UChar* characters, size_t length, UnencodableHandling)

-- 
WebKit Debian packaging