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

[jianli at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit ff6bcf623685e29de8eaf9bc6093893f9c96acd0
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 17:52:22 2010 +0000

    Rename addTwoCStrings to concatenateTwoCStrings.
    
    Rubber-stamped by David Levin.
    
    * fileapi/BlobBuilder.cpp:
    (WebCore::concatenateTwoCStrings):
    (WebCore::BlobBuilder::append):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66505 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 88a4372..3f11764 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,15 @@
 2010-08-31  Jian Li  <jianli at chromium.org>
 
+        Rubber-stamped by David Levin.
+
+        Rename addTwoCStrings to concatenateTwoCStrings.
+
+        * fileapi/BlobBuilder.cpp:
+        (WebCore::concatenateTwoCStrings):
+        (WebCore::BlobBuilder::append):
+
+2010-08-31  Jian Li  <jianli at chromium.org>
+
         Reviewed by Darin Fisher.
 
         Improve BlobBuilder to combine adjacent strings.
diff --git a/WebCore/fileapi/BlobBuilder.cpp b/WebCore/fileapi/BlobBuilder.cpp
index ff024ab..e10df6b 100644
--- a/WebCore/fileapi/BlobBuilder.cpp
+++ b/WebCore/fileapi/BlobBuilder.cpp
@@ -57,7 +57,7 @@ static CString convertToCString(const String& text, const String& endingType, Ex
     return CString();
 }
 
-static CString addTwoCStrings(const CString& a, const CString& b)
+static CString concatenateTwoCStrings(const CString& a, const CString& b)
 {
     if (a.isNull() && b.isNull())
         return CString();
@@ -86,7 +86,7 @@ bool BlobBuilder::append(const String& text, const String& endingType, Exception
 
     // If the last item is a string, concatenate it with current string.
     if (!m_items.isEmpty() && m_items[m_items.size() - 1].type == BlobDataItem::Data)
-        m_items[m_items.size() - 1].data = addTwoCStrings(m_items[m_items.size() - 1].data, cstr);
+        m_items[m_items.size() - 1].data = concatenateTwoCStrings(m_items[m_items.size() - 1].data, cstr);
     else
         m_items.append(BlobDataItem(cstr));
     return true;

-- 
WebKit Debian packaging