[HtmlUnit] SVN: [15016] trunk/htmlunit/src

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

Revision: 15016
          http://sourceforge.net/p/htmlunit/code/15016
Author:   rbri
Date:     2017-12-16 10:39:12 +0000 (Sat, 16 Dec 2017)
Log Message:
-----------
fixes for chrome 63 (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImage.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAudioElementTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2017-12-15 20:14:44 UTC (rev 15015)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2017-12-16 10:39:12 UTC (rev 15016)
@@ -401,7 +401,7 @@
     HTMLIMAGE_BLANK_SRC_AS_EMPTY,
 
     /** Empty src attribute sets display to false. */
-    @BrowserFeature(FF52)
+    @BrowserFeature({IE, FF52})
     HTMLIMAGE_EMPTY_SRC_DISPLAY_FALSE,
 
     /** Is document.cretaeElement('image') an HTMLElement. */

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImage.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImage.java	2017-12-15 20:14:44 UTC (rev 15015)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImage.java	2017-12-16 10:39:12 UTC (rev 15016)
@@ -663,11 +663,19 @@
     @Override
     public boolean isDisplayed() {
         final String src = getSrcAttribute();
-        if (hasFeature(HTMLIMAGE_INVISIBLE_NO_SRC)
-                && (ATTRIBUTE_NOT_DEFINED == src
-                    || (hasFeature(HTMLIMAGE_BLANK_SRC_AS_EMPTY) && StringUtils.isBlank(src))
-                    || (hasFeature(HTMLIMAGE_EMPTY_SRC_DISPLAY_FALSE) && StringUtils.isEmpty(src)))) {
-            return false;
+        if (hasFeature(HTMLIMAGE_INVISIBLE_NO_SRC)) {
+            if (ATTRIBUTE_NOT_DEFINED == src) {
+                return false;
+            }
+            if (StringUtils.isEmpty(src)) {
+                if (hasFeature(HTMLIMAGE_EMPTY_SRC_DISPLAY_FALSE)) {
+                    return false;
+                }
+                return true;
+            }
+            if (hasFeature(HTMLIMAGE_BLANK_SRC_AS_EMPTY) && StringUtils.isBlank(src)) {
+                return false;
+            }
         }
 
         return super.isDisplayed();

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAudioElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAudioElementTest.java	2017-12-15 20:14:44 UTC (rev 15015)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAudioElementTest.java	2017-12-16 10:39:12 UTC (rev 15016)
@@ -326,10 +326,9 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "probably",
-            FF45 = "",
-            FF = "maybe",
-            IE = "")
+    @Alerts(DEFAULT = "",
+            CHROME = "probably",
+            FF52 = "maybe")
     @NotYetImplemented({CHROME, FF52})
     public void canPlayType_AudioFlac() throws Exception {
         canPlayType("audio/flac");