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

[zoltan at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 0cd665aa00c0fa06470c92a29c2c7ddb64a5f0fd
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 29 15:41:07 2009 +0000

    Allow custom memory allocation control for WebCore's ShorthandScope
    https://bugs.webkit.org/show_bug.cgi?id=30859
    
    Reviewed by Darin Adler.
    
    Inherits ShorthandScope class from FastAllocBase because it is
    instantiated by 'new' in WebCore/css/CSSParser.cpp:902 and
    it is no need to be copyable.
    
    * css/CSSParser.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50273 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a005a33..7309e54 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Darin Adler.
 
+        Allow custom memory allocation control for WebCore's ShorthandScope
+        https://bugs.webkit.org/show_bug.cgi?id=30859
+
+        Inherits ShorthandScope class from FastAllocBase because it is 
+        instantiated by 'new' in WebCore/css/CSSParser.cpp:902 and 
+        it is no need to be copyable.        
+
+        * css/CSSParser.h:
+
+2009-10-29  Zoltan Horvath  <zoltan at webkit.org>
+
+        Reviewed by Darin Adler.
+
         Allow custom memory allocation control for WebCore's AXObjectCache
         https://bugs.webkit.org/show_bug.cgi?id=30848
 
diff --git a/WebCore/css/CSSParser.h b/WebCore/css/CSSParser.h
index 6d1bb32..ace2fbd 100644
--- a/WebCore/css/CSSParser.h
+++ b/WebCore/css/CSSParser.h
@@ -287,7 +287,7 @@ namespace WebCore {
     int cssPropertyID(const String&);
     int cssValueKeywordID(const CSSParserString&);
 
-    class ShorthandScope {
+    class ShorthandScope : public FastAllocBase {
     public:
         ShorthandScope(CSSParser* parser, int propId) : m_parser(parser)
         {

-- 
WebKit Debian packaging