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

[robert at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 244deab6193ae1c832981a16dcba43c9767f74f1
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 20:57:33 2010 +0000

    2010-09-08  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            Remove some unnecessary duplicate calls to string functions
    
            https://bugs.webkit.org/show_bug.cgi?id=45314
    
            * wtf/text/WTFString.cpp:
            (WTF::String::format):
    2010-09-08  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            Remove some unnecessary duplicate calls to string functions
    
            https://bugs.webkit.org/show_bug.cgi?id=45314
    
            * platform/network/curl/ResourceHandleManager.cpp:
            (WebCore::parseDataUrl):
            * websockets/WebSocketChannel.cpp:
            (WebCore::WebSocketChannel::send):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67012 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 77446f7..a494620 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-08  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        Remove some unnecessary duplicate calls to string functions
+
+        https://bugs.webkit.org/show_bug.cgi?id=45314
+
+        * wtf/text/WTFString.cpp:
+        (WTF::String::format):
+
 2010-09-08  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/JavaScriptCore/wtf/text/WTFString.cpp b/JavaScriptCore/wtf/text/WTFString.cpp
index 853e1b5..9b53e81 100644
--- a/JavaScriptCore/wtf/text/WTFString.cpp
+++ b/JavaScriptCore/wtf/text/WTFString.cpp
@@ -335,7 +335,8 @@ String String::format(const char *format, ...)
 
     va_end(args);
 
-    return StringImpl::create(buffer.toUtf8().constData(), buffer.toUtf8().length());
+    QByteArray ba = buffer.toUtf8();
+    return StringImpl::create(ba.constData(), ba.length());
 
 #elif OS(WINCE)
     va_list args;
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fcff9ad..b496766 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-08  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        Remove some unnecessary duplicate calls to string functions
+
+        https://bugs.webkit.org/show_bug.cgi?id=45314
+
+        * platform/network/curl/ResourceHandleManager.cpp:
+        (WebCore::parseDataUrl):
+        * websockets/WebSocketChannel.cpp:
+        (WebCore::WebSocketChannel::send):
+
 2010-09-08  Peter Kasting  <pkasting at google.com>
 
         Not reviewed, fallout from http://trac.webkit.org/changeset/67001
diff --git a/WebCore/platform/network/curl/ResourceHandleManager.cpp b/WebCore/platform/network/curl/ResourceHandleManager.cpp
index ba68351..8d2a1bf 100644
--- a/WebCore/platform/network/curl/ResourceHandleManager.cpp
+++ b/WebCore/platform/network/curl/ResourceHandleManager.cpp
@@ -612,7 +612,8 @@ static void parseDataUrl(ResourceHandle* handle)
 
         // WebCore's decoder fails on Acid3 test 97 (whitespace).
         Vector<char> out;
-        if (base64Decode(data.latin1().data(), data.latin1().length(), out) && out.size() > 0)
+        CString latin1 = data.latin1();
+        if (base64Decode(latin1.data(), latin1.length(), out) && out.size() > 0)
             client->didReceiveData(handle, out.data(), out.size(), 0);
     } else {
         // We have to convert to UTF-16 early due to limitations in KURL
diff --git a/WebCore/websockets/WebSocketChannel.cpp b/WebCore/websockets/WebSocketChannel.cpp
index 54be16a..a09224d 100644
--- a/WebCore/websockets/WebSocketChannel.cpp
+++ b/WebCore/websockets/WebSocketChannel.cpp
@@ -88,7 +88,8 @@ bool WebSocketChannel::send(const String& msg)
     ASSERT(!m_suspended);
     Vector<char> buf;
     buf.append('\0');  // frame type
-    buf.append(msg.utf8().data(), msg.utf8().length());
+    CString utf8 = msg.utf8();
+    buf.append(utf8.data(), utf8.length());
     buf.append('\xff');  // frame end
     return m_handle->send(buf.data(), buf.size());
 }

-- 
WebKit Debian packaging