Title: [210021] trunk/Source/WebCore
- Revision
- 210021
- Author
- d...@apple.com
- Date
- 2016-12-20 04:27:51 -0800 (Tue, 20 Dec 2016)
Log Message
Use ENABLE() in place of ENABLE_CSS_SELECTORS_LEVEL4
https://bugs.webkit.org/show_bug.cgi?id=166043
<rdar://problems/29743655>
Reviewed by Alex Christensen.
This doesn't compile unless the ENABLE_CSS_SELECTORS_LEVEL4 is defined.
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::matchRecursively):
* css/SelectorFilter.cpp:
(WebCore::SelectorFilter::collectIdentifierHashes):
* css/parser/CSSSelectorParser.cpp:
(WebCore::isOnlyPseudoClassFunction):
(WebCore::CSSSelectorParser::consumePseudo):
(WebCore::CSSSelectorParser::consumeCombinator):
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::fragmentRelationForSelectorRelation):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (210020 => 210021)
--- trunk/Source/WebCore/ChangeLog 2016-12-20 11:42:20 UTC (rev 210020)
+++ trunk/Source/WebCore/ChangeLog 2016-12-20 12:27:51 UTC (rev 210021)
@@ -1,3 +1,24 @@
+2016-12-19 Dean Jackson <d...@apple.com>
+
+ Use ENABLE() in place of ENABLE_CSS_SELECTORS_LEVEL4
+ https://bugs.webkit.org/show_bug.cgi?id=166043
+ <rdar://problems/29743655>
+
+ Reviewed by Alex Christensen.
+
+ This doesn't compile unless the ENABLE_CSS_SELECTORS_LEVEL4 is defined.
+
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::matchRecursively):
+ * css/SelectorFilter.cpp:
+ (WebCore::SelectorFilter::collectIdentifierHashes):
+ * css/parser/CSSSelectorParser.cpp:
+ (WebCore::isOnlyPseudoClassFunction):
+ (WebCore::CSSSelectorParser::consumePseudo):
+ (WebCore::CSSSelectorParser::consumeCombinator):
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::fragmentRelationForSelectorRelation):
+
2016-12-20 Yusuke Suzuki <utatane....@gmail.com>
Unreviewed, attempt to fix Windows Debug build part 2
Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (210020 => 210021)
--- trunk/Source/WebCore/css/SelectorChecker.cpp 2016-12-20 11:42:20 UTC (rev 210020)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2016-12-20 12:27:51 UTC (rev 210021)
@@ -333,7 +333,7 @@
switch (relation) {
case CSSSelector::DescendantSpace:
-#if ENABLE_CSS_SELECTORS_LEVEL4
+#if ENABLE(CSS_SELECTORS_LEVEL4)
case CSSSelector::DescendantDoubleChild:
#endif
nextContext = localContextForParent(nextContext);
Modified: trunk/Source/WebCore/css/SelectorFilter.cpp (210020 => 210021)
--- trunk/Source/WebCore/css/SelectorFilter.cpp 2016-12-20 11:42:20 UTC (rev 210020)
+++ trunk/Source/WebCore/css/SelectorFilter.cpp 2016-12-20 12:27:51 UTC (rev 210021)
@@ -139,7 +139,7 @@
skipOverSubselectors = true;
break;
case CSSSelector::DescendantSpace:
-#if ENABLE_CSS_SELECTORS_LEVEL4
+#if ENABLE(CSS_SELECTORS_LEVEL4)
case CSSSelector::DescendantDoubleChild:
#endif
case CSSSelector::Child:
Modified: trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp (210020 => 210021)
--- trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp 2016-12-20 11:42:20 UTC (rev 210020)
+++ trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp 2016-12-20 12:27:51 UTC (rev 210021)
@@ -459,7 +459,7 @@
case CSSSelector::PseudoClassNthLastOfType:
case CSSSelector::PseudoClassLang:
case CSSSelector::PseudoClassAny:
-#if ENABLE_CSS_SELECTORS_LEVEL4
+#if ENABLE(CSS_SELECTORS_LEVEL4)
case CSSSelector::PseudoClassDir:
case CSSSelector::PseudoClassRole:
#endif
@@ -600,7 +600,7 @@
selector->setSelectorList(WTFMove(selectorList));
return selector;
}
-#if ENABLE_CSS_SELECTORS_LEVEL4
+#if ENABLE(CSS_SELECTORS_LEVEL4)
case CSSSelector::PseudoClassDir:
case CSSSelector::PseudoClassRole: {
const CSSParserToken& ident = block.consumeIncludingWhitespace();
@@ -673,7 +673,7 @@
return CSSSelector::IndirectAdjacent;
}
-#if ENABLE_CSS_SELECTORS_LEVEL4
+#if ENABLE(CSS_SELECTORS_LEVEL4)
range.consume();
if (range.peek().type() == DelimiterToken && range.peek().delimiter() == '>') {
range.consumeIncludingWhitespace();
Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (210020 => 210021)
--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2016-12-20 11:42:20 UTC (rev 210020)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2016-12-20 12:27:51 UTC (rev 210021)
@@ -402,7 +402,7 @@
{
switch (relation) {
case CSSSelector::DescendantSpace:
-#if ENABLE_CSS_SELECTORS_LEVEL4
+#if ENABLE(CSS_SELECTORS_LEVEL4)
case CSSSelector::DescendantDoubleChild:
#endif
return FragmentRelation::Descendant;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
