CSS: Remove support for unitless 0 angles in offset-rotate

ericwilligers · Commit Bot · commit ecd2115cc793 · 2017-06-06T20:42:59.000Z
Angles in offset-rotate must specify units. w3c/csswg-drafts#1162 (comment) Discussed in Intent: https://groups.google.com/a/chromium.org/d/msg/blink-dev/mP-bj7jCyvM/UChplbzpBgAJ Bug: 727195 Change-Id: Iac2e641b3a35c92bdf26e441d52d520469ef3ee6 Reviewed-on: https://chromium-review.googlesource.com/522483 Reviewed-by: Jochen Eisinger <jochen@chromium.org> Reviewed-by: Rune Lillesveen <rune@opera.com> Commit-Queue: Eric Willigers <ericwilligers@chromium.org> Cr-Commit-Position: refs/heads/master@{#477398}
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css/motion-1/parsing/offset-parsing-invalid.html b/third_party/WebKit/LayoutTests/external/wpt/css/motion-1/parsing/offset-parsing-invalid.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Motion Path Module Level 1: parsing offset with invalid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-shorthand">
+<meta name="assert" content="offset supports only the grammar from the spec.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("offset", "path('m 0 0 h 100') 100px 0");
+test_invalid_value("offset", "ray(sides 0) 50% 90deg auto");
+test_invalid_value("offset", "100px 0deg path('m 0 0 h 100')");
+</script>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css/motion-1/parsing/offset-parsing-valid.html b/third_party/WebKit/LayoutTests/external/wpt/css/motion-1/parsing/offset-parsing-valid.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Motion Path Module Level 1: parsing offset with valid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-shorthand">
+<meta name="assert" content="offset supports the full grammar from the spec.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value("offset", "path('m 0 0 h 100') 100px 0deg");
+test_valid_value("offset", "ray(sides 0deg) 50% 90deg auto", "ray(0deg sides) 50% auto 90deg");
+test_valid_value("offset", "none calc(10px + 20%) auto");
+</script>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css/motion-1/parsing/offset-rotate-parsing-invalid-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/motion-1/parsing/offset-rotate-parsing-invalid-expected.txt
diff --git a/third_party/WebKit/LayoutTests/fast/css/usecounter-angle-zero-offset-rotate.html b/third_party/WebKit/LayoutTests/fast/css/usecounter-angle-zero-offset-rotate.html
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
@@ -689,14 +689,13 @@ static CSSValue* ConsumeTextDecorationLine(CSSParserTokenRange& range) {
 static CSSValue* ConsumeOffsetRotate(CSSParserTokenRange& range,
                                      const CSSParserContext& context) {
   CSSValue* angle =
-      ConsumeAngle(range, context, UseCounter::kUnitlessZeroAngleOffsetRotate);
+      ConsumeAngle(range, context, Optional<UseCounter::Feature>());
   CSSValue* keyword = ConsumeIdent<CSSValueAuto, CSSValueReverse>(range);
   if (!angle && !keyword)
     return nullptr;
 
   if (!angle) {
-    angle = ConsumeAngle(range, context,
-                         UseCounter::kUnitlessZeroAngleOffsetRotate);
+    angle = ConsumeAngle(range, context, Optional<UseCounter::Feature>());
   }
 
   CSSValueList* list = CSSValueList::CreateSpaceSeparated();
diff --git a/third_party/WebKit/public/platform/UseCounterFeature.def b/third_party/WebKit/public/platform/UseCounterFeature.def
@@ -1538,7 +1538,6 @@ kThreeValuedPositionObjectPosition = 2004,
 kThreeValuedPositionPerspectiveOrigin = 2005,
 kUnitlessZeroAngleFilter = 2007,
 kUnitlessZeroAngleGradient = 2008,
-kUnitlessZeroAngleOffsetRotate = 2009,
 kUnitlessZeroAngleTransform = 2010,
 kHTMLOListElementStartGetterReversedWithoutStartAttribute = 2011,
 kCredentialManagerPreventSilentAccess = 2012,

-Original file line number
+Diff line change
@@ @@ -0,0 +1,20 @@ @@
 +>
 +<html>
 +<head>
 +<meta charset="utf-8">
 +<title>Motion Path Module Level 1: parsing offset with invalid valuestitle>
 +<link rel="author" title="Eric Willigers" href="mailto:[email protected]">
 +<link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-shorthand">
 +<meta name="assert" content="offset supports only the grammar from the spec.">
 +<script src="/resources/testharness.js">script>
 +<script src="/resources/testharnessreport.js">script>
 +<script src="resources/parsing-testcommon.js">script>
 +head>
 +<body>
 +<script>
 +test_invalid_value("offset", "path('m 0 0 h 100') 100px 0");
 +test_invalid_value("offset", "ray(sides 0) 50% 90deg auto");
 +test_invalid_value("offset", "100px 0deg path('m 0 0 h 100')");
 +script>
 +body>
 +html>