From: <rb...@us...> - 2017-06-10 11:01:34
|
Revision: 14582 http://sourceforge.net/p/htmlunit/code/14582 Author: rbri Date: 2017-06-10 11:01:31 +0000 (Sat, 10 Jun 2017) Log Message: ----------- latest chrome Modified Paths: -------------- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ElementTest.java Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2017-06-10 10:56:53 UTC (rev 14581) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2017-06-10 11:01:31 UTC (rev 14582) @@ -828,10 +828,6 @@ @BrowserFeature(IE) JS_DOM_CDATA_DELETE_THROWS_NEGATIVE_COUNT, - /** Element.baseURI is null for XML element. */ - @BrowserFeature(CHROME) - JS_ELEMENT_BASE_URL_NULL, - /** Indicates that attributeNS returns an empty string instead of null if not found. */ @BrowserFeature(IE) JS_ELEMENT_GET_ATTRIBUTE_RETURNS_EMPTY, Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java 2017-06-10 10:56:53 UTC (rev 14581) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java 2017-06-10 11:01:31 UTC (rev 14582) @@ -14,7 +14,6 @@ */ package com.gargoylesoftware.htmlunit.javascript.host.dom; -import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_ELEMENT_BASE_URL_NULL; import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_NODE_CONTAINS_RETURNS_FALSE_FOR_INVALID_ARG; import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_NODE_INSERT_BEFORE_REF_OPTIONAL; import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME; @@ -701,9 +700,6 @@ */ @JsxGetter({CHROME, FF}) public String getBaseURI() { - if ("Element".equals(getClass().getSimpleName()) && getBrowserVersion().hasFeature(JS_ELEMENT_BASE_URL_NULL)) { - return null; - } return getDomNodeOrDie().getBaseURI(); } Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ElementTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ElementTest.java 2017-06-10 10:56:53 UTC (rev 14581) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ElementTest.java 2017-06-10 11:01:31 UTC (rev 14582) @@ -873,7 +873,6 @@ */ @Test @Alerts(DEFAULT = {"§§URL§§", "§§URL§§"}, - CHROME = {"null", "§§URL§§"}, IE = {"undefined", "undefined"}) public void baseURI() throws Exception { final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_ + "<html><head><title>foo</title><script>\n" |