[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 a50a3444b4e36b162330ac10d510b1ddad227b4f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 15 18:50:54 2009 +0000

    2009-12-15  Zoltan Horvath  <zoltan at webkit.org>
    
            Reviewed by Darin Adler.
    
            Allow custom memory allocation control for FontPlatformDataCacheKey class
            https://bugs.webkit.org/show_bug.cgi?id=32552
    
            Inherits the following struct from FastAllocBase because it is instantiated by 'new':
    
            struct name                     - instantiated at: WebCore/'location'
            struct FontPlatformDataCacheKey - platform/graphics/FontCache.cpp:118
    
            * platform/graphics/FontCache.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52163 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 879d034..f278083 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-15  Zoltan Horvath  <zoltan at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Allow custom memory allocation control for FontPlatformDataCacheKey class
+        https://bugs.webkit.org/show_bug.cgi?id=32552
+
+        Inherits the following struct from FastAllocBase because it is instantiated by 'new':
+
+        struct name                     - instantiated at: WebCore/'location'
+        struct FontPlatformDataCacheKey - platform/graphics/FontCache.cpp:118
+
+        * platform/graphics/FontCache.cpp:
+
 2009-12-15  Jian Li  <jianli at chromium.org>
 
         Reviewed by Dmitry Titov.
diff --git a/WebCore/platform/graphics/FontCache.cpp b/WebCore/platform/graphics/FontCache.cpp
index 06ea56b..bb83319 100644
--- a/WebCore/platform/graphics/FontCache.cpp
+++ b/WebCore/platform/graphics/FontCache.cpp
@@ -53,7 +53,7 @@ FontCache::FontCache()
 {
 }
 
-struct FontPlatformDataCacheKey {
+struct FontPlatformDataCacheKey : FastAllocBase {
     FontPlatformDataCacheKey(const AtomicString& family = AtomicString(), unsigned size = 0, unsigned weight = 0, bool italic = false,
                              bool isPrinterFont = false, FontRenderingMode renderingMode = NormalRenderingMode)
         : m_family(family)

-- 
WebKit Debian packaging