[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 31fdc20113d98c6efba093ec910a8cf2d67ec0fa
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 15 21:55:05 2009 +0000

    2009-12-15  Zoltan Horvath  <zoltan at webkit.org>
    
            Reviewed by Darin Adler.
    
            Allow custom memory allocation control for WeakGCMap class
            https://bugs.webkit.org/show_bug.cgi?id=32547
    
            Inherits WeakGCMap from FastAllocBase because it is instantiated by
            'new' at: WebCore/dom/Document.cpp:512.
    
            * runtime/WeakGCMap.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52171 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index ffee57b..22ac824 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Darin Adler.
 
+        Allow custom memory allocation control for WeakGCMap class
+        https://bugs.webkit.org/show_bug.cgi?id=32547
+
+        Inherits WeakGCMap from FastAllocBase because it is instantiated by
+        'new' at: WebCore/dom/Document.cpp:512.
+
+        * runtime/WeakGCMap.h:
+
+2009-12-15  Zoltan Horvath  <zoltan at webkit.org>
+
+        Reviewed by Darin Adler.
+
         Allow custom memory allocation control for dtoa's P5Node struct
         https://bugs.webkit.org/show_bug.cgi?id=32544
 
diff --git a/JavaScriptCore/runtime/WeakGCMap.h b/JavaScriptCore/runtime/WeakGCMap.h
index e287d17..abf1d79 100644
--- a/JavaScriptCore/runtime/WeakGCMap.h
+++ b/JavaScriptCore/runtime/WeakGCMap.h
@@ -34,7 +34,7 @@ class JSCell;
 
 // A HashMap whose get() function returns emptyValue() for cells awaiting destruction.
 template<typename KeyType, typename MappedType>
-class WeakGCMap {
+class WeakGCMap : public FastAllocBase {
     /*
     Invariants:
         * A value enters the WeakGCMap marked. (Guaranteed by set().)

-- 
WebKit Debian packaging