Attachment 347151 Details for Bug 188559 – Patch

[patch] Patch

bug-188559-20180815155319.patch (text/plain), 22.13 KB, created by Fujii Hironori on 2018-08-14 23:53:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-08-14 23:53:20 PDT

Size: 22.13 KB

patch

obsolete

>Subversion Revision: 234881
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 37d41f2d37ebce7c0beccf687755a132511f4445..d2acd0f3f0b244921d3758d9c92b515d107de60b 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-08-14  Alex Christensen  <achristensen@webkit.org>
>+
>+        Use a Variant instead of a union in CSSSelector
>+        https://bugs.webkit.org/show_bug.cgi?id=188559
>+
>+        Reviewed by Antti Koivisto.
>+
>+        * wtf/Variant.h:
>+        Add packing macros to make it so Variant-containing structures don't always have 7 bytes of padding per Variant.
>+
> 2018-08-14  Saam barati  <sbarati@apple.com>
> 
>         HashMap<Ref<P>, V> asserts when V is not zero for its empty value
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index b33909817c0fae14e6617f52be30c3e1a20a13cb..d745eefbc7aeff8103156b707c58a07c7cde48ad 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,48 @@
>+2018-08-14  Alex Christensen  <achristensen@webkit.org>
>+
>+        Use a Variant instead of a union in CSSSelector
>+        https://bugs.webkit.org/show_bug.cgi?id=188559
>+
>+        Reviewed by Antti Koivisto.
>+
>+        No change in behavior. This just makes some of the existing problems more obvious and easy to fix.
>+
>+        I moved m_caseInsensitiveAttributeValueMatching to RareData because it's only used with RareData.
>+        I only have m_isForPage when assertions are enabled because it's only used for an assertion.
>+        The rest is pretty straightforward translating union syntax to Variant syntax.
>+        I use RefPtr for now where I could use Ref because it's never null to make copying easier, but that's temporary.
>+
>+        * css/CSSSelector.cpp:
>+        (WebCore::CSSSelector::CSSSelector):
>+        (WebCore::CSSSelector::createRareData):
>+        (WebCore::CSSSelector::setAttribute):
>+        (WebCore::CSSSelector::setArgument):
>+        (WebCore::CSSSelector::setLangArgumentList):
>+        (WebCore::CSSSelector::setSelectorList):
>+        (WebCore::CSSSelector::setNth):
>+        (WebCore::CSSSelector::matchNth const):
>+        (WebCore::CSSSelector::nthA const):
>+        (WebCore::CSSSelector::nthB const):
>+        (WebCore::CSSSelector::RareData::RareData):
>+        * css/CSSSelector.h:
>+        (WebCore::CSSSelector::argument const):
>+        (WebCore::CSSSelector::langArgumentList const):
>+        (WebCore::CSSSelector::selectorList const):
>+        (WebCore::CSSSelector::attribute const):
>+        (WebCore::CSSSelector::attributeCanonicalLocalName const):
>+        (WebCore::CSSSelector::setValue):
>+        (WebCore::CSSSelector::CSSSelector):
>+        (WebCore::CSSSelector::~CSSSelector):
>+        (WebCore::CSSSelector::tagQName const):
>+        (WebCore::CSSSelector::tagLowercaseLocalName const):
>+        (WebCore::CSSSelector::value const):
>+        (WebCore::CSSSelector::serializingValue const):
>+        (WebCore::CSSSelector::attributeValueMatchingIsCaseInsensitive const):
>+        (WebCore::CSSSelector::RareData::create): Deleted.
>+        * css/parser/CSSParserImpl.cpp:
>+        (WebCore::CSSParserImpl::parsePageSelector):
>+        * css/parser/CSSParserSelector.h:
>+
> 2018-08-14  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         Unreviewed, rolling out r234874 and r234876.
>diff --git a/Source/WTF/wtf/Variant.h b/Source/WTF/wtf/Variant.h
>index f6405aa188d1eaf60c1e554fb5b2fe09c936809b..35fabdb6a8fc00e5ff23ced76f05ab5537b5433a 100644
>--- a/Source/WTF/wtf/Variant.h
>+++ b/Source/WTF/wtf/Variant.h
>@@ -1435,6 +1435,7 @@ struct __noexcept_variant_swap:
> __noexcept_variant_swap_impl<__all_swappable<_Types...>::value,_Types...>
> {};
> 
>+#pragma pack(push, 1)
> template<typename ... _Types>
> class Variant:
>         private __variant_base<
>@@ -1721,6 +1722,7 @@ public:
>         }
>     }
> };
>+#pragma pack(pop)
> 
> template<>
> class Variant<>{
>diff --git a/Source/WebCore/css/CSSSelector.cpp b/Source/WebCore/css/CSSSelector.cpp
>index b2fdd1bd5efe9eaad4ecc0bfe9f35268f3f8b7b2..5b62e7253008a5604948a29447e50f5031d5c2c6 100644
>--- a/Source/WebCore/css/CSSSelector.cpp
>+++ b/Source/WebCore/css/CSSSelector.cpp
>@@ -40,25 +40,19 @@ namespace WebCore {
> 
> using namespace HTMLNames;
> 
>-struct SameSizeAsCSSSelector {
>-    unsigned flags;
>-    void* unionPointer;
>-};
>-
> static_assert(CSSSelector::RelationType::Subselector == 0, "Subselector must be 0 for consumeCombinator.");
>-static_assert(sizeof(CSSSelector) == sizeof(SameSizeAsCSSSelector), "CSSSelector should remain small.");
>+static_assert(sizeof(CSSSelector) == sizeof(void*) + sizeof(unsigned), "CSSSelector should remain small.");
> 
> CSSSelector::CSSSelector(const QualifiedName& tagQName, bool tagIsForNamespaceRule)
>     : m_relation(DescendantSpace)
>     , m_match(Tag)
>-    , m_pseudoType(0)
>     , m_isLastInSelectorList(false)
>     , m_isLastInTagHistory(true)
>-    , m_hasRareData(false)
>-    , m_hasNameWithCase(false)
>-    , m_isForPage(false)
>+    , m_pseudoType(0)
>     , m_tagIsForNamespaceRule(tagIsForNamespaceRule)
>-    , m_caseInsensitiveAttributeValueMatching(false)
>+#if !ASSERT_DISABLED
>+    , m_isForPage(false)
>+#endif
> #if !ASSERT_WITH_SECURITY_IMPLICATION_DISABLED
>     , m_destructorHasBeenCalled(false)
> #endif
>@@ -66,25 +60,21 @@ CSSSelector::CSSSelector(const QualifiedName& tagQName, bool tagIsForNamespaceRu
>     const AtomicString& tagLocalName = tagQName.localName();
>     const AtomicString tagLocalNameASCIILowercase = tagLocalName.convertToASCIILowercase();
> 
>-    if (tagLocalName == tagLocalNameASCIILowercase) {
>-        m_data.m_tagQName = tagQName.impl();
>-        m_data.m_tagQName->ref();
>-    } else {
>-        m_data.m_nameWithCase = adoptRef(new NameWithCase(tagQName, tagLocalNameASCIILowercase)).leakRef();
>-        m_hasNameWithCase = true;
>-    }
>+    if (tagLocalName == tagLocalNameASCIILowercase)
>+        m_data = tagQName;
>+    else
>+        m_data = adoptRef(new NameWithCase(tagQName, tagLocalNameASCIILowercase));
> }
> 
> void CSSSelector::createRareData()
> {
>     ASSERT(match() != Tag);
>-    ASSERT(!m_hasNameWithCase);
>-    if (m_hasRareData)
>+    ASSERT(!WTF::holds_alternative<RefPtr<NameWithCase>>(m_data));
>+    if (WTF::holds_alternative<RefPtr<RareData>>(m_data))
>         return;
>     // Move the value to the rare data stucture.
>-    AtomicString value { adoptRef(m_data.m_value) };
>-    m_data.m_rareData = &RareData::create(WTFMove(value)).leakRef();
>-    m_hasRareData = true;
>+    AtomicString value = WTF::get<AtomicString>(m_data);
>+    m_data = adoptRef(new RareData(WTFMove(value)));
> }
> 
> static unsigned simpleSelectorSpecificityInternal(const CSSSelector& simpleSelector, bool isComputingMaximumSpecificity);
>@@ -753,61 +743,54 @@ String CSSSelector::selectorText(const String& rightSide) const
> void CSSSelector::setAttribute(const QualifiedName& value, bool convertToLowercase, AttributeMatchType matchType)
> {
>     createRareData();
>-    m_data.m_rareData->m_attribute = value;
>-    m_data.m_rareData->m_attributeCanonicalLocalName = convertToLowercase ? value.localName().convertToASCIILowercase() : value.localName();
>-    m_caseInsensitiveAttributeValueMatching = matchType == CaseInsensitive;
>+    WTF::get<RefPtr<RareData>>(m_data)->m_attribute = value;
>+    WTF::get<RefPtr<RareData>>(m_data)->m_attributeCanonicalLocalName = convertToLowercase ? value.localName().convertToASCIILowercase() : value.localName();
>+    WTF::get<RefPtr<RareData>>(m_data)->m_caseInsensitiveAttributeValueMatching = matchType == CaseInsensitive;
> }
>     
> void CSSSelector::setArgument(const AtomicString& value)
> {
>     createRareData();
>-    m_data.m_rareData->m_argument = value;
>+    WTF::get<RefPtr<RareData>>(m_data)->m_argument = value;
> }
> 
> void CSSSelector::setLangArgumentList(std::unique_ptr<Vector<AtomicString>> argumentList)
> {
>     createRareData();
>-    m_data.m_rareData->m_langArgumentList = WTFMove(argumentList);
>+    WTF::get<RefPtr<RareData>>(m_data)->m_langArgumentList = WTFMove(argumentList);
> }
> 
> void CSSSelector::setSelectorList(std::unique_ptr<CSSSelectorList> selectorList)
> {
>     createRareData();
>-    m_data.m_rareData->m_selectorList = WTFMove(selectorList);
>+    WTF::get<RefPtr<RareData>>(m_data)->m_selectorList = WTFMove(selectorList);
> }
> 
> void CSSSelector::setNth(int a, int b)
> {
>     createRareData();
>-    m_data.m_rareData->m_a = a;
>-    m_data.m_rareData->m_b = b;
>+    WTF::get<RefPtr<RareData>>(m_data)->m_a = a;
>+    WTF::get<RefPtr<RareData>>(m_data)->m_b = b;
> }
> 
> bool CSSSelector::matchNth(int count) const
> {
>-    ASSERT(m_hasRareData);
>-    return m_data.m_rareData->matchNth(count);
>+    return WTF::get<RefPtr<RareData>>(m_data)->matchNth(count);
> }
> 
> int CSSSelector::nthA() const
> {
>-    ASSERT(m_hasRareData);
>-    return m_data.m_rareData->m_a;
>+    return WTF::get<RefPtr<RareData>>(m_data)->m_a;
> }
> 
> int CSSSelector::nthB() const
> {
>-    ASSERT(m_hasRareData);
>-    return m_data.m_rareData->m_b;
>+    return WTF::get<RefPtr<RareData>>(m_data)->m_b;
> }
> 
> CSSSelector::RareData::RareData(AtomicString&& value)
>     : m_matchingValue(value)
>     , m_serializingValue(value)
>-    , m_a(0)
>-    , m_b(0)
>-    , m_attribute(anyQName())
>-    , m_argument(nullAtom())
> {
> }
> 
>diff --git a/Source/WebCore/css/CSSSelector.h b/Source/WebCore/css/CSSSelector.h
>index a6a1bd96d635f450c2f4f376bbfabaa8cb4ae3c2..49960598999487f67b4fcc16018e516cfb7af173 100644
>--- a/Source/WebCore/css/CSSSelector.h
>+++ b/Source/WebCore/css/CSSSelector.h
>@@ -23,6 +23,7 @@
> 
> #include "QualifiedName.h"
> #include "RenderStyleConstants.h"
>+#include <wtf/Variant.h>
> 
> namespace WebCore {
>     class CSSSelectorList;
>@@ -33,6 +34,7 @@ namespace WebCore {
>         ClassC = 1
>     };
> 
>+#pragma pack(push, 1)
>     // this class represents a selector for a StyleRule
>     class CSSSelector {
>         WTF_MAKE_FAST_ALLOCATED;
>@@ -235,10 +237,10 @@ namespace WebCore {
>         const AtomicString& serializingValue() const;
>         const QualifiedName& attribute() const;
>         const AtomicString& attributeCanonicalLocalName() const;
>-        const AtomicString& argument() const { return m_hasRareData ? m_data.m_rareData->m_argument : nullAtom(); }
>+        const AtomicString& argument() const { return WTF::holds_alternative<RefPtr<RareData>>(m_data) ? WTF::get<RefPtr<RareData>>(m_data)->m_argument : nullAtom(); }
>         bool attributeValueMatchingIsCaseInsensitive() const;
>-        const Vector<AtomicString>* langArgumentList() const { return m_hasRareData ? m_data.m_rareData->m_langArgumentList.get() : nullptr; }
>-        const CSSSelectorList* selectorList() const { return m_hasRareData ? m_data.m_rareData->m_selectorList.get() : nullptr; }
>+        const Vector<AtomicString>* langArgumentList() const { return WTF::holds_alternative<RefPtr<RareData>>(m_data) ? WTF::get<RefPtr<RareData>>(m_data)->m_langArgumentList.get() : nullptr; }
>+        const CSSSelectorList* selectorList() const { return WTF::holds_alternative<RefPtr<RareData>>(m_data) ? WTF::get<RefPtr<RareData>>(m_data)->m_selectorList.get() : nullptr; }
> 
>         void setValue(const AtomicString&, bool matchLowerCase = false);
>         
>@@ -315,22 +317,27 @@ namespace WebCore {
>         bool isLastInTagHistory() const { return m_isLastInTagHistory; }
>         void setNotLastInTagHistory() { m_isLastInTagHistory = false; }
> 
>+#if !ASSERT_DISABLED
>         bool isForPage() const { return m_isForPage; }
>         void setForPage() { m_isForPage = true; }
>+#endif
> 
>     private:
>-        unsigned m_relation              : 4; // enum RelationType.
>-        mutable unsigned m_match         : 4; // enum Match.
>-        mutable unsigned m_pseudoType    : 8; // PseudoType.
>-        unsigned m_isLastInSelectorList  : 1;
>-        unsigned m_isLastInTagHistory    : 1;
>-        unsigned m_hasRareData           : 1;
>-        unsigned m_hasNameWithCase       : 1;
>-        unsigned m_isForPage             : 1;
>-        unsigned m_tagIsForNamespaceRule : 1;
>-        unsigned m_caseInsensitiveAttributeValueMatching : 1;
>+        struct RareData;
>+        struct NameWithCase;
>+        Variant<AtomicString, QualifiedName, RefPtr<RareData>, RefPtr<NameWithCase>> m_data;
>+
>+        unsigned char m_relation               : 3; // enum RelationType.
>+        mutable unsigned char m_match          : 4; // enum Match.
>+        unsigned char m_isLastInSelectorList   : 1;
>+        unsigned char m_isLastInTagHistory     : 1;
>+        mutable unsigned char m_pseudoType     : 7; // enum PseudoClassType.
>+        unsigned char m_tagIsForNamespaceRule  : 1;
>+#if !ASSERT_DISABLED
>+        unsigned char m_isForPage              : 1;
>+#endif
> #if !ASSERT_WITH_SECURITY_IMPLICATION_DISABLED
>-        unsigned m_destructorHasBeenCalled : 1;
>+        unsigned char m_destructorHasBeenCalled : 1;
> #endif
> 
>         unsigned simpleSelectorSpecificityForPage() const;
>@@ -339,7 +346,7 @@ namespace WebCore {
>         CSSSelector& operator=(const CSSSelector&);
> 
>         struct RareData : public RefCounted<RareData> {
>-            static Ref<RareData> create(AtomicString&& value) { return adoptRef(*new RareData(WTFMove(value))); }
>+            RareData(AtomicString&& value);
>             ~RareData();
> 
>             bool matchNth(int count);
>@@ -350,16 +357,14 @@ namespace WebCore {
>             AtomicString m_matchingValue;
>             AtomicString m_serializingValue;
>             
>-            int m_a; // Used for :nth-*
>-            int m_b; // Used for :nth-*
>-            QualifiedName m_attribute; // used for attribute selector
>+            int m_a { 0 }; // Used for :nth-*
>+            int m_b { 0 }; // Used for :nth-*
>+            QualifiedName m_attribute { anyQName() }; // used for attribute selector
>             AtomicString m_attributeCanonicalLocalName;
>-            AtomicString m_argument; // Used for :contains and :nth-*
>+            AtomicString m_argument { nullAtom() }; // Used for :contains and :nth-*
>             std::unique_ptr<Vector<AtomicString>> m_langArgumentList; // Used for :lang arguments.
>             std::unique_ptr<CSSSelectorList> m_selectorList; // Used for :matches() and :not().
>-        
>-        private:
>-            RareData(AtomicString&& value);
>+            bool m_caseInsensitiveAttributeValueMatching { false };
>         };
>         void createRareData();
> 
>@@ -374,28 +379,21 @@ namespace WebCore {
>             const QualifiedName m_originalName;
>             const AtomicString m_lowercaseLocalName;
>         };
>-
>-        union DataUnion {
>-            DataUnion() : m_value(0) { }
>-            AtomicStringImpl* m_value;
>-            QualifiedName::QualifiedNameImpl* m_tagQName;
>-            RareData* m_rareData;
>-            NameWithCase* m_nameWithCase;
>-        } m_data;
>     };
>+#pragma pack(pop)
> 
> inline const QualifiedName& CSSSelector::attribute() const
> {
>     ASSERT(isAttributeSelector());
>-    ASSERT(m_hasRareData);
>-    return m_data.m_rareData->m_attribute;
>+    ASSERT(WTF::holds_alternative<RefPtr<RareData>>(m_data));
>+    return WTF::get<RefPtr<RareData>>(m_data)->m_attribute;
> }
> 
> inline const AtomicString& CSSSelector::attributeCanonicalLocalName() const
> {
>     ASSERT(isAttributeSelector());
>-    ASSERT(m_hasRareData);
>-    return m_data.m_rareData->m_attributeCanonicalLocalName;
>+    ASSERT(WTF::holds_alternative<RefPtr<RareData>>(m_data));
>+    return WTF::get<RefPtr<RareData>>(m_data)->m_attributeCanonicalLocalName;
> }
> 
> inline bool CSSSelector::matchesPseudoElement() const
>@@ -458,20 +456,16 @@ inline void CSSSelector::setValue(const AtomicString& value, bool matchLowerCase
> {
>     ASSERT(match() != Tag);
>     AtomicString matchingValue = matchLowerCase ? value.convertToASCIILowercase() : value;
>-    if (!m_hasRareData && matchingValue != value)
>+    if (!WTF::holds_alternative<RefPtr<RareData>>(m_data) && matchingValue != value)
>         createRareData();
>     
>-    // Need to do ref counting manually for the union.
>-    if (!m_hasRareData) {
>-        if (m_data.m_value)
>-            m_data.m_value->deref();
>-        m_data.m_value = value.impl();
>-        m_data.m_value->ref();
>+    if (!WTF::holds_alternative<RefPtr<RareData>>(m_data)) {
>+        m_data = value;
>         return;
>     }
> 
>-    m_data.m_rareData->m_matchingValue = WTFMove(matchingValue);
>-    m_data.m_rareData->m_serializingValue = value;
>+    WTF::get<RefPtr<RareData>>(m_data)->m_matchingValue = WTFMove(matchingValue);
>+    WTF::get<RefPtr<RareData>>(m_data)->m_serializingValue = value;
> }
> 
> inline CSSSelector::CSSSelector()
>@@ -480,11 +474,10 @@ inline CSSSelector::CSSSelector()
>     , m_pseudoType(0)
>     , m_isLastInSelectorList(false)
>     , m_isLastInTagHistory(true)
>-    , m_hasRareData(false)
>-    , m_hasNameWithCase(false)
>-    , m_isForPage(false)
>     , m_tagIsForNamespaceRule(false)
>-    , m_caseInsensitiveAttributeValueMatching(false)
>+#if !ASSERT_DISABLED
>+    , m_isForPage(false)
>+#endif
> #if !ASSERT_WITH_SECURITY_IMPLICATION_DISABLED
>     , m_destructorHasBeenCalled(false)
> #endif
>@@ -492,33 +485,20 @@ inline CSSSelector::CSSSelector()
> }
> 
> inline CSSSelector::CSSSelector(const CSSSelector& o)
>-    : m_relation(o.m_relation)
>+    : m_data(o.m_data)
>+    , m_relation(o.m_relation)
>     , m_match(o.m_match)
>     , m_pseudoType(o.m_pseudoType)
>     , m_isLastInSelectorList(o.m_isLastInSelectorList)
>     , m_isLastInTagHistory(o.m_isLastInTagHistory)
>-    , m_hasRareData(o.m_hasRareData)
>-    , m_hasNameWithCase(o.m_hasNameWithCase)
>-    , m_isForPage(o.m_isForPage)
>     , m_tagIsForNamespaceRule(o.m_tagIsForNamespaceRule)
>-    , m_caseInsensitiveAttributeValueMatching(o.m_caseInsensitiveAttributeValueMatching)
>+#if !ASSERT_DISABLED
>+    , m_isForPage(o.m_isForPage)
>+#endif
> #if !ASSERT_WITH_SECURITY_IMPLICATION_DISABLED
>     , m_destructorHasBeenCalled(false)
> #endif
> {
>-    if (o.m_hasRareData) {
>-        m_data.m_rareData = o.m_data.m_rareData;
>-        m_data.m_rareData->ref();
>-    } else if (o.m_hasNameWithCase) {
>-        m_data.m_nameWithCase = o.m_data.m_nameWithCase;
>-        m_data.m_nameWithCase->ref();
>-    } if (o.match() == Tag) {
>-        m_data.m_tagQName = o.m_data.m_tagQName;
>-        m_data.m_tagQName->ref();
>-    } else if (o.m_data.m_value) {
>-        m_data.m_value = o.m_data.m_value;
>-        m_data.m_value->ref();
>-    }
> }
> 
> inline CSSSelector::~CSSSelector()
>@@ -527,62 +507,44 @@ inline CSSSelector::~CSSSelector()
> #if !ASSERT_WITH_SECURITY_IMPLICATION_DISABLED
>     m_destructorHasBeenCalled = true;
> #endif
>-    if (m_hasRareData) {
>-        m_data.m_rareData->deref();
>-        m_data.m_rareData = nullptr;
>-        m_hasRareData = false;
>-    } else if (m_hasNameWithCase) {
>-        m_data.m_nameWithCase->deref();
>-        m_data.m_nameWithCase = nullptr;
>-        m_hasNameWithCase = false;
>-    } else if (match() == Tag) {
>-        m_data.m_tagQName->deref();
>-        m_data.m_tagQName = nullptr;
>-        m_match = Unknown;
>-    } else if (m_data.m_value) {
>-        m_data.m_value->deref();
>-        m_data.m_value = nullptr;
>-    }
> }
> 
> inline const QualifiedName& CSSSelector::tagQName() const
> {
>     ASSERT(match() == Tag);
>-    if (m_hasNameWithCase)
>-        return m_data.m_nameWithCase->m_originalName;
>-    return *reinterpret_cast<const QualifiedName*>(&m_data.m_tagQName);
>+    if (WTF::holds_alternative<RefPtr<NameWithCase>>(m_data))
>+        return WTF::get<RefPtr<NameWithCase>>(m_data)->m_originalName;
>+    return WTF::get<QualifiedName>(m_data);
> }
> 
> inline const AtomicString& CSSSelector::tagLowercaseLocalName() const
> {
>-    if (m_hasNameWithCase)
>-        return m_data.m_nameWithCase->m_lowercaseLocalName;
>-    return m_data.m_tagQName->m_localName;
>+    if (WTF::holds_alternative<RefPtr<NameWithCase>>(m_data))
>+        return WTF::get<RefPtr<NameWithCase>>(m_data)->m_lowercaseLocalName;
>+    return WTF::get<QualifiedName>(m_data).localName();
> }
> 
> inline const AtomicString& CSSSelector::value() const
> {
>     ASSERT(match() != Tag);
>-    if (m_hasRareData)
>-        return m_data.m_rareData->m_matchingValue;
>+    if (WTF::holds_alternative<RefPtr<RareData>>(m_data))
>+        return WTF::get<RefPtr<RareData>>(m_data)->m_matchingValue;
> 
>-    // AtomicString is really just an AtomicStringImpl* so the cast below is safe.
>-    return *reinterpret_cast<const AtomicString*>(&m_data.m_value);
>+    return WTF::get<AtomicString>(m_data);
> }
> 
> inline const AtomicString& CSSSelector::serializingValue() const
> {
>     ASSERT(match() != Tag);
>-    if (m_hasRareData)
>-        return m_data.m_rareData->m_serializingValue;
>+    if (WTF::holds_alternative<RefPtr<RareData>>(m_data))
>+        return WTF::get<RefPtr<RareData>>(m_data)->m_serializingValue;
>     
>-    // AtomicString is really just an AtomicStringImpl* so the cast below is safe.
>-    return *reinterpret_cast<const AtomicString*>(&m_data.m_value);
>+    return WTF::get<AtomicString>(m_data);
> }
>     
> inline bool CSSSelector::attributeValueMatchingIsCaseInsensitive() const
> {
>-    return m_caseInsensitiveAttributeValueMatching;
>+    return WTF::holds_alternative<RefPtr<RareData>>(m_data) && WTF::get<RefPtr<RareData>>(m_data)->m_caseInsensitiveAttributeValueMatching;
> }
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/css/parser/CSSParserImpl.cpp b/Source/WebCore/css/parser/CSSParserImpl.cpp
>index a8ecfe70f1e6015b2ca55f051813cfc036fb9287..1f24b4b7474ba09ef8fce9b5658f5053af89f0f8 100644
>--- a/Source/WebCore/css/parser/CSSParserImpl.cpp
>+++ b/Source/WebCore/css/parser/CSSParserImpl.cpp
>@@ -294,7 +294,9 @@ CSSSelectorList CSSParserImpl::parsePageSelector(CSSParserTokenRange range, Styl
>             selector->prependTagSelector(QualifiedName(nullAtom(), typeSelector, styleSheet->defaultNamespace()));
>     }
> 
>+#if !ASSERT_DISABLED
>     selector->setForPage();
>+#endif
>     return { Vector<std::unique_ptr<CSSParserSelector>>::from(WTFMove(selector)) };
> }
> 
>diff --git a/Source/WebCore/css/parser/CSSParserSelector.h b/Source/WebCore/css/parser/CSSParserSelector.h
>index 498bea0622fc3efb2663814bf3b59418600f1a0b..553ad8836d125927b8c8f527f189b258673f90f7 100644
>--- a/Source/WebCore/css/parser/CSSParserSelector.h
>+++ b/Source/WebCore/css/parser/CSSParserSelector.h
>@@ -59,7 +59,9 @@ public:
>     void setNth(int a, int b) { m_selector->setNth(a, b); }
>     void setMatch(CSSSelector::Match value) { m_selector->setMatch(value); }
>     void setRelation(CSSSelector::RelationType value) { m_selector->setRelation(value); }
>+#if !ASSERT_DISABLED
>     void setForPage() { m_selector->setForPage(); }
>+#endif
> 
>     CSSSelector::Match match() const { return m_selector->match(); }
>     CSSSelector::PseudoElementType pseudoElementType() const { return m_selector->pseudoElementType(); }

Actions: View | Formatted Diff | Diff

Attachments on bug 188559: 347086 | 347092 | 347150 | 347151 | 349620