<!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>[174801] 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/174801">174801</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-16 17:35:59 -0700 (Thu, 16 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use is<>() / downcast<>() for ContentData subclasses
https://bugs.webkit.org/show_bug.cgi?id=137768
Reviewed by Andreas Kling.
Use is<>() / downcast<>() for ContentData subclasses.
No new tests, no behavior change.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::contentToCSSValue):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::loadPendingImages):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::createFor):
* rendering/style/ContentData.h:
(WebCore::operator==):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::setContent):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleContentDatah">trunk/Source/WebCore/rendering/style/ContentData.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174800 => 174801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-10-16 23:55:59 UTC (rev 174800)
+++ trunk/Source/WebCore/ChangeLog        2014-10-17 00:35:59 UTC (rev 174801)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-10-16 Chris Dumez <cdumez@apple.com>
+
+ Use is<>() / downcast<>() for ContentData subclasses
+ https://bugs.webkit.org/show_bug.cgi?id=137768
+
+ Reviewed by Andreas Kling.
+
+ Use is<>() / downcast<>() for ContentData subclasses.
+
+ No new tests, no behavior change.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::contentToCSSValue):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::loadPendingImages):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::createFor):
+ * rendering/style/ContentData.h:
+ (WebCore::operator==):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::setContent):
+
</ins><span class="cx"> 2014-10-16 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r174744.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (174800 => 174801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp        2014-10-16 23:55:59 UTC (rev 174800)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp        2014-10-17 00:35:59 UTC (rev 174801)
</span><span class="lines">@@ -1462,12 +1462,12 @@
</span><span class="cx"> {
</span><span class="cx"> auto list = CSSValueList::createSpaceSeparated();
</span><span class="cx"> for (const ContentData* contentData = style->contentData(); contentData; contentData = contentData->next()) {
</span><del>- if (contentData->isCounter())
- list.get().append(cssValuePool().createValue(toCounterContentData(contentData)->counter().identifier(), CSSPrimitiveValue::CSS_COUNTER_NAME));
- else if (contentData->isImage())
- list.get().append(*toImageContentData(contentData)->image().cssValue());
- else if (contentData->isText())
- list.get().append(cssValuePool().createValue(toTextContentData(contentData)->text(), CSSPrimitiveValue::CSS_STRING));
</del><ins>+ if (is<CounterContentData>(*contentData))
+ list.get().append(cssValuePool().createValue(downcast<CounterContentData>(*contentData).counter().identifier(), CSSPrimitiveValue::CSS_COUNTER_NAME));
+ else if (is<ImageContentData>(*contentData))
+ list.get().append(*downcast<ImageContentData>(*contentData).image().cssValue());
+ else if (is<TextContentData>(*contentData))
+ list.get().append(cssValuePool().createValue(downcast<TextContentData>(*contentData).text(), CSSPrimitiveValue::CSS_STRING));
</ins><span class="cx"> }
</span><span class="cx"> if (style->hasFlowFrom())
</span><span class="cx"> list.get().append(cssValuePool().createValue(style->regionThread(), CSSPrimitiveValue::CSS_STRING));
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (174800 => 174801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp        2014-10-16 23:55:59 UTC (rev 174800)
+++ trunk/Source/WebCore/css/StyleResolver.cpp        2014-10-17 00:35:59 UTC (rev 174801)
</span><span class="lines">@@ -3713,12 +3713,12 @@
</span><span class="cx"> }
</span><span class="cx"> case CSSPropertyContent: {
</span><span class="cx"> for (ContentData* contentData = const_cast<ContentData*>(m_state.style()->contentData()); contentData; contentData = contentData->next()) {
</span><del>- if (contentData->isImage()) {
- auto& styleImage = toImageContentData(contentData)->image();
</del><ins>+ if (is<ImageContentData>(*contentData)) {
+ auto& styleImage = downcast<ImageContentData>(*contentData).image();
</ins><span class="cx"> if (styleImage.isPendingImage()) {
</span><span class="cx"> RefPtr<StyleImage> loadedImage = loadPendingImage(toStylePendingImage(styleImage));
</span><span class="cx"> if (loadedImage)
</span><del>- toImageContentData(contentData)->setImage(loadedImage.release());
</del><ins>+ downcast<ImageContentData>(*contentData).setImage(loadedImage.release());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (174800 => 174801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp        2014-10-16 23:55:59 UTC (rev 174800)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp        2014-10-17 00:35:59 UTC (rev 174801)
</span><span class="lines">@@ -139,8 +139,8 @@
</span><span class="cx"> // Works only if we have exactly one piece of content and it's a URL.
</span><span class="cx"> // Otherwise acts as if we didn't support this feature.
</span><span class="cx"> const ContentData* contentData = style.get().contentData();
</span><del>- if (contentData && !contentData->next() && contentData->isImage() && !element.isPseudoElement()) {
- auto& styleImage = toImageContentData(contentData)->image();
</del><ins>+ if (contentData && !contentData->next() && is<ImageContentData>(*contentData) && !element.isPseudoElement()) {
+ auto& styleImage = downcast<ImageContentData>(*contentData).image();
</ins><span class="cx"> auto image = createRenderer<RenderImage>(element, WTF::move(style), const_cast<StyleImage*>(&styleImage));
</span><span class="cx"> image->setIsGeneratedContent();
</span><span class="cx"> return WTF::move(image);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleContentDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/ContentData.h (174800 => 174801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/ContentData.h        2014-10-16 23:55:59 UTC (rev 174800)
+++ trunk/Source/WebCore/rendering/style/ContentData.h        2014-10-17 00:35:59 UTC (rev 174801)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "CounterContent.h"
</span><span class="cx"> #include "StyleImage.h"
</span><span class="cx"> #include "RenderPtr.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">@@ -77,9 +78,6 @@
</span><span class="cx"> Type m_type;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#define CONTENT_DATA_TYPE_CASTS(ToClassName, FromClassName, ContentDataName) \
- TYPE_CASTS_BASE(ToClassName, FromClassName, resource, resource->is##ContentDataName(), resource.is##ContentDataName())
-
</del><span class="cx"> class ImageContentData final : public ContentData {
</span><span class="cx"> public:
</span><span class="cx"> explicit ImageContentData(PassRefPtr<StyleImage> image)
</span><span class="lines">@@ -107,8 +105,6 @@
</span><span class="cx"> RefPtr<StyleImage> m_image;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-CONTENT_DATA_TYPE_CASTS(ImageContentData, ContentData, Image)
-
</del><span class="cx"> inline bool operator==(const ImageContentData& a, const ImageContentData& b)
</span><span class="cx"> {
</span><span class="cx"> return a.image() == b.image();
</span><span class="lines">@@ -138,8 +134,6 @@
</span><span class="cx"> String m_text;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-CONTENT_DATA_TYPE_CASTS(TextContentData, ContentData, Text)
-
</del><span class="cx"> inline bool operator==(const TextContentData& a, const TextContentData& b)
</span><span class="cx"> {
</span><span class="cx"> return a.text() == b.text();
</span><span class="lines">@@ -178,8 +172,6 @@
</span><span class="cx"> std::unique_ptr<CounterContent> m_counter;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-CONTENT_DATA_TYPE_CASTS(CounterContentData, ContentData, Counter)
-
</del><span class="cx"> inline bool operator==(const CounterContentData& a, const CounterContentData& b)
</span><span class="cx"> {
</span><span class="cx"> return a.counter() == b.counter();
</span><span class="lines">@@ -209,8 +201,6 @@
</span><span class="cx"> QuoteType m_quote;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-CONTENT_DATA_TYPE_CASTS(QuoteContentData, ContentData, Quote)
-
</del><span class="cx"> inline bool operator==(const QuoteContentData& a, const QuoteContentData& b)
</span><span class="cx"> {
</span><span class="cx"> return a.quote() == b.quote();
</span><span class="lines">@@ -228,13 +218,13 @@
</span><span class="cx">
</span><span class="cx"> switch (a.type()) {
</span><span class="cx"> case ContentData::CounterDataType:
</span><del>- return toCounterContentData(a) == toCounterContentData(b);
</del><ins>+ return downcast<CounterContentData>(a) == downcast<CounterContentData>(b);
</ins><span class="cx"> case ContentData::ImageDataType:
</span><del>- return toImageContentData(a) == toImageContentData(b);
</del><ins>+ return downcast<ImageContentData>(a) == downcast<ImageContentData>(b);
</ins><span class="cx"> case ContentData::QuoteDataType:
</span><del>- return toQuoteContentData(a) == toQuoteContentData(b);
</del><ins>+ return downcast<QuoteContentData>(a) == downcast<QuoteContentData>(b);
</ins><span class="cx"> case ContentData::TextDataType:
</span><del>- return toTextContentData(a) == toTextContentData(b);
</del><ins>+ return downcast<TextContentData>(a) == downcast<TextContentData>(b);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -248,4 +238,14 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+#define SPECIALIZE_TYPE_TRAITS_CONTENT_DATA(ToClassName, ContentDataName) \
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::ToClassName) \
+ static bool isType(const WebCore::ContentData& contentData) { return contentData.is##ContentDataName(); } \
+SPECIALIZE_TYPE_TRAITS_END()
+
+SPECIALIZE_TYPE_TRAITS_CONTENT_DATA(ImageContentData, Image)
+SPECIALIZE_TYPE_TRAITS_CONTENT_DATA(TextContentData, Text)
+SPECIALIZE_TYPE_TRAITS_CONTENT_DATA(CounterContentData, Counter)
+SPECIALIZE_TYPE_TRAITS_CONTENT_DATA(QuoteContentData, Quote)
+
</ins><span class="cx"> #endif // ContentData_h
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (174800 => 174801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp        2014-10-16 23:55:59 UTC (rev 174800)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp        2014-10-17 00:35:59 UTC (rev 174801)
</span><span class="lines">@@ -904,9 +904,9 @@
</span><span class="cx">
</span><span class="cx"> if (lastContent) {
</span><span class="cx"> // We attempt to merge with the last ContentData if possible.
</span><del>- if (lastContent->isText()) {
- TextContentData* textContent = toTextContentData(lastContent);
- textContent->setText(textContent->text() + string);
</del><ins>+ if (is<TextContentData>(*lastContent)) {
+ TextContentData& textContent = downcast<TextContentData>(*lastContent);
+ textContent.setText(textContent.text() + string);
</ins><span class="cx"> } else
</span><span class="cx"> lastContent->setNext(std::make_unique<TextContentData>(string));
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>