1 files changed, 54 insertions, 114 deletions

diff --git a/Source/WebCore/rendering/style/ContentData.h b/Source/WebCore/rendering/style/ContentData.h
index d97a197b8..4d1b9717a 100644
--- a/Source/WebCore/rendering/style/ContentData.h
+++ b/Source/WebCore/rendering/style/ContentData.h
@@ -28,7 +28,7 @@
 #include "CounterContent.h"
 #include "StyleImage.h"
 #include "RenderPtr.h"
-#include <wtf/TypeCasts.h>
+#include <wtf/OwnPtr.h>
 
 namespace WebCore {
 
@@ -39,199 +39,149 @@ class RenderStyle;
 class ContentData {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    enum Type {
-        CounterDataType,
-        ImageDataType,
-        QuoteDataType,
-        TextDataType
-    };
     virtual ~ContentData() { }
 
-    Type type() const { return m_type; }
-
-    bool isCounter() const { return type() == CounterDataType; }
-    bool isImage() const { return type() == ImageDataType; }
-    bool isQuote() const { return type() == QuoteDataType; }
-    bool isText() const { return type() == TextDataType; }
+    virtual bool isCounter() const { return false; }
+    virtual bool isImage() const { return false; }
+    virtual bool isQuote() const { return false; }
+    virtual bool isText() const { return false; }
 
     virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const = 0;
 
     std::unique_ptr<ContentData> clone() const;
 
     ContentData* next() const { return m_next.get(); }
-    void setNext(std::unique_ptr<ContentData> next) { m_next = WTFMove(next); }
+    void setNext(std::unique_ptr<ContentData> next) { m_next = std::move(next); }
 
     void setAltText(const String& alt) { m_altText = alt; }
     const String& altText() const { return m_altText; }
-
-protected:
-    explicit ContentData(Type type)
-        : m_type(type)
-    {
-    }
+    
+    virtual bool equals(const ContentData&) const = 0;
 
 private:
     virtual std::unique_ptr<ContentData> cloneInternal() const = 0;
 
     std::unique_ptr<ContentData> m_next;
     String m_altText;
-    Type m_type;
 };
 
 class ImageContentData final : public ContentData {
 public:
     explicit ImageContentData(PassRefPtr<StyleImage> image)
-        : ContentData(ImageDataType)
-        , m_image(image)
+        : m_image(image)
     {
-        ASSERT(m_image);
     }
 
-    const StyleImage& image() const { return *m_image; }
-    void setImage(PassRefPtr<StyleImage> image)
-    {
-        ASSERT(image);
-        m_image = image;
-    }
+    const StyleImage* image() const { return m_image.get(); }
+    StyleImage* image() { return m_image.get(); }
+    void setImage(PassRefPtr<StyleImage> image) { m_image = image; }
 
+    virtual bool isImage() const override { return true; }
     virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const override;
 
+    virtual bool equals(const ContentData& data) const override
+    {
+        if (!data.isImage())
+            return false;
+        return *static_cast<const ImageContentData&>(data).image() == *image();
+    }
+
 private:
     virtual std::unique_ptr<ContentData> cloneInternal() const override
     {
-        std::unique_ptr<ContentData> image = std::make_unique<ImageContentData>(m_image.get());
-        image->setAltText(altText());
+        RefPtr<StyleImage> image = const_cast<StyleImage*>(this->image());
 
-        return image;
+        return std::make_unique<ImageContentData>(image.release());
     }
 
     RefPtr<StyleImage> m_image;
 };
 
-inline bool operator==(const ImageContentData& a, const ImageContentData& b)
-{
-    return a.image() == b.image();
-}
-
-inline bool operator!=(const ImageContentData& a, const ImageContentData& b)
-{
-    return !(a == b);
-}
-
 class TextContentData final : public ContentData {
 public:
     explicit TextContentData(const String& text)
-        : ContentData(TextDataType)
-        , m_text(text)
+        : m_text(text)
     {
     }
 
     const String& text() const { return m_text; }
     void setText(const String& text) { m_text = text; }
 
+    virtual bool isText() const override { return true; }
     virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const override;
 
+    virtual bool equals(const ContentData& data) const override
+    {
+        if (!data.isText())
+            return false;
+        return static_cast<const TextContentData&>(data).text() == text();
+    }
+
 private:
     virtual std::unique_ptr<ContentData> cloneInternal() const override { return std::make_unique<TextContentData>(text()); }
 
     String m_text;
 };
 
-inline bool operator==(const TextContentData& a, const TextContentData& b)
-{
-    return a.text() == b.text();
-}
-
-inline bool operator!=(const TextContentData& a, const TextContentData& b)
-{
-    return !(a == b);
-}
-
 class CounterContentData final : public ContentData {
 public:
     explicit CounterContentData(std::unique_ptr<CounterContent> counter)
-        : ContentData(CounterDataType)
-        , m_counter(WTFMove(counter))
+        : m_counter(std::move(counter))
     {
-        ASSERT(m_counter);
     }
 
-    const CounterContent& counter() const { return *m_counter; }
-    void setCounter(std::unique_ptr<CounterContent> counter)
-    {
-        ASSERT(counter);
-        m_counter = WTFMove(counter);
-    }
+    const CounterContent* counter() const { return m_counter.get(); }
+    void setCounter(std::unique_ptr<CounterContent> counter) { m_counter = std::move(counter); }
 
+    virtual bool isCounter() const override { return true; }
     virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const override;
 
 private:
     virtual std::unique_ptr<ContentData> cloneInternal() const override
     {
-        auto counterData = std::make_unique<CounterContent>(counter());
-        return std::make_unique<CounterContentData>(WTFMove(counterData));
+        auto counterData = std::make_unique<CounterContent>(*counter());
+        return std::make_unique<CounterContentData>(std::move(counterData));
+    }
+
+    virtual bool equals(const ContentData& data) const override
+    {
+        if (!data.isCounter())
+            return false;
+        return *static_cast<const CounterContentData&>(data).counter() == *counter();
     }
 
     std::unique_ptr<CounterContent> m_counter;
 };
 
-inline bool operator==(const CounterContentData& a, const CounterContentData& b)
-{
-    return a.counter() == b.counter();
-}
-
-inline bool operator!=(const CounterContentData& a, const CounterContentData& b)
-{
-    return !(a == b);
-}
-
 class QuoteContentData final : public ContentData {
 public:
     explicit QuoteContentData(QuoteType quote)
-        : ContentData(QuoteDataType)
-        , m_quote(quote)
+        : m_quote(quote)
     {
     }
 
     QuoteType quote() const { return m_quote; }
     void setQuote(QuoteType quote) { m_quote = quote; }
 
+    virtual bool isQuote() const override { return true; }
     virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const override;
 
+    virtual bool equals(const ContentData& data) const override
+    {
+        if (!data.isQuote())
+            return false;
+        return static_cast<const QuoteContentData&>(data).quote() == quote();
+    }
+
 private:
     virtual std::unique_ptr<ContentData> cloneInternal() const override { return std::make_unique<QuoteContentData>(quote()); }
 
     QuoteType m_quote;
 };
 
-inline bool operator==(const QuoteContentData& a, const QuoteContentData& b)
-{
-    return a.quote() == b.quote();
-}
-
-inline bool operator!=(const QuoteContentData& a, const QuoteContentData& b)
-{
-    return !(a == b);
-}
-
 inline bool operator==(const ContentData& a, const ContentData& b)
 {
-    if (a.type() != b.type())
-        return false;
-
-    switch (a.type()) {
-    case ContentData::CounterDataType:
-        return downcast<CounterContentData>(a) == downcast<CounterContentData>(b);
-    case ContentData::ImageDataType:
-        return downcast<ImageContentData>(a) == downcast<ImageContentData>(b);
-    case ContentData::QuoteDataType:
-        return downcast<QuoteContentData>(a) == downcast<QuoteContentData>(b);
-    case ContentData::TextDataType:
-        return downcast<TextContentData>(a) == downcast<TextContentData>(b);
-    }
-
-    ASSERT_NOT_REACHED();
-    return false;
+    return a.equals(b);
 }
 
 inline bool operator!=(const ContentData& a, const ContentData& b)
@@ -241,14 +191,4 @@ inline bool operator!=(const ContentData& a, const ContentData& b)
 
 } // namespace WebCore
 
-#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)
-
 #endif // ContentData_h