<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174256] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174256">174256</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-10-02 21:38:19 -0700 (Thu, 02 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSCharsetRuleh">trunk/Source/WebCore/css/CSSCharsetRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceRulecpp">trunk/Source/WebCore/css/CSSFontFaceRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceRuleh">trunk/Source/WebCore/css/CSSFontFaceRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSGroupingRulecpp">trunk/Source/WebCore/css/CSSGroupingRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSGroupingRuleh">trunk/Source/WebCore/css/CSSGroupingRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSImportRulecpp">trunk/Source/WebCore/css/CSSImportRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSImportRuleh">trunk/Source/WebCore/css/CSSImportRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSMediaRulecpp">trunk/Source/WebCore/css/CSSMediaRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSMediaRuleh">trunk/Source/WebCore/css/CSSMediaRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSPageRulecpp">trunk/Source/WebCore/css/CSSPageRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPageRuleh">trunk/Source/WebCore/css/CSSPageRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSRuleh">trunk/Source/WebCore/css/CSSRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleRulecpp">trunk/Source/WebCore/css/CSSStyleRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleRuleh">trunk/Source/WebCore/css/CSSStyleRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleSheetcpp">trunk/Source/WebCore/css/CSSStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSSupportsRulecpp">trunk/Source/WebCore/css/CSSSupportsRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSSupportsRuleh">trunk/Source/WebCore/css/CSSSupportsRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSUnknownRuleh">trunk/Source/WebCore/css/CSSUnknownRule.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleRulecpp">trunk/Source/WebCore/css/StyleRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleRuleImporth">trunk/Source/WebCore/css/StyleRuleImport.h</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSKeyframeRulecpp">trunk/Source/WebCore/css/WebKitCSSKeyframeRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSKeyframeRuleh">trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSKeyframesRulecpp">trunk/Source/WebCore/css/WebKitCSSKeyframesRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSKeyframesRuleh">trunk/Source/WebCore/css/WebKitCSSKeyframesRule.h</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSRegionRulecpp">trunk/Source/WebCore/css/WebKitCSSRegionRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSRegionRuleh">trunk/Source/WebCore/css/WebKitCSSRegionRule.h</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSViewportRulecpp">trunk/Source/WebCore/css/WebKitCSSViewportRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSViewportRuleh">trunk/Source/WebCore/css/WebKitCSSViewportRule.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/ChangeLog 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -1,3 +1,86 @@
</span><ins>+2014-10-02 Andreas Kling <akling@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2014-10-02 Christophe Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Use is<>() / downcast<>() for CSSRule subclasses
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCharsetRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCharsetRule.h (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCharsetRule.h 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/CSSCharsetRule.h 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class CSSCharsetRule : public CSSRule {
</del><ins>+class CSSCharsetRule final : public CSSRule {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<CSSCharsetRule> create(CSSStyleSheet* parent, const String& encoding)
</span><span class="cx"> {
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> virtual CSSRule::Type type() const override { return CHARSET_RULE; }
</span><span class="cx"> virtual String cssText() const override;
</span><del>- virtual void reattach(StyleRuleBase* rule) override { ASSERT_UNUSED(rule, !rule); }
</del><ins>+ virtual void reattach(StyleRuleBase&) override { }
</ins><span class="cx">
</span><span class="cx"> const String& encoding() const { return m_encoding; }
</span><span class="cx"> void setEncoding(const String& encoding, ExceptionCode&) { m_encoding = encoding; }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceRule.cpp (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceRule.cpp 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/CSSFontFaceRule.cpp 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CSSFontFaceRule::CSSFontFaceRule(StyleRuleFontFace* fontFaceRule, CSSStyleSheet* parent)
</del><ins>+CSSFontFaceRule::CSSFontFaceRule(StyleRuleFontFace& fontFaceRule, CSSStyleSheet* parent)
</ins><span class="cx"> : CSSRule(parent)
</span><span class="cx"> , m_fontFaceRule(fontFaceRule)
</span><span class="cx"> {
</span><span class="lines">@@ -60,11 +60,10 @@
</span><span class="cx"> return result.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSFontFaceRule::reattach(StyleRuleBase* rule)
</del><ins>+void CSSFontFaceRule::reattach(StyleRuleBase& rule)
</ins><span class="cx"> {
</span><del>- ASSERT(rule);
- ASSERT_WITH_SECURITY_IMPLICATION(rule->isFontFaceRule());
- m_fontFaceRule = static_cast<StyleRuleFontFace*>(rule);
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(rule.isFontFaceRule());
+ m_fontFaceRule = static_cast<StyleRuleFontFace&>(rule);
</ins><span class="cx"> if (m_propertiesCSSOMWrapper)
</span><span class="cx"> m_propertiesCSSOMWrapper->reattach(m_fontFaceRule->mutableProperties());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceRule.h (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceRule.h 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/CSSFontFaceRule.h 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -30,22 +30,22 @@
</span><span class="cx"> class StyleRuleFontFace;
</span><span class="cx"> class StyleRuleCSSStyleDeclaration;
</span><span class="cx">
</span><del>-class CSSFontFaceRule : public CSSRule {
</del><ins>+class CSSFontFaceRule final : public CSSRule {
</ins><span class="cx"> public:
</span><del>- static PassRefPtr<CSSFontFaceRule> create(StyleRuleFontFace* rule, CSSStyleSheet* sheet) { return adoptRef(new CSSFontFaceRule(rule, sheet)); }
</del><ins>+ static PassRefPtr<CSSFontFaceRule> create(StyleRuleFontFace& rule, CSSStyleSheet* sheet) { return adoptRef(new CSSFontFaceRule(rule, sheet)); }
</ins><span class="cx">
</span><span class="cx"> virtual ~CSSFontFaceRule();
</span><span class="cx">
</span><span class="cx"> virtual CSSRule::Type type() const override { return FONT_FACE_RULE; }
</span><span class="cx"> virtual String cssText() const override;
</span><del>- virtual void reattach(StyleRuleBase*) override;
</del><ins>+ virtual void reattach(StyleRuleBase&) override;
</ins><span class="cx">
</span><span class="cx"> CSSStyleDeclaration& style();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- CSSFontFaceRule(StyleRuleFontFace*, CSSStyleSheet* parent);
</del><ins>+ CSSFontFaceRule(StyleRuleFontFace&, CSSStyleSheet* parent);
</ins><span class="cx">
</span><del>- RefPtr<StyleRuleFontFace> m_fontFaceRule;
</del><ins>+ Ref<StyleRuleFontFace> m_fontFaceRule;
</ins><span class="cx"> RefPtr<StyleRuleCSSStyleDeclaration> m_propertiesCSSOMWrapper;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGroupingRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGroupingRule.cpp (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGroupingRule.cpp 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/CSSGroupingRule.cpp 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CSSGroupingRule::CSSGroupingRule(StyleRuleGroup* groupRule, CSSStyleSheet* parent)
</del><ins>+CSSGroupingRule::CSSGroupingRule(StyleRuleGroup& groupRule, CSSStyleSheet* parent)
</ins><span class="cx"> : CSSRule(parent)
</span><span class="cx"> , m_groupRule(groupRule)
</span><del>- , m_childRuleCSSOMWrappers(groupRule->childRules().size())
</del><ins>+ , m_childRuleCSSOMWrappers(groupRule.childRules().size())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -148,13 +148,12 @@
</span><span class="cx"> return *m_ruleListCSSOMWrapper;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSGroupingRule::reattach(StyleRuleBase* rule)
</del><ins>+void CSSGroupingRule::reattach(StyleRuleBase& rule)
</ins><span class="cx"> {
</span><del>- ASSERT(rule);
- m_groupRule = static_cast<StyleRuleGroup*>(rule);
</del><ins>+ m_groupRule = static_cast<StyleRuleGroup&>(rule);
</ins><span class="cx"> for (unsigned i = 0; i < m_childRuleCSSOMWrappers.size(); ++i) {
</span><span class="cx"> if (m_childRuleCSSOMWrappers[i])
</span><del>- m_childRuleCSSOMWrappers[i]->reattach(m_groupRule->childRules()[i].get());
</del><ins>+ m_childRuleCSSOMWrappers[i]->reattach(*m_groupRule.get().childRules()[i]);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGroupingRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGroupingRule.h (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGroupingRule.h 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/CSSGroupingRule.h 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~CSSGroupingRule();
</span><span class="cx">
</span><del>- virtual void reattach(StyleRuleBase*) override;
</del><ins>+ virtual void reattach(StyleRuleBase&) override;
</ins><span class="cx">
</span><span class="cx"> CSSRuleList& cssRules() const;
</span><span class="cx">
</span><span class="lines">@@ -48,11 +48,11 @@
</span><span class="cx"> CSSRule* item(unsigned index) const;
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- CSSGroupingRule(StyleRuleGroup* groupRule, CSSStyleSheet* parent);
</del><ins>+ CSSGroupingRule(StyleRuleGroup& groupRule, CSSStyleSheet* parent);
</ins><span class="cx">
</span><span class="cx"> void appendCssTextForItems(StringBuilder&) const;
</span><span class="cx">
</span><del>- RefPtr<StyleRuleGroup> m_groupRule;
</del><ins>+ Ref<StyleRuleGroup> m_groupRule;
</ins><span class="cx"> mutable Vector<RefPtr<CSSRule>> m_childRuleCSSOMWrappers;
</span><span class="cx"> mutable std::unique_ptr<CSSRuleList> m_ruleListCSSOMWrapper;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImportRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImportRule.cpp (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImportRule.cpp 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/CSSImportRule.cpp 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CSSImportRule::CSSImportRule(StyleRuleImport* importRule, CSSStyleSheet* parent)
</del><ins>+CSSImportRule::CSSImportRule(StyleRuleImport& importRule, CSSStyleSheet* parent)
</ins><span class="cx"> : CSSRule(parent)
</span><span class="cx"> , m_importRule(importRule)
</span><span class="cx"> {
</span><span class="lines">@@ -50,13 +50,13 @@
</span><span class="cx">
</span><span class="cx"> String CSSImportRule::href() const
</span><span class="cx"> {
</span><del>- return m_importRule->href();
</del><ins>+ return m_importRule.get().href();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaList& CSSImportRule::media() const
</span><span class="cx"> {
</span><span class="cx"> if (!m_mediaCSSOMWrapper)
</span><del>- m_mediaCSSOMWrapper = MediaList::create(m_importRule->mediaQueries(), const_cast<CSSImportRule*>(this));
</del><ins>+ m_mediaCSSOMWrapper = MediaList::create(m_importRule.get().mediaQueries(), const_cast<CSSImportRule*>(this));
</ins><span class="cx"> return *m_mediaCSSOMWrapper;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -64,11 +64,11 @@
</span><span class="cx"> {
</span><span class="cx"> StringBuilder result;
</span><span class="cx"> result.appendLiteral("@import url(\"");
</span><del>- result.append(m_importRule->href());
</del><ins>+ result.append(m_importRule.get().href());
</ins><span class="cx"> result.appendLiteral("\")");
</span><span class="cx">
</span><del>- if (m_importRule->mediaQueries()) {
- String mediaText = m_importRule->mediaQueries()->mediaText();
</del><ins>+ if (m_importRule.get().mediaQueries()) {
+ String mediaText = m_importRule.get().mediaQueries()->mediaText();
</ins><span class="cx"> if (!mediaText.isEmpty()) {
</span><span class="cx"> result.append(' ');
</span><span class="cx"> result.append(mediaText);
</span><span class="lines">@@ -81,15 +81,15 @@
</span><span class="cx">
</span><span class="cx"> CSSStyleSheet* CSSImportRule::styleSheet() const
</span><span class="cx"> {
</span><del>- if (!m_importRule->styleSheet())
</del><ins>+ if (!m_importRule.get().styleSheet())
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> if (!m_styleSheetCSSOMWrapper)
</span><del>- m_styleSheetCSSOMWrapper = CSSStyleSheet::create(*m_importRule->styleSheet(), const_cast<CSSImportRule*>(this));
</del><ins>+ m_styleSheetCSSOMWrapper = CSSStyleSheet::create(*m_importRule.get().styleSheet(), const_cast<CSSImportRule*>(this));
</ins><span class="cx"> return m_styleSheetCSSOMWrapper.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSImportRule::reattach(StyleRuleBase*)
</del><ins>+void CSSImportRule::reattach(StyleRuleBase&)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Implement when enabling caching for stylesheets with import rules.
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImportRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImportRule.h (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImportRule.h 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/CSSImportRule.h 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -31,24 +31,24 @@
</span><span class="cx"> class MediaQuerySet;
</span><span class="cx"> class StyleRuleImport;
</span><span class="cx">
</span><del>-class CSSImportRule : public CSSRule {
</del><ins>+class CSSImportRule final : public CSSRule {
</ins><span class="cx"> public:
</span><del>- static PassRefPtr<CSSImportRule> create(StyleRuleImport* rule, CSSStyleSheet* sheet) { return adoptRef(new CSSImportRule(rule, sheet)); }
</del><ins>+ static PassRefPtr<CSSImportRule> create(StyleRuleImport& rule, CSSStyleSheet* sheet) { return adoptRef(new CSSImportRule(rule, sheet)); }
</ins><span class="cx">
</span><span class="cx"> virtual ~CSSImportRule();
</span><span class="cx">
</span><span class="cx"> virtual CSSRule::Type type() const override { return IMPORT_RULE; }
</span><span class="cx"> virtual String cssText() const override;
</span><del>- virtual void reattach(StyleRuleBase*) override;
</del><ins>+ virtual void reattach(StyleRuleBase&) override;
</ins><span class="cx">
</span><span class="cx"> String href() const;
</span><span class="cx"> MediaList& media() const;
</span><span class="cx"> CSSStyleSheet* styleSheet() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- CSSImportRule(StyleRuleImport*, CSSStyleSheet*);
</del><ins>+ CSSImportRule(StyleRuleImport&, CSSStyleSheet*);
</ins><span class="cx">
</span><del>- RefPtr<StyleRuleImport> m_importRule;
</del><ins>+ Ref<StyleRuleImport> m_importRule;
</ins><span class="cx"> mutable RefPtr<MediaList> m_mediaCSSOMWrapper;
</span><span class="cx"> mutable RefPtr<CSSStyleSheet> m_styleSheetCSSOMWrapper;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSMediaRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSMediaRule.cpp (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSMediaRule.cpp 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/CSSMediaRule.cpp 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CSSMediaRule::CSSMediaRule(StyleRuleMedia* mediaRule, CSSStyleSheet* parent)
</del><ins>+CSSMediaRule::CSSMediaRule(StyleRuleMedia& mediaRule, CSSStyleSheet* parent)
</ins><span class="cx"> : CSSGroupingRule(mediaRule, parent)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> MediaQuerySet* CSSMediaRule::mediaQueries() const
</span><span class="cx"> {
</span><del>- return toStyleRuleMedia(m_groupRule.get())->mediaQueries();
</del><ins>+ return toStyleRuleMedia(&m_groupRule.get())->mediaQueries();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String CSSMediaRule::cssText() const
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> return m_mediaCSSOMWrapper.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSMediaRule::reattach(StyleRuleBase* rule)
</del><ins>+void CSSMediaRule::reattach(StyleRuleBase& rule)
</ins><span class="cx"> {
</span><span class="cx"> CSSGroupingRule::reattach(rule);
</span><span class="cx"> if (m_mediaCSSOMWrapper && mediaQueries())
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSMediaRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSMediaRule.h (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSMediaRule.h 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/CSSMediaRule.h 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -30,20 +30,20 @@
</span><span class="cx">
</span><span class="cx"> class StyleRuleMedia;
</span><span class="cx">
</span><del>-class CSSMediaRule : public CSSGroupingRule {
</del><ins>+class CSSMediaRule final : public CSSGroupingRule {
</ins><span class="cx"> public:
</span><del>- static PassRefPtr<CSSMediaRule> create(StyleRuleMedia* rule, CSSStyleSheet* sheet) { return adoptRef(new CSSMediaRule(rule, sheet)); }
</del><ins>+ static PassRefPtr<CSSMediaRule> create(StyleRuleMedia& rule, CSSStyleSheet* sheet) { return adoptRef(new CSSMediaRule(rule, sheet)); }
</ins><span class="cx">
</span><span class="cx"> virtual ~CSSMediaRule();
</span><span class="cx">
</span><span class="cx"> virtual CSSRule::Type type() const override { return MEDIA_RULE; }
</span><del>- virtual void reattach(StyleRuleBase*) override;
</del><ins>+ virtual void reattach(StyleRuleBase&) override;
</ins><span class="cx"> virtual String cssText() const override;
</span><span class="cx">
</span><span class="cx"> MediaList* media() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- CSSMediaRule(StyleRuleMedia*, CSSStyleSheet*);
</del><ins>+ CSSMediaRule(StyleRuleMedia&, CSSStyleSheet*);
</ins><span class="cx">
</span><span class="cx"> MediaQuerySet* mediaQueries() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPageRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPageRule.cpp (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPageRule.cpp 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/CSSPageRule.cpp 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CSSPageRule::CSSPageRule(StyleRulePage* pageRule, CSSStyleSheet* parent)
</del><ins>+CSSPageRule::CSSPageRule(StyleRulePage& pageRule, CSSStyleSheet* parent)
</ins><span class="cx"> : CSSRule(parent)
</span><span class="cx"> , m_pageRule(pageRule)
</span><span class="cx"> {
</span><span class="lines">@@ -94,13 +94,12 @@
</span><span class="cx"> return result.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSPageRule::reattach(StyleRuleBase* rule)
</del><ins>+void CSSPageRule::reattach(StyleRuleBase& rule)
</ins><span class="cx"> {
</span><del>- ASSERT(rule);
- ASSERT_WITH_SECURITY_IMPLICATION(rule->isPageRule());
- m_pageRule = static_cast<StyleRulePage*>(rule);
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(rule.isPageRule());
+ m_pageRule = static_cast<StyleRulePage&>(rule);
</ins><span class="cx"> if (m_propertiesCSSOMWrapper)
</span><del>- m_propertiesCSSOMWrapper->reattach(m_pageRule->mutableProperties());
</del><ins>+ m_propertiesCSSOMWrapper->reattach(m_pageRule.get().mutableProperties());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPageRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPageRule.h (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPageRule.h 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/CSSPageRule.h 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -31,15 +31,15 @@
</span><span class="cx"> class StyleRulePage;
</span><span class="cx"> class StyleRuleCSSStyleDeclaration;
</span><span class="cx">
</span><del>-class CSSPageRule : public CSSRule {
</del><ins>+class CSSPageRule final : public CSSRule {
</ins><span class="cx"> public:
</span><del>- static PassRefPtr<CSSPageRule> create(StyleRulePage* rule, CSSStyleSheet* sheet) { return adoptRef(new CSSPageRule(rule, sheet)); }
</del><ins>+ static PassRefPtr<CSSPageRule> create(StyleRulePage& rule, CSSStyleSheet* sheet) { return adoptRef(new CSSPageRule(rule, sheet)); }
</ins><span class="cx">
</span><span class="cx"> virtual ~CSSPageRule();
</span><span class="cx">
</span><span class="cx"> virtual CSSRule::Type type() const override { return PAGE_RULE; }
</span><span class="cx"> virtual String cssText() const override;
</span><del>- virtual void reattach(StyleRuleBase*) override;
</del><ins>+ virtual void reattach(StyleRuleBase&) override;
</ins><span class="cx">
</span><span class="cx"> CSSStyleDeclaration& style();
</span><span class="cx">
</span><span class="lines">@@ -47,9 +47,9 @@
</span><span class="cx"> void setSelectorText(const String&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- CSSPageRule(StyleRulePage*, CSSStyleSheet*);
</del><ins>+ CSSPageRule(StyleRulePage&, CSSStyleSheet*);
</ins><span class="cx">
</span><del>- RefPtr<StyleRulePage> m_pageRule;
</del><ins>+ Ref<StyleRulePage> m_pageRule;
</ins><span class="cx"> mutable RefPtr<StyleRuleCSSStyleDeclaration> m_propertiesCSSOMWrapper;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSRule.h (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSRule.h 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/CSSRule.h 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> virtual Type type() const = 0;
</span><span class="cx"> virtual String cssText() const = 0;
</span><del>- virtual void reattach(StyleRuleBase*) = 0;
</del><ins>+ virtual void reattach(StyleRuleBase&) = 0;
</ins><span class="cx">
</span><span class="cx"> void setParentStyleSheet(CSSStyleSheet* styleSheet)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleRule.cpp (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleRule.cpp 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/CSSStyleRule.cpp 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> return cache;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSStyleRule::CSSStyleRule(StyleRule* styleRule, CSSStyleSheet* parent)
</del><ins>+CSSStyleRule::CSSStyleRule(StyleRule& styleRule, CSSStyleSheet* parent)
</ins><span class="cx"> : CSSRule(parent)
</span><span class="cx"> , m_styleRule(styleRule)
</span><span class="cx"> {
</span><span class="lines">@@ -131,11 +131,10 @@
</span><span class="cx"> return result.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSStyleRule::reattach(StyleRuleBase* rule)
</del><ins>+void CSSStyleRule::reattach(StyleRuleBase& rule)
</ins><span class="cx"> {
</span><del>- ASSERT(rule);
- ASSERT_WITH_SECURITY_IMPLICATION(rule->isStyleRule());
- m_styleRule = static_cast<StyleRule*>(rule);
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(rule.isStyleRule());
+ m_styleRule = static_cast<StyleRule&>(rule);
</ins><span class="cx"> if (m_propertiesCSSOMWrapper)
</span><span class="cx"> m_propertiesCSSOMWrapper->reattach(m_styleRule->mutableProperties());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleRule.h (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleRule.h 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/CSSStyleRule.h 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -30,15 +30,15 @@
</span><span class="cx"> class StyleRuleCSSStyleDeclaration;
</span><span class="cx"> class StyleRule;
</span><span class="cx">
</span><del>-class CSSStyleRule : public CSSRule {
</del><ins>+class CSSStyleRule final : public CSSRule {
</ins><span class="cx"> public:
</span><del>- static PassRefPtr<CSSStyleRule> create(StyleRule* rule, CSSStyleSheet* sheet) { return adoptRef(new CSSStyleRule(rule, sheet)); }
</del><ins>+ static PassRefPtr<CSSStyleRule> create(StyleRule& rule, CSSStyleSheet* sheet) { return adoptRef(new CSSStyleRule(rule, sheet)); }
</ins><span class="cx">
</span><span class="cx"> virtual ~CSSStyleRule();
</span><span class="cx">
</span><span class="cx"> virtual CSSRule::Type type() const { return STYLE_RULE; }
</span><span class="cx"> virtual String cssText() const override;
</span><del>- virtual void reattach(StyleRuleBase*) override;
</del><ins>+ virtual void reattach(StyleRuleBase&) override;
</ins><span class="cx">
</span><span class="cx"> String selectorText() const;
</span><span class="cx"> void setSelectorText(const String&);
</span><span class="lines">@@ -46,14 +46,14 @@
</span><span class="cx"> CSSStyleDeclaration& style();
</span><span class="cx">
</span><span class="cx"> // FIXME: Not CSSOM. Remove.
</span><del>- StyleRule* styleRule() const { return m_styleRule.get(); }
</del><ins>+ StyleRule* styleRule() const { return &const_cast<StyleRule&>(m_styleRule.get()); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- CSSStyleRule(StyleRule*, CSSStyleSheet*);
</del><ins>+ CSSStyleRule(StyleRule&, CSSStyleSheet*);
</ins><span class="cx">
</span><span class="cx"> String generateSelectorText() const;
</span><span class="cx">
</span><del>- RefPtr<StyleRule> m_styleRule;
</del><ins>+ Ref<StyleRule> m_styleRule;
</ins><span class="cx"> RefPtr<StyleRuleCSSStyleDeclaration> m_propertiesCSSOMWrapper;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleSheet.cpp (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleSheet.cpp 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/CSSStyleSheet.cpp 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> for (unsigned i = 0; i < m_childRuleCSSOMWrappers.size(); ++i) {
</span><span class="cx"> if (!m_childRuleCSSOMWrappers[i])
</span><span class="cx"> continue;
</span><del>- m_childRuleCSSOMWrappers[i]->reattach(m_contents->ruleAt(i));
</del><ins>+ m_childRuleCSSOMWrappers[i]->reattach(*m_contents->ruleAt(i));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSupportsRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSupportsRule.cpp (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSupportsRule.cpp 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/CSSSupportsRule.cpp 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CSSSupportsRule::CSSSupportsRule(StyleRuleSupports* supportsRule, CSSStyleSheet* parent)
</del><ins>+CSSSupportsRule::CSSSupportsRule(StyleRuleSupports& supportsRule, CSSStyleSheet* parent)
</ins><span class="cx"> : CSSGroupingRule(supportsRule, parent)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> String CSSSupportsRule::conditionText() const
</span><span class="cx"> {
</span><del>- return toStyleRuleSupports(m_groupRule.get())->conditionText();
</del><ins>+ return toStyleRuleSupports(&m_groupRule.get())->conditionText();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSupportsRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSupportsRule.h (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSupportsRule.h 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/CSSSupportsRule.h 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -38,9 +38,9 @@
</span><span class="cx"> class CSSRule;
</span><span class="cx"> class StyleRuleSupports;
</span><span class="cx">
</span><del>-class CSSSupportsRule : public CSSGroupingRule {
</del><ins>+class CSSSupportsRule final : public CSSGroupingRule {
</ins><span class="cx"> public:
</span><del>- static PassRefPtr<CSSSupportsRule> create(StyleRuleSupports* rule, CSSStyleSheet* sheet)
</del><ins>+ static PassRefPtr<CSSSupportsRule> create(StyleRuleSupports& rule, CSSStyleSheet* sheet)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new CSSSupportsRule(rule, sheet));
</span><span class="cx"> }
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> String conditionText() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- CSSSupportsRule(StyleRuleSupports*, CSSStyleSheet*);
</del><ins>+ CSSSupportsRule(StyleRuleSupports&, CSSStyleSheet*);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSUnknownRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSUnknownRule.h (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSUnknownRule.h 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/CSSUnknownRule.h 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -26,14 +26,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class CSSUnknownRule : public CSSRule {
</del><ins>+class CSSUnknownRule final : public CSSRule {
</ins><span class="cx"> public:
</span><span class="cx"> CSSUnknownRule() : CSSRule(0) { }
</span><span class="cx"> virtual ~CSSUnknownRule() { }
</span><span class="cx">
</span><span class="cx"> virtual CSSRule::Type type() const override { return UNKNOWN_RULE; }
</span><span class="cx"> virtual String cssText() const override { return String(); }
</span><del>- virtual void reattach(StyleRuleBase*) override { }
</del><ins>+ virtual void reattach(StyleRuleBase&) override { }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleRule.cpp (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleRule.cpp 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/StyleRule.cpp 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -147,39 +147,39 @@
</span><span class="cx"> PassRefPtr<CSSRule> StyleRuleBase::createCSSOMWrapper(CSSStyleSheet* parentSheet, CSSRule* parentRule) const
</span><span class="cx"> {
</span><span class="cx"> RefPtr<CSSRule> rule;
</span><del>- StyleRuleBase* self = const_cast<StyleRuleBase*>(this);
</del><ins>+ StyleRuleBase& self = const_cast<StyleRuleBase&>(*this);
</ins><span class="cx"> switch (type()) {
</span><span class="cx"> case Style:
</span><del>- rule = CSSStyleRule::create(static_cast<StyleRule*>(self), parentSheet);
</del><ins>+ rule = CSSStyleRule::create(static_cast<StyleRule&>(self), parentSheet);
</ins><span class="cx"> break;
</span><span class="cx"> case Page:
</span><del>- rule = CSSPageRule::create(static_cast<StyleRulePage*>(self), parentSheet);
</del><ins>+ rule = CSSPageRule::create(static_cast<StyleRulePage&>(self), parentSheet);
</ins><span class="cx"> break;
</span><span class="cx"> case FontFace:
</span><del>- rule = CSSFontFaceRule::create(static_cast<StyleRuleFontFace*>(self), parentSheet);
</del><ins>+ rule = CSSFontFaceRule::create(static_cast<StyleRuleFontFace&>(self), parentSheet);
</ins><span class="cx"> break;
</span><span class="cx"> case Media:
</span><del>- rule = CSSMediaRule::create(static_cast<StyleRuleMedia*>(self), parentSheet);
</del><ins>+ rule = CSSMediaRule::create(static_cast<StyleRuleMedia&>(self), parentSheet);
</ins><span class="cx"> break;
</span><span class="cx"> #if ENABLE(CSS3_CONDITIONAL_RULES)
</span><span class="cx"> case Supports:
</span><del>- rule = CSSSupportsRule::create(static_cast<StyleRuleSupports*>(self), parentSheet);
</del><ins>+ rule = CSSSupportsRule::create(static_cast<StyleRuleSupports&>(self), parentSheet);
</ins><span class="cx"> break;
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_REGIONS)
</span><span class="cx"> case Region:
</span><del>- rule = WebKitCSSRegionRule::create(static_cast<StyleRuleRegion*>(self), parentSheet);
</del><ins>+ rule = WebKitCSSRegionRule::create(static_cast<StyleRuleRegion&>(self), parentSheet);
</ins><span class="cx"> break;
</span><span class="cx"> #endif
</span><span class="cx"> case Import:
</span><del>- rule = CSSImportRule::create(static_cast<StyleRuleImport*>(self), parentSheet);
</del><ins>+ rule = CSSImportRule::create(static_cast<StyleRuleImport&>(self), parentSheet);
</ins><span class="cx"> break;
</span><span class="cx"> case Keyframes:
</span><del>- rule = WebKitCSSKeyframesRule::create(static_cast<StyleRuleKeyframes*>(self), parentSheet);
</del><ins>+ rule = WebKitCSSKeyframesRule::create(static_cast<StyleRuleKeyframes&>(self), parentSheet);
</ins><span class="cx"> break;
</span><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx"> case Viewport:
</span><del>- rule = WebKitCSSViewportRule::create(static_cast<StyleRuleViewport*>(self), parentSheet);
</del><ins>+ rule = WebKitCSSViewportRule::create(static_cast<StyleRuleViewport&>(self), parentSheet);
</ins><span class="cx"> break;
</span><span class="cx"> #endif
</span><span class="cx"> case Unknown:
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleRuleImporth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleRuleImport.h (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleRuleImport.h 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/StyleRuleImport.h 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> StyleSheetContents* styleSheet() const { return m_styleSheet.get(); }
</span><span class="cx">
</span><span class="cx"> bool isLoading() const;
</span><del>- MediaQuerySet* mediaQueries() { return m_mediaQueries.get(); }
</del><ins>+ MediaQuerySet* mediaQueries() const { return m_mediaQueries.get(); }
</ins><span class="cx">
</span><span class="cx"> void requestStyleSheet();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSKeyframeRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSKeyframeRule.cpp (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSKeyframeRule.cpp 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/WebKitCSSKeyframeRule.cpp 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> return result.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebKitCSSKeyframeRule::WebKitCSSKeyframeRule(StyleKeyframe* keyframe, WebKitCSSKeyframesRule* parent)
</del><ins>+WebKitCSSKeyframeRule::WebKitCSSKeyframeRule(StyleKeyframe& keyframe, WebKitCSSKeyframesRule* parent)
</ins><span class="cx"> : CSSRule(0)
</span><span class="cx"> , m_keyframe(keyframe)
</span><span class="cx"> {
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> return *m_propertiesCSSOMWrapper;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebKitCSSKeyframeRule::reattach(StyleRuleBase*)
</del><ins>+void WebKitCSSKeyframeRule::reattach(StyleRuleBase&)
</ins><span class="cx"> {
</span><span class="cx"> // No need to reattach, the underlying data is shareable on mutation.
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSKeyframeRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -65,13 +65,13 @@
</span><span class="cx"> String m_key;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class WebKitCSSKeyframeRule : public CSSRule {
</del><ins>+class WebKitCSSKeyframeRule final : public CSSRule {
</ins><span class="cx"> public:
</span><span class="cx"> virtual ~WebKitCSSKeyframeRule();
</span><span class="cx">
</span><span class="cx"> virtual CSSRule::Type type() const override { return WEBKIT_KEYFRAME_RULE; }
</span><span class="cx"> virtual String cssText() const override { return m_keyframe->cssText(); }
</span><del>- virtual void reattach(StyleRuleBase*) override;
</del><ins>+ virtual void reattach(StyleRuleBase&) override;
</ins><span class="cx">
</span><span class="cx"> String keyText() const { return m_keyframe->keyText(); }
</span><span class="cx"> void setKeyText(const String& s) { m_keyframe->setKeyText(s); }
</span><span class="lines">@@ -79,9 +79,9 @@
</span><span class="cx"> CSSStyleDeclaration& style();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebKitCSSKeyframeRule(StyleKeyframe*, WebKitCSSKeyframesRule* parent);
</del><ins>+ WebKitCSSKeyframeRule(StyleKeyframe&, WebKitCSSKeyframesRule* parent);
</ins><span class="cx">
</span><del>- RefPtr<StyleKeyframe> m_keyframe;
</del><ins>+ Ref<StyleKeyframe> m_keyframe;
</ins><span class="cx"> mutable RefPtr<StyleRuleCSSStyleDeclaration> m_propertiesCSSOMWrapper;
</span><span class="cx">
</span><span class="cx"> friend class WebKitCSSKeyframesRule;
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSKeyframesRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSKeyframesRule.cpp (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSKeyframesRule.cpp 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/WebKitCSSKeyframesRule.cpp 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -86,10 +86,10 @@
</span><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebKitCSSKeyframesRule::WebKitCSSKeyframesRule(StyleRuleKeyframes* keyframesRule, CSSStyleSheet* parent)
</del><ins>+WebKitCSSKeyframesRule::WebKitCSSKeyframesRule(StyleRuleKeyframes& keyframesRule, CSSStyleSheet* parent)
</ins><span class="cx"> : CSSRule(parent)
</span><span class="cx"> , m_keyframesRule(keyframesRule)
</span><del>- , m_childRuleCSSOMWrappers(keyframesRule->keyframes().size())
</del><ins>+ , m_childRuleCSSOMWrappers(keyframesRule.keyframes().size())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
</span><span class="cx"> RefPtr<WebKitCSSKeyframeRule>& rule = m_childRuleCSSOMWrappers[index];
</span><span class="cx"> if (!rule)
</span><del>- rule = adoptRef(new WebKitCSSKeyframeRule(m_keyframesRule->keyframes()[index].get(), const_cast<WebKitCSSKeyframesRule*>(this)));
</del><ins>+ rule = adoptRef(new WebKitCSSKeyframeRule(*m_keyframesRule->keyframes()[index], const_cast<WebKitCSSKeyframesRule*>(this)));
</ins><span class="cx">
</span><span class="cx"> return rule.get();
</span><span class="cx"> }
</span><span class="lines">@@ -192,11 +192,10 @@
</span><span class="cx"> return *m_ruleListCSSOMWrapper;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebKitCSSKeyframesRule::reattach(StyleRuleBase* rule)
</del><ins>+void WebKitCSSKeyframesRule::reattach(StyleRuleBase& rule)
</ins><span class="cx"> {
</span><del>- ASSERT(rule);
- ASSERT_WITH_SECURITY_IMPLICATION(rule->isKeyframesRule());
- m_keyframesRule = static_cast<StyleRuleKeyframes*>(rule);
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(rule.isKeyframesRule());
+ m_keyframesRule = static_cast<StyleRuleKeyframes&>(rule);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSKeyframesRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSKeyframesRule.h (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSKeyframesRule.h 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/WebKitCSSKeyframesRule.h 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -65,15 +65,15 @@
</span><span class="cx"> AtomicString m_name;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class WebKitCSSKeyframesRule : public CSSRule {
</del><ins>+class WebKitCSSKeyframesRule final : public CSSRule {
</ins><span class="cx"> public:
</span><del>- static PassRefPtr<WebKitCSSKeyframesRule> create(StyleRuleKeyframes* rule, CSSStyleSheet* sheet) { return adoptRef(new WebKitCSSKeyframesRule(rule, sheet)); }
</del><ins>+ static PassRefPtr<WebKitCSSKeyframesRule> create(StyleRuleKeyframes& rule, CSSStyleSheet* sheet) { return adoptRef(new WebKitCSSKeyframesRule(rule, sheet)); }
</ins><span class="cx">
</span><span class="cx"> virtual ~WebKitCSSKeyframesRule();
</span><span class="cx">
</span><span class="cx"> virtual CSSRule::Type type() const override { return WEBKIT_KEYFRAMES_RULE; }
</span><span class="cx"> virtual String cssText() const override;
</span><del>- virtual void reattach(StyleRuleBase*) override;
</del><ins>+ virtual void reattach(StyleRuleBase&) override;
</ins><span class="cx">
</span><span class="cx"> String name() const { return m_keyframesRule->name(); }
</span><span class="cx"> void setName(const String&);
</span><span class="lines">@@ -90,9 +90,9 @@
</span><span class="cx"> WebKitCSSKeyframeRule* item(unsigned index) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebKitCSSKeyframesRule(StyleRuleKeyframes*, CSSStyleSheet* parent);
</del><ins>+ WebKitCSSKeyframesRule(StyleRuleKeyframes&, CSSStyleSheet* parent);
</ins><span class="cx">
</span><del>- RefPtr<StyleRuleKeyframes> m_keyframesRule;
</del><ins>+ Ref<StyleRuleKeyframes> m_keyframesRule;
</ins><span class="cx"> mutable Vector<RefPtr<WebKitCSSKeyframeRule>> m_childRuleCSSOMWrappers;
</span><span class="cx"> mutable std::unique_ptr<CSSRuleList> m_ruleListCSSOMWrapper;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSRegionRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSRegionRule.cpp (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSRegionRule.cpp 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/WebKitCSSRegionRule.cpp 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> #if ENABLE(CSS_REGIONS)
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-WebKitCSSRegionRule::WebKitCSSRegionRule(StyleRuleRegion* regionRule, CSSStyleSheet* parent)
</del><ins>+WebKitCSSRegionRule::WebKitCSSRegionRule(StyleRuleRegion& regionRule, CSSStyleSheet* parent)
</ins><span class="cx"> : CSSGroupingRule(regionRule, parent)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> result.appendLiteral("@-webkit-region ");
</span><span class="cx">
</span><span class="cx"> // First add the selectors.
</span><del>- result.append(toStyleRuleRegion(m_groupRule.get())->selectorList().selectorsText());
</del><ins>+ result.append(toStyleRuleRegion(&m_groupRule.get())->selectorList().selectorsText());
</ins><span class="cx">
</span><span class="cx"> // Then add the rules.
</span><span class="cx"> result.appendLiteral(" { \n");
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSRegionRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSRegionRule.h (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSRegionRule.h 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/WebKitCSSRegionRule.h 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -39,15 +39,15 @@
</span><span class="cx">
</span><span class="cx"> class StyleRuleRegion;
</span><span class="cx">
</span><del>-class WebKitCSSRegionRule : public CSSGroupingRule {
</del><ins>+class WebKitCSSRegionRule final : public CSSGroupingRule {
</ins><span class="cx"> public:
</span><del>- static PassRefPtr<WebKitCSSRegionRule> create(StyleRuleRegion* rule, CSSStyleSheet* sheet) { return adoptRef(new WebKitCSSRegionRule(rule, sheet)); }
</del><ins>+ static PassRefPtr<WebKitCSSRegionRule> create(StyleRuleRegion& rule, CSSStyleSheet* sheet) { return adoptRef(new WebKitCSSRegionRule(rule, sheet)); }
</ins><span class="cx">
</span><span class="cx"> virtual CSSRule::Type type() const override { return WEBKIT_REGION_RULE; }
</span><span class="cx"> virtual String cssText() const override;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebKitCSSRegionRule(StyleRuleRegion*, CSSStyleSheet* parent);
</del><ins>+ WebKitCSSRegionRule(StyleRuleRegion&, CSSStyleSheet* parent);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSViewportRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSViewportRule.cpp (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSViewportRule.cpp 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/WebKitCSSViewportRule.cpp 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -75,11 +75,10 @@
</span><span class="cx"> return result.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebKitCSSViewportRule::reattach(StyleRuleBase* rule)
</del><ins>+void WebKitCSSViewportRule::reattach(StyleRuleBase& rule)
</ins><span class="cx"> {
</span><del>- ASSERT(rule);
- ASSERT_WITH_SECURITY_IMPLICATION(rule->isViewportRule());
- m_viewportRule = static_cast<StyleRuleViewport*>(rule);
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(rule.isViewportRule());
+ m_viewportRule = static_cast<StyleRuleViewport&>(rule);
</ins><span class="cx">
</span><span class="cx"> if (m_propertiesCSSOMWrapper)
</span><span class="cx"> m_propertiesCSSOMWrapper->reattach(m_viewportRule->mutableProperties());
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSViewportRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSViewportRule.h (174255 => 174256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSViewportRule.h 2014-10-03 02:49:15 UTC (rev 174255)
+++ trunk/Source/WebCore/css/WebKitCSSViewportRule.h 2014-10-03 04:38:19 UTC (rev 174256)
</span><span class="lines">@@ -41,9 +41,9 @@
</span><span class="cx"> class StyleRuleViewport;
</span><span class="cx"> class StyleRuleCSSStyleDeclaration;
</span><span class="cx">
</span><del>-class WebKitCSSViewportRule: public CSSRule {
</del><ins>+class WebKitCSSViewportRule final : public CSSRule {
</ins><span class="cx"> public:
</span><del>- static PassRefPtr<WebKitCSSViewportRule> create(StyleRuleViewport* viewportRule, CSSStyleSheet* sheet)
</del><ins>+ static PassRefPtr<WebKitCSSViewportRule> create(StyleRuleViewport& viewportRule, CSSStyleSheet* sheet)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new WebKitCSSViewportRule(viewportRule, sheet));
</span><span class="cx"> }
</span><span class="lines">@@ -51,14 +51,14 @@
</span><span class="cx">
</span><span class="cx"> virtual CSSRule::Type type() const override { return WEBKIT_VIEWPORT_RULE; }
</span><span class="cx"> virtual String cssText() const override;
</span><del>- virtual void reattach(StyleRuleBase*) override;
</del><ins>+ virtual void reattach(StyleRuleBase&) override;
</ins><span class="cx">
</span><span class="cx"> CSSStyleDeclaration& style();
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebKitCSSViewportRule(StyleRuleViewport*, CSSStyleSheet*);
</span><span class="cx">
</span><del>- RefPtr<StyleRuleViewport> m_viewportRule;
</del><ins>+ Ref<StyleRuleViewport> m_viewportRule;
</ins><span class="cx"> mutable RefPtr<StyleRuleCSSStyleDeclaration> m_propertiesCSSOMWrapper;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>