Changeset 148397 in webkit

Timestamp:

Apr 14, 2013 8:46:33 AM (11 years ago)

Author:

akling@apple.com

Message:

Move parseDeclaration() and clear() to MutableStylePropertySet.
<​http://webkit.org/b/114583>

Reviewed by Anders Carlsson.

...and remove ASSERT(isMutable()) from the function bodies.

• svg/SVGFontFaceElement.cpp:

(WebCore::SVGFontFaceElement::removedFrom):

Use clear() directly instead of taking an empty string through the CSS parser.

• css/StylePropertySet.cpp:

(WebCore::MutableStylePropertySet::parseDeclaration):
(WebCore::MutableStylePropertySet::clear):

• css/StylePropertySet.h:

(StylePropertySet):
(MutableStylePropertySet):

• dom/StyledElement.cpp:

(WebCore::StyledElement::setInlineStyleFromString):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/StylePropertySet.cpp (modified) (2 diffs)
• css/StylePropertySet.h (modified) (2 diffs)
• dom/StyledElement.cpp (modified) (1 diff)
• svg/SVGFontFaceElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-14  Andreas Kling  <akling@apple.com>
+
+        Move parseDeclaration() and clear() to MutableStylePropertySet.
+        <http://webkit.org/b/114583>
+
+        Reviewed by Anders Carlsson.
+
+        ...and remove ASSERT(isMutable()) from the function bodies.
+
+        * svg/SVGFontFaceElement.cpp:
+        (WebCore::SVGFontFaceElement::removedFrom):
+
+            Use clear() directly instead of taking an empty string through the CSS parser.
+
+        * css/StylePropertySet.cpp:
+        (WebCore::MutableStylePropertySet::parseDeclaration):
+        (WebCore::MutableStylePropertySet::clear):
+        * css/StylePropertySet.h:
+        (StylePropertySet):
+        (MutableStylePropertySet):
+        * dom/StyledElement.cpp:
+        (WebCore::StyledElement::setInlineStyleFromString):
+
 2013-04-14  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/css/StylePropertySet.cpp

@@ -746 +746 @@
 }
 
-void StylePropertySet::parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet)
-{
-    ASSERT(isMutable());
-
+void MutableStylePropertySet::parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet)
+{
     mutablePropertyVector().clear();
 
@@ -1104 +1102 @@
 };
 
-void StylePropertySet::clear()
-{
-    ASSERT(isMutable());
+void MutableStylePropertySet::clear()
+{
     mutablePropertyVector().clear();
 }

trunk/Source/WebCore/css/StylePropertySet.h

@@ -120 +120 @@
     void removePrefixedOrUnprefixedProperty(CSSPropertyID);
 
-    void parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet);
-
     void addParsedProperties(const Vector<CSSProperty>&);
     void addParsedProperty(const CSSProperty&);
 
-    void clear();
     PassRefPtr<StylePropertySet> copyBlockProperties() const;
     void removeBlockProperties();
@@ -235 +232 @@
     MutableStylePropertySet(const StylePropertySet&);
 
+    void clear();
+    void parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet);
+
     CSSStyleDeclaration* ensureCSSStyleDeclaration();
     CSSStyleDeclaration* ensureInlineCSSStyleDeclaration(const StyledElement* parentElement);

trunk/Source/WebCore/dom/StyledElement.cpp

@@ -194 +194 @@
     if (!inlineStyle)
         inlineStyle = CSSParser::parseInlineStyleDeclaration(newStyleString, this);
-    else
-        inlineStyle->parseDeclaration(newStyleString, document()->elementSheet()->contents());
+    else {
+        ASSERT(inlineStyle->isMutable());
+        static_pointer_cast<MutableStylePropertySet>(inlineStyle)->parseDeclaration(newStyleString, document()->elementSheet()->contents());
+    }
 }
 

trunk/Source/WebCore/svg/SVGFontFaceElement.cpp

@@ -340 +340 @@
         m_fontElement = 0;
         document()->accessSVGExtensions()->unregisterSVGFontFaceElement(this);
-        m_fontFaceRule->mutableProperties()->parseDeclaration(emptyString(), 0);
+        m_fontFaceRule->mutableProperties()->clear();
 
         document()->styleResolverChanged(DeferRecalcStyle);