<!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>[175548] 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/175548">175548</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-11-04 08:17:50 -0800 (Tue, 04 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSMediaRulecpp">trunk/Source/WebCore/css/CSSMediaRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSSupportsRulecpp">trunk/Source/WebCore/css/CSSSupportsRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleRuleh">trunk/Source/WebCore/css/StyleRule.h</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSRegionRulecpp">trunk/Source/WebCore/css/WebKitCSSRegionRule.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175547 => 175548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-04 16:11:08 UTC (rev 175547)
+++ trunk/Source/WebCore/ChangeLog 2014-11-04 16:17:50 UTC (rev 175548)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-11-04 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> RenderQuote shouldn't need a pre-destructor hook.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSMediaRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSMediaRule.cpp (175547 => 175548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSMediaRule.cpp 2014-11-04 16:11:08 UTC (rev 175547)
+++ trunk/Source/WebCore/css/CSSMediaRule.cpp 2014-11-04 16:17:50 UTC (rev 175548)
</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 downcast<StyleRuleMedia>(m_groupRule.get()).mediaQueries();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String CSSMediaRule::cssText() const
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSupportsRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSupportsRule.cpp (175547 => 175548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSupportsRule.cpp 2014-11-04 16:11:08 UTC (rev 175547)
+++ trunk/Source/WebCore/css/CSSSupportsRule.cpp 2014-11-04 16:17:50 UTC (rev 175548)
</span><span class="lines">@@ -59,7 +59,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 downcast<StyleRuleSupports>(m_groupRule.get()).conditionText();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleRule.h (175547 => 175548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleRule.h 2014-11-04 16:11:08 UTC (rev 175547)
+++ trunk/Source/WebCore/css/StyleRule.h 2014-11-04 16:17:50 UTC (rev 175548)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "MediaList.h"
</span><span class="cx"> #include "StyleProperties.h"
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><ins>+#include <wtf/TypeCasts.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -271,24 +272,18 @@
</span><span class="cx"> };
</span><span class="cx"> #endif // ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx">
</span><del>-inline const StyleRuleMedia* toStyleRuleMedia(const StyleRuleGroup* rule)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(!rule || rule->isMediaRule());
- return static_cast<const StyleRuleMedia*>(rule);
-}
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-inline const StyleRuleSupports* toStyleRuleSupports(const StyleRuleGroup* rule)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(!rule || rule->isSupportsRule());
- return static_cast<const StyleRuleSupports*>(rule);
-}
</del><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::StyleRuleMedia)
+ static bool isType(const WebCore::StyleRuleGroup& group) { return group.isMediaRule(); }
+SPECIALIZE_TYPE_TRAITS_END()
</ins><span class="cx">
</span><del>-inline const StyleRuleRegion* toStyleRuleRegion(const StyleRuleGroup* rule)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(!rule || rule->isRegionRule());
- return static_cast<const StyleRuleRegion*>(rule);
-}
</del><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::StyleRuleSupports)
+ static bool isType(const WebCore::StyleRuleGroup& group) { return group.isSupportsRule(); }
+SPECIALIZE_TYPE_TRAITS_END()
</ins><span class="cx">
</span><del>-} // namespace WebCore
</del><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::StyleRuleRegion)
+ static bool isType(const WebCore::StyleRuleGroup& group) { return group.isRegionRule(); }
+SPECIALIZE_TYPE_TRAITS_END()
</ins><span class="cx">
</span><span class="cx"> #endif // StyleRule_h
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSRegionRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSRegionRule.cpp (175547 => 175548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSRegionRule.cpp 2014-11-04 16:11:08 UTC (rev 175547)
+++ trunk/Source/WebCore/css/WebKitCSSRegionRule.cpp 2014-11-04 16:17:50 UTC (rev 175548)
</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(downcast<StyleRuleRegion>(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>
</div>
</body>
</html>