proper check for css-wide idents (cont.)

ylafon · ylafon · commit c51c0ce44c00 · 2021-10-08T10:45:43.000+02:00
diff --git a/org/w3c/css/properties/css3/CssTransition.java b/org/w3c/css/properties/css3/CssTransition.java
@@ -200,17 +200,17 @@ private CssTransitionValue checkLayer(ApplContext ac,
                             caller.getPropertyName(), ac);
                 case CssTypes.CSS_IDENT:
                     CssIdent ident = val.getIdent();
-                    if (inherit.equals(ident)) {
+                    if (CssIdent.isCssWide(ident)) {
                         if (expression.getCount() != 1) {
                             throw new InvalidParamException("unrecognize", ac);
                         }
-                        v.property = inherit;
+                        v.property = val;
                         break;
                     }
                     if (v.timingfunc == null) {
                         CssIdent match = CssTransitionTimingFunction.getAllowedIdent(ident);
                         if (match != null) {
-                            v.timingfunc = match;
+                            v.timingfunc = val;
                             break;
                         }
                     }
diff --git a/org/w3c/css/properties/css3/CssTransitionDelay.java b/org/w3c/css/properties/css3/CssTransitionDelay.java
@@ -8,6 +8,7 @@
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
 import org.w3c.css.values.CssLayerList;
 import org.w3c.css.values.CssTypes;
 import org.w3c.css.values.CssValue;
@@ -32,8 +33,7 @@ public CssTransitionDelay() {
      * Creates a new CssTransitionDelay
      *
      * @param expression The expression for this property
-     * @throws org.w3c.css.util.InvalidParamException
-     *          Expressions are incorrect
+     * @throws org.w3c.css.util.InvalidParamException Expressions are incorrect
      */
     public CssTransitionDelay(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
@@ -52,9 +52,9 @@ public CssTransitionDelay(ApplContext ac, CssExpression expression, boolean chec
                     values.add(val);
                     break;
                 case CssTypes.CSS_IDENT:
-                    if (inherit.equals(val.getIdent())) {
+                    if (CssIdent.isCssWide(val.getIdent())) {
                         gotinherit = true;
-                        values.add(inherit);
+                        values.add(val);
                         break;
                     }
                 default:
diff --git a/org/w3c/css/properties/css3/CssTransitionDuration.java b/org/w3c/css/properties/css3/CssTransitionDuration.java
@@ -9,6 +9,7 @@
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssCheckableValue;
 import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
 import org.w3c.css.values.CssLayerList;
 import org.w3c.css.values.CssTypes;
 import org.w3c.css.values.CssValue;
@@ -55,9 +56,9 @@ public CssTransitionDuration(ApplContext ac, CssExpression expression, boolean c
                     values.add(val);
                     break;
                 case CssTypes.CSS_IDENT:
-                    if (inherit.equals(val.getIdent())) {
+                    if (CssIdent.isCssWide(val.getIdent())) {
                         gotinherit = true;
-                        values.add(inherit);
+                        values.add(val);
                         break;
                     }
                 default:
diff --git a/org/w3c/css/properties/css3/CssTransitionProperty.java b/org/w3c/css/properties/css3/CssTransitionProperty.java
@@ -66,17 +66,17 @@ public CssTransitionProperty(ApplContext ac, CssExpression expression, boolean c
             op = expression.getOperator();
             switch (val.getType()) {
                 case CssTypes.CSS_IDENT:
-                    if (inherit.equals(val.getIdent())) {
+                    if (CssIdent.isCssWide(val.getIdent())) {
                         singleVal = true;
-                        sValue = inherit;
-                        values.add(inherit);
+                        sValue = val;
+                        values.add(val);
                     } else {
                         CssIdent ident = getAllowedIdent(ac, val.getIdent());
                         if (ident == none) {
                             singleVal = true;
-                            sValue = none;
+                            sValue = val;
                         }
-                        values.add(ident);
+                        values.add(val);
                     }
                     break;
                 default:
diff --git a/org/w3c/css/properties/css3/CssTransitionTimingFunction.java b/org/w3c/css/properties/css3/CssTransitionTimingFunction.java
@@ -86,15 +86,14 @@ public CssTransitionTimingFunction(ApplContext ac, CssExpression expression, boo
                     values.add(val);
                     break;
                 case CssTypes.CSS_IDENT:
-                    if (inherit.equals(val.getIdent())) {
+                    if (CssIdent.isCssWide(val.getIdent())) {
                         singleVal = true;
-                        sValue = inherit;
-                        values.add(inherit);
+                        sValue = val;
+                        values.add(val);
                         break;
                     } else {
-                        CssIdent id = getAllowedIdent(val.getIdent());
-                        if (id != null) {
-                            values.add(id);
+                        if (getAllowedIdent(val.getIdent()) != null) {
+                            values.add(val);
                             break;
                         }
                         // if not recognized, let it fail
diff --git a/org/w3c/css/properties/css3/CssUnicodeBidi.java b/org/w3c/css/properties/css3/CssUnicodeBidi.java
@@ -70,7 +70,7 @@ public CssUnicodeBidi(ApplContext ac, CssExpression expression, boolean check)
                     getPropertyName(), ac);
         }
         CssIdent id = val.getIdent();
-        if (!inherit.equals(id) && (getAllowedIdent(id) == null)) {
+        if (!CssIdent.isCssWide(id) && (getAllowedIdent(id) == null)) {
             throw new InvalidParamException("value",
                     val.toString(),
                     getPropertyName(), ac);
diff --git a/org/w3c/css/properties/css3/CssUserSelect.java b/org/w3c/css/properties/css3/CssUserSelect.java
@@ -68,7 +68,7 @@ public CssUserSelect(ApplContext ac, CssExpression expression,
 
         if (val.getType() == CssTypes.CSS_IDENT) {
             CssIdent id = val.getIdent();
-            if (inherit.equals(id)) {
+            if (CssIdent.isCssWide(id)) {
                 value = val;
             } else {
                 if (getAllowedIdent(id) == null) {
diff --git a/org/w3c/css/properties/css3/CssVerticalAlign.java b/org/w3c/css/properties/css3/CssVerticalAlign.java
@@ -89,7 +89,7 @@ public CssVerticalAlign(ApplContext ac, CssExpression expression,
                     break;
                 case CssTypes.CSS_IDENT:
                     CssIdent id = val.getIdent();
-                    if (inherit.equals(id)) {
+                    if (CssIdent.isCssWide(id)) {
                         // inherit can only be alone
                         if (expression.getCount() > 1) {
                             throw new InvalidParamException("value", expression.getValue(),
diff --git a/org/w3c/css/properties/css3/CssVisibility.java b/org/w3c/css/properties/css3/CssVisibility.java
@@ -69,7 +69,7 @@ public CssVisibility(ApplContext ac, CssExpression expression, boolean check)
                     getPropertyName(), ac);
         }
         CssIdent id = val.getIdent();
-        if (!inherit.equals(id) && (getAllowedIdent(id) == null)) {
+        if (!CssIdent.isCssWide(id) && (getAllowedIdent(id) == null)) {
                 throw new InvalidParamException("value",
                         val.toString(),
                         getPropertyName(), ac);

Original file line number	Diff line number	Diff line change
`@@ -200,17 +200,17 @@ private CssTransitionValue checkLayer(ApplContext ac,`
`200`	`200`	`caller.getPropertyName(), ac);`
`201`	`201`	`case CssTypes.CSS_IDENT:`
`202`	`202`	`CssIdent ident = val.getIdent();`
`203`		`- if (inherit.equals(ident)) {`
	`203`	`+ if (CssIdent.isCssWide(ident)) {`
`204`	`204`	`if (expression.getCount() != 1) {`
`205`	`205`	`throw new InvalidParamException("unrecognize", ac);`
`206`	`206`	`}`
`207`		`- v.property = inherit;`
	`207`	`+ v.property = val;`
`208`	`208`	`break;`
`209`	`209`	`}`
`210`	`210`	`if (v.timingfunc == null) {`
`211`	`211`	`CssIdent match = CssTransitionTimingFunction.getAllowedIdent(ident);`
`212`	`212`	`if (match != null) {`
`213`		`- v.timingfunc = match;`
	`213`	`+ v.timingfunc = val;`
`214`	`214`	`break;`
`215`	`215`	`}`
`216`	`216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public CssUnicodeBidi(ApplContext ac, CssExpression expression, boolean check)`
`70`	`70`	`getPropertyName(), ac);`
`71`	`71`	`}`
`72`	`72`	`CssIdent id = val.getIdent();`
`73`		`- if (!inherit.equals(id) && (getAllowedIdent(id) == null)) {`
	`73`	`+ if (!CssIdent.isCssWide(id) && (getAllowedIdent(id) == null)) {`
`74`	`74`	`throw new InvalidParamException("value",`
`75`	`75`	`val.toString(),`
`76`	`76`	`getPropertyName(), ac);`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public CssVisibility(ApplContext ac, CssExpression expression, boolean check)`
`69`	`69`	`getPropertyName(), ac);`
`70`	`70`	`}`
`71`	`71`	`CssIdent id = val.getIdent();`
`72`		`- if (!inherit.equals(id) && (getAllowedIdent(id) == null)) {`
	`72`	`+ if (!CssIdent.isCssWide(id) && (getAllowedIdent(id) == null)) {`
`73`	`73`	`throw new InvalidParamException("value",`
`74`	`74`	`val.toString(),`
`75`	`75`	`getPropertyName(), ac);`