[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 71fa0c5a7f639fc7acb8ce19c7dbe4fca09409a9
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 19 00:50:58 2010 +0000

    2010-01-18  Zoltan Horvath  <zoltan at webkit.org>
    
            Reviewed by Darin Adler.
    
            Allow custom memory allocation control for UString class
            https://bugs.webkit.org/show_bug.cgi?id=27831
    
            Inherits the following class from FastAllocBase because it is
            instantiated by 'new' and no need to be copyable:
    
            class name     - instantiated at:
            classs UString - JavaScriptCore/runtime/UString.cpp:160
    
            * runtime/UString.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53438 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 189f8cc..d9afacc 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-01-18  Zoltan Horvath  <zoltan at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Allow custom memory allocation control for UString class
+        https://bugs.webkit.org/show_bug.cgi?id=27831
+
+        Inherits the following class from FastAllocBase because it is
+        instantiated by 'new' and no need to be copyable:
+
+        class name     - instantiated at:
+        classs UString - JavaScriptCore/runtime/UString.cpp:160
+
+        * runtime/UString.h:
+
 2010-01-18  Evan Cheng  <evan.cheng at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/JavaScriptCore/runtime/UString.h b/JavaScriptCore/runtime/UString.h
index 0c13689..57baaf9 100644
--- a/JavaScriptCore/runtime/UString.h
+++ b/JavaScriptCore/runtime/UString.h
@@ -74,7 +74,7 @@ namespace JSC {
 
     typedef Vector<char, 32> CStringBuffer;
 
-    class UString {
+    class UString : public FastAllocBase {
         friend class JIT;
 
     public:

-- 
WebKit Debian packaging