<!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>[174332] 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/174332">174332</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-05 17:23:58 -0700 (Sun, 05 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use is<>() / downcast<>() for StyleSheet subclasses
https://bugs.webkit.org/show_bug.cgi?id=137429
Reviewed by Benjamin Poulain.
Use is<>() / downcast<>() for StyleSheet subclasses.
No new tests, no behavior change.
* bindings/gobject/WebKitDOMPrivate.cpp:
(WebKit::wrap):
* css/CSSStyleSheet.h:
(isType):
* css/StyleSheet.h:
* dom/Document.cpp:
(WebCore::Document::applyXSLTransform):
* dom/DocumentStyleSheetCollection.cpp:
(WebCore::filterEnabledNonemptyCSSStyleSheets):
* dom/ProcessingInstruction.cpp:
(WebCore::ProcessingInstruction::parseStyleSheet):
* inspector/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::getAllStyleSheets):
* xml/XSLStyleSheet.h:
(isType):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMPrivatecpp">trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleSheeth">trunk/Source/WebCore/css/CSSStyleSheet.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleSheeth">trunk/Source/WebCore/css/StyleSheet.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentStyleSheetCollectioncpp">trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp</a></li>
<li><a href="#trunkSourceWebCoredomProcessingInstructioncpp">trunk/Source/WebCore/dom/ProcessingInstruction.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCSSAgentcpp">trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXSLStyleSheeth">trunk/Source/WebCore/xml/XSLStyleSheet.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174331 => 174332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-05 23:27:48 UTC (rev 174331)
+++ trunk/Source/WebCore/ChangeLog 2014-10-06 00:23:58 UTC (rev 174332)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2014-10-05 Christophe Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Use is<>() / downcast<>() for StyleSheet subclasses
+ https://bugs.webkit.org/show_bug.cgi?id=137429
+
+ Reviewed by Benjamin Poulain.
+
+ Use is<>() / downcast<>() for StyleSheet subclasses.
+
+ No new tests, no behavior change.
+
+ * bindings/gobject/WebKitDOMPrivate.cpp:
+ (WebKit::wrap):
+ * css/CSSStyleSheet.h:
+ (isType):
+ * css/StyleSheet.h:
+ * dom/Document.cpp:
+ (WebCore::Document::applyXSLTransform):
+ * dom/DocumentStyleSheetCollection.cpp:
+ (WebCore::filterEnabledNonemptyCSSStyleSheets):
+ * dom/ProcessingInstruction.cpp:
+ (WebCore::ProcessingInstruction::parseStyleSheet):
+ * inspector/InspectorCSSAgent.cpp:
+ (WebCore::InspectorCSSAgent::getAllStyleSheets):
+ * xml/XSLStyleSheet.h:
+ (isType):
+
+2014-10-05 Christophe Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Use is<>() / downcast<>() for CryptoAlgorithmParameters subclasses
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137432
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp (174331 => 174332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp 2014-10-05 23:27:48 UTC (rev 174331)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp 2014-10-06 00:23:58 UTC (rev 174332)
</span><span class="lines">@@ -140,8 +140,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(styleSheet);
</span><span class="cx">
</span><del>- if (styleSheet->isCSSStyleSheet())
- return WEBKIT_DOM_STYLE_SHEET(wrapCSSStyleSheet(toCSSStyleSheet(styleSheet)));
</del><ins>+ if (is<CSSStyleSheet>(*styleSheet))
+ return WEBKIT_DOM_STYLE_SHEET(wrapCSSStyleSheet(downcast<CSSStyleSheet>(styleSheet)));
</ins><span class="cx"> return wrapStyleSheet(styleSheet);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleSheet.h (174331 => 174332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleSheet.h 2014-10-05 23:27:48 UTC (rev 174331)
+++ trunk/Source/WebCore/css/CSSStyleSheet.h 2014-10-06 00:23:58 UTC (rev 174332)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><ins>+#include <wtf/TypeCasts.h>
</ins><span class="cx"> #include <wtf/text/AtomicStringHash.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -139,8 +140,10 @@
</span><span class="cx"> mutable std::unique_ptr<CSSRuleList> m_ruleListCSSOMWrapper;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-STYLE_SHEET_TYPE_CASTS(CSSStyleSheet)
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-} // namespace
</del><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::CSSStyleSheet)
+ static bool isType(const WebCore::StyleSheet& styleSheet) { return styleSheet.isCSSStyleSheet(); }
+SPECIALIZE_TYPE_TRAITS_END()
</ins><span class="cx">
</span><del>-#endif
</del><ins>+#endif // CSSStyleSheet_h
</ins></span></pre></div>
<a id="trunkSourceWebCorecssStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleSheet.h (174331 => 174332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleSheet.h 2014-10-05 23:27:48 UTC (rev 174331)
+++ trunk/Source/WebCore/css/StyleSheet.h 2014-10-06 00:23:58 UTC (rev 174332)
</span><span class="lines">@@ -55,10 +55,6 @@
</span><span class="cx"> virtual bool isXSLStyleSheet() const { return false; }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#define STYLE_SHEET_TYPE_CASTS(ToClassName) \
- template<typename T> inline ToClassName* to##ToClassName(const RefPtr<T>& styleSheet) { return to##ToClassName(styleSheet.get()); } \
- TYPE_CASTS_BASE(ToClassName, StyleSheet, styleSheet, styleSheet->is##ToClassName(), styleSheet.is##ToClassName())
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-} // namespace
-
-#endif
</del><ins>+#endif // StyleSheet_h
</ins></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (174331 => 174332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-10-05 23:27:48 UTC (rev 174331)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-10-06 00:23:58 UTC (rev 174332)
</span><span class="lines">@@ -4383,7 +4383,7 @@
</span><span class="cx"> void Document::applyXSLTransform(ProcessingInstruction* pi)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<XSLTProcessor> processor = XSLTProcessor::create();
</span><del>- processor->setXSLStyleSheet(static_cast<XSLStyleSheet*>(pi->sheet()));
</del><ins>+ processor->setXSLStyleSheet(downcast<XSLStyleSheet>(pi->sheet()));
</ins><span class="cx"> String resultMIMEType;
</span><span class="cx"> String newSource;
</span><span class="cx"> String resultEncoding;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentStyleSheetCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp (174331 => 174332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp 2014-10-05 23:27:48 UTC (rev 174331)
+++ trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp 2014-10-06 00:23:58 UTC (rev 174332)
</span><span class="lines">@@ -409,14 +409,14 @@
</span><span class="cx"> static void filterEnabledNonemptyCSSStyleSheets(Vector<RefPtr<CSSStyleSheet>>& result, const Vector<RefPtr<StyleSheet>>& sheets)
</span><span class="cx"> {
</span><span class="cx"> for (unsigned i = 0; i < sheets.size(); ++i) {
</span><del>- if (!sheets[i]->isCSSStyleSheet())
</del><ins>+ if (!is<CSSStyleSheet>(*sheets[i]))
</ins><span class="cx"> continue;
</span><del>- if (sheets[i]->disabled())
</del><ins>+ CSSStyleSheet& sheet = downcast<CSSStyleSheet>(*sheets[i]);
+ if (sheet.disabled())
</ins><span class="cx"> continue;
</span><del>- CSSStyleSheet* sheet = toCSSStyleSheet(sheets[i]);
- if (!sheet->length())
</del><ins>+ if (!sheet.length())
</ins><span class="cx"> continue;
</span><del>- result.append(sheet);
</del><ins>+ result.append(&sheet);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomProcessingInstructioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ProcessingInstruction.cpp (174331 => 174332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ProcessingInstruction.cpp 2014-10-05 23:27:48 UTC (rev 174331)
+++ trunk/Source/WebCore/dom/ProcessingInstruction.cpp 2014-10-06 00:23:58 UTC (rev 174332)
</span><span class="lines">@@ -222,10 +222,10 @@
</span><span class="cx"> void ProcessingInstruction::parseStyleSheet(const String& sheet)
</span><span class="cx"> {
</span><span class="cx"> if (m_isCSS)
</span><del>- toCSSStyleSheet(*m_sheet).contents().parseString(sheet);
</del><ins>+ downcast<CSSStyleSheet>(*m_sheet).contents().parseString(sheet);
</ins><span class="cx"> #if ENABLE(XSLT)
</span><span class="cx"> else if (m_isXSL)
</span><del>- static_cast<XSLStyleSheet*>(m_sheet.get())->parseString(sheet);
</del><ins>+ downcast<XSLStyleSheet>(*m_sheet).parseString(sheet);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (m_cachedSheet)
</span><span class="lines">@@ -235,10 +235,10 @@
</span><span class="cx"> m_loading = false;
</span><span class="cx">
</span><span class="cx"> if (m_isCSS)
</span><del>- toCSSStyleSheet(*m_sheet).contents().checkLoaded();
</del><ins>+ downcast<CSSStyleSheet>(*m_sheet).contents().checkLoaded();
</ins><span class="cx"> #if ENABLE(XSLT)
</span><span class="cx"> else if (m_isXSL)
</span><del>- static_cast<XSLStyleSheet*>(m_sheet.get())->checkLoaded();
</del><ins>+ downcast<XSLStyleSheet>(*m_sheet).checkLoaded();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp (174331 => 174332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2014-10-05 23:27:48 UTC (rev 174331)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2014-10-06 00:23:58 UTC (rev 174332)
</span><span class="lines">@@ -684,8 +684,8 @@
</span><span class="cx"> StyleSheetList& list = (*it)->styleSheets();
</span><span class="cx"> for (unsigned i = 0; i < list.length(); ++i) {
</span><span class="cx"> StyleSheet& styleSheet = *list.item(i);
</span><del>- if (styleSheet.isCSSStyleSheet())
- collectStyleSheets(&toCSSStyleSheet(styleSheet), styleInfos.get());
</del><ins>+ if (is<CSSStyleSheet>(styleSheet))
+ collectStyleSheets(&downcast<CSSStyleSheet>(styleSheet), styleInfos.get());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLStyleSheet.h (174331 => 174332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLStyleSheet.h 2014-10-05 23:27:48 UTC (rev 174331)
+++ trunk/Source/WebCore/xml/XSLStyleSheet.h 2014-10-06 00:23:58 UTC (rev 174332)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include <libxslt/transform.h>
</span><span class="cx">
</span><span class="cx"> #include <wtf/PassRefPtr.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">@@ -97,11 +98,11 @@
</span><span class="cx"> virtual URL baseURL() const override { return m_finalURL; }
</span><span class="cx"> virtual bool isLoading() const override;
</span><span class="cx">
</span><del>- virtual bool isXSLStyleSheet() const override { return true; }
-
</del><span class="cx"> private:
</span><span class="cx"> XSLStyleSheet(Node* parentNode, const String& originalURL, const URL& finalURL, bool embedded);
</span><span class="cx"> XSLStyleSheet(XSLImportRule* parentImport, const String& originalURL, const URL& finalURL);
</span><ins>+
+ virtual bool isXSLStyleSheet() const override { return true; }
</ins><span class="cx">
</span><span class="cx"> Node* m_ownerNode;
</span><span class="cx"> String m_originalURL;
</span><span class="lines">@@ -121,6 +122,10 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::XSLStyleSheet)
+ static bool isType(const WebCore::StyleSheet& styleSheet) { return styleSheet.isXSLStyleSheet(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #endif // ENABLE(XSLT)
</span><span class="cx">
</span><span class="cx"> #endif // XSLStyleSheet_h
</span></span></pre>
</div>
</div>
</body>
</html>