Diff
Modified: branches/safari-604-branch/LayoutTests/ChangeLog (223274 => 223275)
--- branches/safari-604-branch/LayoutTests/ChangeLog 2017-10-13 02:13:20 UTC (rev 223274)
+++ branches/safari-604-branch/LayoutTests/ChangeLog 2017-10-13 05:35:43 UTC (rev 223275)
@@ -1,3 +1,24 @@
+2017-10-12 Jason Marcell <[email protected]>
+
+ Cherry-pick r222627. rdar://problem/34938437
+
+ 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-10-12 Dean Jackson <[email protected]>
[WebGL] VideoTextureCopierCV doesn't correctly restore vertex attribute state
Modified: branches/safari-604-branch/LayoutTests/TestExpectations (223274 => 223275)
--- branches/safari-604-branch/LayoutTests/TestExpectations 2017-10-13 02:13:20 UTC (rev 223274)
+++ branches/safari-604-branch/LayoutTests/TestExpectations 2017-10-13 05:35:43 UTC (rev 223275)
@@ -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 ]
Deleted: branches/safari-604-branch/LayoutTests/fast/css/variables/constants/invalid-constant-name-fallback-expected.html (223274 => 223275)
--- branches/safari-604-branch/LayoutTests/fast/css/variables/constants/invalid-constant-name-fallback-expected.html 2017-10-13 02:13:20 UTC (rev 223274)
+++ branches/safari-604-branch/LayoutTests/fast/css/variables/constants/invalid-constant-name-fallback-expected.html 2017-10-13 05:35:43 UTC (rev 223275)
@@ -1,14 +0,0 @@
-<style>
-div {
- position: absolute;
- left: 100px;
- top: 100px;
- width: 100px;
- height: 100px;
- background-color: green;
-}
-</style>
-<body>
-<div></div>
-<p>The box should be at 100, 100.</p>
-
Deleted: branches/safari-604-branch/LayoutTests/fast/css/variables/constants/invalid-constant-name-fallback.html (223274 => 223275)
--- branches/safari-604-branch/LayoutTests/fast/css/variables/constants/invalid-constant-name-fallback.html 2017-10-13 02:13:20 UTC (rev 223274)
+++ branches/safari-604-branch/LayoutTests/fast/css/variables/constants/invalid-constant-name-fallback.html 2017-10-13 05:35:43 UTC (rev 223275)
@@ -1,21 +0,0 @@
-<script>
-if (window.internals)
- internals.settings.setConstantPropertiesEnabled(true);
-</script>
-<style>
-div {
- position: absolute;
- width: 100px;
- height: 100px;
- background-color: green;
-
- --valid-fallback: 100px;
-
- top: constant(some-unknown-name, var(--valid-fallback));
- left: constant(--some-invalid-name, var(--valid-fallback));
-}
-</style>
-<body>
-<div></div>
-<p>The box should be at 100, 100.</p>
-
Deleted: branches/safari-604-branch/LayoutTests/fast/css/variables/constants/ios/safe-area-inset-set-expected.html (223274 => 223275)
--- branches/safari-604-branch/LayoutTests/fast/css/variables/constants/ios/safe-area-inset-set-expected.html 2017-10-13 02:13:20 UTC (rev 223274)
+++ branches/safari-604-branch/LayoutTests/fast/css/variables/constants/ios/safe-area-inset-set-expected.html 2017-10-13 05:35:43 UTC (rev 223275)
@@ -1,32 +0,0 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
-<head>
- <script>
- if (window.internals)
- internals.settings.setViewportFitEnabled(true);
- </script>
- <meta name="viewport" content="initial-scale=1, viewport-fit=cover">
- <style>
- #a {
- position: absolute;
- left: 25px;
- top: 50px;
- width: 100px;
- height: 100px;
- background-color: green;
- }
-
- #b {
- position: absolute;
- left: 75px;
- top: 100px;
- width: 100px;
- height: 100px;
- background-color: blue;
- }
- </style>
-</head>
-<body>
- <div id="a"></div>
- <div id="b"></div>
- <p>The boxes should be at 25, 50 and 75, 100.</p>
-</body>
\ No newline at end of file
Deleted: branches/safari-604-branch/LayoutTests/fast/css/variables/constants/ios/safe-area-inset-set.html (223274 => 223275)
--- branches/safari-604-branch/LayoutTests/fast/css/variables/constants/ios/safe-area-inset-set.html 2017-10-13 02:13:20 UTC (rev 223274)
+++ branches/safari-604-branch/LayoutTests/fast/css/variables/constants/ios/safe-area-inset-set.html 2017-10-13 05:35:43 UTC (rev 223275)
@@ -1,56 +0,0 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
-<script>
-if (window.internals) {
- internals.settings.setConstantPropertiesEnabled(true);
- internals.settings.setViewportFitEnabled(true);
-}
-</script>
-<head>
- <meta name="viewport" content="initial-scale=1, viewport-fit=cover">
- <style>
- #a {
- position: absolute;
- left: constant(safe-area-inset-right);
- top: constant(safe-area-inset-top);
- width: 100px;
- height: 100px;
- background-color: green;
- }
-
- #b {
- position: absolute;
- left: constant(safe-area-inset-bottom);
- top: constant(safe-area-inset-left);
- width: 100px;
- height: 100px;
- background-color: blue;
- }
- </style>
- <script>
- function getUIScript()
- {
- return `
- (function() {
- uiController.setSafeAreaInsets(50, 25, 75, 100);
- uiController.doAfterVisibleContentRectUpdate(function () {
- uiController.uiScriptComplete();
- });
- })();`
- }
-
- if (window.testRunner) {
- testRunner.waitUntilDone();
- window._onload_ = function () {
- testRunner.runUIScript(getUIScript(), function(result) {
- testRunner.notifyDone();
- });
- }
- }
- </script>
-</head>
-<body>
- <div id="a"></div>
- <div id="b"></div>
- <p>The boxes should be at 25, 50 and 75, 100.</p>
-</body>
-
Deleted: branches/safari-604-branch/LayoutTests/fast/css/variables/constants/safe-area-inset-cannot-override-expected.html (223274 => 223275)
--- branches/safari-604-branch/LayoutTests/fast/css/variables/constants/safe-area-inset-cannot-override-expected.html 2017-10-13 02:13:20 UTC (rev 223274)
+++ branches/safari-604-branch/LayoutTests/fast/css/variables/constants/safe-area-inset-cannot-override-expected.html 2017-10-13 05:35:43 UTC (rev 223275)
@@ -1,24 +0,0 @@
-<style>
-#a {
- position: absolute;
- left: 0px;
- top: 0px;
- width: 100px;
- height: 100px;
- background-color: green;
-}
-
-#b {
- position: absolute;
- left: 0px;
- top: 0px;
- width: 100px;
- height: 100px;
- background-color: blue;
-}
-</style>
-<body>
-<div id="a"></div>
-<div id="b"></div>
-<p>The boxes should both be at 0, 0.</p>
-
Deleted: branches/safari-604-branch/LayoutTests/fast/css/variables/constants/safe-area-inset-cannot-override.html (223274 => 223275)
--- branches/safari-604-branch/LayoutTests/fast/css/variables/constants/safe-area-inset-cannot-override.html 2017-10-13 02:13:20 UTC (rev 223274)
+++ branches/safari-604-branch/LayoutTests/fast/css/variables/constants/safe-area-inset-cannot-override.html 2017-10-13 05:35:43 UTC (rev 223275)
@@ -1,37 +0,0 @@
-<script>
-if (window.internals)
- internals.settings.setConstantPropertiesEnabled(true);
-</script>
-<style>
-html {
- --safe-area-inset-bottom: 50px;
- safe-area-inset-left: 50px;
-}
-
-#a {
- position: absolute;
- --safe-area-inset-right: 100px;
- safe-area-inset-top: 100px;
- left: constant(safe-area-inset-right);
- top: constant(safe-area-inset-top);
- width: 100px;
- height: 100px;
- background-color: green;
-}
-
-#b {
- position: absolute;
- --safe-area-inset-bottom: 200px;
- safe-area-inset-left: 200px;
- left: constant(safe-area-inset-bottom);
- top: constant(safe-area-inset-left);
- width: 100px;
- height: 100px;
- background-color: blue;
-}
-</style>
-<body>
-<div id="a"></div>
-<div id="b"></div>
-<p>The boxes should both be at 0, 0.</p>
-
Deleted: branches/safari-604-branch/LayoutTests/fast/css/variables/constants/safe-area-inset-zero-expected.html (223274 => 223275)
--- branches/safari-604-branch/LayoutTests/fast/css/variables/constants/safe-area-inset-zero-expected.html 2017-10-13 02:13:20 UTC (rev 223274)
+++ branches/safari-604-branch/LayoutTests/fast/css/variables/constants/safe-area-inset-zero-expected.html 2017-10-13 05:35:43 UTC (rev 223275)
@@ -1,14 +0,0 @@
-<style>
-div {
- position: absolute;
- left: 0px;
- top: 0px;
- width: 100px;
- height: 100px;
- background-color: green;
-}
-</style>
-<body>
-<div></div>
-<p>The box should be at 0, 0.</p>
-
Deleted: branches/safari-604-branch/LayoutTests/fast/css/variables/constants/safe-area-inset-zero.html (223274 => 223275)
--- branches/safari-604-branch/LayoutTests/fast/css/variables/constants/safe-area-inset-zero.html 2017-10-13 02:13:20 UTC (rev 223274)
+++ branches/safari-604-branch/LayoutTests/fast/css/variables/constants/safe-area-inset-zero.html 2017-10-13 05:35:43 UTC (rev 223275)
@@ -1,21 +0,0 @@
-<script>
-if (window.internals)
- internals.settings.setConstantPropertiesEnabled(true);
-</script>
-<style>
-div {
- position: absolute;
- left: 100px;
- top: 100px;
- width: 100px;
- height: 100px;
- background-color: green;
-
- top: constant(safe-area-inset-top);
- left: constant(safe-area-inset-left);
-}
-</style>
-<body>
-<div></div>
-<p>The box should be at 0, 0.</p>
-
Modified: branches/safari-604-branch/LayoutTests/platform/ios/TestExpectations (223274 => 223275)
--- branches/safari-604-branch/LayoutTests/platform/ios/TestExpectations 2017-10-13 02:13:20 UTC (rev 223274)
+++ branches/safari-604-branch/LayoutTests/platform/ios/TestExpectations 2017-10-13 05:35:43 UTC (rev 223275)
@@ -481,7 +481,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: branches/safari-604-branch/Source/WebCore/ChangeLog (223274 => 223275)
--- branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-13 02:13:20 UTC (rev 223274)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-13 05:35:43 UTC (rev 223275)
@@ -1,3 +1,24 @@
+2017-10-12 Jason Marcell <[email protected]>
+
+ Cherry-pick r222627. rdar://problem/34938437
+
+ 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-10-13 Dean Jackson <[email protected]>
Cherry-pick r223063. rdar://problem/34921832
Modified: branches/safari-604-branch/Source/WebCore/css/CSSValueKeywords.in (223274 => 223275)
--- branches/safari-604-branch/Source/WebCore/css/CSSValueKeywords.in 2017-10-13 02:13:20 UTC (rev 223274)
+++ branches/safari-604-branch/Source/WebCore/css/CSSValueKeywords.in 2017-10-13 05:35:43 UTC (rev 223275)
@@ -849,7 +849,6 @@
//
// Environment Variables
//
-constant
env
//
Modified: branches/safari-604-branch/Source/WebCore/css/CSSVariableData.cpp (223274 => 223275)
--- branches/safari-604-branch/Source/WebCore/css/CSSVariableData.cpp 2017-10-13 02:13:20 UTC (rev 223274)
+++ branches/safari-604-branch/Source/WebCore/css/CSSVariableData.cpp 2017-10-13 05:35:43 UTC (rev 223275)
@@ -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: branches/safari-604-branch/Source/WebCore/css/parser/CSSVariableParser.cpp (223274 => 223275)
--- branches/safari-604-branch/Source/WebCore/css/parser/CSSVariableParser.cpp 2017-10-13 02:13:20 UTC (rev 223274)
+++ branches/safari-604-branch/Source/WebCore/css/parser/CSSVariableParser.cpp 2017-10-13 05:35:43 UTC (rev 223275)
@@ -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: branches/safari-604-branch/Source/WebInspectorUI/ChangeLog (223274 => 223275)
--- branches/safari-604-branch/Source/WebInspectorUI/ChangeLog 2017-10-13 02:13:20 UTC (rev 223274)
+++ branches/safari-604-branch/Source/WebInspectorUI/ChangeLog 2017-10-13 05:35:43 UTC (rev 223275)
@@ -1,3 +1,20 @@
+2017-10-12 Jason Marcell <[email protected]>
+
+ Cherry-pick r222627. rdar://problem/34938437
+
+ 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-10-10 Jason Marcell <[email protected]>
Cherry-pick r222762. rdar://problem/34771420
Modified: branches/safari-604-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js (223274 => 223275)
--- branches/safari-604-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2017-10-13 02:13:20 UTC (rev 223274)
+++ branches/safari-604-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2017-10-13 05:35:43 UTC (rev 223275)
@@ -62,6 +62,26 @@
return new WebInspector.CSSCompletions(acceptedKeywords, true);
};
+WebInspector.CSSKeywordCompletions.forFunction = function(functionName)
+{
+ let suggestions = ["var()"];
+
+ if (functionName === "var")
+ suggestions = [];
+ 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()");
+ else if (functionName === "repeat")
+ suggestions = suggestions.concat(["auto", "auto-fill", "auto-fit", "min-content", "max-content"]);
+ else if (functionName.endsWith("gradient")) {
+ suggestions = suggestions.concat(["to", "left", "right", "top", "bottom"]);
+ suggestions = suggestions.concat(WebInspector.CSSKeywordCompletions._colors);
+ }
+
+ return new WebInspector.CSSCompletions(suggestions, true);
+}
+
WebInspector.CSSKeywordCompletions.addCustomCompletions = function(properties)
{
for (var property of properties) {
