Diff
Modified: trunk/Source/WebCore/ChangeLog (149529 => 149530)
--- trunk/Source/WebCore/ChangeLog 2013-05-03 19:31:15 UTC (rev 149529)
+++ trunk/Source/WebCore/ChangeLog 2013-05-03 20:27:39 UTC (rev 149530)
@@ -1,5 +1,36 @@
2013-05-03 Andreas Kling <[email protected]>
+ CSSRule style declarations getters shouldn't be const.
+ <http://webkit.org/b/115572>
+
+ Reviewed by Antti Koivisto.
+
+ Accessing the CSSStyleDeclaration for a CSSRule is a potentially mutating operation,
+ and should not be const.
+
+ * css/CSSFontFaceRule.cpp:
+ (WebCore::CSSFontFaceRule::style):
+ * css/CSSFontFaceRule.h:
+ * css/CSSPageRule.cpp:
+ (WebCore::CSSPageRule::style):
+ * css/CSSPageRule.h:
+ * css/CSSStyleRule.cpp:
+ (WebCore::CSSStyleRule::style):
+ * css/CSSStyleRule.h:
+ (CSSStyleRule):
+ * css/WebKitCSSFilterRule.cpp:
+ (WebCore::WebKitCSSFilterRule::style):
+ * css/WebKitCSSFilterRule.h:
+ * css/WebKitCSSKeyframeRule.cpp:
+ (WebCore::WebKitCSSKeyframeRule::style):
+ * css/WebKitCSSKeyframeRule.h:
+ (WebKitCSSKeyframeRule):
+ * css/WebKitCSSViewportRule.cpp:
+ (WebCore::WebKitCSSViewportRule::style):
+ * css/WebKitCSSViewportRule.h:
+
+2013-05-03 Andreas Kling <[email protected]>
+
Use NotNull tag for placement new in WebCore.
<http://webkit.org/b/115569>
Modified: trunk/Source/WebCore/css/CSSFontFaceRule.cpp (149529 => 149530)
--- trunk/Source/WebCore/css/CSSFontFaceRule.cpp 2013-05-03 19:31:15 UTC (rev 149529)
+++ trunk/Source/WebCore/css/CSSFontFaceRule.cpp 2013-05-03 20:27:39 UTC (rev 149530)
@@ -41,10 +41,10 @@
m_propertiesCSSOMWrapper->clearParentRule();
}
-CSSStyleDeclaration* CSSFontFaceRule::style() const
+CSSStyleDeclaration* CSSFontFaceRule::style()
{
if (!m_propertiesCSSOMWrapper)
- m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_fontFaceRule->mutableProperties(), const_cast<CSSFontFaceRule*>(this));
+ m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_fontFaceRule->mutableProperties(), this);
return m_propertiesCSSOMWrapper.get();
}
Modified: trunk/Source/WebCore/css/CSSFontFaceRule.h (149529 => 149530)
--- trunk/Source/WebCore/css/CSSFontFaceRule.h 2013-05-03 19:31:15 UTC (rev 149529)
+++ trunk/Source/WebCore/css/CSSFontFaceRule.h 2013-05-03 20:27:39 UTC (rev 149530)
@@ -40,7 +40,7 @@
virtual String cssText() const OVERRIDE;
virtual void reattach(StyleRuleBase*) OVERRIDE;
- CSSStyleDeclaration* style() const;
+ CSSStyleDeclaration* style();
private:
CSSFontFaceRule(StyleRuleFontFace*, CSSStyleSheet* parent);
Modified: trunk/Source/WebCore/css/CSSPageRule.cpp (149529 => 149530)
--- trunk/Source/WebCore/css/CSSPageRule.cpp 2013-05-03 19:31:15 UTC (rev 149529)
+++ trunk/Source/WebCore/css/CSSPageRule.cpp 2013-05-03 20:27:39 UTC (rev 149530)
@@ -46,10 +46,10 @@
m_propertiesCSSOMWrapper->clearParentRule();
}
-CSSStyleDeclaration* CSSPageRule::style() const
+CSSStyleDeclaration* CSSPageRule::style()
{
if (!m_propertiesCSSOMWrapper)
- m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_pageRule->mutableProperties(), const_cast<CSSPageRule*>(this));
+ m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_pageRule->mutableProperties(), this);
return m_propertiesCSSOMWrapper.get();
}
Modified: trunk/Source/WebCore/css/CSSPageRule.h (149529 => 149530)
--- trunk/Source/WebCore/css/CSSPageRule.h 2013-05-03 19:31:15 UTC (rev 149529)
+++ trunk/Source/WebCore/css/CSSPageRule.h 2013-05-03 20:27:39 UTC (rev 149530)
@@ -41,7 +41,7 @@
virtual String cssText() const OVERRIDE;
virtual void reattach(StyleRuleBase*) OVERRIDE;
- CSSStyleDeclaration* style() const;
+ CSSStyleDeclaration* style();
String selectorText() const;
void setSelectorText(const String&);
Modified: trunk/Source/WebCore/css/CSSStyleRule.cpp (149529 => 149530)
--- trunk/Source/WebCore/css/CSSStyleRule.cpp 2013-05-03 19:31:15 UTC (rev 149529)
+++ trunk/Source/WebCore/css/CSSStyleRule.cpp 2013-05-03 20:27:39 UTC (rev 149530)
@@ -57,10 +57,10 @@
}
}
-CSSStyleDeclaration* CSSStyleRule::style() const
+CSSStyleDeclaration* CSSStyleRule::style()
{
if (!m_propertiesCSSOMWrapper) {
- m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_styleRule->mutableProperties(), const_cast<CSSStyleRule*>(this));
+ m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_styleRule->mutableProperties(), this);
}
return m_propertiesCSSOMWrapper.get();
}
Modified: trunk/Source/WebCore/css/CSSStyleRule.h (149529 => 149530)
--- trunk/Source/WebCore/css/CSSStyleRule.h 2013-05-03 19:31:15 UTC (rev 149529)
+++ trunk/Source/WebCore/css/CSSStyleRule.h 2013-05-03 20:27:39 UTC (rev 149530)
@@ -43,7 +43,7 @@
String selectorText() const;
void setSelectorText(const String&);
- CSSStyleDeclaration* style() const;
+ CSSStyleDeclaration* style();
// FIXME: Not CSSOM. Remove.
StyleRule* styleRule() const { return m_styleRule.get(); }
Modified: trunk/Source/WebCore/css/WebKitCSSFilterRule.cpp (149529 => 149530)
--- trunk/Source/WebCore/css/WebKitCSSFilterRule.cpp 2013-05-03 19:31:15 UTC (rev 149529)
+++ trunk/Source/WebCore/css/WebKitCSSFilterRule.cpp 2013-05-03 20:27:39 UTC (rev 149530)
@@ -51,10 +51,10 @@
m_propertiesCSSOMWrapper->clearParentRule();
}
-CSSStyleDeclaration* WebKitCSSFilterRule::style() const
+CSSStyleDeclaration* WebKitCSSFilterRule::style()
{
if (!m_propertiesCSSOMWrapper)
- m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_filterRule->mutableProperties(), const_cast<WebKitCSSFilterRule*>(this));
+ m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_filterRule->mutableProperties(), this);
return m_propertiesCSSOMWrapper.get();
}
Modified: trunk/Source/WebCore/css/WebKitCSSFilterRule.h (149529 => 149530)
--- trunk/Source/WebCore/css/WebKitCSSFilterRule.h 2013-05-03 19:31:15 UTC (rev 149529)
+++ trunk/Source/WebCore/css/WebKitCSSFilterRule.h 2013-05-03 20:27:39 UTC (rev 149530)
@@ -50,7 +50,7 @@
virtual String cssText() const OVERRIDE;
virtual void reattach(StyleRuleBase*) OVERRIDE;
- CSSStyleDeclaration* style() const;
+ CSSStyleDeclaration* style();
private:
WebKitCSSFilterRule(StyleRuleFilter*, CSSStyleSheet* parent);
Modified: trunk/Source/WebCore/css/WebKitCSSKeyframeRule.cpp (149529 => 149530)
--- trunk/Source/WebCore/css/WebKitCSSKeyframeRule.cpp 2013-05-03 19:31:15 UTC (rev 149529)
+++ trunk/Source/WebCore/css/WebKitCSSKeyframeRule.cpp 2013-05-03 20:27:39 UTC (rev 149530)
@@ -109,10 +109,10 @@
m_propertiesCSSOMWrapper->clearParentRule();
}
-CSSStyleDeclaration* WebKitCSSKeyframeRule::style() const
+CSSStyleDeclaration* WebKitCSSKeyframeRule::style()
{
if (!m_propertiesCSSOMWrapper)
- m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_keyframe->mutableProperties(), const_cast<WebKitCSSKeyframeRule*>(this));
+ m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_keyframe->mutableProperties(), this);
return m_propertiesCSSOMWrapper.get();
}
Modified: trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h (149529 => 149530)
--- trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h 2013-05-03 19:31:15 UTC (rev 149529)
+++ trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h 2013-05-03 20:27:39 UTC (rev 149530)
@@ -78,7 +78,7 @@
String keyText() const { return m_keyframe->keyText(); }
void setKeyText(const String& s) { m_keyframe->setKeyText(s); }
- CSSStyleDeclaration* style() const;
+ CSSStyleDeclaration* style();
private:
WebKitCSSKeyframeRule(StyleKeyframe*, WebKitCSSKeyframesRule* parent);
Modified: trunk/Source/WebCore/css/WebKitCSSViewportRule.cpp (149529 => 149530)
--- trunk/Source/WebCore/css/WebKitCSSViewportRule.cpp 2013-05-03 19:31:15 UTC (rev 149529)
+++ trunk/Source/WebCore/css/WebKitCSSViewportRule.cpp 2013-05-03 20:27:39 UTC (rev 149530)
@@ -52,10 +52,10 @@
m_propertiesCSSOMWrapper->clearParentRule();
}
-CSSStyleDeclaration* WebKitCSSViewportRule::style() const
+CSSStyleDeclaration* WebKitCSSViewportRule::style()
{
if (!m_propertiesCSSOMWrapper)
- m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_viewportRule->mutableProperties(), const_cast<WebKitCSSViewportRule*>(this));
+ m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_viewportRule->mutableProperties(), this);
return m_propertiesCSSOMWrapper.get();
}
Modified: trunk/Source/WebCore/css/WebKitCSSViewportRule.h (149529 => 149530)
--- trunk/Source/WebCore/css/WebKitCSSViewportRule.h 2013-05-03 19:31:15 UTC (rev 149529)
+++ trunk/Source/WebCore/css/WebKitCSSViewportRule.h 2013-05-03 20:27:39 UTC (rev 149530)
@@ -53,7 +53,7 @@
virtual String cssText() const OVERRIDE;
virtual void reattach(StyleRuleBase*) OVERRIDE;
- CSSStyleDeclaration* style() const;
+ CSSStyleDeclaration* style();
private:
WebKitCSSViewportRule(StyleRuleViewport*, CSSStyleSheet*);
