<!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>[163936] 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/163936">163936</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2014-02-11 20:08:22 -0800 (Tue, 11 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ContentData equals() methods are not inline-able <http://webkit.org/b/128538>
Reviewed by Darin Adler.
Get rid of pure virtual equals() method in favor of
ContentData::Type enum for runtime type information.
This also lets us devirtualize the isFoo() methods.
* rendering/style/ContentData.h:
(WebCore::ContentData::type): Add.
(WebCore::ContentData::isCounter): Devirtualize.
(WebCore::ContentData::isImage): Devirtualize.
(WebCore::ContentData::isQuote): Devirtualize.
(WebCore::ContentData::isText): Devirtualize.
(WebCore::ContentData::ContentData): Add. Include
ContentData::Type parameter.
(WebCore::operator==): Add overloaded methods for each subclass.
Stop using pure virtual equals() method, check type(), and use
overloaded subclass operator==() methods.
(WebCore::operator!=): Add overloaded methods for each subclass.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleContentDatah">trunk/Source/WebCore/rendering/style/ContentData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163935 => 163936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-12 04:06:42 UTC (rev 163935)
+++ trunk/Source/WebCore/ChangeLog 2014-02-12 04:08:22 UTC (rev 163936)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-02-11 David Kilzer <ddkilzer@apple.com>
+
+ ContentData equals() methods are not inline-able
+ <http://webkit.org/b/128538>
+
+ Reviewed by Darin Adler.
+
+ Get rid of pure virtual equals() method in favor of
+ ContentData::Type enum for runtime type information.
+ This also lets us devirtualize the isFoo() methods.
+
+ * rendering/style/ContentData.h:
+ (WebCore::ContentData::type): Add.
+ (WebCore::ContentData::isCounter): Devirtualize.
+ (WebCore::ContentData::isImage): Devirtualize.
+ (WebCore::ContentData::isQuote): Devirtualize.
+ (WebCore::ContentData::isText): Devirtualize.
+ (WebCore::ContentData::ContentData): Add. Include
+ ContentData::Type parameter.
+ (WebCore::operator==): Add overloaded methods for each subclass.
+ Stop using pure virtual equals() method, check type(), and use
+ overloaded subclass operator==() methods.
+ (WebCore::operator!=): Add overloaded methods for each subclass.
+
</ins><span class="cx"> 2014-02-11 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Protect some RenderFlowThread functions.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleContentDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/ContentData.h (163935 => 163936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/ContentData.h 2014-02-12 04:06:42 UTC (rev 163935)
+++ trunk/Source/WebCore/rendering/style/ContentData.h 2014-02-12 04:08:22 UTC (rev 163936)
</span><span class="lines">@@ -39,13 +39,21 @@
</span><span class="cx"> class ContentData {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><ins>+ enum Type {
+ CounterDataType,
+ ImageDataType,
+ QuoteDataType,
+ TextDataType
+ };
</ins><span class="cx"> virtual ~ContentData() { }
</span><span class="cx">
</span><del>- virtual bool isCounter() const { return false; }
- virtual bool isImage() const { return false; }
- virtual bool isQuote() const { return false; }
- virtual bool isText() const { return false; }
</del><ins>+ Type type() const { return m_type; }
</ins><span class="cx">
</span><ins>+ bool isCounter() const { return type() == CounterDataType; }
+ bool isImage() const { return type() == ImageDataType; }
+ bool isQuote() const { return type() == QuoteDataType; }
+ bool isText() const { return type() == TextDataType; }
+
</ins><span class="cx"> virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const = 0;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<ContentData> clone() const;
</span><span class="lines">@@ -55,14 +63,19 @@
</span><span class="cx">
</span><span class="cx"> void setAltText(const String& alt) { m_altText = alt; }
</span><span class="cx"> const String& altText() const { return m_altText; }
</span><del>-
- virtual bool equals(const ContentData&) const = 0;
</del><span class="cx">
</span><ins>+protected:
+ explicit ContentData(Type type)
+ : m_type(type)
+ {
+ }
+
</ins><span class="cx"> private:
</span><span class="cx"> virtual std::unique_ptr<ContentData> cloneInternal() const = 0;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<ContentData> m_next;
</span><span class="cx"> String m_altText;
</span><ins>+ Type m_type;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #define CONTENT_DATA_TYPE_CASTS(ToClassName, FromClassName, ContentDataName) \
</span><span class="lines">@@ -71,7 +84,8 @@
</span><span class="cx"> class ImageContentData final : public ContentData {
</span><span class="cx"> public:
</span><span class="cx"> explicit ImageContentData(PassRefPtr<StyleImage> image)
</span><del>- : m_image(image)
</del><ins>+ : ContentData(ImageDataType)
+ , m_image(image)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -79,11 +93,8 @@
</span><span class="cx"> StyleImage* image() { return m_image.get(); }
</span><span class="cx"> void setImage(PassRefPtr<StyleImage> image) { m_image = image; }
</span><span class="cx">
</span><del>- virtual bool isImage() const override { return true; }
</del><span class="cx"> virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const override;
</span><span class="cx">
</span><del>- virtual bool equals(const ContentData&) const override;
-
</del><span class="cx"> private:
</span><span class="cx"> virtual std::unique_ptr<ContentData> cloneInternal() const override
</span><span class="cx"> {
</span><span class="lines">@@ -97,28 +108,29 @@
</span><span class="cx">
</span><span class="cx"> CONTENT_DATA_TYPE_CASTS(ImageContentData, ContentData, Image)
</span><span class="cx">
</span><del>-inline bool ImageContentData::equals(const ContentData& data) const
</del><ins>+inline bool operator==(const ImageContentData& a, const ImageContentData& b)
</ins><span class="cx"> {
</span><del>- if (!data.isImage())
- return false;
- return *toImageContentData(data).image() == *image();
</del><ins>+ return *a.image() == *b.image();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool operator!=(const ImageContentData& a, const ImageContentData& b)
+{
+ return !(a == b);
+}
+
</ins><span class="cx"> class TextContentData final : public ContentData {
</span><span class="cx"> public:
</span><span class="cx"> explicit TextContentData(const String& text)
</span><del>- : m_text(text)
</del><ins>+ : ContentData(TextDataType)
+ , m_text(text)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String& text() const { return m_text; }
</span><span class="cx"> void setText(const String& text) { m_text = text; }
</span><span class="cx">
</span><del>- virtual bool isText() const override { return true; }
</del><span class="cx"> virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const override;
</span><span class="cx">
</span><del>- virtual bool equals(const ContentData&) const override;
-
</del><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="cx">
</span><span class="lines">@@ -127,24 +139,27 @@
</span><span class="cx">
</span><span class="cx"> CONTENT_DATA_TYPE_CASTS(TextContentData, ContentData, Text)
</span><span class="cx">
</span><del>-inline bool TextContentData::equals(const ContentData& data) const
</del><ins>+inline bool operator==(const TextContentData& a, const TextContentData& b)
</ins><span class="cx"> {
</span><del>- if (!data.isText())
- return false;
- return toTextContentData(data).text() == text();
</del><ins>+ return a.text() == b.text();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool operator!=(const TextContentData& a, const TextContentData& b)
+{
+ return !(a == b);
+}
+
</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><del>- : m_counter(std::move(counter))
</del><ins>+ : ContentData(CounterDataType)
+ , m_counter(std::move(counter))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const CounterContent* counter() const { return m_counter.get(); }
</span><span class="cx"> void setCounter(std::unique_ptr<CounterContent> counter) { m_counter = std::move(counter); }
</span><span class="cx">
</span><del>- virtual bool isCounter() const override { return true; }
</del><span class="cx"> virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const override;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -154,35 +169,34 @@
</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&) const override;
-
</del><span class="cx"> std::unique_ptr<CounterContent> m_counter;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> CONTENT_DATA_TYPE_CASTS(CounterContentData, ContentData, Counter)
</span><span class="cx">
</span><del>-inline bool CounterContentData::equals(const ContentData& data) const
</del><ins>+inline bool operator==(const CounterContentData& a, const CounterContentData& b)
</ins><span class="cx"> {
</span><del>- if (!data.isCounter())
- return false;
- return *toCounterContentData(data).counter() == *counter();
</del><ins>+ return *a.counter() == *b.counter();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool operator!=(const CounterContentData& a, const CounterContentData& b)
+{
+ return !(a == b);
+}
+
</ins><span class="cx"> class QuoteContentData final : public ContentData {
</span><span class="cx"> public:
</span><span class="cx"> explicit QuoteContentData(QuoteType quote)
</span><del>- : m_quote(quote)
</del><ins>+ : ContentData(QuoteDataType)
+ , m_quote(quote)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> QuoteType quote() const { return m_quote; }
</span><span class="cx"> void setQuote(QuoteType quote) { m_quote = quote; }
</span><span class="cx">
</span><del>- virtual bool isQuote() const override { return true; }
</del><span class="cx"> virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const override;
</span><span class="cx">
</span><del>- virtual bool equals(const ContentData&) const override;
-
</del><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="cx">
</span><span class="lines">@@ -191,16 +205,34 @@
</span><span class="cx">
</span><span class="cx"> CONTENT_DATA_TYPE_CASTS(QuoteContentData, ContentData, Quote)
</span><span class="cx">
</span><del>-inline bool QuoteContentData::equals(const ContentData& data) const
</del><ins>+inline bool operator==(const QuoteContentData& a, const QuoteContentData& b)
</ins><span class="cx"> {
</span><del>- if (!data.isQuote())
- return false;
- return toQuoteContentData(data).quote() == quote();
</del><ins>+ return a.quote() == b.quote();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool operator!=(const QuoteContentData& a, const QuoteContentData& b)
+{
+ return !(a == b);
+}
+
</ins><span class="cx"> inline bool operator==(const ContentData& a, const ContentData& b)
</span><span class="cx"> {
</span><del>- return a.equals(b);
</del><ins>+ if (a.type() != b.type())
+ return false;
+
+ switch (a.type()) {
+ case ContentData::CounterDataType:
+ return toCounterContentData(a) == toCounterContentData(b);
+ case ContentData::ImageDataType:
+ return toImageContentData(a) == toImageContentData(b);
+ case ContentData::QuoteDataType:
+ return toQuoteContentData(a) == toQuoteContentData(b);
+ case ContentData::TextDataType:
+ return toTextContentData(a) == toTextContentData(b);
+ }
+
+ ASSERT_NOT_REACHED();
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool operator!=(const ContentData& a, const ContentData& b)
</span></span></pre>
</div>
</div>
</body>
</html>