Changeset 106358 in webkit

Timestamp:

Jan 31, 2012 6:58:37 AM (12 years ago)

Author:

Antti Koivisto

Message:

Parent SVGFontFaceElements style declaration to the rule
​https://bugs.webkit.org/show_bug.cgi?id=77421

Reviewed by Adam Roben.

For some reason the declaration is parented to the element which adds a bunch of unnecessary special case code.
The invalidation on mutation is done explicitly by SVGFontFaceElement so that is not affected. The declaration
is not exposed so the change is not observable with a test.

• css/CSSFontFaceRule.cpp:

(WebCore::CSSFontFaceRule::~CSSFontFaceRule):

• css/CSSMutableStyleDeclaration.h:

(WebCore::CSSMutableStyleDeclaration::createInline):

• svg/SVGFontFaceElement.cpp:

(WebCore::SVGFontFaceElement::SVGFontFaceElement):
(WebCore::SVGFontFaceElement::parseMappedAttribute):
(WebCore::SVGFontFaceElement::fontFamily):
(WebCore::SVGFontFaceElement::rebuildFontFace):

• svg/SVGFontFaceElement.h:

Remove the unnecessary m_styleDeclaration field, access through m_fontFaceRule instead.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSFontFaceRule.cpp (modified) (1 diff)
• css/CSSMutableStyleDeclaration.h (modified) (1 diff)
• svg/SVGFontFaceElement.cpp (modified) (4 diffs)
• svg/SVGFontFaceElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-31  Antti Koivisto  <antti@apple.com>
+
+        Parent SVGFontFaceElements style declaration to the rule
+        https://bugs.webkit.org/show_bug.cgi?id=77421
+
+        Reviewed by Adam Roben.
+
+        For some reason the declaration is parented to the element which adds a bunch of unnecessary special case code.
+        The invalidation on mutation is done explicitly by SVGFontFaceElement so that is not affected. The declaration
+        is not exposed so the change is not observable with a test.
+
+        * css/CSSFontFaceRule.cpp:
+        (WebCore::CSSFontFaceRule::~CSSFontFaceRule):
+        * css/CSSMutableStyleDeclaration.h:
+        (WebCore::CSSMutableStyleDeclaration::createInline):
+        * svg/SVGFontFaceElement.cpp:
+        (WebCore::SVGFontFaceElement::SVGFontFaceElement):
+        (WebCore::SVGFontFaceElement::parseMappedAttribute):
+        (WebCore::SVGFontFaceElement::fontFamily):
+        (WebCore::SVGFontFaceElement::rebuildFontFace):
+        * svg/SVGFontFaceElement.h:
+        
+            Remove the unnecessary m_styleDeclaration field, access through m_fontFaceRule instead.
+
 2012-01-31  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/Source/WebCore/css/CSSFontFaceRule.cpp

@@ -34 +34 @@
 CSSFontFaceRule::~CSSFontFaceRule()
 {
-    // FIXME: SVGFontFaceElement's style declaration should probably be parented to the rule too.
-    if (m_style && !m_style->isElementStyleDeclaration())
+    if (m_style)
         m_style->clearParentRule();
 }

trunk/Source/WebCore/css/CSSMutableStyleDeclaration.h

@@ -57 +57 @@
     { 
         return adoptRef(new CSSMutableStyleDeclaration(element, true));
-    }
-    static PassRefPtr<CSSMutableStyleDeclaration> createForSVGFontFaceElement(StyledElement* element) 
-    { 
-        return adoptRef(new CSSMutableStyleDeclaration(element, false));
     }
 

trunk/Source/WebCore/svg/SVGFontFaceElement.cpp

@@ -50 +50 @@
     : SVGElement(tagName, document)
     , m_fontFaceRule(CSSFontFaceRule::create())
-    , m_styleDeclaration(CSSMutableStyleDeclaration::createForSVGFontFaceElement(this))
 {
     ASSERT(hasTagName(font_faceTag));
-    m_styleDeclaration->setStrictParsing(true);
-    m_fontFaceRule->setDeclaration(m_styleDeclaration.get());
+    RefPtr<CSSMutableStyleDeclaration> styleDeclaration = CSSMutableStyleDeclaration::create(m_fontFaceRule.get());
+    styleDeclaration->setStrictParsing(true);
+    m_fontFaceRule->setDeclaration(styleDeclaration.release());
 }
 
@@ -114 +114 @@
     int propId = cssPropertyIdForSVGAttributeName(attr->name());
     if (propId > 0) {
-        m_styleDeclaration->setProperty(propId, attr->value(), false);
+        m_fontFaceRule->style()->setProperty(propId, attr->value(), false);
         rebuildFontFace();
         return;
@@ -259 +259 @@
 String SVGFontFaceElement::fontFamily() const
 {
-    return m_styleDeclaration->getPropertyValue(CSSPropertyFontFamily);
+    return m_fontFaceRule->style()->getPropertyValue(CSSPropertyFontFamily);
 }
 
@@ -300 +300 @@
     CSSProperty srcProperty(CSSPropertySrc, list);
     const CSSProperty* srcPropertyRef = &srcProperty;
-    m_styleDeclaration->addParsedProperties(&srcPropertyRef, 1);
+    m_fontFaceRule->style()->addParsedProperties(&srcPropertyRef, 1);
 
     if (describesParentFont) {    
         // Traverse parsed CSS values and associate CSSFontFaceSrcValue elements with ourselves.
-        RefPtr<CSSValue> src = m_styleDeclaration->getPropertyCSSValue(CSSPropertySrc);
+        RefPtr<CSSValue> src = m_fontFaceRule->style()->getPropertyCSSValue(CSSPropertySrc);
         CSSValueList* srcList = static_cast<CSSValueList*>(src.get());
 

trunk/Source/WebCore/svg/SVGFontFaceElement.h

@@ -62 +62 @@
 
     RefPtr<CSSFontFaceRule> m_fontFaceRule;
-    RefPtr<CSSMutableStyleDeclaration> m_styleDeclaration;
-
     RefPtr<SVGFontElement> m_fontElement;
 };