Title: [187353] trunk/Source/WebCore
- Revision
- 187353
- Author
- [email protected]
- Date
- 2015-07-24 11:51:48 -0700 (Fri, 24 Jul 2015)
Log Message
REGRESSION (r187149): Build fails when CSS_SELECTORS_LEVEL4 is disabled
This is a follow-up fix to:
[CSS Selectors Level 4] Add #ifdefs to the new '>>' descendant combinator
<https://bugs.webkit.org/show_bug.cgi?id=147184>
* css/CSSParserValues.cpp:
(WebCore::CSSParserSelector::appendTagHistory):
* css/CSSParserValues.h:
* css/CSSSelector.h:
- Change ENABLE_CSS_SELECTORS_LEVEL4 to
ENABLE(CSS_SELECTORS_LEVEL4).
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (187352 => 187353)
--- trunk/Source/WebCore/ChangeLog 2015-07-24 18:48:17 UTC (rev 187352)
+++ trunk/Source/WebCore/ChangeLog 2015-07-24 18:51:48 UTC (rev 187353)
@@ -1,3 +1,18 @@
+2015-07-24 David Kilzer <[email protected]>
+
+ REGRESSION (r187149): Build fails when CSS_SELECTORS_LEVEL4 is disabled
+
+ This is a follow-up fix to:
+ [CSS Selectors Level 4] Add #ifdefs to the new '>>' descendant combinator
+ <https://bugs.webkit.org/show_bug.cgi?id=147184>
+
+ * css/CSSParserValues.cpp:
+ (WebCore::CSSParserSelector::appendTagHistory):
+ * css/CSSParserValues.h:
+ * css/CSSSelector.h:
+ - Change ENABLE_CSS_SELECTORS_LEVEL4 to
+ ENABLE(CSS_SELECTORS_LEVEL4).
+
2015-07-24 Devin Rousso <[email protected]>
Web Inspector: Editing non-inspector-stylesheet rule selectors fails after the first change
Modified: trunk/Source/WebCore/css/CSSParserValues.cpp (187352 => 187353)
--- trunk/Source/WebCore/css/CSSParserValues.cpp 2015-07-24 18:48:17 UTC (rev 187352)
+++ trunk/Source/WebCore/css/CSSParserValues.cpp 2015-07-24 18:51:48 UTC (rev 187353)
@@ -336,7 +336,7 @@
case CSSParserSelectorCombinator::DescendantSpace:
selectorRelation = CSSSelector::Descendant;
break;
-#if ENABLE_CSS_SELECTORS_LEVEL4
+#if ENABLE(CSS_SELECTORS_LEVEL4)
case CSSParserSelectorCombinator::DescendantDoubleChild:
selectorRelation = CSSSelector::Descendant;
break;
@@ -350,7 +350,7 @@
}
end->setRelation(selectorRelation);
-#if ENABLE_CSS_SELECTORS_LEVEL4
+#if ENABLE(CSS_SELECTORS_LEVEL4)
if (relation == CSSParserSelectorCombinator::DescendantDoubleChild)
end->setDescendantUseDoubleChildSyntax();
#endif
Modified: trunk/Source/WebCore/css/CSSParserValues.h (187352 => 187353)
--- trunk/Source/WebCore/css/CSSParserValues.h 2015-07-24 18:48:17 UTC (rev 187352)
+++ trunk/Source/WebCore/css/CSSParserValues.h 2015-07-24 18:51:48 UTC (rev 187353)
@@ -181,7 +181,7 @@
enum class CSSParserSelectorCombinator {
Child,
DescendantSpace,
-#if ENABLE_CSS_SELECTORS_LEVEL4
+#if ENABLE(CSS_SELECTORS_LEVEL4)
DescendantDoubleChild,
#endif
DirectAdjacent,
@@ -238,7 +238,7 @@
void prependTagSelector(const QualifiedName&, bool tagIsForNamespaceRule = false);
private:
-#if ENABLE_CSS_SELECTORS_LEVEL4
+#if ENABLE(CSS_SELECTORS_LEVEL4)
void setDescendantUseDoubleChildSyntax() { m_selector->setDescendantUseDoubleChildSyntax(); }
#endif
Modified: trunk/Source/WebCore/css/CSSSelector.h (187352 => 187353)
--- trunk/Source/WebCore/css/CSSSelector.h 2015-07-24 18:48:17 UTC (rev 187352)
+++ trunk/Source/WebCore/css/CSSSelector.h 2015-07-24 18:51:48 UTC (rev 187353)
@@ -283,7 +283,7 @@
ASSERT(m_relation == relation);
}
-#if ENABLE_CSS_SELECTORS_LEVEL4
+#if ENABLE(CSS_SELECTORS_LEVEL4)
void setDescendantUseDoubleChildSyntax()
{
ASSERT(relation() == Descendant);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
