[HtmlUnit] SVN: [15417] trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/ javascript/host/css/ComputedCSSStyleDeclaration.java

Revision: 15417
          http://sourceforge.net/p/htmlunit/code/15417
Author:   rbri
Date:     2018-06-29 17:33:58 +0000 (Fri, 29 Jun 2018)
Log Message:
-----------
ff60 support (wip)

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

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java	2018-06-29 17:10:26 UTC (rev 15416)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java	2018-06-29 17:33:58 UTC (rev 15417)
@@ -16,6 +16,7 @@
 
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_COMPUTED_BLOCK_IF_NOT_ATTACHED;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_COMPUTED_NO_Z_INDEX;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLDEFINITION_INLINE_IN_QUIRKS;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_CLIENTHIGHT_INPUT_17;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_CLIENTWIDTH_INPUT_TEXT_143;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_CLIENTWIDTH_INPUT_TEXT_169;
@@ -105,6 +106,7 @@
 import com.gargoylesoftware.htmlunit.html.HtmlButton;
 import com.gargoylesoftware.htmlunit.html.HtmlButtonInput;
 import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput;
+import com.gargoylesoftware.htmlunit.html.HtmlDefinitionDescription;
 import com.gargoylesoftware.htmlunit.html.HtmlDivision;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlFileInput;
@@ -568,7 +570,10 @@
             if (browserVersion.hasFeature(CSS_COMPUTED_NO_Z_INDEX)) {
                 return "";
             }
-            if (!ignoreBlockIfNotAttached && browserVersion.hasFeature(CSS_COMPUTED_BLOCK_IF_NOT_ATTACHED)) {
+            if (!ignoreBlockIfNotAttached
+                    && (browserVersion.hasFeature(CSS_COMPUTED_BLOCK_IF_NOT_ATTACHED)
+                            || (domElem instanceof HtmlDefinitionDescription
+                                    && browserVersion.hasFeature(HTMLDEFINITION_INLINE_IN_QUIRKS)))) {
                 changeValueIfEmpty = true;
             }
         }
@@ -1830,7 +1835,7 @@
      * @see #pixelString(Element, CSSStyleDeclaration.CssValue)
      */
     protected String pixelString(final String value) {
-        if (value == EMPTY_FINAL || value.endsWith("px")) {
+        if (EMPTY_FINAL == value || value.endsWith("px")) {
             return value;
         }
         return pixelValue(value) + "px";


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot