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

[darin at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 08a2cff75287ef8b96aa5b7f25b04de7f13c7d72
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 19 01:19:37 2010 +0000

    Fix build by reverting the previous change.
    
    * runtime/UString.h: Rolled out the FastAllocBase base class.
    It was making UString larger, and therefore JSString larger,
    and too big for a garbage collection cell.
    
    This raises the unpleasant possibility that many classes became
    larger because we added the FastAllocBase base class. I am
    worried about this, and it needs to be investigated.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53444 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index d9afacc..056d9e2 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-18  Darin Adler  <darin at apple.com>
+
+        Fix build by reverting the previous change.
+
+        * runtime/UString.h: Rolled out the FastAllocBase base class.
+        It was making UString larger, and therefore JSString larger,
+        and too big for a garbage collection cell.
+
+        This raises the unpleasant possibility that many classes became
+        larger because we added the FastAllocBase base class. I am
+        worried about this, and it needs to be investigated.
+
 2010-01-18  Zoltan Horvath  <zoltan at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/JavaScriptCore/runtime/UString.h b/JavaScriptCore/runtime/UString.h
index 57baaf9..0c13689 100644
--- a/JavaScriptCore/runtime/UString.h
+++ b/JavaScriptCore/runtime/UString.h
@@ -74,7 +74,7 @@ namespace JSC {
 
     typedef Vector<char, 32> CStringBuffer;
 
-    class UString : public FastAllocBase {
+    class UString {
         friend class JIT;
 
     public:

-- 
WebKit Debian packaging