Changeset 101934 in webkit

Timestamp:

Dec 3, 2011, 1:45:35 PM (14 years ago)

Author:

kling@webkit.org

Message:

Keep CSSInheritedValue in the CSS value pool.
<​http://webkit.org/b/73747>

Reviewed by Antti Koivisto.

We only need one CSSInheritedValue instance per document, so cache it
in CSSValuePool and have the parser create it through there.

• css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):

• css/CSSValuePool.cpp:

(WebCore::CSSValuePool::CSSValuePool):
(WebCore::CSSValuePool::createInheritedValue):

• css/CSSValuePool.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSParser.cpp (modified) (1 diff)
• css/CSSValuePool.cpp (modified) (2 diffs)
• css/CSSValuePool.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-03  Andreas Kling  <kling@webkit.org>
+
+        Keep CSSInheritedValue in the CSS value pool.
+        <http://webkit.org/b/73747>
+
+        Reviewed by Antti Koivisto.
+
+        We only need one CSSInheritedValue instance per document, so cache it
+        in CSSValuePool and have the parser create it through there.
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseValue):
+        * css/CSSValuePool.cpp:
+        (WebCore::CSSValuePool::CSSValuePool):
+        (WebCore::CSSValuePool::createInheritedValue):
+        * css/CSSValuePool.h:
+
 2011-12-03  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -845 +845 @@
         if (num != 1)
             return false;
-        addProperty(propId, CSSInheritedValue::create(), important);
+        addProperty(propId, cssValuePool()->createInheritedValue(), important);
         return true;
     }

trunk/Source/WebCore/css/CSSValuePool.cpp

@@ -31 +31 @@
 
 CSSValuePool::CSSValuePool()
-    : m_colorTransparent(CSSPrimitiveValue::createColor(Color::transparent))
+    : m_inheritedValue(CSSInheritedValue::create())
+    , m_colorTransparent(CSSPrimitiveValue::createColor(Color::transparent))
     , m_colorWhite(CSSPrimitiveValue::createColor(Color::white))
     , m_colorBlack(CSSPrimitiveValue::createColor(Color::black))
@@ -42 +43 @@
 CSSValuePool::~CSSValuePool()
 {
+}
+
+PassRefPtr<CSSInheritedValue> CSSValuePool::createInheritedValue()
+{
+    return m_inheritedValue;
 }
 

trunk/Source/WebCore/css/CSSValuePool.h

@@ -27 +27 @@
 #define CSSValuePool_h
 
+#include "CSSInheritedValue.h"
 #include "CSSPrimitiveValue.h"
 #include <wtf/HashMap.h>
@@ -38 +39 @@
     ~CSSValuePool();
 
+    PassRefPtr<CSSInheritedValue> createInheritedValue();
     PassRefPtr<CSSPrimitiveValue> createIdentifierValue(int identifier);
     PassRefPtr<CSSPrimitiveValue> createColorValue(unsigned rgbValue);
@@ -46 +48 @@
 private:
     CSSValuePool();
+
+    RefPtr<CSSInheritedValue> m_inheritedValue;
 
     typedef HashMap<int, RefPtr<CSSPrimitiveValue> > IdentifierValueCache;