Title: [235002] trunk/Source/WebCore
- Revision
- 235002
- Author
- [email protected]
- Date
- 2018-08-17 17:20:18 -0700 (Fri, 17 Aug 2018)
Log Message
Clean up CSSSelectorList after r234825
https://bugs.webkit.org/show_bug.cgi?id=188566
Patch by Alex Christensen <[email protected]> on 2018-08-17
Reviewed by Megan Gardner.
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (235001 => 235002)
--- trunk/Source/WebCore/ChangeLog 2018-08-18 00:11:49 UTC (rev 235001)
+++ trunk/Source/WebCore/ChangeLog 2018-08-18 00:20:18 UTC (rev 235002)
@@ -1,3 +1,22 @@
+2018-08-17 Alex Christensen <[email protected]>
+
+ Clean up CSSSelectorList after r234825
+ https://bugs.webkit.org/show_bug.cgi?id=188566
+
+ Reviewed by Megan Gardner.
+
+ 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-17 Brent Fulgham <[email protected]>
Remove Adobe SSO exception now that StorageAccess API is available
Modified: trunk/Source/WebCore/css/CSSSelectorList.cpp (235001 => 235002)
--- trunk/Source/WebCore/css/CSSSelectorList.cpp 2018-08-18 00:11:49 UTC (rev 235001)
+++ trunk/Source/WebCore/css/CSSSelectorList.cpp 2018-08-18 00:20:18 UTC (rev 235002)
@@ -42,11 +42,6 @@
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 @@
return size;
}
-CSSSelectorList& CSSSelectorList::operator=(CSSSelectorList&& other)
-{
- m_selectorArray = WTFMove(other.m_selectorArray);
- return *this;
-}
-
String CSSSelectorList::selectorsText() const
{
StringBuilder result;
Modified: trunk/Source/WebCore/css/CSSSelectorList.h (235001 => 235002)
--- trunk/Source/WebCore/css/CSSSelectorList.h 2018-08-18 00:11:49 UTC (rev 235001)
+++ trunk/Source/WebCore/css/CSSSelectorList.h 2018-08-18 00:20:18 UTC (rev 235002)
@@ -38,9 +38,9 @@
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 @@
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;
Modified: trunk/Source/WebCore/css/StyleRule.cpp (235001 => 235002)
--- trunk/Source/WebCore/css/StyleRule.cpp 2018-08-18 00:11:49 UTC (rev 235001)
+++ trunk/Source/WebCore/css/StyleRule.cpp 2018-08-18 00:20:18 UTC (rev 235002)
@@ -218,7 +218,7 @@
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
Modified: trunk/Source/WebCore/css/parser/CSSParserImpl.cpp (235001 => 235002)
--- trunk/Source/WebCore/css/parser/CSSParserImpl.cpp 2018-08-18 00:11:49 UTC (rev 235001)
+++ trunk/Source/WebCore/css/parser/CSSParserImpl.cpp 2018-08-18 00:20:18 UTC (rev 235002)
@@ -295,7 +295,7 @@
}
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)
Modified: trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp (235001 => 235002)
--- trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp 2018-08-18 00:11:49 UTC (rev 235001)
+++ trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp 2018-08-18 00:20:18 UTC (rev 235002)
@@ -70,7 +70,7 @@
if (m_failedParsing)
return { };
- return { WTFMove(selectorList) };
+ return CSSSelectorList { WTFMove(selectorList) };
}
CSSSelectorList CSSSelectorParser::consumeCompoundSelectorList(CSSParserTokenRange& range)
@@ -92,7 +92,7 @@
if (m_failedParsing)
return { };
- return { WTFMove(selectorList) };
+ return CSSSelectorList { WTFMove(selectorList) };
}
static bool consumeLangArgumentList(std::unique_ptr<Vector<AtomicString>>& argumentList, CSSParserTokenRange& range)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
