Menu
▾
▴
[HtmlUnit] SVN: [15019] trunk/htmlunit/src
|
From: <rb...@us...> - 2017-12-18 16:54:33
|
Revision: 15019
http://sourceforge.net/p/htmlunit/code/15019
Author: rbri
Date: 2017-12-18 16:54:30 +0000 (Mon, 18 Dec 2017)
Log Message:
-----------
fixes for chrome 63 (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImage.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElement.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/huge/HostParentOfWTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImage2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java
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-17 14:46:58 UTC (rev 15018)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImage.java 2017-12-18 16:54:30 UTC (rev 15019)
@@ -667,15 +667,10 @@
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 !(hasFeature(HTMLIMAGE_EMPTY_SRC_DISPLAY_FALSE) && StringUtils.isEmpty(src));
}
return super.isDisplayed();
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElement.java 2017-12-17 14:46:58 UTC (rev 15018)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElement.java 2017-12-18 16:54:30 UTC (rev 15019)
@@ -253,9 +253,7 @@
}
final BrowserVersion browserVersion = getBrowserVersion();
- if (browserVersion.hasFeature(JS_IMAGE_WIDTH_HEIGHT_RETURNS_16x16_0x0)
- && !StringUtils.isEmpty(src)
- && StringUtils.isBlank(src)) {
+ if (browserVersion.hasFeature(JS_IMAGE_WIDTH_HEIGHT_RETURNS_16x16_0x0) && StringUtils.isBlank(src)) {
return 0;
}
@@ -315,9 +313,7 @@
}
final BrowserVersion browserVersion = getBrowserVersion();
- if (browserVersion.hasFeature(JS_IMAGE_WIDTH_HEIGHT_RETURNS_16x16_0x0)
- && !StringUtils.isEmpty(src)
- && StringUtils.isBlank(src)) {
+ if (browserVersion.hasFeature(JS_IMAGE_WIDTH_HEIGHT_RETURNS_16x16_0x0) && StringUtils.isBlank(src)) {
return 0;
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/huge/HostParentOfWTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/huge/HostParentOfWTest.java 2017-12-17 14:46:58 UTC (rev 15018)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/huge/HostParentOfWTest.java 2017-12-18 16:54:30 UTC (rev 15019)
@@ -289,6 +289,16 @@
* @throws Exception if the test fails
*/
@Test
+ @Alerts(DEFAULT = "false",
+ CHROME = "true")
+ public void _WebKitCSSMatrix_DOMMatrix() throws Exception {
+ test("WebKitCSSMatrix", "DOMMatrix");
+ }
+
+ /**
+ * @throws Exception if the test fails
+ */
+ @Test
@Alerts(DEFAULT = "true",
IE = "false",
FF45 = "false")
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImage2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImage2Test.java 2017-12-17 14:46:58 UTC (rev 15018)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImage2Test.java 2017-12-18 16:54:30 UTC (rev 15019)
@@ -151,6 +151,7 @@
*/
@Test
@Alerts(DEFAULT = "true",
+ CHROME = "false",
FF52 = "false")
public void isDisplayedEmptySource() throws Exception {
isDisplayed("src=''");
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElementTest.java 2017-12-17 14:46:58 UTC (rev 15018)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElementTest.java 2017-12-18 16:54:30 UTC (rev 15019)
@@ -472,7 +472,6 @@
*/
@Test
@Alerts(DEFAULT = {"number: 300", "number: 200", "number: 0", "number: 0", "number: 0", "number: 0"},
- CHROME = {"number: 300", "number: 200", "number: 16", "number: 16", "number: 16", "number: 16"},
FF45 = {"number: 300", "number: 200", "number: 24", "number: 24", "number: 24", "number: 24"},
IE = {"number: 300", "number: 200", "number: 28", "number: 30", "number: 28", "number: 30"})
@NotYetImplemented(FF52)
@@ -506,7 +505,7 @@
webConnection.setResponse(URL_SECOND, directBytes, 200, "ok", "image/jpg", emptyList);
}
- loadPageWithAlerts2(html);
+ loadPageWithAlerts2(html, 70000);
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java 2017-12-17 14:46:58 UTC (rev 15018)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java 2017-12-18 16:54:30 UTC (rev 15019)
@@ -244,6 +244,7 @@
*/
@Test
@Alerts(DEFAULT = "Thursday, December 20, 2012, GMT",
+ CHROME = "Thursday, December 20, 2012, UTC",
IE = "\u200EThursday\u200E, \u200EDecember\u200E \u200E20\u200E, \u200E2012")
@NotYetImplemented
public void format_utc_short() throws Exception {
|
