Menu
▾
▴
[HtmlUnit] SVN: [8015] trunk/htmlunit/src
|
From: <mgu...@us...> - 2013-01-21 10:03:29
|
Revision: 8015
http://sourceforge.net/p/htmlunit/code/8015
Author: mguillem
Date: 2013-01-21 10:03:26 +0000 (Mon, 21 Jan 2013)
Log Message:
-----------
fixed ClasCastException when fontSize is read for the style of a SVG element
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgTextTest.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-01-21 09:53:11 UTC (rev 8014)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java 2013-01-21 10:03:26 UTC (rev 8015)
@@ -602,7 +602,7 @@
public String getFontSize() {
String value = super.getFontSize();
if (value.isEmpty()) {
- final HTMLElement parent = (HTMLElement) getElement().getParentElement();
+ final Element parent = getElement().getParentElement();
if (parent != null) {
value = parent.getCurrentStyle().getFontSize();
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgTextTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgTextTest.java 2013-01-21 09:53:11 UTC (rev 8014)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgTextTest.java 2013-01-21 10:03:26 UTC (rev 8015)
@@ -65,4 +65,24 @@
}
}
}
+
+ /**
+ * @throws Exception if the test fails
+ */
+ @Test
+ @Alerts(FF = "16px", IE = "exception")
+ public void getFontSize() throws Exception {
+ final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
+ + "<html><body>\n"
+ + " <svg xmlns='http://www.w3.org/2000/svg' version='1.1'>\n"
+ + " <text id='myId'/>\n"
+ + " </svg>\n"
+ + "<script>\n"
+ + "try {\n"
+ + " alert(window.getComputedStyle(document.getElementById('myId'), null).fontSize);\n"
+ + "} catch(e) { alert('exception'); }\n"
+ + "</script></body></html>";
+
+ loadPageWithAlerts2(html);
+ }
}
|
