<!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>[163770] 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/163770">163770</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2014-02-10 00:23:52 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add type-safe casts for ContentData subclasses
<http://webkit.org/b/128510>
Reviewed by Darin Adler.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::contentToCSSValue):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::loadPendingImages):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::createFor):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::setContent):
- Switch to toFooContentData() methods.
* rendering/style/ContentData.h:
- Define toFooContentData() methods.
- Extract FooContentData::equals() methods so that the
toFooContentData() methods can be used.</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 (163769 => 163770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-10 08:13:37 UTC (rev 163769)
+++ trunk/Source/WebCore/ChangeLog 2014-02-10 08:23:52 UTC (rev 163770)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-02-10 David Kilzer <ddkilzer@apple.com>
+
+ Add type-safe casts for ContentData subclasses
+ <http://webkit.org/b/128510>
+
+ Reviewed by Darin Adler.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::contentToCSSValue):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::loadPendingImages):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::createFor):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::setContent):
+ - Switch to toFooContentData() methods.
+
+ * rendering/style/ContentData.h:
+ - Define toFooContentData() methods.
+ - Extract FooContentData::equals() methods so that the
+ toFooContentData() methods can be used.
+
</ins><span class="cx"> 2014-02-09 Dirk Schulze <dschulze@chromium.org>
</span><span class="cx">
</span><span class="cx"> -webkit-clip-path should support fill, stroke, view-box keywords
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (163769 => 163770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-02-10 08:13:37 UTC (rev 163769)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-02-10 08:23:52 UTC (rev 163770)
</span><span class="lines">@@ -1404,15 +1404,15 @@
</span><span class="cx"> auto list = CSSValueList::createSpaceSeparated();
</span><span class="cx"> for (const ContentData* contentData = style->contentData(); contentData; contentData = contentData->next()) {
</span><span class="cx"> if (contentData->isCounter()) {
</span><del>- const CounterContent* counter = static_cast<const CounterContentData*>(contentData)->counter();
</del><ins>+ const CounterContent* counter = toCounterContentData(contentData)->counter();
</ins><span class="cx"> ASSERT(counter);
</span><span class="cx"> list.get().append(cssValuePool().createValue(counter->identifier(), CSSPrimitiveValue::CSS_COUNTER_NAME));
</span><span class="cx"> } else if (contentData->isImage()) {
</span><del>- const StyleImage* image = static_cast<const ImageContentData*>(contentData)->image();
</del><ins>+ const StyleImage* image = toImageContentData(contentData)->image();
</ins><span class="cx"> ASSERT(image);
</span><span class="cx"> list.get().append(image->cssValue());
</span><span class="cx"> } else if (contentData->isText())
</span><del>- list.get().append(cssValuePool().createValue(static_cast<const TextContentData*>(contentData)->text(), CSSPrimitiveValue::CSS_STRING));
</del><ins>+ list.get().append(cssValuePool().createValue(toTextContentData(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 (163769 => 163770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-10 08:13:37 UTC (rev 163769)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-10 08:23:52 UTC (rev 163770)
</span><span class="lines">@@ -3547,11 +3547,11 @@
</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><span class="cx"> if (contentData->isImage()) {
</span><del>- StyleImage* image = static_cast<ImageContentData*>(contentData)->image();
</del><ins>+ StyleImage* image = toImageContentData(contentData)->image();
</ins><span class="cx"> if (image->isPendingImage()) {
</span><span class="cx"> RefPtr<StyleImage> loadedImage = loadPendingImage(static_cast<StylePendingImage*>(image));
</span><span class="cx"> if (loadedImage)
</span><del>- static_cast<ImageContentData*>(contentData)->setImage(loadedImage.release());
</del><ins>+ toImageContentData(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 (163769 => 163770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-02-10 08:13:37 UTC (rev 163769)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-02-10 08:23:52 UTC (rev 163770)
</span><span class="lines">@@ -127,7 +127,7 @@
</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><span class="cx"> if (contentData && !contentData->next() && contentData->isImage() && !element.isPseudoElement()) {
</span><del>- auto styleImage = const_cast<StyleImage*>(static_cast<const ImageContentData*>(contentData)->image());
</del><ins>+ auto styleImage = const_cast<StyleImage*>(toImageContentData(contentData)->image());
</ins><span class="cx"> auto image = createRenderer<RenderImage>(element, std::move(style), styleImage);
</span><span class="cx"> if (styleImage)
</span><span class="cx"> image->setIsGeneratedContent();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleContentDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/ContentData.h (163769 => 163770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/ContentData.h 2014-02-10 08:13:37 UTC (rev 163769)
+++ trunk/Source/WebCore/rendering/style/ContentData.h 2014-02-10 08:23:52 UTC (rev 163770)
</span><span class="lines">@@ -65,6 +65,9 @@
</span><span class="cx"> String m_altText;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+#define CONTENT_DATA_TYPE_CASTS(ToClassName, FromClassName, ContentDataName) \
+ TYPE_CASTS_BASE(ToClassName, FromClassName, resource, resource->is##ContentDataName(), resource.is##ContentDataName())
+
</ins><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">@@ -79,12 +82,7 @@
</span><span class="cx"> virtual bool isImage() const override { return true; }
</span><span class="cx"> virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const override;
</span><span class="cx">
</span><del>- virtual bool equals(const ContentData& data) const override
- {
- if (!data.isImage())
- return false;
- return *static_cast<const ImageContentData&>(data).image() == *image();
- }
</del><ins>+ virtual bool equals(const ContentData&) const override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual std::unique_ptr<ContentData> cloneInternal() const override
</span><span class="lines">@@ -97,6 +95,15 @@
</span><span class="cx"> RefPtr<StyleImage> m_image;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+CONTENT_DATA_TYPE_CASTS(ImageContentData, ContentData, Image)
+
+inline bool ImageContentData::equals(const ContentData& data) const
+{
+ if (!data.isImage())
+ return false;
+ return *toImageContentData(data).image() == *image();
+}
+
</ins><span class="cx"> class TextContentData final : public ContentData {
</span><span class="cx"> public:
</span><span class="cx"> explicit TextContentData(const String& text)
</span><span class="lines">@@ -110,12 +117,7 @@
</span><span class="cx"> virtual bool isText() const override { return true; }
</span><span class="cx"> virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const override;
</span><span class="cx">
</span><del>- virtual bool equals(const ContentData& data) const override
- {
- if (!data.isText())
- return false;
- return static_cast<const TextContentData&>(data).text() == text();
- }
</del><ins>+ virtual bool equals(const ContentData&) const override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual std::unique_ptr<ContentData> cloneInternal() const override { return std::make_unique<TextContentData>(text()); }
</span><span class="lines">@@ -123,6 +125,15 @@
</span><span class="cx"> String m_text;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+CONTENT_DATA_TYPE_CASTS(TextContentData, ContentData, Text)
+
+inline bool TextContentData::equals(const ContentData& data) const
+{
+ if (!data.isText())
+ return false;
+ return toTextContentData(data).text() == text();
+}
+
</ins><span class="cx"> class CounterContentData final : public ContentData {
</span><span class="cx"> public:
</span><span class="cx"> explicit CounterContentData(std::unique_ptr<CounterContent> counter)
</span><span class="lines">@@ -143,16 +154,20 @@
</span><span class="cx"> return std::make_unique<CounterContentData>(std::move(counterData));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool equals(const ContentData& data) const override
- {
- if (!data.isCounter())
- return false;
- return *static_cast<const CounterContentData&>(data).counter() == *counter();
- }
</del><ins>+ virtual bool equals(const ContentData&) const override;
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<CounterContent> m_counter;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+CONTENT_DATA_TYPE_CASTS(CounterContentData, ContentData, Counter)
+
+inline bool CounterContentData::equals(const ContentData& data) const
+{
+ if (!data.isCounter())
+ return false;
+ return *toCounterContentData(data).counter() == *counter();
+}
+
</ins><span class="cx"> class QuoteContentData final : public ContentData {
</span><span class="cx"> public:
</span><span class="cx"> explicit QuoteContentData(QuoteType quote)
</span><span class="lines">@@ -166,12 +181,7 @@
</span><span class="cx"> virtual bool isQuote() const override { return true; }
</span><span class="cx"> virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const override;
</span><span class="cx">
</span><del>- virtual bool equals(const ContentData& data) const override
- {
- if (!data.isQuote())
- return false;
- return static_cast<const QuoteContentData&>(data).quote() == quote();
- }
</del><ins>+ virtual bool equals(const ContentData&) const override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual std::unique_ptr<ContentData> cloneInternal() const override { return std::make_unique<QuoteContentData>(quote()); }
</span><span class="lines">@@ -179,6 +189,15 @@
</span><span class="cx"> QuoteType m_quote;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+CONTENT_DATA_TYPE_CASTS(QuoteContentData, ContentData, Quote)
+
+inline bool QuoteContentData::equals(const ContentData& data) const
+{
+ if (!data.isQuote())
+ return false;
+ return toQuoteContentData(data).quote() == quote();
+}
+
</ins><span class="cx"> inline bool operator==(const ContentData& a, const ContentData& b)
</span><span class="cx"> {
</span><span class="cx"> return a.equals(b);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (163769 => 163770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-02-10 08:13:37 UTC (rev 163769)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-02-10 08:23:52 UTC (rev 163770)
</span><span class="lines">@@ -893,7 +893,7 @@
</span><span class="cx"> if (lastContent) {
</span><span class="cx"> // We attempt to merge with the last ContentData if possible.
</span><span class="cx"> if (lastContent->isText()) {
</span><del>- TextContentData* textContent = static_cast<TextContentData*>(lastContent);
</del><ins>+ TextContentData* textContent = toTextContentData(lastContent);
</ins><span class="cx"> textContent->setText(textContent->text() + string);
</span><span class="cx"> } else
</span><span class="cx"> lastContent->setNext(std::make_unique<TextContentData>(string));
</span></span></pre>
</div>
</div>
</body>
</html>