<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204247] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204247">204247</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-08-07 19:47:59 -0700 (Sun, 07 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Node.baseURI should not be nullable
https://bugs.webkit.org/show_bug.cgi?id=160649
Reviewed by Darin Adler.
LayoutTests/imported/w3c:
* web-platform-tests/dom/interfaces-expected.txt:
Rebaseline now that one more check is passing.
* web-platform-tests/domparsing/DOMParser-parseFromString-html-expected.txt:
Rebaseline now that the baseURI is "about:blank" instead of null. The check
is still failing. We are falling back to using the document's URL, as expected.
However, the document's URL should not be "about:blank" in this case, which is
why we are failing the previous check.
Source/WebCore:
Node.baseURI should not be nullable as per the latest DOM specification:
- https://dom.spec.whatwg.org/#dom-node-baseuri
It is not nullable in Firefox. It is supposed to fallback to using the
document's URL. The document's URL is "about:blank" by default so
baseURI() now returns "about:blank" in the internal URL is null,
similarly to what we do for Document.URL (c.g. urlForBindings()).
No new tests, rebaselined existing test.
* dom/Node.cpp:
(WebCore::Node::baseURI):
* dom/Node.h:
* dom/Node.idl:
LayoutTests:
Drop outdated DOM test.
* dom/xhtml/level3/core/nodegetbaseuri02-expected.txt: Removed.
* dom/xhtml/level3/core/nodegetbaseuri02.js: Removed.
* dom/xhtml/level3/core/nodegetbaseuri02.xhtml: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsdominterfacesexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsdomparsingDOMParserparseFromStringhtmlexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/domparsing/DOMParser-parseFromString-html-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</a></li>
<li><a href="#trunkSourceWebCoredomNodeidl">trunk/Source/WebCore/dom/Node.idl</a></li>
<li><a href="#trunkSourceWebCoresvgSVGImageLoadercpp">trunk/Source/WebCore/svg/SVGImageLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGURIReferencecpp">trunk/Source/WebCore/svg/SVGURIReference.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsdomxhtmllevel3corenodegetbaseuri02expectedtxt">trunk/LayoutTests/dom/xhtml/level3/core/nodegetbaseuri02-expected.txt</a></li>
<li><a href="#trunkLayoutTestsdomxhtmllevel3corenodegetbaseuri02js">trunk/LayoutTests/dom/xhtml/level3/core/nodegetbaseuri02.js</a></li>
<li><a href="#trunkLayoutTestsdomxhtmllevel3corenodegetbaseuri02xhtml">trunk/LayoutTests/dom/xhtml/level3/core/nodegetbaseuri02.xhtml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (204246 => 204247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-08 01:33:38 UTC (rev 204246)
+++ trunk/LayoutTests/ChangeLog 2016-08-08 02:47:59 UTC (rev 204247)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-08-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Node.baseURI should not be nullable
+ https://bugs.webkit.org/show_bug.cgi?id=160649
+
+ Reviewed by Darin Adler.
+
+ Drop outdated DOM test.
+
+ * dom/xhtml/level3/core/nodegetbaseuri02-expected.txt: Removed.
+ * dom/xhtml/level3/core/nodegetbaseuri02.js: Removed.
+ * dom/xhtml/level3/core/nodegetbaseuri02.xhtml: Removed.
+
+2016-08-07 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Drop SVGDocument as per the SVG2 specification
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160361
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsdomxhtmllevel3corenodegetbaseuri02expectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/dom/xhtml/level3/core/nodegetbaseuri02-expected.txt (204246 => 204247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/dom/xhtml/level3/core/nodegetbaseuri02-expected.txt 2016-08-08 01:33:38 UTC (rev 204246)
+++ trunk/LayoutTests/dom/xhtml/level3/core/nodegetbaseuri02-expected.txt 2016-08-08 02:47:59 UTC (rev 204247)
</span><span class="lines">@@ -1,3 +0,0 @@
</span><del>-Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetbaseuri02
-Status error
-Message Line 120: TypeError
</del></span></pre></div>
<a id="trunkLayoutTestsdomxhtmllevel3corenodegetbaseuri02js"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/dom/xhtml/level3/core/nodegetbaseuri02.js (204246 => 204247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/dom/xhtml/level3/core/nodegetbaseuri02.js 2016-08-08 01:33:38 UTC (rev 204246)
+++ trunk/LayoutTests/dom/xhtml/level3/core/nodegetbaseuri02.js 2016-08-08 02:47:59 UTC (rev 204247)
</span><span class="lines">@@ -1,129 +0,0 @@
</span><del>-
-/*
-Copyright © 2001-2004 World Wide Web Consortium,
-(Massachusetts Institute of Technology, European Research Consortium
-for Informatics and Mathematics, Keio University). All
-Rights Reserved. This work is distributed under the W3C® Software License [1] in the
-hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-*/
-
-
-
- /**
- * Gets URI that identifies the test.
- * @return uri identifier of test
- */
-function getTargetURI() {
- return "http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetbaseuri02";
- }
-
-var docsLoaded = -1000000;
-var builder = null;
-
-//
-// This function is called by the testing framework before
-// running the test suite.
-//
-// If there are no configuration exceptions, asynchronous
-// document loading is started. Otherwise, the status
-// is set to complete and the exception is immediately
-// raised when entering the body of the test.
-//
-function setUpPage() {
- setUpPageStatus = 'running';
- try {
- //
- // creates test document builder, may throw exception
- //
- builder = createConfiguredBuilder();
-
- docsLoaded = 0;
-
- var docRef = null;
- if (typeof(this.doc) != 'undefined') {
- docRef = this.doc;
- }
- docsLoaded += preload(docRef, "doc", "barfoo");
-
- if (docsLoaded == 1) {
- setUpPageStatus = 'complete';
- }
- } catch(ex) {
- catchInitializationError(builder, ex);
- setUpPageStatus = 'complete';
- }
-}
-
-
-
-//
-// This method is called on the completion of
-// each asychronous load started in setUpTests.
-//
-// When every synchronous loaded document has completed,
-// the page status is changed which allows the
-// body of the test to be executed.
-function loadComplete() {
- if (++docsLoaded == 1) {
- setUpPageStatus = 'complete';
- }
-}
-
-
-/**
-*
- Using getBaseURI check if the baseURI attribute of a new Document node is null
- and if affected by changes in Document.documentURI.
-
-* @author IBM
-* @author Neil Delima
-* @see http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core#Node3-baseURI
-* @see http://www.w3.org/Bugs/Public/show_bug.cgi?id=419
-* @see http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/infoset-mapping#Infoset2Document
-*/
-function nodegetbaseuri02() {
- var success;
- if(checkInitialization(builder, "nodegetbaseuri02") != null) return;
- var doc;
- var newDoc;
- var domImpl;
- var baseURI;
- var rootNS;
- var rootName;
- var docElem;
- var nullDocType = null;
-
-
- var docRef = null;
- if (typeof(this.doc) != 'undefined') {
- docRef = this.doc;
- }
- doc = load(docRef, "doc", "barfoo");
- docElem = doc.documentElement;
-
- rootNS = docElem.namespaceURI;
-
- rootName = docElem.tagName;
-
- domImpl = doc.implementation;
-newDoc = domImpl.createDocument(rootNS,rootName,nullDocType);
- baseURI = newDoc.baseURI;
-
- assertNull("baseURIIsNull",baseURI);
- newDoc.documentURI = "http://www.example.com/sample.xml";
-
- baseURI = newDoc.baseURI;
-
- assertEquals("baseURISameAsDocURI","http://www.example.com/sample.xml".toLowerCase(),baseURI.toLowerCase());
-
-}
-
-
-
-
-function runTest() {
- nodegetbaseuri02();
-}
</del></span></pre></div>
<a id="trunkLayoutTestsdomxhtmllevel3corenodegetbaseuri02xhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/dom/xhtml/level3/core/nodegetbaseuri02.xhtml (204246 => 204247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/dom/xhtml/level3/core/nodegetbaseuri02.xhtml 2016-08-08 01:33:38 UTC (rev 204246)
+++ trunk/LayoutTests/dom/xhtml/level3/core/nodegetbaseuri02.xhtml 2016-08-08 02:47:59 UTC (rev 204247)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>-<!DOCTYPE html [
-<!ENTITY ent1 'foo'>
-<!ENTITY ent2 'foo<br/>'>
-<!ELEMENT html (head, body)>
-<!ATTLIST html xmlns CDATA #IMPLIED>
-<!ELEMENT head (title,script*)>
-<!ELEMENT script (#PCDATA)>
-<!ATTLIST script
- src CDATA #IMPLIED
- type CDATA #IMPLIED
- charset CDATA #IMPLIED>
-<!ELEMENT title (#PCDATA)>
-<!ELEMENT body (p)>
-<!ATTLIST body onload CDATA #IMPLIED>
-<!ELEMENT p (#PCDATA|br)*>
-<!ELEMENT br EMPTY>
-]>
-<html xmlns='http://www.w3.org/1999/xhtml'>
-<head>
-<title>replaceWholeText sample</title>
-<script type='text/javascript' src='selfxhtml.js'></script><script charset='UTF-8' type='text/javascript' src='nodegetbaseuri02.js'></script><script type='text/javascript'>function loadComplete() { startTest(); }</script></head>
-<body onload="loadComplete()">
-<p>bar</p>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (204246 => 204247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-08 01:33:38 UTC (rev 204246)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-08 02:47:59 UTC (rev 204247)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-08-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Node.baseURI should not be nullable
+ https://bugs.webkit.org/show_bug.cgi?id=160649
+
+ Reviewed by Darin Adler.
+
+ * web-platform-tests/dom/interfaces-expected.txt:
+ Rebaseline now that one more check is passing.
+
+ * web-platform-tests/domparsing/DOMParser-parseFromString-html-expected.txt:
+ Rebaseline now that the baseURI is "about:blank" instead of null. The check
+ is still failing. We are falling back to using the document's URL, as expected.
+ However, the document's URL should not be "about:blank" in this case, which is
+ why we are failing the previous check.
+
+2016-08-07 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Drop SVGDocument as per the SVG2 specification
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160361
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsdominterfacesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt (204246 => 204247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt 2016-08-08 01:33:38 UTC (rev 204246)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt 2016-08-08 02:47:59 UTC (rev 204247)
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx"> PASS Node interface: new Document() must inherit property "NOTATION_NODE" with the proper type (11)
</span><span class="cx"> PASS Node interface: new Document() must inherit property "nodeType" with the proper type (12)
</span><span class="cx"> PASS Node interface: new Document() must inherit property "nodeName" with the proper type (13)
</span><del>-FAIL Node interface: new Document() must inherit property "baseURI" with the proper type (14) assert_equals: expected "string" but got "object"
</del><ins>+PASS Node interface: new Document() must inherit property "baseURI" with the proper type (14)
</ins><span class="cx"> PASS Node interface: new Document() must inherit property "isConnected" with the proper type (15)
</span><span class="cx"> PASS Node interface: new Document() must inherit property "ownerDocument" with the proper type (16)
</span><span class="cx"> PASS Node interface: new Document() must inherit property "parentNode" with the proper type (17)
</span><span class="lines">@@ -470,7 +470,7 @@
</span><span class="cx"> PASS Node interface: xmlDoc must inherit property "NOTATION_NODE" with the proper type (11)
</span><span class="cx"> PASS Node interface: xmlDoc must inherit property "nodeType" with the proper type (12)
</span><span class="cx"> PASS Node interface: xmlDoc must inherit property "nodeName" with the proper type (13)
</span><del>-FAIL Node interface: xmlDoc must inherit property "baseURI" with the proper type (14) assert_equals: expected "string" but got "object"
</del><ins>+PASS Node interface: xmlDoc must inherit property "baseURI" with the proper type (14)
</ins><span class="cx"> PASS Node interface: xmlDoc must inherit property "isConnected" with the proper type (15)
</span><span class="cx"> PASS Node interface: xmlDoc must inherit property "ownerDocument" with the proper type (16)
</span><span class="cx"> PASS Node interface: xmlDoc must inherit property "parentNode" with the proper type (17)
</span><span class="lines">@@ -875,7 +875,7 @@
</span><span class="cx"> PASS Node interface: element must inherit property "NOTATION_NODE" with the proper type (11)
</span><span class="cx"> PASS Node interface: element must inherit property "nodeType" with the proper type (12)
</span><span class="cx"> PASS Node interface: element must inherit property "nodeName" with the proper type (13)
</span><del>-FAIL Node interface: element must inherit property "baseURI" with the proper type (14) assert_equals: expected "string" but got "object"
</del><ins>+PASS Node interface: element must inherit property "baseURI" with the proper type (14)
</ins><span class="cx"> PASS Node interface: element must inherit property "isConnected" with the proper type (15)
</span><span class="cx"> PASS Node interface: element must inherit property "ownerDocument" with the proper type (16)
</span><span class="cx"> PASS Node interface: element must inherit property "parentNode" with the proper type (17)
</span><span class="lines">@@ -1130,7 +1130,7 @@
</span><span class="cx"> PASS Node interface: xmlDoc.createProcessingInstruction("abc", "def") must inherit property "NOTATION_NODE" with the proper type (11)
</span><span class="cx"> PASS Node interface: xmlDoc.createProcessingInstruction("abc", "def") must inherit property "nodeType" with the proper type (12)
</span><span class="cx"> PASS Node interface: xmlDoc.createProcessingInstruction("abc", "def") must inherit property "nodeName" with the proper type (13)
</span><del>-FAIL Node interface: xmlDoc.createProcessingInstruction("abc", "def") must inherit property "baseURI" with the proper type (14) assert_equals: expected "string" but got "object"
</del><ins>+PASS Node interface: xmlDoc.createProcessingInstruction("abc", "def") must inherit property "baseURI" with the proper type (14)
</ins><span class="cx"> PASS Node interface: xmlDoc.createProcessingInstruction("abc", "def") must inherit property "isConnected" with the proper type (15)
</span><span class="cx"> PASS Node interface: xmlDoc.createProcessingInstruction("abc", "def") must inherit property "ownerDocument" with the proper type (16)
</span><span class="cx"> PASS Node interface: xmlDoc.createProcessingInstruction("abc", "def") must inherit property "parentNode" with the proper type (17)
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsdomparsingDOMParserparseFromStringhtmlexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/domparsing/DOMParser-parseFromString-html-expected.txt (204246 => 204247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/domparsing/DOMParser-parseFromString-html-expected.txt 2016-08-08 01:33:38 UTC (rev 204246)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/domparsing/DOMParser-parseFromString-html-expected.txt 2016-08-08 02:47:59 UTC (rev 204247)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PASS inputEncoding
</span><span class="cx"> PASS charset
</span><span class="cx"> FAIL URL value assert_equals: The document must have a URL value equal to the URL of the active document. expected "http://localhost:8800/domparsing/DOMParser-parseFromString-html.html" but got "about:blank"
</span><del>-FAIL baseURI value assert_equals: expected (string) "http://localhost:8800/domparsing/DOMParser-parseFromString-html.html" but got (object) null
</del><ins>+FAIL baseURI value assert_equals: expected "http://localhost:8800/domparsing/DOMParser-parseFromString-html.html" but got "about:blank"
</ins><span class="cx"> PASS Location value
</span><span class="cx"> PASS DOMParser parses HTML tag soup with no problems
</span><span class="cx"> PASS DOMParser throws on an invalid enum value
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204246 => 204247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-08 01:33:38 UTC (rev 204246)
+++ trunk/Source/WebCore/ChangeLog 2016-08-08 02:47:59 UTC (rev 204247)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2016-08-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Node.baseURI should not be nullable
+ https://bugs.webkit.org/show_bug.cgi?id=160649
+
+ Reviewed by Darin Adler.
+
+ Node.baseURI should not be nullable as per the latest DOM specification:
+ - https://dom.spec.whatwg.org/#dom-node-baseuri
+
+ It is not nullable in Firefox. It is supposed to fallback to using the
+ document's URL. The document's URL is "about:blank" by default so
+ baseURI() now returns "about:blank" in the internal URL is null,
+ similarly to what we do for Document.URL (c.g. urlForBindings()).
+
+ No new tests, rebaselined existing test.
+
+ * dom/Node.cpp:
+ (WebCore::Node::baseURI):
+ * dom/Node.h:
+ * dom/Node.idl:
+
+2016-08-07 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Drop SVGDocument as per the SVG2 specification
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160361
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (204246 => 204247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2016-08-08 01:33:38 UTC (rev 204246)
+++ trunk/Source/WebCore/dom/Node.cpp 2016-08-08 02:47:59 UTC (rev 204247)
</span><span class="lines">@@ -1202,9 +1202,10 @@
</span><span class="cx"> return document == this ? nullptr : document;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-URL Node::baseURI() const
</del><ins>+const URL& Node::baseURI() const
</ins><span class="cx"> {
</span><del>- return document().baseURL();
</del><ins>+ auto& url = document().baseURL();
+ return url.isNull() ? blankURL() : url;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Node::isEqualNode(Node* other) const
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (204246 => 204247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h 2016-08-08 01:33:38 UTC (rev 204246)
+++ trunk/Source/WebCore/dom/Node.h 2016-08-08 02:47:59 UTC (rev 204247)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> Node* pseudoAwareFirstChild() const;
</span><span class="cx"> Node* pseudoAwareLastChild() const;
</span><span class="cx">
</span><del>- URL baseURI() const;
</del><ins>+ const URL& baseURI() const;
</ins><span class="cx">
</span><span class="cx"> void getSubresourceURLs(ListHashSet<URL>&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.idl (204246 => 204247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.idl 2016-08-08 01:33:38 UTC (rev 204246)
+++ trunk/Source/WebCore/dom/Node.idl 2016-08-08 02:47:59 UTC (rev 204247)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> // Introduced in DOM Level 3:
</span><span class="cx">
</span><del>- readonly attribute USVString? baseURI;
</del><ins>+ readonly attribute USVString baseURI;
</ins><span class="cx">
</span><span class="cx"> // FIXME: the spec says this can also raise on retrieval.
</span><span class="cx"> [SetterRaisesException] attribute DOMString? textContent;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGImageLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGImageLoader.cpp (204246 => 204247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGImageLoader.cpp 2016-08-08 01:33:38 UTC (rev 204246)
+++ trunk/Source/WebCore/svg/SVGImageLoader.cpp 2016-08-08 02:47:59 UTC (rev 204247)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> String SVGImageLoader::sourceURI(const AtomicString& attribute) const
</span><span class="cx"> {
</span><span class="cx"> URL base = element().baseURI();
</span><del>- if (base.isValid())
</del><ins>+ if (base != blankURL())
</ins><span class="cx"> return URL(base, stripLeadingAndTrailingHTMLSpaces(attribute)).string();
</span><span class="cx"> return element().document().completeURL(stripLeadingAndTrailingHTMLSpaces(attribute));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGURIReferencecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGURIReference.cpp (204246 => 204247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGURIReference.cpp 2016-08-08 01:33:38 UTC (rev 204246)
+++ trunk/Source/WebCore/svg/SVGURIReference.cpp 2016-08-08 02:47:59 UTC (rev 204247)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> if (start == notFound)
</span><span class="cx"> return emptyString();
</span><span class="cx">
</span><del>- URL base = start ? URL(document.baseURI(), url.substring(0, start)) : document.baseURI();
</del><ins>+ URL base = start ? URL(document.baseURL(), url.substring(0, start)) : document.baseURL();
</ins><span class="cx"> String fragmentIdentifier = url.substring(start);
</span><span class="cx"> URL kurl(base, fragmentIdentifier);
</span><span class="cx"> if (equalIgnoringFragmentIdentifier(kurl, document.url()))
</span><span class="lines">@@ -64,11 +64,11 @@
</span><span class="cx"> // Exclude the '#' character when determining the fragmentIdentifier.
</span><span class="cx"> fragmentIdentifier = url.substring(startOfFragmentIdentifier + 1);
</span><span class="cx"> if (startOfFragmentIdentifier) {
</span><del>- URL base(document.baseURI(), url.substring(0, startOfFragmentIdentifier));
</del><ins>+ URL base(document.baseURL(), url.substring(0, startOfFragmentIdentifier));
</ins><span class="cx"> return URL(base, url.substring(startOfFragmentIdentifier));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return URL(document.baseURI(), url.substring(startOfFragmentIdentifier));
</del><ins>+ return URL(document.baseURL(), url.substring(startOfFragmentIdentifier));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Element* SVGURIReference::targetElementFromIRIString(const String& iri, const Document& document, String* fragmentIdentifier, const Document* externalDocument)
</span></span></pre>
</div>
</div>
</body>
</html>