More complete fix for #387

As SVGTinyStyle inherit from CSS3 and as image-rendering is present in CSS3
it is better to define it in Css3Style, and move all the casts from SVGBasicStyle
to Css3Style

Author: ylafon

org/w3c/css/properties/css/CssImageRendering.java

@@ -6,7 +6,7 @@
 package org.w3c.css.properties.css;
 
 import org.w3c.css.parser.CssStyle;
-import org.w3c.css.properties.svg.SVGBasicStyle;
+import org.w3c.css.properties.css3.Css3Style;
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssExpression;
@@ -78,7 +78,7 @@ public String toString() {
      * @param style The CssStyle
      */
     public void addToStyle(ApplContext ac, CssStyle style) {
-        SVGBasicStyle s = (SVGBasicStyle) style;
+        Css3Style s = (Css3Style) style;
         if (s.cssImageRendering != null) {
             style.addRedefinitionWarning(ac, this);
         }
@@ -105,9 +105,9 @@ public boolean equals(CssProperty property) {
      */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
         if (resolve) {
-            return ((SVGBasicStyle) style).getImageRendering();
+            return ((Css3Style) style).getImageRendering();
         } else {
-            return ((SVGBasicStyle) style).cssImageRendering;
+            return ((Css3Style) style).cssImageRendering;
         }
     }
 }

org/w3c/css/properties/css3/Css3Style.java

@@ -52,6 +52,7 @@
 import org.w3c.css.properties.css.CssBorderBlockWidth;
 import org.w3c.css.properties.css.CssBorderEndEndRadius;
 import org.w3c.css.properties.css.CssBorderEndStartRadius;
+import org.w3c.css.properties.css.CssImageRendering;
 import org.w3c.css.properties.css.CssBorderImageSource;
 import org.w3c.css.properties.css.CssBorderInline;
 import org.w3c.css.properties.css.CssBorderInlineColor;
@@ -566,6 +567,7 @@ public class Css3Style extends ATSCStyle {
     public CssObjectPosition cssObjectPosition;
     public CssImageOrientation cssImageOrientation;
     public CssImageResolution cssImageResolution;
+    public CssImageRendering cssImageRendering;
 
     CssRubySpan cssRubySpan;
 
@@ -1797,6 +1799,13 @@ public org.w3c.css.properties.css.counterstyle.CssNegative getCounterStyleCssNeg
         return counterStyleCssNegative;
     }
 
+    public CssImageRendering getImageRendering() {
+        if (cssImageRendering == null) {
+            cssImageRendering = (CssImageRendering) style.CascadingOrder(new CssImageRendering(), style, selector);
+        }
+        return cssImageRendering;
+    }
+
     public CssBorderImageSource getBorderImageSource() {
         if (cssBorder.borderImage.source == null) {
             cssBorder.borderImage.source = (CssBorderImageSource) style.CascadingOrder(new CssBorderImageSource(), style, selector);

org/w3c/css/properties/svg/SVGBasicStyle.java

@@ -17,7 +17,6 @@
 import org.w3c.css.properties.css.CssFillOpacity;
 import org.w3c.css.properties.css.CssGlyphOrientationHorizontal;
 import org.w3c.css.properties.css.CssGlyphOrientationVertical;
-import org.w3c.css.properties.css.CssImageRendering;
 import org.w3c.css.properties.css.CssKerning;
 import org.w3c.css.properties.css.CssMask;
 import org.w3c.css.properties.css.CssPointerEvents;
@@ -34,7 +33,6 @@ public class SVGBasicStyle extends SVGTinyStyle {
     public CssColorRendering cssColorRendering;
     public CssShapeRendering cssShapeRendering;
     public CssTextRendering cssTextRendering;
-    public CssImageRendering cssImageRendering;
     public CssTextAnchor cssTextAnchor;
     public CssFillOpacity cssFillOpacity;
     public CssStrokeOpacity cssStrokeOpacity;
@@ -59,15 +57,6 @@ public CssColorInterpolation getColorInterpolation() {
         return cssColorInterpolation;
     }
 
-    public CssImageRendering getImageRendering() {
-        if (cssImageRendering == null) {
-            cssImageRendering =
-                    (CssImageRendering) style.CascadingOrder(new CssImageRendering(),
-                            style, selector);
-        }
-        return cssImageRendering;
-    }
-
     public CssColorRendering getColorRendering() {
         if (cssColorRendering == null) {
             cssColorRendering =