Changeset 148399 in webkit

Timestamp:

Apr 14, 2013 9:21:02 AM (11 years ago)

Author:

akling@apple.com

Message:

CSSParser should return ImmutableStylePropertySets.
<​http://webkit.org/b/114585>

Reviewed by Anders Carlsson.

The StylePropertySets created by CSSParser were already immutable.
Let this be reflected in the pointer types returned.

• css/CSSParser.cpp:

(WebCore::CSSParser::parseInlineStyleDeclaration):
(WebCore::CSSParser::parseDeclaration):
(WebCore::CSSParser::createStylePropertySet):

• css/CSSParser.h:

(CSSParser):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSParser.cpp (modified) (4 diffs)
• css/CSSParser.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-14  Andreas Kling  <akling@apple.com>
+
+        CSSParser should return ImmutableStylePropertySets.
+        <http://webkit.org/b/114585>
+
+        Reviewed by Anders Carlsson.
+
+        The StylePropertySets created by CSSParser were already immutable.
+        Let this be reflected in the pointer types returned.
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseInlineStyleDeclaration):
+        (WebCore::CSSParser::parseDeclaration):
+        (WebCore::CSSParser::createStylePropertySet):
+        * css/CSSParser.h:
+        (CSSParser):
+
 2013-04-14  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -1432 +1432 @@
 }
 
-PassRefPtr<StylePropertySet> CSSParser::parseInlineStyleDeclaration(const String& string, Element* element)
+PassRefPtr<ImmutableStylePropertySet> CSSParser::parseInlineStyleDeclaration(const String& string, Element* element)
 {
     CSSParserContext context = element->document()->elementSheet()->contents()->parserContext();
@@ -1439 +1439 @@
 }
 
-PassRefPtr<StylePropertySet> CSSParser::parseDeclaration(const String& string, StyleSheetContents* contextStyleSheet)
+PassRefPtr<ImmutableStylePropertySet> CSSParser::parseDeclaration(const String& string, StyleSheetContents* contextStyleSheet)
 {
     setStyleSheet(contextStyleSheet);
@@ -1450 +1450 @@
         deleteFontFaceOnlyValues();
 
-    RefPtr<StylePropertySet> style = createStylePropertySet();
+    RefPtr<ImmutableStylePropertySet> style = createStylePropertySet();
     clearProperties();
     return style.release();
@@ -1543 +1543 @@
 }
 
-PassRefPtr<StylePropertySet> CSSParser::createStylePropertySet()
+PassRefPtr<ImmutableStylePropertySet> CSSParser::createStylePropertySet()
 {
     BitArray<numCSSProperties> seenProperties;

trunk/Source/WebCore/css/CSSParser.h

@@ -55 +55 @@
 class Document;
 class Element;
+class ImmutableStylePropertySet;
 class MediaQueryExp;
 class MediaQuerySet;
@@ -98 +99 @@
     PassRefPtr<CSSPrimitiveValue> parseValidPrimitive(int ident, CSSParserValue*);
     bool parseDeclaration(StylePropertySet*, const String&, PassRefPtr<CSSRuleSourceData>, StyleSheetContents* contextStyleSheet);
-    static PassRefPtr<StylePropertySet> parseInlineStyleDeclaration(const String&, Element*);
+    static PassRefPtr<ImmutableStylePropertySet> parseInlineStyleDeclaration(const String&, Element*);
     PassOwnPtr<MediaQuery> parseMediaQuery(const String&);
 
@@ -371 +372 @@
     void clearProperties();
 
-    PassRefPtr<StylePropertySet> createStylePropertySet();
+    PassRefPtr<ImmutableStylePropertySet> createStylePropertySet();
 
     CSSParserContext m_context;
@@ -547 +548 @@
 
     bool parseValue(StylePropertySet*, CSSPropertyID, const String&, bool important, StyleSheetContents* contextStyleSheet);
-    PassRefPtr<StylePropertySet> parseDeclaration(const String&, StyleSheetContents* contextStyleSheet);
+    PassRefPtr<ImmutableStylePropertySet> parseDeclaration(const String&, StyleSheetContents* contextStyleSheet);
 
     enum SizeParameterType {