Fix for #505, might add better handling of fallback types later

Author: ylafon

org/w3c/css/values/CssCalc.java

@@ -62,7 +62,7 @@ public CssCalc(ApplContext ac, CssValue value) {
             if (value.getRawType() == CssTypes.CSS_CALC) {
                 CssCalc c = (CssCalc) value;
                 contains_variable = c.hasCssVariable();
-            } else if (value.getType() == CssTypes.CSS_VARIABLE) {
+            } else if (value.getRawType() == CssTypes.CSS_VARIABLE) {
                 contains_variable = true;
             }
         }
@@ -128,7 +128,7 @@ public CssCalc addRightSide(String oper, CssValue value) throws InvalidParamExce
                 throw new InvalidParamException("operator", oper, ac);
         }
         val2 = value;
-        if (val2.getType() == CssTypes.CSS_VARIABLE) {
+        if (val2.getRawType() == CssTypes.CSS_VARIABLE) {
             contains_variable = true;
         }
         _computeResultingType(false);

org/w3c/css/values/CssCheckableValue.java

@@ -31,6 +31,10 @@ public void markCssVariable() {
         contains_variable = true;
     }
 
+    public boolean isCheckableValue() {
+        return true;
+    }
+
     /**
      * check if the value is positive or null
      *

org/w3c/css/values/CssMathFunction.java

@@ -485,6 +485,13 @@ private void _computeResultingTypeTrig(boolean is_final)
         }
     }
 
+    // a var() with a fallback reports the fallback's type, so getType() alone is
+    // not enough to tell that a value is dynamic
+    private static boolean valueHasVar(CssValue v)
+    throws InvalidParamException {
+        return v.isCheckableValue() && v.getCheckableValue().hasCssVariable();
+    }
+
     private void _computeResultingTypeList(boolean is_final)
             throws InvalidParamException {
         int valtype = CssTypes.CSS_MATH_FUNCTION;
@@ -495,7 +502,7 @@ private void _computeResultingTypeList(boolean is_final)
             if (firstVal) {
                 valtype = v.getType();
                 // Variable? defer to the next type
-                if (valtype == CssTypes.CSS_VARIABLE) {
+                if (valtype == CssTypes.CSS_VARIABLE || valueHasVar(v)) {
                     markCssVariable();
                     continue;
                 }
@@ -525,7 +532,8 @@ private void _computeResultingTypeList(boolean is_final)
                     continue;
                 }
                 // if it is a variable without a computed type, skip it
-                if ((v.getType() == CssTypes.CSS_VARIABLE) || (v.getRawType() == CssTypes.CSS_VARIABLE)) {
+                if ((v.getType() == CssTypes.CSS_VARIABLE) || (v.getRawType() == CssTypes.CSS_VARIABLE)
+                        || valueHasVar(v)) {
                     markCssVariable();
                     continue;
                 }

org/w3c/css/values/CssValue.java

@@ -82,6 +82,10 @@ public CssFrequency getFrequency() throws InvalidParamException {
         throw new ClassCastException("unknown");
     }
 
+    public boolean isCheckableValue() {
+        return false;
+    }
+
     public CssCheckableValue getCheckableValue() throws InvalidParamException {
         throw new ClassCastException("unknown");
     }