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

[barraclough at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 90b42517e39536331f95428e6b3c29d0b9ec153f
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 12 21:20:06 2010 +0000

    Revert changes to ALWAYS_INLINEness of a couple of functions in UString.
    This appears to have degraded performance.
    
    Reviewed by Sam Weinig
    
    * runtime/UString.cpp:
    (JSC::UString::ascii):
    * runtime/UString.h:
    (JSC::UString::length):
    (JSC::UString::isEmpty):
    (JSC::UString::~UString):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65266 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index bbc9c90..a6dbf7e 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-12  Gavin Barraclough  <barraclough at apple.com>
+
+        Reviewed by Sam Weinig
+
+        Revert changes to ALWAYS_INLINEness of a couple of functions in UString.
+        This appears to have degraded performance.
+
+        * runtime/UString.cpp:
+        (JSC::UString::ascii):
+        * runtime/UString.h:
+        (JSC::UString::length):
+        (JSC::UString::isEmpty):
+        (JSC::UString::~UString):
+
 2010-08-12  Csaba Osztrogonác  <ossy at webkit.org>
 
         Reviewed by Antonio Gomes.
diff --git a/JavaScriptCore/runtime/UString.cpp b/JavaScriptCore/runtime/UString.cpp
index 4d8ab9e..32305db 100644
--- a/JavaScriptCore/runtime/UString.cpp
+++ b/JavaScriptCore/runtime/UString.cpp
@@ -197,7 +197,7 @@ char* UString::ascii() const
     delete[] asciiBuffer;
     asciiBuffer = new char[neededSize];
 
-    const UChar* p = characters(); // Don't roll me out!
+    const UChar* p = characters();
     char* q = asciiBuffer;
     const UChar* limit = p + len;
     while (p != limit) {
diff --git a/JavaScriptCore/runtime/UString.h b/JavaScriptCore/runtime/UString.h
index ecc00ba..e9c347d 100644
--- a/JavaScriptCore/runtime/UString.h
+++ b/JavaScriptCore/runtime/UString.h
@@ -86,7 +86,7 @@ public:
      */
     CString UTF8String(bool strict = false) const;
 
-    ALWAYS_INLINE unsigned length() const
+    unsigned length() const
     {
         if (!m_impl)
             return 0;
@@ -121,7 +121,7 @@ public:
     UString substr(unsigned pos = 0, unsigned len = 0xFFFFFFFF) const;
 
     bool isNull() const { return !m_impl; }
-    ALWAYS_INLINE bool isEmpty() const { return !m_impl || !m_impl->length(); }
+    bool isEmpty() const { return !m_impl || !m_impl->length(); }
 
     StringImpl* impl() const { return m_impl.get(); }
 
@@ -137,6 +137,7 @@ public:
         return m_impl->cost();
     }
 
+    ALWAYS_INLINE ~UString() { }
 private:
     RefPtr<StringImpl> m_impl;
 };
@@ -266,3 +267,5 @@ template <> struct VectorTraits<JSC::UString> : SimpleClassVectorTraits
 } // namespace WTF
 
 #endif
+
+#include "StringConcatenate.h"

-- 
WebKit Debian packaging