[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[zoltan at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 145b05c0691a91b70bc61341d2bc59ed35477de1
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 7 17:09:13 2009 +0000

    2009-10-07  Zoltan Horvath  <zoltan at webkit.org>
    
            Rubber-stamped by Eric Seidel.
    
            Allow custom memory allocation control for WebCore's CachedResourceClient class
            https://bugs.webkit.org/show_bug.cgi?id=30165
    
            Inherits CachedResourceClient class from FastAllocBase because (its
            child class) CSSFontFaceSource has been instantiated by 'new' in WebCore/css/CSSFontFaceSource.h:46.
    
            * loader/CachedResourceClient.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49251 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 29f91da..6895199 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,17 @@
 2009-10-07  Zoltan Horvath  <zoltan at webkit.org>
 
+        Rubber-stamped by Eric Seidel.
+
+        Allow custom memory allocation control for WebCore's CachedResourceClient class
+        https://bugs.webkit.org/show_bug.cgi?id=30165
+
+        Inherits CachedResourceClient class from FastAllocBase because (its
+        child class) CSSFontFaceSource has been instantiated by 'new' in WebCore/css/CSSFontFaceSource.h:46.
+
+        * loader/CachedResourceClient.h:
+
+2009-10-07  Zoltan Horvath  <zoltan at webkit.org>
+
         Reviewed by Darin Adler.
 
         Allow custom memory allocation control for WebCore's IdentifierRep 
diff --git a/WebCore/loader/CachedResourceClient.h b/WebCore/loader/CachedResourceClient.h
index 2e0b15b..dd9bb94 100644
--- a/WebCore/loader/CachedResourceClient.h
+++ b/WebCore/loader/CachedResourceClient.h
@@ -25,6 +25,8 @@
 #ifndef CachedResourceClient_h
 #define CachedResourceClient_h
 
+#include <wtf/FastAllocBase.h>
+
 #if ENABLE(XBL)
 namespace XBL {
     class XBLDocument;
@@ -48,7 +50,7 @@ namespace WebCore {
      * inherit from this class and overload one of the 3 functions
      *
      */
-    class CachedResourceClient
+    class CachedResourceClient : public FastAllocBase
     {
     public:
         virtual ~CachedResourceClient() { }

-- 
WebKit Debian packaging