Title: [209085] trunk/Source/WebCore
- Revision
- 209085
- Author
- [email protected]
- Date
- 2016-11-29 13:04:05 -0800 (Tue, 29 Nov 2016)
Log Message
[CSS Parser] Fix ::cue parsing
https://bugs.webkit.org/show_bug.cgi?id=165152
Reviewed by Zalan Bujtas.
* css/parser/CSSParserValues.h:
(WebCore::CSSParserSelector::setPseudoElementType):
* css/parser/CSSSelectorParser.cpp:
(WebCore::isOnlyPseudoClassFunction):
(WebCore::isOnlyPseudoElementFunction):
(WebCore::CSSSelectorParser::consumePseudo):
(WebCore::isPseudoClassFunction): Deleted.
(WebCore::isPseudoElementFunction): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (209084 => 209085)
--- trunk/Source/WebCore/ChangeLog 2016-11-29 19:46:31 UTC (rev 209084)
+++ trunk/Source/WebCore/ChangeLog 2016-11-29 21:04:05 UTC (rev 209085)
@@ -1,3 +1,19 @@
+2016-11-29 Dave Hyatt <[email protected]>
+
+ [CSS Parser] Fix ::cue parsing
+ https://bugs.webkit.org/show_bug.cgi?id=165152
+
+ Reviewed by Zalan Bujtas.
+
+ * css/parser/CSSParserValues.h:
+ (WebCore::CSSParserSelector::setPseudoElementType):
+ * css/parser/CSSSelectorParser.cpp:
+ (WebCore::isOnlyPseudoClassFunction):
+ (WebCore::isOnlyPseudoElementFunction):
+ (WebCore::CSSSelectorParser::consumePseudo):
+ (WebCore::isPseudoClassFunction): Deleted.
+ (WebCore::isPseudoElementFunction): Deleted.
+
2016-11-28 Gavin Barraclough <[email protected]>
HTMLMediaElement::updateVolume should updateIsPlayingMedia
Modified: trunk/Source/WebCore/css/parser/CSSParserValues.h (209084 => 209085)
--- trunk/Source/WebCore/css/parser/CSSParserValues.h 2016-11-29 19:46:31 UTC (rev 209084)
+++ trunk/Source/WebCore/css/parser/CSSParserValues.h 2016-11-29 21:04:05 UTC (rev 209085)
@@ -235,6 +235,8 @@
CSSSelector::Match match() const { return m_selector->match(); }
CSSSelector::PseudoElementType pseudoElementType() const { return m_selector->pseudoElementType(); }
const CSSSelectorList* selectorList() const { return m_selector->selectorList(); }
+
+ void setPseudoElementType(CSSSelector::PseudoElementType type) { m_selector->setPseudoElementType(type); }
void adoptSelectorVector(Vector<std::unique_ptr<CSSParserSelector>>& selectorVector);
void setLangArgumentList(const Vector<CSSParserString>& stringVector);
Modified: trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp (209084 => 209085)
--- trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp 2016-11-29 19:46:31 UTC (rev 209084)
+++ trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp 2016-11-29 21:04:05 UTC (rev 209085)
@@ -461,7 +461,7 @@
return selector;
}
-static bool isPseudoClassFunction(CSSSelector::PseudoClassType pseudoClassType)
+static bool isOnlyPseudoClassFunction(CSSSelector::PseudoClassType pseudoClassType)
{
switch (pseudoClassType) {
case CSSSelector::PseudoClassNot:
@@ -483,12 +483,10 @@
return false;
}
-static bool isPseudoElementFunction(CSSSelector::PseudoElementType pseudoElementType)
+static bool isOnlyPseudoElementFunction(CSSSelector::PseudoElementType pseudoElementType)
{
+ // Note that we omit cue since it can be both an ident or a function.
switch (pseudoElementType) {
-#if ENABLE(VIDEO_TRACK)
- case CSSSelector::PseudoElementCue:
-#endif
case CSSSelector::PseudoElementSlotted:
return true;
default:
@@ -533,8 +531,22 @@
if (colons == 1)
selector = std::unique_ptr<CSSParserSelector>(CSSParserSelector::parsePseudoClassSelectorFromStringView(value));
- else
+ else {
selector = std::unique_ptr<CSSParserSelector>(CSSParserSelector::parsePseudoElementSelectorFromStringView(value));
+ if (selector && selector->match() == CSSSelector::PseudoElement && selector->pseudoElementType() == CSSSelector::PseudoElementWebKitCustom) {
+ // FIXME-NEWPARSER: The old parser treats cue as two pseudo-element types, because it
+ // is unable to handle a dual pseudo-element (one that can be both an ident or a
+ // function) without splitting them up.
+ //
+ // This means that "cue" is being parsed as PseudoElementWebkitCustom when used as an
+ // identifier, and it's being parsed as PseudoElementCue when used as a function.
+ //
+ // We have to mimic this behavior until the old parser is gone, at which point we can
+ // make all code use PseudoElementCue.
+ if (token.type() == FunctionToken && value.startsWithIgnoringASCIICase("cue"))
+ selector->setPseudoElementType(CSSSelector::PseudoElementCue);
+ }
+ }
if (!selector || (selector->match() == CSSSelector::PseudoElement && m_disallowPseudoElements))
return nullptr;
@@ -541,8 +553,8 @@
if (token.type() == IdentToken) {
range.consume();
- if ((selector->match() == CSSSelector::PseudoElement && (selector->pseudoElementType() == CSSSelector::PseudoElementUnknown || isPseudoElementFunction(selector->pseudoElementType())))
- || (selector->match() == CSSSelector::PseudoClass && (selector->pseudoClassType() == CSSSelector::PseudoClassUnknown || isPseudoClassFunction(selector->pseudoClassType()))))
+ if ((selector->match() == CSSSelector::PseudoElement && (selector->pseudoElementType() == CSSSelector::PseudoElementUnknown || isOnlyPseudoElementFunction(selector->pseudoElementType())))
+ || (selector->match() == CSSSelector::PseudoClass && (selector->pseudoClassType() == CSSSelector::PseudoClassUnknown || isOnlyPseudoClassFunction(selector->pseudoClassType()))))
return nullptr;
return selector;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes