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

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

Revision: 8366
          http://sourceforge.net/p/htmlunit/code/8366
Author:   rbri
Date:     2013-07-04 19:58:13 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
fix contentWidth calculation for iframes

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	2013-07-01 20:30:43 UTC (rev 8365)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java	2013-07-04 19:58:13 UTC (rev 8366)
@@ -42,8 +42,11 @@
 import org.apache.commons.lang3.StringUtils;
 import org.w3c.css.sac.Selector;
 
+import com.gargoylesoftware.htmlunit.Page;
+import com.gargoylesoftware.htmlunit.html.BaseFrameElement;
 import com.gargoylesoftware.htmlunit.html.DomNode;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlTableRow;
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
 import com.gargoylesoftware.htmlunit.javascript.host.Element;
@@ -147,7 +150,7 @@
         map.put("FOOTER", "inline");
         map.put("HEADER", "inline");
         map.put("I", "inline");
-        // map.put("IFRAME", "inline");
+        map.put("IFRAME", "inline");
         map.put("IMG", "inline");
         // map.put("INPUT", "inline-block");
         map.put("INS", "inline");
@@ -1202,14 +1205,14 @@
     public int getContentWidth() {
         int width = 0;
         final DomNode domNode = getDomNodeOrDie();
-        final Iterable<DomNode> childs = domNode.getChildren();
-//        if (domNode instanceof BaseFrameElement) {
-//            final Page enclosedPage = ((BaseFrameElement) domNode).getEnclosedPage();
-//            if (enclosedPage instanceof HtmlPage) {
-//                final HtmlPage htmlPage = (HtmlPage) enclosedPage;
-//                childs = htmlPage.getChildren();
-//            }
-//        }
+        Iterable<DomNode> childs = domNode.getChildren();
+        if (domNode instanceof BaseFrameElement) {
+            final Page enclosedPage = ((BaseFrameElement) domNode).getEnclosedPage();
+            if (enclosedPage instanceof HtmlPage) {
+                final HtmlPage htmlPage = (HtmlPage) enclosedPage;
+                childs = htmlPage.getChildren();
+            }
+        }
         for (final DomNode child : childs) {
             if (child.getScriptObject() instanceof HTMLElement) {
                 final HTMLElement e = (HTMLElement) child.getScriptObject();