use current css-wide checks + update to latest CR of css-scrollbar-1

ylafon · ylafon · commit b86f61ae8c16 · 2022-01-05T08:35:38.000+01:00
diff --git a/org/w3c/css/properties/css3/CssScrollbarColor.java b/org/w3c/css/properties/css3/CssScrollbarColor.java
@@ -18,7 +18,7 @@
 import static org.w3c.css.values.CssOperator.SPACE;
 
 /**
- * @spec https://www.w3.org/TR/2021/WD-css-scrollbars-1-20210829/#propdef-scrollbar-color
+ * @spec https://www.w3.org/TR/2021/CR-css-scrollbars-1-20211209/#propdef-scrollbar-color
  */
 public class CssScrollbarColor extends org.w3c.css.properties.css.CssScrollbarColor {
 
@@ -74,7 +74,7 @@ public CssScrollbarColor(ApplContext ac, CssExpression expression, boolean check
 
         switch (val.getType()) {
             case CssTypes.CSS_IDENT:
-                if (inherit.equals(val)) {
+                if (CssIdent.isCssWide(val.getIdent())) {
                     if (expression.getCount() != 1) {
                         throw new InvalidParamException("value",
                                 val.toString(),
@@ -143,7 +143,7 @@ public CssScrollbarColor(ApplContext ac, CssExpression expression, boolean check
             val = expression.getValue();
             switch (val.getType()) {
                 case CssTypes.CSS_IDENT:
-                    if (inherit.equals(val)) {
+                    if (CssIdent.isCssWide(val.getIdent())) {
                         throw new InvalidParamException("value",
                                 val.toString(),
                                 getPropertyName(), ac);
diff --git a/org/w3c/css/properties/css3/CssScrollbarWidth.java b/org/w3c/css/properties/css3/CssScrollbarWidth.java
@@ -13,7 +13,7 @@
 import org.w3c.css.values.CssValue;
 
 /**
- * @spec https://www.w3.org/TR/2021/WD-css-scrollbars-1-20210829/#propdef-scrollbar-width
+ * @spec https://www.w3.org/TR/2021/CR-css-scrollbars-1-20211209/#propdef-scrollbar-width
  */
 public class CssScrollbarWidth extends org.w3c.css.properties.css.CssScrollbarWidth {
 
@@ -66,7 +66,7 @@ public CssScrollbarWidth(ApplContext ac, CssExpression expression, boolean check
 
         switch (val.getType()) {
             case CssTypes.CSS_IDENT:
-                if (inherit.equals(val)) {
+                if (CssIdent.isCssWide(val.getIdent())) {
                     value = val;
                     break;
                 } else {
