Diff
Modified: trunk/LayoutTests/ChangeLog (222626 => 222627)
--- trunk/LayoutTests/ChangeLog 2017-09-28 20:01:43 UTC (rev 222626)
+++ trunk/LayoutTests/ChangeLog 2017-09-28 20:03:07 UTC (rev 222627)
@@ -1,3 +1,20 @@
+2017-09-28 Tim Horton <[email protected]>
+
+ Remove constant() in favor of env()
+ https://bugs.webkit.org/show_bug.cgi?id=177581
+ <rdar://problem/34701321>
+
+ Reviewed by Dean Jackson.
+
+ * fast/css/variables/constants/invalid-constant-name-fallback-expected.html: Removed.
+ * fast/css/variables/constants/invalid-constant-name-fallback.html: Removed.
+ * fast/css/variables/constants/ios/safe-area-inset-set-expected.html: Removed.
+ * fast/css/variables/constants/ios/safe-area-inset-set.html: Removed.
+ * fast/css/variables/constants/safe-area-inset-cannot-override-expected.html: Removed.
+ * fast/css/variables/constants/safe-area-inset-cannot-override.html: Removed.
+ * fast/css/variables/constants/safe-area-inset-zero-expected.html: Removed.
+ * fast/css/variables/constants/safe-area-inset-zero.html: Removed.
+
2017-09-28 Ryan Haddad <[email protected]>
Unreviewed, fix a test name in TestExpectations.
Modified: trunk/LayoutTests/TestExpectations (222626 => 222627)
--- trunk/LayoutTests/TestExpectations 2017-09-28 20:01:43 UTC (rev 222626)
+++ trunk/LayoutTests/TestExpectations 2017-09-28 20:03:07 UTC (rev 222627)
@@ -34,7 +34,6 @@
media/ios [ Skip ]
media/controls/ipad [ Skip ]
fast/text-autosizing [ Skip ]
-fast/css/variables/constants/ios [ Skip ]
fast/css/variables/env/ios [ Skip ]
http/tests/preload/viewport [ Skip ]
Modified: trunk/LayoutTests/platform/ios/TestExpectations (222626 => 222627)
--- trunk/LayoutTests/platform/ios/TestExpectations 2017-09-28 20:01:43 UTC (rev 222626)
+++ trunk/LayoutTests/platform/ios/TestExpectations 2017-09-28 20:03:07 UTC (rev 222627)
@@ -503,7 +503,6 @@
fast/viewport/ios/viewport-fit-contain.html [ Pass ]
fast/viewport/ios/viewport-fit-cover.html [ Pass ]
fast/viewport/ios/viewport-fit-auto.html [ Pass ]
-fast/css/variables/constants/ios [ Pass ]
fast/css/variables/env/ios [ Pass ]
# This test relies on APIs not available on iOS
Modified: trunk/Source/WebCore/ChangeLog (222626 => 222627)
--- trunk/Source/WebCore/ChangeLog 2017-09-28 20:01:43 UTC (rev 222626)
+++ trunk/Source/WebCore/ChangeLog 2017-09-28 20:03:07 UTC (rev 222627)
@@ -1,3 +1,20 @@
+2017-09-28 Tim Horton <[email protected]>
+
+ Remove constant() in favor of env()
+ https://bugs.webkit.org/show_bug.cgi?id=177581
+ <rdar://problem/34701321>
+
+ Reviewed by Dean Jackson.
+
+ No new tests, removing a feature.
+
+ * css/CSSValueKeywords.in:
+ * css/CSSVariableData.cpp:
+ (WebCore::CSSVariableData::checkVariablesForCyclesWithRange const):
+ (WebCore::CSSVariableData::resolveTokenRange const):
+ * css/parser/CSSVariableParser.cpp:
+ (WebCore::classifyBlock):
+
2017-09-28 Brent Fulgham <[email protected]>
Add ports 6679 and 6697 (IRC SSL) to port blacklist
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (222626 => 222627)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2017-09-28 20:01:43 UTC (rev 222626)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2017-09-28 20:03:07 UTC (rev 222627)
@@ -849,7 +849,6 @@
//
// Environment Variables
//
-constant
env
//
Modified: trunk/Source/WebCore/css/CSSVariableData.cpp (222626 => 222627)
--- trunk/Source/WebCore/css/CSSVariableData.cpp 2017-09-28 20:01:43 UTC (rev 222626)
+++ trunk/Source/WebCore/css/CSSVariableData.cpp 2017-09-28 20:03:07 UTC (rev 222627)
@@ -100,7 +100,7 @@
bool CSSVariableData::checkVariablesForCyclesWithRange(CSSParserTokenRange range, CustomPropertyValueMap& customProperties, HashSet<AtomicString>& seenProperties, HashSet<AtomicString>& invalidProperties) const
{
while (!range.atEnd()) {
- if (range.peek().functionId() == CSSValueVar || range.peek().functionId() == CSSValueConstant || range.peek().functionId() == CSSValueEnv) {
+ if (range.peek().functionId() == CSSValueVar || range.peek().functionId() == CSSValueEnv) {
CSSParserTokenRange block = range.consumeBlock();
block.consumeWhitespace();
@@ -170,7 +170,7 @@
{
bool success = true;
while (!range.atEnd()) {
- if (range.peek().functionId() == CSSValueVar || range.peek().functionId() == CSSValueConstant || range.peek().functionId() == CSSValueEnv)
+ if (range.peek().functionId() == CSSValueVar || range.peek().functionId() == CSSValueEnv)
success &= resolveVariableReference(customProperties, range.consumeBlock(), result);
else
result.append(range.consume());
Modified: trunk/Source/WebCore/css/parser/CSSVariableParser.cpp (222626 => 222627)
--- trunk/Source/WebCore/css/parser/CSSVariableParser.cpp 2017-09-28 20:01:43 UTC (rev 222626)
+++ trunk/Source/WebCore/css/parser/CSSVariableParser.cpp 2017-09-28 20:03:07 UTC (rev 222627)
@@ -70,7 +70,7 @@
hasReferences = true;
continue;
}
- if ((token.functionId() == CSSValueConstant || token.functionId() == CSSValueEnv) && parserContext.constantPropertiesEnabled) {
+ if (token.functionId() == CSSValueEnv && parserContext.constantPropertiesEnabled) {
if (!isValidConstantReference(block, hasAtApplyRule, parserContext))
return false; // Bail if any references are invalid
hasReferences = true;
Modified: trunk/Source/WebInspectorUI/ChangeLog (222626 => 222627)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-09-28 20:01:43 UTC (rev 222626)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-09-28 20:03:07 UTC (rev 222627)
@@ -1,3 +1,16 @@
+2017-09-28 Tim Horton <[email protected]>
+
+ Remove constant() in favor of env()
+ https://bugs.webkit.org/show_bug.cgi?id=177581
+ <rdar://problem/34701321>
+
+ Reviewed by Dean Jackson.
+
+ * UserInterface/Models/CSSCompletions.js:
+ * UserInterface/Models/CSSKeywordCompletions.js:
+ (WI.CSSKeywordCompletions.forProperty):
+ (WI.CSSKeywordCompletions.forFunction):
+
2017-09-27 Joseph Pecoraro <[email protected]>
Uncaught Exception: Attempted to assign to readonly property (at ContentView.js:206:34)
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js (222626 => 222627)
--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js 2017-09-28 20:01:43 UTC (rev 222626)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js 2017-09-28 20:03:07 UTC (rev 222627)
@@ -97,7 +97,7 @@
return;
var propertyNamesForCodeMirror = {};
- var valueKeywordsForCodeMirror = {"inherit": true, "initial": true, "unset": true, "revert": true, "var": true, "constant": true, "env": true};
+ var valueKeywordsForCodeMirror = {"inherit": true, "initial": true, "unset": true, "revert": true, "var": true, "env": true};
var colorKeywordsForCodeMirror = {};
function nameForCodeMirror(name)
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js (222626 => 222627)
--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2017-09-28 20:01:43 UTC (rev 222626)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2017-09-28 20:03:07 UTC (rev 222627)
@@ -33,7 +33,7 @@
WI.CSSKeywordCompletions.forProperty = function(propertyName)
{
- let acceptedKeywords = ["initial", "unset", "revert", "var()", "constant()", "env()"];
+ let acceptedKeywords = ["initial", "unset", "revert", "var()", "env()"];
let isNotPrefixed = propertyName.charAt(0) !== "-";
if (propertyName in WI.CSSKeywordCompletions._propertyKeywordMap)
@@ -68,7 +68,7 @@
if (functionName === "var")
suggestions = [];
- else if (functionName === "constant" || functionName == "env")
+ else if (functionName == "env")
suggestions = suggestions.concat(["safe-area-inset-top", "safe-area-inset-right", "safe-area-inset-bottom", "safe-area-inset-left"]);
else if (functionName === "image-set")
suggestions.push("url()");
