[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 a7233f1cd198b1253c5ab30327784bae1cb1e0e6
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 13 02:29:31 2010 +0000

    Eeerk! - revert accidentally committed changes in UString!
    
    * JavaScriptCore.exp:
    * runtime/UString.cpp:
    (JSC::UString::UString):
    * runtime/UString.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65289 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 3ffb511..fc8b54f 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,14 @@
 2010-08-12  Gavin Barraclough  <barraclough at apple.com>
 
+        Eeerk! - revert accidentally committed changes in UString!
+
+        * JavaScriptCore.exp:
+        * runtime/UString.cpp:
+        (JSC::UString::UString):
+        * runtime/UString.h:
+
+2010-08-12  Gavin Barraclough  <barraclough at apple.com>
+
         Reviewed by Sam Weinig
 
         Change UString constructors to match those in WTF::String.
diff --git a/JavaScriptCore/JavaScriptCore.exp b/JavaScriptCore/JavaScriptCore.exp
index a7a8588..50ec307 100644
--- a/JavaScriptCore/JavaScriptCore.exp
+++ b/JavaScriptCore/JavaScriptCore.exp
@@ -255,6 +255,10 @@ __ZN3JSC7UString6numberEd
 __ZN3JSC7UString6numberEi
 __ZN3JSC7UString6numberEj
 __ZN3JSC7UString6numberEl
+__ZN3JSC7UStringC1EPKc
+__ZN3JSC7UStringC1EPKcj
+__ZN3JSC7UStringC1EPKt
+__ZN3JSC7UStringC1EPKtj
 __ZN3JSC8Debugger23recompileAllJSFunctionsEPNS_12JSGlobalDataE
 __ZN3JSC8Debugger6attachEPNS_14JSGlobalObjectE
 __ZN3JSC8Debugger6detachEPNS_14JSGlobalObjectE
diff --git a/JavaScriptCore/runtime/UString.cpp b/JavaScriptCore/runtime/UString.cpp
index b884647..ee7e242 100644
--- a/JavaScriptCore/runtime/UString.cpp
+++ b/JavaScriptCore/runtime/UString.cpp
@@ -56,10 +56,13 @@ extern const double Inf;
 
 COMPILE_ASSERT(sizeof(UString) == sizeof(void*), UString_should_stay_small);
 
-//    UString::UString(const UChar* characters, unsigned length)
-//        : m_impl(characters ? StringImpl::create(characters, length) : 0)
-//    {
-//    }
+// Construct a string with UTF-16 data.
+UString::UString(const UChar* characters, unsigned length)
+    : m_impl(characters ? StringImpl::create(characters, length) : 0)
+{
+}
+
+// Construct a string with UTF-16 data, from a null-terminated source.
 UString::UString(const UChar* characters)
 {
     if (!characters)
@@ -71,14 +74,18 @@ UString::UString(const UChar* characters)
 
     m_impl = StringImpl::create(characters, length);
 }
-//    UString::UString(const char* characters)
-//        : m_impl(characters ? StringImpl::create(characters) : 0)
-//    {
-//    }
-//    UString::UString(const char* characters, unsigned length)
-//        : m_impl(characters ? StringImpl::create(characters, length) : 0)
-//    {
-//    }
+
+// Construct a string with latin1 data.
+UString::UString(const char* characters, unsigned length)
+    : m_impl(characters ? StringImpl::create(characters, length) : 0)
+{
+}
+
+// Construct a string with latin1 data, from a null-terminated source.
+UString::UString(const char* characters)
+    : m_impl(characters ? StringImpl::create(characters) : 0)
+{
+}
 
 UString UString::number(int i)
 {
diff --git a/JavaScriptCore/runtime/UString.h b/JavaScriptCore/runtime/UString.h
index 0aef693..1b6c33e 100644
--- a/JavaScriptCore/runtime/UString.h
+++ b/JavaScriptCore/runtime/UString.h
@@ -47,25 +47,16 @@ public:
     UString() { }
 
     // Construct a string with UTF-16 data.
-    UString(const UChar* characters, unsigned length)
-        : m_impl(characters ? StringImpl::create(characters, length) : 0)
-    {
-    }
+    UString(const UChar* characters, unsigned length);
 
     // Construct a string with UTF-16 data, from a null-terminated source.
     UString(const UChar*);
 
     // Construct a string with latin1 data.
-    UString(const char* characters)
-        : m_impl(characters ? StringImpl::create(characters) : 0)
-    {
-    }
+    UString(const char* characters);
 
     // Construct a string with latin1 data, from a null-terminated source.
-    UString(const char* characters, unsigned length)
-        : m_impl(characters ? StringImpl::create(characters, length) : 0)
-    {
-    }
+    UString(const char* characters, unsigned length);
 
     // Construct a string referencing an existing StringImpl.
     UString(StringImpl* impl) : m_impl(impl) { }

-- 
WebKit Debian packaging