[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[barraclough at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit ce820c94ce002345f72e6298979887ed6af7b671
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 9 07:53:51 2010 +0000

    * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
    * runtime/StringPrototype.cpp:
    
    Reviewed by NOBODY (SL/win build fixes).
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54532 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index b899071..bea5ab4 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,12 @@
 2010-02-08  Gavin Barraclough  <barraclough at apple.com>
 
+        Reviewed by NOBODY (SL/win build fixes).
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
+        * runtime/StringPrototype.cpp:
+
+2010-02-08  Gavin Barraclough  <barraclough at apple.com>
+
         Reviewed by Oliver Hunt
 
         Make String.replace throw an exception on out-of-memory, rather than
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
index f98f741..6afef77 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
@@ -32,7 +32,6 @@ EXPORTS
     ??1ThreadCondition at WTF@@QAE at XZ
     ??1UStringImpl at JSC@@AAE at XZ
     ??2JSGlobalObject at JSC@@SAPAXIPAVJSGlobalData at 1@@Z
-    ??4UString at JSC@@QAEAAV01 at PBD@Z
     ??8JSC@@YA_NABVUString at 0@0 at Z
     ?NaN at JSC@@3NB
     ?UTF8String at UString@JSC@@QBE?AVCString at 2@_N at Z
diff --git a/JavaScriptCore/runtime/StringPrototype.cpp b/JavaScriptCore/runtime/StringPrototype.cpp
index 972bfa6..8c014ec 100644
--- a/JavaScriptCore/runtime/StringPrototype.cpp
+++ b/JavaScriptCore/runtime/StringPrototype.cpp
@@ -244,6 +244,7 @@ public:
     int length;
 };
 
+JSValue jsSpliceSubstringsWithSeparators(ExecState* exec, JSString* sourceVal, const UString& source, const StringRange* substringRanges, int rangeCount, const UString* separators, int separatorCount);
 JSValue jsSpliceSubstringsWithSeparators(ExecState* exec, JSString* sourceVal, const UString& source, const StringRange* substringRanges, int rangeCount, const UString* separators, int separatorCount)
 {
     if (rangeCount == 1 && separatorCount == 0) {
@@ -286,6 +287,7 @@ JSValue jsSpliceSubstringsWithSeparators(ExecState* exec, JSString* sourceVal, c
     return jsString(exec, impl);
 }
 
+JSValue jsReplaceRange(ExecState* exec, const UString& source, int rangeStart, int rangeLength, const UString& replacement);
 JSValue jsReplaceRange(ExecState* exec, const UString& source, int rangeStart, int rangeLength, const UString& replacement)
 {
     int replacementLength = replacement.size();

-- 
WebKit Debian packaging