Changeset 175548 in webkit

Timestamp:

Nov 4, 2014 8:17:50 AM (10 years ago)

Author:

Chris Dumez

Message:

Use SPECIALIZE_TYPE_TRAITS_*() macro for StyleRuleGroup subclasses
​https://bugs.webkit.org/show_bug.cgi?id=138345

Reviewed by Andreas Kling.

Use SPECIALIZE_TYPE_TRAITS_*() macro for StyleRuleGroup subclasses
instead of old-fashion toXXX() functions.

No new tests, no behavior change.

• css/CSSMediaRule.cpp:

(WebCore::CSSMediaRule::mediaQueries):

• css/CSSSupportsRule.cpp:

(WebCore::CSSSupportsRule::conditionText):

• css/StyleRule.h:

(isType):
(WebCore::toStyleRuleMedia): Deleted.
(WebCore::toStyleRuleSupports): Deleted.
(WebCore::toStyleRuleRegion): Deleted.

• css/WebKitCSSRegionRule.cpp:

(WebCore::WebKitCSSRegionRule::cssText):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSMediaRule.cpp (modified) (1 diff)
• css/CSSSupportsRule.cpp (modified) (1 diff)
• css/StyleRule.h (modified) (2 diffs)
• css/WebKitCSSRegionRule.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-04  Chris Dumez  <cdumez@apple.com>
+
+        Use SPECIALIZE_TYPE_TRAITS_*() macro for StyleRuleGroup subclasses
+        https://bugs.webkit.org/show_bug.cgi?id=138345
+
+        Reviewed by Andreas Kling.
+
+        Use SPECIALIZE_TYPE_TRAITS_*() macro for StyleRuleGroup subclasses
+        instead of old-fashion toXXX() functions.
+
+        No new tests, no behavior change.
+
+        * css/CSSMediaRule.cpp:
+        (WebCore::CSSMediaRule::mediaQueries):
+        * css/CSSSupportsRule.cpp:
+        (WebCore::CSSSupportsRule::conditionText):
+        * css/StyleRule.h:
+        (isType):
+        (WebCore::toStyleRuleMedia): Deleted.
+        (WebCore::toStyleRuleSupports): Deleted.
+        (WebCore::toStyleRuleRegion): Deleted.
+        * css/WebKitCSSRegionRule.cpp:
+        (WebCore::WebKitCSSRegionRule::cssText):
+
 2014-11-04  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/css/CSSMediaRule.cpp

@@ -46 +46 @@
 MediaQuerySet* CSSMediaRule::mediaQueries() const
 {
-    return toStyleRuleMedia(&m_groupRule.get())->mediaQueries();
+    return downcast<StyleRuleMedia>(m_groupRule.get()).mediaQueries();
 }
 

trunk/Source/WebCore/css/CSSSupportsRule.cpp

@@ -60 +60 @@
 String CSSSupportsRule::conditionText() const
 {
-    return toStyleRuleSupports(&m_groupRule.get())->conditionText();
+    return downcast<StyleRuleSupports>(m_groupRule.get()).conditionText();
 }
 

trunk/Source/WebCore/css/StyleRule.h

@@ -27 +27 @@
 #include "StyleProperties.h"
 #include <wtf/RefPtr.h>
+#include <wtf/TypeCasts.h>
 
 namespace WebCore {
@@ -272 +273 @@
 #endif // ENABLE(CSS_DEVICE_ADAPTATION)
 
-inline const StyleRuleMedia* toStyleRuleMedia(const StyleRuleGroup* rule)
-{
-    ASSERT_WITH_SECURITY_IMPLICATION(!rule || rule->isMediaRule());
-    return static_cast<const StyleRuleMedia*>(rule);
-}
-
-inline const StyleRuleSupports* toStyleRuleSupports(const StyleRuleGroup* rule)
-{
-    ASSERT_WITH_SECURITY_IMPLICATION(!rule || rule->isSupportsRule());
-    return static_cast<const StyleRuleSupports*>(rule);
-}
-
-inline const StyleRuleRegion* toStyleRuleRegion(const StyleRuleGroup* rule)
-{
-    ASSERT_WITH_SECURITY_IMPLICATION(!rule || rule->isRegionRule());
-    return static_cast<const StyleRuleRegion*>(rule);
-}
-
 } // namespace WebCore
 
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::StyleRuleMedia)
+    static bool isType(const WebCore::StyleRuleGroup& group) { return group.isMediaRule(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::StyleRuleSupports)
+    static bool isType(const WebCore::StyleRuleGroup& group) { return group.isSupportsRule(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::StyleRuleRegion)
+    static bool isType(const WebCore::StyleRuleGroup& group) { return group.isRegionRule(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
 #endif // StyleRule_h

trunk/Source/WebCore/css/WebKitCSSRegionRule.cpp

@@ -52 +52 @@
 
     // First add the selectors.
-    result.append(toStyleRuleRegion(&m_groupRule.get())->selectorList().selectorsText());
+    result.append(downcast<StyleRuleRegion>(m_groupRule.get()).selectorList().selectorsText());
 
     // Then add the rules.