@@ -201,7 +201,7 @@ public class ComputedCssStyleDeclaration extends AbstractCssStyleDeclaration {
201201 * The computed, cached height of the element to which this computed style belongs (no padding, borders, etc.),
202202 * <b>not</b> taking child elements into account.
203203 */
204- private Integer height2_ ;
204+ private Integer emptyHeight_ ;
205205
206206 /** The computed, cached horizontal padding (left + right) of the element to which this computed style belongs. */
207207 private Integer paddingHorizontal_ ;
@@ -1638,33 +1638,30 @@ else if (child instanceof DomText) {
16381638 }
16391639
16401640 /**
1641- * Returns the element's calculated height taking relevant CSS into account, but <b>not</b> the element's child
1642- * elements.
1643- *
16441641 * @return the element's calculated height taking relevant CSS into account, but <b>not</b> the element's child
16451642 * elements
16461643 */
16471644 private int getEmptyHeight () {
1648- final Integer cachedHeight2 = getCachedHeight2 ();
1645+ final Integer cachedHeight2 = getCachedEmptyHeight ();
16491646 if (cachedHeight2 != null ) {
16501647 return cachedHeight2 .intValue ();
16511648 }
16521649
16531650 final DomElement element = getDomElement ();
16541651 if (!element .mayBeDisplayed ()) {
1655- return updateCachedHeight2 (0 );
1652+ return updateCachedEmptyHeight (0 );
16561653 }
16571654
16581655 final String display = getDisplay ();
16591656 if (NONE .equals (display )) {
1660- return updateCachedHeight2 (0 );
1657+ return updateCachedEmptyHeight (0 );
16611658 }
16621659
16631660 final WebWindow webWindow = element .getPage ().getEnclosingWindow ();
16641661 final int windowHeight = webWindow .getInnerHeight ();
16651662
16661663 if (element instanceof HtmlBody ) {
1667- return updateCachedHeight2 (windowHeight );
1664+ return updateCachedEmptyHeight (windowHeight );
16681665 }
16691666
16701667 final boolean isInline = INLINE .equals (display ) && !(element instanceof HtmlInlineFrame );
@@ -1837,7 +1834,7 @@ else if (element instanceof HtmlInlineFrame) {
18371834 height = defaultHeight ;
18381835 }
18391836
1840- return updateCachedHeight2 (height );
1837+ return updateCachedEmptyHeight (height );
18411838 }
18421839
18431840 /**
@@ -2088,20 +2085,20 @@ public int updateCachedHeight(final int height) {
20882085
20892086 /**
20902087 * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span>
2091- * @return the cached height2
2088+ * @return the cached emptyHeight
20922089 */
2093- public Integer getCachedHeight2 () {
2094- return height2_ ;
2090+ public Integer getCachedEmptyHeight () {
2091+ return emptyHeight_ ;
20952092 }
20962093
20972094 /**
20982095 * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span>
2099- * @param height the new value
2100- * @return the param height2
2096+ * @param emptyHeight the new value
2097+ * @return the param emptyHeight
21012098 */
2102- public int updateCachedHeight2 (final int height ) {
2103- height2_ = Integer .valueOf (height );
2104- return height ;
2099+ public int updateCachedEmptyHeight (final int emptyHeight ) {
2100+ emptyHeight_ = Integer .valueOf (emptyHeight );
2101+ return emptyHeight ;
21052102 }
21062103
21072104 /**
0 commit comments