Changeset 174256 in webkit for trunk/Source/WebCore/css/WebKitCSSKeyframesRule.cpp

Timestamp:

Oct 2, 2014, 9:38:19 PM (11 years ago)

Author:

[email protected]

Message:

CSSOM rule wrappers always have a corresponding internal style object.
<​https://webkit.org/b/137379>

Make the CSSOM rule wrapper classes use references & Ref instead of
raw pointers and RefPtr for pointing to the internal style rule.

Also changed the signature of reattach() to take a StyleRuleBase&
since it's never called with a null pointer.

Finally marked the rule classes final.

Reviewed by Geoffrey Garen.

• css/CSSCharsetRule.h:
• css/CSSFontFaceRule.cpp:

(WebCore::CSSFontFaceRule::CSSFontFaceRule):
(WebCore::CSSFontFaceRule::reattach):

• css/CSSFontFaceRule.h:

(WebCore::CSSFontFaceRule::create): Deleted.

• css/CSSGroupingRule.cpp:

(WebCore::CSSGroupingRule::CSSGroupingRule):
(WebCore::CSSGroupingRule::reattach):

• css/CSSGroupingRule.h:
• css/CSSImportRule.cpp:

(WebCore::CSSImportRule::CSSImportRule):
(WebCore::CSSImportRule::href):
(WebCore::CSSImportRule::media):
(WebCore::CSSImportRule::cssText):
(WebCore::CSSImportRule::styleSheet):
(WebCore::CSSImportRule::reattach):

• css/CSSImportRule.h:

(WebCore::CSSImportRule::create): Deleted.

• css/CSSMediaRule.cpp:

(WebCore::CSSMediaRule::CSSMediaRule):
(WebCore::CSSMediaRule::mediaQueries):
(WebCore::CSSMediaRule::reattach):

• css/CSSMediaRule.h:

(WebCore::CSSMediaRule::create): Deleted.

• css/CSSPageRule.cpp:

(WebCore::CSSPageRule::CSSPageRule):
(WebCore::CSSPageRule::reattach):

• css/CSSPageRule.h:

(WebCore::CSSPageRule::create): Deleted.

• css/CSSRule.h:
• css/CSSStyleRule.cpp:

(WebCore::CSSStyleRule::CSSStyleRule):
(WebCore::CSSStyleRule::reattach):

• css/CSSStyleRule.h:

(WebCore::CSSStyleRule::create): Deleted.
(WebCore::CSSStyleRule::styleRule): Deleted.

• css/CSSStyleSheet.cpp:

(WebCore::CSSStyleSheet::reattachChildRuleCSSOMWrappers):

• css/CSSSupportsRule.cpp:

(WebCore::CSSSupportsRule::CSSSupportsRule):
(WebCore::CSSSupportsRule::conditionText):

• css/CSSSupportsRule.h:

(WebCore::CSSSupportsRule::create):

• css/CSSUnknownRule.h:
• css/StyleRule.cpp:

(WebCore::StyleRuleBase::createCSSOMWrapper):

• css/StyleRuleImport.h:

(WebCore::StyleRuleImport::mediaQueries):

• css/WebKitCSSKeyframeRule.cpp:

(WebCore::WebKitCSSKeyframeRule::WebKitCSSKeyframeRule):
(WebCore::WebKitCSSKeyframeRule::reattach):

• css/WebKitCSSKeyframeRule.h:
• css/WebKitCSSKeyframesRule.cpp:

(WebCore::WebKitCSSKeyframesRule::WebKitCSSKeyframesRule):
(WebCore::WebKitCSSKeyframesRule::item):
(WebCore::WebKitCSSKeyframesRule::reattach):

• css/WebKitCSSKeyframesRule.h:

(WebCore::WebKitCSSKeyframesRule::create):

• css/WebKitCSSRegionRule.cpp:

(WebCore::WebKitCSSRegionRule::WebKitCSSRegionRule):
(WebCore::WebKitCSSRegionRule::cssText):

• css/WebKitCSSRegionRule.h:

(WebCore::WebKitCSSRegionRule::create):

• css/WebKitCSSViewportRule.cpp:

(WebCore::WebKitCSSViewportRule::reattach):

• css/WebKitCSSViewportRule.h:

File:

• trunk/Source/WebCore/css/WebKitCSSKeyframesRule.cpp (modified) (3 diffs)

trunk/Source/WebCore/css/WebKitCSSKeyframesRule.cpp

@@ -87 +87 @@
 }
 
-WebKitCSSKeyframesRule::WebKitCSSKeyframesRule(StyleRuleKeyframes* keyframesRule, CSSStyleSheet* parent)
+WebKitCSSKeyframesRule::WebKitCSSKeyframesRule(StyleRuleKeyframes& keyframesRule, CSSStyleSheet* parent)
     : CSSRule(parent)
     , m_keyframesRule(keyframesRule)
-    , m_childRuleCSSOMWrappers(keyframesRule->keyframes().size())
+    , m_childRuleCSSOMWrappers(keyframesRule.keyframes().size())
 {
 }
@@ -181 +181 @@
     RefPtr<WebKitCSSKeyframeRule>& rule = m_childRuleCSSOMWrappers[index];
     if (!rule)
-        rule = adoptRef(new WebKitCSSKeyframeRule(m_keyframesRule->keyframes()[index].get(), const_cast<WebKitCSSKeyframesRule*>(this)));
+        rule = adoptRef(new WebKitCSSKeyframeRule(*m_keyframesRule->keyframes()[index], const_cast<WebKitCSSKeyframesRule*>(this)));
 
     return rule.get(); 
@@ -193 +193 @@
 }
 
-void WebKitCSSKeyframesRule::reattach(StyleRuleBase* rule)
-{
-    ASSERT(rule);
-    ASSERT_WITH_SECURITY_IMPLICATION(rule->isKeyframesRule());
-    m_keyframesRule = static_cast<StyleRuleKeyframes*>(rule);
+void WebKitCSSKeyframesRule::reattach(StyleRuleBase& rule)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(rule.isKeyframesRule());
+    m_keyframesRule = static_cast<StyleRuleKeyframes&>(rule);
 }