[HtmlUnit] SVN: [15350] trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit

[<rb...@us...>]

Revision: 15350
          http://sourceforge.net/p/htmlunit/code/15350
Author:   rbri
Date:     2018-06-17 14:08:37 +0000 (Sun, 17 Jun 2018)
Log Message:
-----------
more ff60 expectations

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-17 13:16:42 UTC (rev 15349)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-17 14:08:37 UTC (rev 15350)
@@ -54,6 +54,10 @@
     @BrowserFeature(CHROME)
     CSS_BACKGROUND_INITIAL,
 
+    /** Background image is 'rgba(0, 0, 0, 0)'. */
+    @BrowserFeature(FF60)
+    CSS_BACKGROUND_RGBA,
+
     /** Computed {@code display} is {@code block} for non-attached elements. */
     @BrowserFeature(FF52)
     CSS_COMPUTED_BLOCK_IF_NOT_ATTACHED,

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java	2018-06-17 13:16:42 UTC (rev 15349)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java	2018-06-17 14:08:37 UTC (rev 15350)
@@ -15,6 +15,7 @@
 package com.gargoylesoftware.htmlunit.javascript.host.css;
 
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_BACKGROUND_INITIAL;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_BACKGROUND_RGBA;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_LENGTH_INITIAL;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_OUTLINE_WIDTH_UNIT_NOT_REQUIRED;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_SET_NULL_THROWS;
@@ -631,6 +632,9 @@
                     }
                     return "rgba(0, 0, 0, 0)";
                 }
+                if (getBrowserVersion().hasFeature(CSS_BACKGROUND_RGBA)) {
+                    return "rgba(0, 0, 0, 0)";
+                }
                 return "transparent"; // default if shorthand is used
             }
             return value;