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

barraclough at apple.com barraclough at apple.com
Wed Dec 22 14:32:26 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 470d4c54bdee94c9c091c15eb99dd232d8e1fa89
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 12 22:05:49 2010 +0000

    Windows build fix.
    
    * wtf/text/StringBuilder.h:
    (WTF::StringBuilder::length):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69608 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 8729486..eb56a15 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-12  Gavin Barraclough  <barraclough at apple.com>
+
+        Windows build fix.
+
+        * wtf/text/StringBuilder.h:
+        (WTF::StringBuilder::length):
+
 2010-10-12  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Gavin Barraclough.
diff --git a/JavaScriptCore/wtf/text/StringBuilder.h b/JavaScriptCore/wtf/text/StringBuilder.h
index f938911..0ac0a7e 100644
--- a/JavaScriptCore/wtf/text/StringBuilder.h
+++ b/JavaScriptCore/wtf/text/StringBuilder.h
@@ -69,6 +69,9 @@ public:
     }
     void resize(size_t size) { m_buffer.resize(size); }
     size_t size() const { return m_buffer.size(); }
+    // FIXME: remove size(), above (strings have a length, not a size).
+    // also, should return an unsigned, not a size_t.
+    size_t length() const { return size(); }
 
     UChar operator[](size_t i) const { return m_buffer.at(i); }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list