[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 0bfa639af4bd4883a2373cac824eb9aae4b00b60
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 20 20:12:32 2009 +0000

    2009-10-20  Zoltan Horvath  <zoltan at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Allow custom memory allocation control for WebCore's CSSProperty
            https://bugs.webkit.org/show_bug.cgi?id=30564
    
            Inherits CSSProperty class from FastAllocBase because it has been
            instantiated by 'new' in WebCore/css/CSSParser.cpp:367.
    
            * css/CSSProperty.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49881 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ca77297..a4b5a5b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-20  Zoltan Horvath  <zoltan at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Allow custom memory allocation control for WebCore's CSSProperty
+        https://bugs.webkit.org/show_bug.cgi?id=30564
+
+        Inherits CSSProperty class from FastAllocBase because it has been
+        instantiated by 'new' in WebCore/css/CSSParser.cpp:367.
+
+        * css/CSSProperty.h:
+
 2009-10-20  Andrew Scherkus  <scherkus at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/css/CSSProperty.h b/WebCore/css/CSSProperty.h
index 7af8348..b5635d0 100644
--- a/WebCore/css/CSSProperty.h
+++ b/WebCore/css/CSSProperty.h
@@ -29,7 +29,7 @@
 
 namespace WebCore {
 
-class CSSProperty {
+class CSSProperty : public FastAllocBase {
 public:
     CSSProperty(int propID, PassRefPtr<CSSValue> value, bool important = false, int shorthandID = 0, bool implicit = false)
         : m_id(propID)

-- 
WebKit Debian packaging