Attachment 347188 Details for Bug 188566 – Patch

[patch] Patch

bug-188566-20180815115615.patch (text/plain), 5.58 KB, created by Alex Christensen on 2018-08-15 11:56:16 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-08-15 11:56:16 PDT

Size: 5.58 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 234890)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,22 @@
>+2018-08-15  Alex Christensen  <achristensen@webkit.org>
>+
>+        Clean up CSSSelectorList after r234825
>+        https://bugs.webkit.org/show_bug.cgi?id=188566
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This is responding to Darin's feedback in https://bugs.webkit.org/show_bug.cgi?id=188539
>+
>+        * css/CSSSelectorList.cpp:
>+        (WebCore::CSSSelectorList::operator=): Deleted.
>+        * css/CSSSelectorList.h:
>+        (WebCore::CSSSelectorList::CSSSelectorList):
>+        * css/parser/CSSParserImpl.cpp:
>+        (WebCore::CSSParserImpl::parsePageSelector):
>+        * css/parser/CSSSelectorParser.cpp:
>+        (WebCore::CSSSelectorParser::consumeComplexSelectorList):
>+        (WebCore::CSSSelectorParser::consumeCompoundSelectorList):
>+
> 2018-08-15  Alex Christensen  <achristensen@webkit.org>
> 
>         Remove failing assertion introduced in r234873
>Index: Source/WebCore/css/CSSSelectorList.cpp
>===================================================================
>--- Source/WebCore/css/CSSSelectorList.cpp	(revision 234881)
>+++ Source/WebCore/css/CSSSelectorList.cpp	(working copy)
>@@ -42,11 +42,6 @@ CSSSelectorList::CSSSelectorList(const C
>         new (NotNull, &m_selectorArray[i]) CSSSelector(other.m_selectorArray[i]);
> }
> 
>-CSSSelectorList::CSSSelectorList(CSSSelectorList&& other)
>-    : m_selectorArray(WTFMove(other.m_selectorArray))
>-{
>-}
>-
> CSSSelectorList::CSSSelectorList(Vector<std::unique_ptr<CSSParserSelector>>&& selectorVector)
> {
>     ASSERT_WITH_SECURITY_IMPLICATION(!selectorVector.isEmpty());
>@@ -106,12 +101,6 @@ unsigned CSSSelectorList::listSize() con
>     return size;
> }
> 
>-CSSSelectorList& CSSSelectorList::operator=(CSSSelectorList&& other)
>-{
>-    m_selectorArray = WTFMove(other.m_selectorArray);
>-    return *this;
>-}
>-
> String CSSSelectorList::selectorsText() const
> {
>     StringBuilder result;
>Index: Source/WebCore/css/CSSSelectorList.h
>===================================================================
>--- Source/WebCore/css/CSSSelectorList.h	(revision 234881)
>+++ Source/WebCore/css/CSSSelectorList.h	(working copy)
>@@ -38,9 +38,9 @@ class CSSSelectorList {
> public:
>     CSSSelectorList() = default;
>     CSSSelectorList(const CSSSelectorList&);
>-    CSSSelectorList(CSSSelectorList&&);
>-    CSSSelectorList(Vector<std::unique_ptr<CSSParserSelector>>&&);
>-    CSSSelectorList(UniqueArray<CSSSelector>&& array)
>+    CSSSelectorList(CSSSelectorList&&) = default;
>+    explicit CSSSelectorList(Vector<std::unique_ptr<CSSParserSelector>>&&);
>+    explicit CSSSelectorList(UniqueArray<CSSSelector>&& array)
>         : m_selectorArray(WTFMove(array)) { }
> 
>     bool isValid() const { return !!m_selectorArray; }
>@@ -66,11 +66,8 @@ public:
>     unsigned componentCount() const;
>     unsigned listSize() const;
> 
>-    CSSSelectorList& operator=(CSSSelectorList&&);
>-
>+    CSSSelectorList& operator=(CSSSelectorList&&) = default;
> private:
>-    void deleteSelectors();
>-
>     // End of a multipart selector is indicated by m_isLastInTagHistory bit in the last item.
>     // End of the array is indicated by m_isLastInSelectorList bit in the last item.
>     UniqueArray<CSSSelector> m_selectorArray;
>Index: Source/WebCore/css/StyleRule.cpp
>===================================================================
>--- Source/WebCore/css/StyleRule.cpp	(revision 234881)
>+++ Source/WebCore/css/StyleRule.cpp	(working copy)
>@@ -218,7 +218,7 @@ Ref<StyleRule> StyleRule::createForSplit
>     for (unsigned i = 0; i < selectors.size(); ++i)
>         new (NotNull, &selectorListArray[i]) CSSSelector(*selectors.at(i));
>     selectorListArray[selectors.size() - 1].setLastInSelectorList();
>-    return StyleRule::create(WTFMove(properties), hasDocumentSecurityOrigin, WTFMove(selectorListArray));
>+    return StyleRule::create(WTFMove(properties), hasDocumentSecurityOrigin, CSSSelectorList(WTFMove(selectorListArray)));
> }
> 
> Vector<RefPtr<StyleRule>> StyleRule::splitIntoMultipleRulesWithMaximumSelectorComponentCount(unsigned maxCount) const
>Index: Source/WebCore/css/parser/CSSParserImpl.cpp
>===================================================================
>--- Source/WebCore/css/parser/CSSParserImpl.cpp	(revision 234881)
>+++ Source/WebCore/css/parser/CSSParserImpl.cpp	(working copy)
>@@ -295,7 +295,7 @@ CSSSelectorList CSSParserImpl::parsePage
>     }
> 
>     selector->setForPage();
>-    return { Vector<std::unique_ptr<CSSParserSelector>>::from(WTFMove(selector)) };
>+    return CSSSelectorList { Vector<std::unique_ptr<CSSParserSelector>>::from(WTFMove(selector)) };
> }
> 
> std::unique_ptr<Vector<double>> CSSParserImpl::parseKeyframeKeyList(const String& keyList)
>Index: Source/WebCore/css/parser/CSSSelectorParser.cpp
>===================================================================
>--- Source/WebCore/css/parser/CSSSelectorParser.cpp	(revision 234881)
>+++ Source/WebCore/css/parser/CSSSelectorParser.cpp	(working copy)
>@@ -70,7 +70,7 @@ CSSSelectorList CSSSelectorParser::consu
> 
>     if (m_failedParsing)
>         return { };
>-    return { WTFMove(selectorList) };
>+    return CSSSelectorList { WTFMove(selectorList) };
> }
> 
> CSSSelectorList CSSSelectorParser::consumeCompoundSelectorList(CSSParserTokenRange& range)
>@@ -92,7 +92,7 @@ CSSSelectorList CSSSelectorParser::consu
> 
>     if (m_failedParsing)
>         return { };
>-    return { WTFMove(selectorList) };
>+    return CSSSelectorList { WTFMove(selectorList) };
> }
> 
> static bool consumeLangArgumentList(std::unique_ptr<Vector<AtomicString>>& argumentList, CSSParserTokenRange& range)

Actions: View | Formatted Diff | Diff

Attachments on bug 188566: 347095 | 347188 | 347254