- Revision
- 92448
- Author
- [email protected]
- Date
- 2011-08-04 23:04:52 -0700 (Thu, 04 Aug 2011)
Log Message
Improve const-correctness in CSS code: type information methods
https://bugs.webkit.org/show_bug.cgi?id=65506
Reviewed by Simon Fraser.
Make "is...()" functions (e.g., "isStyleRule()") const.
Also, change CSSRule's type() function to return CSSRuleType.
No new tests. (no change in semantics)
* css/CSSCharsetRule.h:
(WebCore::CSSCharsetRule::isCharsetRule):
(WebCore::CSSCharsetRule::type):
* css/CSSFontFaceRule.h:
(WebCore::CSSFontFaceRule::isFontFaceRule):
(WebCore::CSSFontFaceRule::type):
* css/CSSImportRule.h:
(WebCore::CSSImportRule::isImportRule):
(WebCore::CSSImportRule::type):
* css/CSSMediaRule.h:
(WebCore::CSSMediaRule::isMediaRule):
(WebCore::CSSMediaRule::type):
* css/CSSPageRule.h:
(WebCore::CSSPageRule::isPageRule):
(WebCore::CSSPageRule::type):
* css/CSSRule.h:
(WebCore::CSSRule::isRule):
* css/CSSStyleRule.h:
(WebCore::CSSStyleRule::isStyleRule):
(WebCore::CSSStyleRule::type):
* css/CSSUnknownRule.h:
(WebCore::CSSUnknownRule::type):
* css/StyleBase.h:
(WebCore::StyleBase::isCharsetRule):
(WebCore::StyleBase::isFontFaceRule):
(WebCore::StyleBase::isImportRule):
(WebCore::StyleBase::isKeyframeRule):
(WebCore::StyleBase::isKeyframesRule):
(WebCore::StyleBase::isMediaRule):
(WebCore::StyleBase::isPageRule):
(WebCore::StyleBase::isRule):
(WebCore::StyleBase::isStyleRule):
* css/WebKitCSSKeyframeRule.h:
(WebCore::WebKitCSSKeyframeRule::isKeyframeRule):
(WebCore::WebKitCSSKeyframeRule::type):
* css/WebKitCSSKeyframesRule.h:
(WebCore::WebKitCSSKeyframesRule::isKeyframesRule):
(WebCore::WebKitCSSKeyframesRule::type):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (92447 => 92448)
--- trunk/Source/WebCore/ChangeLog 2011-08-05 05:42:19 UTC (rev 92447)
+++ trunk/Source/WebCore/ChangeLog 2011-08-05 06:04:52 UTC (rev 92448)
@@ -1,3 +1,54 @@
+2011-08-05 Roland Steiner <[email protected]>
+
+ Improve const-correctness in CSS code: type information methods
+ https://bugs.webkit.org/show_bug.cgi?id=65506
+
+ Reviewed by Simon Fraser.
+
+ Make "is...()" functions (e.g., "isStyleRule()") const.
+ Also, change CSSRule's type() function to return CSSRuleType.
+
+ No new tests. (no change in semantics)
+
+ * css/CSSCharsetRule.h:
+ (WebCore::CSSCharsetRule::isCharsetRule):
+ (WebCore::CSSCharsetRule::type):
+ * css/CSSFontFaceRule.h:
+ (WebCore::CSSFontFaceRule::isFontFaceRule):
+ (WebCore::CSSFontFaceRule::type):
+ * css/CSSImportRule.h:
+ (WebCore::CSSImportRule::isImportRule):
+ (WebCore::CSSImportRule::type):
+ * css/CSSMediaRule.h:
+ (WebCore::CSSMediaRule::isMediaRule):
+ (WebCore::CSSMediaRule::type):
+ * css/CSSPageRule.h:
+ (WebCore::CSSPageRule::isPageRule):
+ (WebCore::CSSPageRule::type):
+ * css/CSSRule.h:
+ (WebCore::CSSRule::isRule):
+ * css/CSSStyleRule.h:
+ (WebCore::CSSStyleRule::isStyleRule):
+ (WebCore::CSSStyleRule::type):
+ * css/CSSUnknownRule.h:
+ (WebCore::CSSUnknownRule::type):
+ * css/StyleBase.h:
+ (WebCore::StyleBase::isCharsetRule):
+ (WebCore::StyleBase::isFontFaceRule):
+ (WebCore::StyleBase::isImportRule):
+ (WebCore::StyleBase::isKeyframeRule):
+ (WebCore::StyleBase::isKeyframesRule):
+ (WebCore::StyleBase::isMediaRule):
+ (WebCore::StyleBase::isPageRule):
+ (WebCore::StyleBase::isRule):
+ (WebCore::StyleBase::isStyleRule):
+ * css/WebKitCSSKeyframeRule.h:
+ (WebCore::WebKitCSSKeyframeRule::isKeyframeRule):
+ (WebCore::WebKitCSSKeyframeRule::type):
+ * css/WebKitCSSKeyframesRule.h:
+ (WebCore::WebKitCSSKeyframesRule::isKeyframesRule):
+ (WebCore::WebKitCSSKeyframesRule::type):
+
2011-08-04 Mark Pilgrim <[email protected]>
Remove LegacyDefaultOptionalArguments flag from plugin IDL files
Modified: trunk/Source/WebCore/css/CSSCharsetRule.h (92447 => 92448)
--- trunk/Source/WebCore/css/CSSCharsetRule.h 2011-08-05 05:42:19 UTC (rev 92447)
+++ trunk/Source/WebCore/css/CSSCharsetRule.h 2011-08-05 06:04:52 UTC (rev 92448)
@@ -44,10 +44,9 @@
private:
CSSCharsetRule(CSSStyleSheet* parent, const String& encoding);
- virtual bool isCharsetRule() { return true; }
-
+ virtual bool isCharsetRule() const { return true; }
// from CSSRule
- virtual unsigned short type() const { return CHARSET_RULE; }
+ virtual CSSRuleType type() const { return CHARSET_RULE; }
String m_encoding;
};
Modified: trunk/Source/WebCore/css/CSSFontFaceRule.h (92447 => 92448)
--- trunk/Source/WebCore/css/CSSFontFaceRule.h 2011-08-05 05:42:19 UTC (rev 92447)
+++ trunk/Source/WebCore/css/CSSFontFaceRule.h 2011-08-05 06:04:52 UTC (rev 92448)
@@ -54,10 +54,9 @@
private:
CSSFontFaceRule(CSSStyleSheet* parent);
- virtual bool isFontFaceRule() { return true; }
-
+ virtual bool isFontFaceRule() const { return true; }
// Inherited from CSSRule
- virtual unsigned short type() const { return FONT_FACE_RULE; }
+ virtual CSSRuleType type() const { return FONT_FACE_RULE; }
RefPtr<CSSMutableStyleDeclaration> m_style;
};
Modified: trunk/Source/WebCore/css/CSSImportRule.h (92447 => 92448)
--- trunk/Source/WebCore/css/CSSImportRule.h 2011-08-05 05:42:19 UTC (rev 92447)
+++ trunk/Source/WebCore/css/CSSImportRule.h 2011-08-05 06:04:52 UTC (rev 92448)
@@ -57,12 +57,12 @@
private:
CSSImportRule(CSSStyleSheet* parent, const String& href, PassRefPtr<MediaList>);
- virtual bool isImportRule() { return true; }
+ virtual bool isImportRule() const { return true; }
+ // from CSSRule
+ virtual CSSRuleType type() const { return IMPORT_RULE; }
+
virtual void insertedIntoParent();
- // from CSSRule
- virtual unsigned short type() const { return IMPORT_RULE; }
-
// from CachedResourceClient
virtual void setCSSStyleSheet(const String& href, const KURL& baseURL, const String& charset, const CachedCSSStyleSheet*);
Modified: trunk/Source/WebCore/css/CSSMediaRule.h (92447 => 92448)
--- trunk/Source/WebCore/css/CSSMediaRule.h 2011-08-05 05:42:19 UTC (rev 92447)
+++ trunk/Source/WebCore/css/CSSMediaRule.h 2011-08-05 06:04:52 UTC (rev 92448)
@@ -55,10 +55,9 @@
private:
CSSMediaRule(CSSStyleSheet* parent, PassRefPtr<MediaList>, PassRefPtr<CSSRuleList>);
- virtual bool isMediaRule() { return true; }
-
+ virtual bool isMediaRule() const { return true; }
// Inherited from CSSRule
- virtual unsigned short type() const { return MEDIA_RULE; }
+ virtual CSSRuleType type() const { return MEDIA_RULE; }
RefPtr<MediaList> m_lstMedia;
RefPtr<CSSRuleList> m_lstCSSRules;
Modified: trunk/Source/WebCore/css/CSSPageRule.h (92447 => 92448)
--- trunk/Source/WebCore/css/CSSPageRule.h 2011-08-05 05:42:19 UTC (rev 92447)
+++ trunk/Source/WebCore/css/CSSPageRule.h 2011-08-05 06:04:52 UTC (rev 92448)
@@ -46,10 +46,9 @@
private:
CSSPageRule(CSSStyleSheet* parent, int sourceLine);
- virtual bool isPageRule() { return true; }
-
+ virtual bool isPageRule() const { return true; }
// Inherited from CSSRule
- virtual unsigned short type() const { return PAGE_RULE; }
+ virtual CSSRuleType type() const { return PAGE_RULE; }
};
} // namespace WebCore
Modified: trunk/Source/WebCore/css/CSSRule.h (92447 => 92448)
--- trunk/Source/WebCore/css/CSSRule.h 2011-08-05 05:42:19 UTC (rev 92447)
+++ trunk/Source/WebCore/css/CSSRule.h 2011-08-05 06:04:52 UTC (rev 92448)
@@ -46,8 +46,7 @@
WEBKIT_KEYFRAME_RULE
};
- // FIXME: Change to return CSSRuleType.
- virtual unsigned short type() const = 0;
+ virtual CSSRuleType type() const = 0;
CSSStyleSheet* parentStyleSheet() const;
CSSRule* parentRule() const;
@@ -64,7 +63,7 @@
}
private:
- virtual bool isRule() { return true; }
+ virtual bool isRule() const { return true; }
};
} // namespace WebCore
Modified: trunk/Source/WebCore/css/CSSStyleRule.h (92447 => 92448)
--- trunk/Source/WebCore/css/CSSStyleRule.h 2011-08-05 05:42:19 UTC (rev 92447)
+++ trunk/Source/WebCore/css/CSSStyleRule.h 2011-08-05 06:04:52 UTC (rev 92448)
@@ -64,10 +64,9 @@
CSSStyleRule(CSSStyleSheet* parent, int sourceLine);
private:
- virtual bool isStyleRule() { return true; }
-
+ virtual bool isStyleRule() const { return true; }
// Inherited from CSSRule
- virtual unsigned short type() const { return STYLE_RULE; }
+ virtual CSSRuleType type() const { return STYLE_RULE; }
RefPtr<CSSMutableStyleDeclaration> m_style;
CSSSelectorList m_selectorList;
Modified: trunk/Source/WebCore/css/CSSUnknownRule.h (92447 => 92448)
--- trunk/Source/WebCore/css/CSSUnknownRule.h 2011-08-05 05:42:19 UTC (rev 92447)
+++ trunk/Source/WebCore/css/CSSUnknownRule.h 2011-08-05 06:04:52 UTC (rev 92448)
@@ -28,7 +28,7 @@
class CSSUnknownRule : public CSSRule {
private:
- virtual unsigned short type() const { return UNKNOWN_RULE; }
+ virtual CSSRuleType type() const { return UNKNOWN_RULE; }
};
} // namespace WebCore
Modified: trunk/Source/WebCore/css/StyleBase.h (92447 => 92448)
--- trunk/Source/WebCore/css/StyleBase.h 2011-08-05 05:42:19 UTC (rev 92447)
+++ trunk/Source/WebCore/css/StyleBase.h 2011-08-05 06:04:52 UTC (rev 92448)
@@ -48,16 +48,17 @@
KURL baseURL() const;
virtual bool isCSSStyleSheet() const { return false; }
- virtual bool isCharsetRule() { return false; }
- virtual bool isFontFaceRule() { return false; }
- virtual bool isImportRule() { return false; }
- virtual bool isKeyframeRule() { return false; }
- virtual bool isKeyframesRule() { return false; }
- virtual bool isMediaRule() { return false; }
- virtual bool isPageRule() { return false; }
-
- virtual bool isRule() { return false; }
- virtual bool isStyleRule() { return false; }
+
+ virtual bool isCharsetRule() const { return false; }
+ virtual bool isFontFaceRule() const { return false; }
+ virtual bool isImportRule() const { return false; }
+ virtual bool isKeyframeRule() const { return false; }
+ virtual bool isKeyframesRule() const { return false; }
+ virtual bool isMediaRule() const { return false; }
+ virtual bool isPageRule() const { return false; }
+ virtual bool isRule() const { return false; }
+ virtual bool isStyleRule() const { return false; }
+
virtual bool isStyleSheet() const { return false; }
virtual bool isXSLStyleSheet() const { return false; }
Modified: trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h (92447 => 92448)
--- trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h 2011-08-05 05:42:19 UTC (rev 92447)
+++ trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h 2011-08-05 06:04:52 UTC (rev 92448)
@@ -49,11 +49,6 @@
virtual ~WebKitCSSKeyframeRule();
- virtual bool isKeyframeRule() { return true; }
-
- // Inherited from CSSRule
- virtual unsigned short type() const { return WEBKIT_KEYFRAME_RULE; }
-
String keyText() const { return m_key; }
void setKeyText(const String& s) { m_key = s; }
@@ -72,6 +67,10 @@
const CSSMutableStyleDeclaration* declaration() const { return m_style.get(); }
private:
+ virtual bool isKeyframeRule() const { return true; }
+ // Inherited from CSSRule
+ virtual CSSRuleType type() const { return WEBKIT_KEYFRAME_RULE; }
+
static void parseKeyString(const String& s, Vector<float>& keys);
WebKitCSSKeyframeRule(CSSStyleSheet* parent);
Modified: trunk/Source/WebCore/css/WebKitCSSKeyframesRule.h (92447 => 92448)
--- trunk/Source/WebCore/css/WebKitCSSKeyframesRule.h 2011-08-05 05:42:19 UTC (rev 92447)
+++ trunk/Source/WebCore/css/WebKitCSSKeyframesRule.h 2011-08-05 06:04:52 UTC (rev 92448)
@@ -51,11 +51,6 @@
~WebKitCSSKeyframesRule();
- virtual bool isKeyframesRule() { return true; }
-
- // Inherited from CSSRule
- virtual unsigned short type() const { return WEBKIT_KEYFRAMES_RULE; }
-
String name() const;
void setName(const String&);
@@ -84,6 +79,10 @@
private:
WebKitCSSKeyframesRule(CSSStyleSheet* parent);
+ virtual bool isKeyframesRule() const { return true; }
+ // Inherited from CSSRule
+ virtual CSSRuleType type() const { return WEBKIT_KEYFRAMES_RULE; }
+
int findRuleIndex(const String& key) const;
RefPtr<CSSRuleList> m_lstCSSRules;
