<!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>[204536] 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/204536">204536</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-08-16 15:56:02 -0700 (Tue, 16 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Align isDefaultNamespace() / lookupPrefix() / lookupNamespaceURI() with the specification
https://bugs.webkit.org/show_bug.cgi?id=160911
Reviewed by Ryosuke Niwa.
LayoutTests/imported/w3c:
Rebaseline W3C test now that more checks are passing.
* web-platform-tests/dom/nodes/Node-lookupNamespaceURI-expected.txt:
Source/WebCore:
Align isDefaultNamespace() / lookupPrefix() / lookupNamespaceURI() with the specification:
- https://dom.spec.whatwg.org/#dom-node-isdefaultnamespace
- https://dom.spec.whatwg.org/#dom-node-lookupprefix
- https://dom.spec.whatwg.org/#dom-node-lookupnamespaceuri
Our implementation now matches closely the text of the DOM specification
and we pass more W3C tests as it fixes the following bug:
- isDefaultNamespace(null) / isDefaultNamespace('') was not returning true for in cases
where the node's default namespace was null. Our implementation was returning false
instead of comparing the node's default namespace (in this case null) with the input
namespace (in this case null).
No new tests, rebaselined existing test.
* dom/Node.cpp:
(WebCore::locateDefaultNamespace):
(WebCore::Node::isDefaultNamespace):
(WebCore::Node::lookupNamespaceURI):
(WebCore::locateNamespacePrefix):
(WebCore::Node::lookupPrefix):
(WebCore::appendTextContent): Deleted.
(WebCore::Node::textContent): Deleted.
(WebCore::Node::setTextContent): Deleted.
* dom/Node.h:
* xml/NativeXPathNSResolver.cpp:
(WebCore::NativeXPathNSResolver::lookupNamespaceURI):
LayoutTests:
Drop several outdated tests.
* dom/xhtml/level3/core/nodeisdefaultnamespace03-expected.txt: Removed.
* dom/xhtml/level3/core/nodeisdefaultnamespace03.js: Removed.
* dom/xhtml/level3/core/nodeisdefaultnamespace03.xhtml: Removed.
* dom/xhtml/level3/core/nodelookupnamespaceuri08-expected.txt: Removed.
* dom/xhtml/level3/core/nodelookupnamespaceuri08.js: Removed.
* dom/xhtml/level3/core/nodelookupnamespaceuri08.xhtml: Removed.
* dom/xhtml/level3/core/nodelookupnamespaceuri09-expected.txt: Removed.
* dom/xhtml/level3/core/nodelookupnamespaceuri09.js: Removed.
* dom/xhtml/level3/core/nodelookupnamespaceuri09.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="#trunkLayoutTestsimportedw3cwebplatformtestsdomnodesNodelookupNamespaceURIexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Node-lookupNamespaceURI-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="#trunkSourceWebCorexmlNativeXPathNSResolvercpp">trunk/Source/WebCore/xml/NativeXPathNSResolver.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsdomxhtmllevel3corenodeisdefaultnamespace03expectedtxt">trunk/LayoutTests/dom/xhtml/level3/core/nodeisdefaultnamespace03-expected.txt</a></li>
<li><a href="#trunkLayoutTestsdomxhtmllevel3corenodeisdefaultnamespace03js">trunk/LayoutTests/dom/xhtml/level3/core/nodeisdefaultnamespace03.js</a></li>
<li><a href="#trunkLayoutTestsdomxhtmllevel3corenodeisdefaultnamespace03xhtml">trunk/LayoutTests/dom/xhtml/level3/core/nodeisdefaultnamespace03.xhtml</a></li>
<li><a href="#trunkLayoutTestsdomxhtmllevel3corenodelookupnamespaceuri08expectedtxt">trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri08-expected.txt</a></li>
<li><a href="#trunkLayoutTestsdomxhtmllevel3corenodelookupnamespaceuri08js">trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri08.js</a></li>
<li><a href="#trunkLayoutTestsdomxhtmllevel3corenodelookupnamespaceuri08xhtml">trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri08.xhtml</a></li>
<li><a href="#trunkLayoutTestsdomxhtmllevel3corenodelookupnamespaceuri09expectedtxt">trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri09-expected.txt</a></li>
<li><a href="#trunkLayoutTestsdomxhtmllevel3corenodelookupnamespaceuri09js">trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri09.js</a></li>
<li><a href="#trunkLayoutTestsdomxhtmllevel3corenodelookupnamespaceuri09xhtml">trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri09.xhtml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (204535 => 204536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-16 22:51:27 UTC (rev 204535)
+++ trunk/LayoutTests/ChangeLog 2016-08-16 22:56:02 UTC (rev 204536)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-08-16 Chris Dumez <cdumez@apple.com>
+
+ Align isDefaultNamespace() / lookupPrefix() / lookupNamespaceURI() with the specification
+ https://bugs.webkit.org/show_bug.cgi?id=160911
+
+ Reviewed by Ryosuke Niwa.
+
+ Drop several outdated tests.
+
+ * dom/xhtml/level3/core/nodeisdefaultnamespace03-expected.txt: Removed.
+ * dom/xhtml/level3/core/nodeisdefaultnamespace03.js: Removed.
+ * dom/xhtml/level3/core/nodeisdefaultnamespace03.xhtml: Removed.
+ * dom/xhtml/level3/core/nodelookupnamespaceuri08-expected.txt: Removed.
+ * dom/xhtml/level3/core/nodelookupnamespaceuri08.js: Removed.
+ * dom/xhtml/level3/core/nodelookupnamespaceuri08.xhtml: Removed.
+ * dom/xhtml/level3/core/nodelookupnamespaceuri09-expected.txt: Removed.
+ * dom/xhtml/level3/core/nodelookupnamespaceuri09.js: Removed.
+ * dom/xhtml/level3/core/nodelookupnamespaceuri09.xhtml: Removed.
+
</ins><span class="cx"> 2016-08-15 Ada Chan <adachan@apple.com>
</span><span class="cx">
</span><span class="cx"> Placeholder does not show the first time going into picture-in-picture on video without controls
</span></span></pre></div>
<a id="trunkLayoutTestsdomxhtmllevel3corenodeisdefaultnamespace03expectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/dom/xhtml/level3/core/nodeisdefaultnamespace03-expected.txt (204535 => 204536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/dom/xhtml/level3/core/nodeisdefaultnamespace03-expected.txt 2016-08-16 22:51:27 UTC (rev 204535)
+++ trunk/LayoutTests/dom/xhtml/level3/core/nodeisdefaultnamespace03-expected.txt 2016-08-16 22:56:02 UTC (rev 204536)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisdefaultnamespace03
-Status Success
</del></span></pre></div>
<a id="trunkLayoutTestsdomxhtmllevel3corenodeisdefaultnamespace03js"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/dom/xhtml/level3/core/nodeisdefaultnamespace03.js (204535 => 204536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/dom/xhtml/level3/core/nodeisdefaultnamespace03.js 2016-08-16 22:51:27 UTC (rev 204535)
+++ trunk/LayoutTests/dom/xhtml/level3/core/nodeisdefaultnamespace03.js 2016-08-16 22:56:02 UTC (rev 204536)
</span><span class="lines">@@ -1,115 +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/nodeisdefaultnamespace03";
- }
-
-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();
- setImplementationAttribute("namespaceAware", true);
-
- docsLoaded = 0;
-
- var docRef = null;
- if (typeof(this.doc) != 'undefined') {
- docRef = this.doc;
- }
- docsLoaded += preload(docRef, "doc", "hc_staff");
-
- 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 isDefaultNamespace on this DocumentType node with the value of the namespaceURI parameter
- as null check if the value returned is false.
-
-* @author IBM
-* @author Neil Delima
-* @see http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core#Node3-isDefaultNamespace
-*/
-function nodeisdefaultnamespace03() {
- var success;
- if(checkInitialization(builder, "nodeisdefaultnamespace03") != null) return;
- var doc;
- var docType;
- var isDefault;
- var nullNSURI = null;
-
-
- var docRef = null;
- if (typeof(this.doc) != 'undefined') {
- docRef = this.doc;
- }
- doc = load(docRef, "doc", "hc_staff");
- docType = doc.doctype;
-
- isDefault = docType.isDefaultNamespace(nullNSURI);
- assertFalse("nodeisdefaultnamespace03",isDefault);
-
-}
-
-
-
-
-function runTest() {
- nodeisdefaultnamespace03();
-}
</del></span></pre></div>
<a id="trunkLayoutTestsdomxhtmllevel3corenodeisdefaultnamespace03xhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/dom/xhtml/level3/core/nodeisdefaultnamespace03.xhtml (204535 => 204536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/dom/xhtml/level3/core/nodeisdefaultnamespace03.xhtml 2016-08-16 22:51:27 UTC (rev 204535)
+++ trunk/LayoutTests/dom/xhtml/level3/core/nodeisdefaultnamespace03.xhtml 2016-08-16 22:56:02 UTC (rev 204536)
</span><span class="lines">@@ -1,73 +0,0 @@
</span><del>-<?xml version="1.0"?><?TEST-STYLE PIDATA?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "xhtml1-strict.dtd" [
- <!ENTITY alpha "&#945;">
- <!ENTITY beta "&#946;">
- <!ENTITY gamma "&#947;">
- <!ENTITY delta "&#948;">
- <!ENTITY epsilon "&#949;">
- <!ENTITY alpha "&#950;">
- <!NOTATION notation1 PUBLIC "notation1File">
- <!NOTATION notation2 SYSTEM "notation2File">
- <!ATTLIST p
- dir CDATA 'rtl'
- xmlns:dmstc CDATA #IMPLIED
- xmlns:nm CDATA #IMPLIED
- xmlns:emp2 CDATA #IMPLIED>
- <!ATTLIST html
- xmlns:xsi CDATA #IMPLIED
- xsi:schemaLocation CDATA #IMPLIED>
- <!ATTLIST acronym xsi:noNamespaceSchemaLocation CDATA #IMPLIED>
- <!ENTITY ent4 "<span xmlns='http://www.w3.org/1999/xhtml'>Element data</span><?PItarget PIdata?>">
- <!ATTLIST span xmlns CDATA #IMPLIED>
-]>
-<!-- This is comment number 1.-->
-<html xmlns='http://www.w3.org/1999/xhtml'
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.w3.org/1999/xhtml hc_staff.xsd"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/><title>hc_staff</title><script type="text/javascript" src="selfxhtml.js"/><script charset="UTF-8" type="text/javascript" src="nodeisdefaultnamespace03.js"/><script type='text/javascript'>function loadComplete() { startTest(); }</script></head><body onload="loadComplete()">
- <p xmlns:dmstc="http://www.usa.com">
- <em>EMP0001</em>
- <strong>Margaret Martin</strong>
- <code>Accountant</code>
- <sup>56,000</sup>
- <var>Female</var>
- <acronym title="Yes" xsi:noNamespaceSchemaLocation="Yes">1230 North Ave. Dallas, Texas 98551</acronym>
- </p>
- <p xmlns:dmstc="http://www.usa.com">
- <em>EMP0002</em>
- <strong>Martha Raynolds
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></strong>
- <code>Secretary</code>
- <sup>35,000</sup>
- <var>Female</var>
- <acronym title="Yes" class="Yes" xsi:noNamespaceSchemaLocation="Yes">&beta; Dallas, &gamma;
- 98554</acronym>
- </p>
- <p xmlns:dmstc="http://www.netzero.com">
- <em>EMP0003</em>
- <strong>Roger
- Jones</strong>
- <code>Department Manager</code>
- <sup>100,000</sup>
- <var>&ent4;</var>
- <acronym title="Yes" class="No" id="_98553" xsi:noNamespaceSchemaLocation="Yes">PO Box 27 Irving, texas 98553</acronym>
- </p>
- <p xmlns:nm="http://www.altavista.com">
- <em>EMP0004</em>
- <strong>Jeny Oconnor</strong>
- <code>Personnel Director</code>
- <sup>95,000</sup>
- <var>Female</var>
- <acronym title="Yes" class="Y&alpha;" id="_98556" xsi:noNamespaceSchemaLocation="Yes">27 South Road. Dallas, Texas 98556</acronym>
- </p>
- <p xmlns:emp2="http://www.nist.gov">
- <em>EMP0005</em>
- <strong>Robert Myers</strong>
- <code>Computer Specialist</code>
- <sup>90,000</sup>
- <var>male</var>
- <acronym title="Yes" class="Yes" xsi:noNamespaceSchemaLocation="Yes">1821 Nordic. Road, Irving Texas 98558</acronym>
- </p>
-</body></html>
</del></span></pre></div>
<a id="trunkLayoutTestsdomxhtmllevel3corenodelookupnamespaceuri08expectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri08-expected.txt (204535 => 204536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri08-expected.txt 2016-08-16 22:51:27 UTC (rev 204535)
+++ trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri08-expected.txt 2016-08-16 22:56:02 UTC (rev 204536)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodelookupnamespaceuri08
-Status Success
</del></span></pre></div>
<a id="trunkLayoutTestsdomxhtmllevel3corenodelookupnamespaceuri08js"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri08.js (204535 => 204536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri08.js 2016-08-16 22:51:27 UTC (rev 204535)
+++ trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri08.js 2016-08-16 22:56:02 UTC (rev 204536)
</span><span class="lines">@@ -1,116 +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/nodelookupnamespaceuri08";
- }
-
-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();
- setImplementationAttribute("namespaceAware", true);
-
- docsLoaded = 0;
-
- var docRef = null;
- if (typeof(this.doc) != 'undefined') {
- docRef = this.doc;
- }
- docsLoaded += preload(docRef, "doc", "hc_staff");
-
- 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';
- }
-}
-
-
-/**
-*
- Invoke lookupNamespaceURI on an Element node with no prefix, which has 2 namespace
- attribute declarations with and without namespace prefixes and check if the value of the prefix
- returned by using a valid prefix and an empty prefix as a parameter is a valid
- namespaceURI or null.
-
-* @author IBM
-* @author Neil Delima
-* @see http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core#Node3-lookupNamespaceURI
-*/
-function nodelookupnamespaceuri08() {
- var success;
- if(checkInitialization(builder, "nodelookupnamespaceuri08") != null) return;
- var doc;
- var elem;
- var elemList;
- var namespaceURI;
- var namespaceURIEmpty;
-
- var docRef = null;
- if (typeof(this.doc) != 'undefined') {
- docRef = this.doc;
- }
- doc = load(docRef, "doc", "hc_staff");
- elemList = doc.getElementsByTagName("p");
- elem = elemList.item(0);
- namespaceURI = elem.lookupNamespaceURI("dmstc");
- assertEquals("nodelookupnamespaceuri08","http://www.usa.com",namespaceURI);
- namespaceURIEmpty = elem.lookupNamespaceURI("");
- assertNull("nodelookupnamespaceprefixEmpty08",namespaceURIEmpty);
-
-}
-
-
-
-
-function runTest() {
- nodelookupnamespaceuri08();
-}
</del></span></pre></div>
<a id="trunkLayoutTestsdomxhtmllevel3corenodelookupnamespaceuri08xhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri08.xhtml (204535 => 204536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri08.xhtml 2016-08-16 22:51:27 UTC (rev 204535)
+++ trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri08.xhtml 2016-08-16 22:56:02 UTC (rev 204536)
</span><span class="lines">@@ -1,73 +0,0 @@
</span><del>-<?xml version="1.0"?><?TEST-STYLE PIDATA?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "xhtml1-strict.dtd" [
- <!ENTITY alpha "&#945;">
- <!ENTITY beta "&#946;">
- <!ENTITY gamma "&#947;">
- <!ENTITY delta "&#948;">
- <!ENTITY epsilon "&#949;">
- <!ENTITY alpha "&#950;">
- <!NOTATION notation1 PUBLIC "notation1File">
- <!NOTATION notation2 SYSTEM "notation2File">
- <!ATTLIST p
- dir CDATA 'rtl'
- xmlns:dmstc CDATA #IMPLIED
- xmlns:nm CDATA #IMPLIED
- xmlns:emp2 CDATA #IMPLIED>
- <!ATTLIST html
- xmlns:xsi CDATA #IMPLIED
- xsi:schemaLocation CDATA #IMPLIED>
- <!ATTLIST acronym xsi:noNamespaceSchemaLocation CDATA #IMPLIED>
- <!ENTITY ent4 "<span xmlns='http://www.w3.org/1999/xhtml'>Element data</span><?PItarget PIdata?>">
- <!ATTLIST span xmlns CDATA #IMPLIED>
-]>
-<!-- This is comment number 1.-->
-<html xmlns='http://www.w3.org/1999/xhtml'
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.w3.org/1999/xhtml hc_staff.xsd"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/><title>hc_staff</title><script type="text/javascript" src="selfxhtml.js"/><script charset="UTF-8" type="text/javascript" src="nodelookupnamespaceuri08.js"/><script type='text/javascript'>function loadComplete() { startTest(); }</script></head><body onload="loadComplete()">
- <p xmlns:dmstc="http://www.usa.com">
- <em>EMP0001</em>
- <strong>Margaret Martin</strong>
- <code>Accountant</code>
- <sup>56,000</sup>
- <var>Female</var>
- <acronym title="Yes" xsi:noNamespaceSchemaLocation="Yes">1230 North Ave. Dallas, Texas 98551</acronym>
- </p>
- <p xmlns:dmstc="http://www.usa.com">
- <em>EMP0002</em>
- <strong>Martha Raynolds
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></strong>
- <code>Secretary</code>
- <sup>35,000</sup>
- <var>Female</var>
- <acronym title="Yes" class="Yes" xsi:noNamespaceSchemaLocation="Yes">&beta; Dallas, &gamma;
- 98554</acronym>
- </p>
- <p xmlns:dmstc="http://www.netzero.com">
- <em>EMP0003</em>
- <strong>Roger
- Jones</strong>
- <code>Department Manager</code>
- <sup>100,000</sup>
- <var>&ent4;</var>
- <acronym title="Yes" class="No" id="_98553" xsi:noNamespaceSchemaLocation="Yes">PO Box 27 Irving, texas 98553</acronym>
- </p>
- <p xmlns:nm="http://www.altavista.com">
- <em>EMP0004</em>
- <strong>Jeny Oconnor</strong>
- <code>Personnel Director</code>
- <sup>95,000</sup>
- <var>Female</var>
- <acronym title="Yes" class="Y&alpha;" id="_98556" xsi:noNamespaceSchemaLocation="Yes">27 South Road. Dallas, Texas 98556</acronym>
- </p>
- <p xmlns:emp2="http://www.nist.gov">
- <em>EMP0005</em>
- <strong>Robert Myers</strong>
- <code>Computer Specialist</code>
- <sup>90,000</sup>
- <var>male</var>
- <acronym title="Yes" class="Yes" xsi:noNamespaceSchemaLocation="Yes">1821 Nordic. Road, Irving Texas 98558</acronym>
- </p>
-</body></html>
</del></span></pre></div>
<a id="trunkLayoutTestsdomxhtmllevel3corenodelookupnamespaceuri09expectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri09-expected.txt (204535 => 204536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri09-expected.txt 2016-08-16 22:51:27 UTC (rev 204535)
+++ trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri09-expected.txt 2016-08-16 22:56:02 UTC (rev 204536)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodelookupnamespaceuri09
-Status Success
</del></span></pre></div>
<a id="trunkLayoutTestsdomxhtmllevel3corenodelookupnamespaceuri09js"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri09.js (204535 => 204536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri09.js 2016-08-16 22:51:27 UTC (rev 204535)
+++ trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri09.js 2016-08-16 22:56:02 UTC (rev 204536)
</span><span class="lines">@@ -1,115 +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/nodelookupnamespaceuri09";
- }
-
-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();
- setImplementationAttribute("namespaceAware", true);
-
- docsLoaded = 0;
-
- var docRef = null;
- if (typeof(this.doc) != 'undefined') {
- docRef = this.doc;
- }
- docsLoaded += preload(docRef, "doc", "hc_staff");
-
- 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';
- }
-}
-
-
-/**
-*
- Invoke lookupNamespaceURI on an Element node with no prefix, whose parent has no prefix and
- 2 namespace attribute declarations with and without namespace prefixes and check if the value of
- the namespaceURI returned by using each prefix as a parameter is valid.
-
-* @author IBM
-* @author Neil Delima
-* @see http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core#Node3-lookupNamespaceURI
-*/
-function nodelookupnamespaceuri09() {
- var success;
- if(checkInitialization(builder, "nodelookupnamespaceuri09") != null) return;
- var doc;
- var elem;
- var elemList;
- var namespaceURI;
- var namespaceURIEmpty;
-
- var docRef = null;
- if (typeof(this.doc) != 'undefined') {
- docRef = this.doc;
- }
- doc = load(docRef, "doc", "hc_staff");
- elemList = doc.getElementsByTagName("em");
- elem = elemList.item(0);
- namespaceURI = elem.lookupNamespaceURI("dmstc");
- assertEquals("nodelookupnamespaceuri09","http://www.usa.com",namespaceURI);
- namespaceURIEmpty = elem.lookupNamespaceURI("");
- assertNull("nodelookupnamespaceprefixEmpty09",namespaceURIEmpty);
-
-}
-
-
-
-
-function runTest() {
- nodelookupnamespaceuri09();
-}
</del></span></pre></div>
<a id="trunkLayoutTestsdomxhtmllevel3corenodelookupnamespaceuri09xhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri09.xhtml (204535 => 204536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri09.xhtml 2016-08-16 22:51:27 UTC (rev 204535)
+++ trunk/LayoutTests/dom/xhtml/level3/core/nodelookupnamespaceuri09.xhtml 2016-08-16 22:56:02 UTC (rev 204536)
</span><span class="lines">@@ -1,73 +0,0 @@
</span><del>-<?xml version="1.0"?><?TEST-STYLE PIDATA?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "xhtml1-strict.dtd" [
- <!ENTITY alpha "&#945;">
- <!ENTITY beta "&#946;">
- <!ENTITY gamma "&#947;">
- <!ENTITY delta "&#948;">
- <!ENTITY epsilon "&#949;">
- <!ENTITY alpha "&#950;">
- <!NOTATION notation1 PUBLIC "notation1File">
- <!NOTATION notation2 SYSTEM "notation2File">
- <!ATTLIST p
- dir CDATA 'rtl'
- xmlns:dmstc CDATA #IMPLIED
- xmlns:nm CDATA #IMPLIED
- xmlns:emp2 CDATA #IMPLIED>
- <!ATTLIST html
- xmlns:xsi CDATA #IMPLIED
- xsi:schemaLocation CDATA #IMPLIED>
- <!ATTLIST acronym xsi:noNamespaceSchemaLocation CDATA #IMPLIED>
- <!ENTITY ent4 "<span xmlns='http://www.w3.org/1999/xhtml'>Element data</span><?PItarget PIdata?>">
- <!ATTLIST span xmlns CDATA #IMPLIED>
-]>
-<!-- This is comment number 1.-->
-<html xmlns='http://www.w3.org/1999/xhtml'
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.w3.org/1999/xhtml hc_staff.xsd"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/><title>hc_staff</title><script type="text/javascript" src="selfxhtml.js"/><script charset="UTF-8" type="text/javascript" src="nodelookupnamespaceuri09.js"/><script type='text/javascript'>function loadComplete() { startTest(); }</script></head><body onload="loadComplete()">
- <p xmlns:dmstc="http://www.usa.com">
- <em>EMP0001</em>
- <strong>Margaret Martin</strong>
- <code>Accountant</code>
- <sup>56,000</sup>
- <var>Female</var>
- <acronym title="Yes" xsi:noNamespaceSchemaLocation="Yes">1230 North Ave. Dallas, Texas 98551</acronym>
- </p>
- <p xmlns:dmstc="http://www.usa.com">
- <em>EMP0002</em>
- <strong>Martha Raynolds
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></strong>
- <code>Secretary</code>
- <sup>35,000</sup>
- <var>Female</var>
- <acronym title="Yes" class="Yes" xsi:noNamespaceSchemaLocation="Yes">&beta; Dallas, &gamma;
- 98554</acronym>
- </p>
- <p xmlns:dmstc="http://www.netzero.com">
- <em>EMP0003</em>
- <strong>Roger
- Jones</strong>
- <code>Department Manager</code>
- <sup>100,000</sup>
- <var>&ent4;</var>
- <acronym title="Yes" class="No" id="_98553" xsi:noNamespaceSchemaLocation="Yes">PO Box 27 Irving, texas 98553</acronym>
- </p>
- <p xmlns:nm="http://www.altavista.com">
- <em>EMP0004</em>
- <strong>Jeny Oconnor</strong>
- <code>Personnel Director</code>
- <sup>95,000</sup>
- <var>Female</var>
- <acronym title="Yes" class="Y&alpha;" id="_98556" xsi:noNamespaceSchemaLocation="Yes">27 South Road. Dallas, Texas 98556</acronym>
- </p>
- <p xmlns:emp2="http://www.nist.gov">
- <em>EMP0005</em>
- <strong>Robert Myers</strong>
- <code>Computer Specialist</code>
- <sup>90,000</sup>
- <var>male</var>
- <acronym title="Yes" class="Yes" xsi:noNamespaceSchemaLocation="Yes">1821 Nordic. Road, Irving Texas 98558</acronym>
- </p>
-</body></html>
</del></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (204535 => 204536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-16 22:51:27 UTC (rev 204535)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-16 22:56:02 UTC (rev 204536)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-08-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Align isDefaultNamespace() / lookupPrefix() / lookupNamespaceURI() with the specification
+ https://bugs.webkit.org/show_bug.cgi?id=160911
+
+ Reviewed by Ryosuke Niwa.
+
+ Rebaseline W3C test now that more checks are passing.
+
+ * web-platform-tests/dom/nodes/Node-lookupNamespaceURI-expected.txt:
+
+2016-08-16 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Re-sync imported/w3c/web-platform-tests/dom/ranges/Range-mutations.html with upstream
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160903
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsdomnodesNodelookupNamespaceURIexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Node-lookupNamespaceURI-expected.txt (204535 => 204536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Node-lookupNamespaceURI-expected.txt 2016-08-16 22:51:27 UTC (rev 204535)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Node-lookupNamespaceURI-expected.txt 2016-08-16 22:56:02 UTC (rev 204536)
</span><span class="lines">@@ -5,8 +5,8 @@
</span><span class="cx"> PASS DocumentFragment should have null namespace, prefix ""
</span><span class="cx"> PASS DocumentFragment should have null namespace, prefix "foo"
</span><span class="cx"> PASS DocumentFragment should have null namespace, prefix "xmlns"
</span><del>-FAIL DocumentFragment is in default namespace, prefix null assert_equals: expected true but got false
-FAIL DocumentFragment is in default namespace, prefix "" assert_equals: expected true but got false
</del><ins>+PASS DocumentFragment is in default namespace, prefix null
+PASS DocumentFragment is in default namespace, prefix ""
</ins><span class="cx"> PASS DocumentFragment is in default namespace, prefix "foo"
</span><span class="cx"> PASS DocumentFragment is in default namespace, prefix "xmlns"
</span><span class="cx"> PASS Element should have null namespace, prefix null
</span><span class="lines">@@ -14,12 +14,12 @@
</span><span class="cx"> PASS Element should not have namespace matching prefix with namespaceURI value
</span><span class="cx"> PASS Element should not have XMLNS namespace
</span><span class="cx"> PASS Element has namespace URI matching prefix
</span><del>-FAIL Empty namespace is not default, prefix null assert_equals: expected true but got false
-FAIL Empty namespace is not default, prefix "" assert_equals: expected true but got false
</del><ins>+PASS Empty namespace is not default, prefix null
+PASS Empty namespace is not default, prefix ""
</ins><span class="cx"> PASS fooNamespace is not default
</span><span class="cx"> PASS xmlns namespace is not default
</span><span class="cx"> PASS Element should have baz namespace, prefix null
</span><del>-FAIL Element should have baz namespace, prefix "" assert_equals: expected (string) "bazURI" but got (object) null
</del><ins>+PASS Element should have baz namespace, prefix ""
</ins><span class="cx"> PASS Element does not has namespace with xlmns prefix
</span><span class="cx"> PASS Element has bar namespace
</span><span class="cx"> PASS Empty namespace is not default on fooElem, prefix null
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> PASS bar namespace is not default
</span><span class="cx"> PASS baz namespace is default
</span><span class="cx"> PASS Comment should inherit baz namespace
</span><del>-FAIL Comment should inherit baz namespace assert_equals: expected (string) "bazURI" but got (object) null
</del><ins>+PASS Comment should inherit baz namespace
</ins><span class="cx"> PASS Comment should inherit namespace URI matching prefix
</span><span class="cx"> PASS Comment should inherit bar namespace
</span><span class="cx"> PASS For comment, empty namespace is not default, prefix null
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> PASS For comment, inherited bar namespace is not default
</span><span class="cx"> PASS For comment, inherited baz namespace is default
</span><span class="cx"> PASS Child element should inherit baz namespace
</span><del>-FAIL Child element should have null namespace assert_equals: expected (string) "childNamespace" but got (object) null
</del><ins>+PASS Child element should have null namespace
</ins><span class="cx"> PASS Child element should not have XMLNS namespace
</span><span class="cx"> PASS Child element has namespace URI matching prefix
</span><span class="cx"> PASS Empty namespace is not default for child, prefix null
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> PASS baz namespace is default for child
</span><span class="cx"> PASS childNamespace is default for child
</span><span class="cx"> PASS Document should have xhtml namespace, prefix null
</span><del>-FAIL Document should have xhtml namespace, prefix "" assert_equals: expected (string) "http://www.w3.org/1999/xhtml" but got (object) null
</del><ins>+PASS Document should have xhtml namespace, prefix ""
</ins><span class="cx"> PASS Document has no namespace URI matching prefix
</span><span class="cx"> PASS Document has bar namespace
</span><span class="cx"> PASS For document, empty namespace is not default, prefix null
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204535 => 204536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-16 22:51:27 UTC (rev 204535)
+++ trunk/Source/WebCore/ChangeLog 2016-08-16 22:56:02 UTC (rev 204536)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2016-08-16 Chris Dumez <cdumez@apple.com>
+
+ Align isDefaultNamespace() / lookupPrefix() / lookupNamespaceURI() with the specification
+ https://bugs.webkit.org/show_bug.cgi?id=160911
+
+ Reviewed by Ryosuke Niwa.
+
+ Align isDefaultNamespace() / lookupPrefix() / lookupNamespaceURI() with the specification:
+ - https://dom.spec.whatwg.org/#dom-node-isdefaultnamespace
+ - https://dom.spec.whatwg.org/#dom-node-lookupprefix
+ - https://dom.spec.whatwg.org/#dom-node-lookupnamespaceuri
+
+ Our implementation now matches closely the text of the DOM specification
+ and we pass more W3C tests as it fixes the following bug:
+ - isDefaultNamespace(null) / isDefaultNamespace('') was not returning true for in cases
+ where the node's default namespace was null. Our implementation was returning false
+ instead of comparing the node's default namespace (in this case null) with the input
+ namespace (in this case null).
+
+ No new tests, rebaselined existing test.
+
+ * dom/Node.cpp:
+ (WebCore::locateDefaultNamespace):
+ (WebCore::Node::isDefaultNamespace):
+ (WebCore::Node::lookupNamespaceURI):
+ (WebCore::locateNamespacePrefix):
+ (WebCore::Node::lookupPrefix):
+ (WebCore::appendTextContent): Deleted.
+ (WebCore::Node::textContent): Deleted.
+ (WebCore::Node::setTextContent): Deleted.
+ * dom/Node.h:
+ * xml/NativeXPathNSResolver.cpp:
+ (WebCore::NativeXPathNSResolver::lookupNamespaceURI):
+
</ins><span class="cx"> 2016-08-15 Ada Chan <adachan@apple.com>
</span><span class="cx">
</span><span class="cx"> Placeholder does not show the first time going into picture-in-picture on video without controls
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (204535 => 204536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2016-08-16 22:51:27 UTC (rev 204535)
+++ trunk/Source/WebCore/dom/Node.cpp 2016-08-16 22:56:02 UTC (rev 204536)
</span><span class="lines">@@ -70,6 +70,7 @@
</span><span class="cx"> #include "TouchEvent.h"
</span><span class="cx"> #include "TreeScopeAdopter.h"
</span><span class="cx"> #include "WheelEvent.h"
</span><ins>+#include "XMLNSNames.h"
</ins><span class="cx"> #include "XMLNames.h"
</span><span class="cx"> #include <wtf/RefCountedLeakCounter.h>
</span><span class="cx"> #include <wtf/SHA1.h>
</span><span class="lines">@@ -1313,159 +1314,103 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Node::isDefaultNamespace(const AtomicString& namespaceURIMaybeEmpty) const
</del><ins>+// https://dom.spec.whatwg.org/#locate-a-namespace
+static const AtomicString& locateDefaultNamespace(const Node& node, const AtomicString& prefix)
</ins><span class="cx"> {
</span><del>- const AtomicString& namespaceURI = namespaceURIMaybeEmpty.isEmpty() ? nullAtom : namespaceURIMaybeEmpty;
</del><ins>+ switch (node.nodeType()) {
+ case Node::ELEMENT_NODE: {
+ auto& element = downcast<Element>(node);
+ auto& namespaceURI = element.namespaceURI();
+ if (!namespaceURI.isNull() && element.prefix() == prefix)
+ return namespaceURI;
</ins><span class="cx">
</span><del>- switch (nodeType()) {
- case ELEMENT_NODE: {
- const Element& element = downcast<Element>(*this);
-
- if (element.prefix().isNull())
- return element.namespaceURI() == namespaceURI;
</del><ins>+ if (element.hasAttributes()) {
+ for (auto& attribute : element.attributesIterator()) {
+ if (attribute.namespaceURI() != XMLNSNames::xmlnsNamespaceURI)
+ continue;
</ins><span class="cx">
</span><del>- if (element.hasAttributes()) {
- for (const Attribute& attribute : element.attributesIterator()) {
- if (attribute.localName() == xmlnsAtom)
- return attribute.value() == namespaceURI;
</del><ins>+ if ((prefix.isNull() && attribute.prefix().isNull() && attribute.localName() == xmlnsAtom) || (attribute.prefix() == xmlnsAtom && attribute.localName() == prefix)) {
+ auto& result = attribute.value();
+ return result.isEmpty() ? nullAtom : result;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- if (auto* parent = parentElement())
- return parent->isDefaultNamespace(namespaceURI);
-
- return false;
</del><span class="cx"> }
</span><del>- case DOCUMENT_NODE:
- if (Element* documentElement = downcast<Document>(*this).documentElement())
- return documentElement->isDefaultNamespace(namespaceURI);
- return false;
- case DOCUMENT_TYPE_NODE:
- case DOCUMENT_FRAGMENT_NODE:
- return false;
- case ATTRIBUTE_NODE: {
- const Attr* attr = static_cast<const Attr*>(this);
- if (attr->ownerElement())
- return attr->ownerElement()->isDefaultNamespace(namespaceURI);
- return false;
- }
- default:
- if (auto* parent = parentElement())
- return parent->isDefaultNamespace(namespaceURI);
- return false;
</del><ins>+ auto* parent = node.parentElement();
+ return parent ? locateDefaultNamespace(*parent, prefix) : nullAtom;
</ins><span class="cx"> }
</span><ins>+ case Node::DOCUMENT_NODE:
+ if (auto* documentElement = downcast<Document>(node).documentElement())
+ return locateDefaultNamespace(*documentElement, prefix);
+ return nullAtom;
+ case Node::DOCUMENT_TYPE_NODE:
+ case Node::DOCUMENT_FRAGMENT_NODE:
+ return nullAtom;
+ case Node::ATTRIBUTE_NODE:
+ if (auto* ownerElement = downcast<Attr>(node).ownerElement())
+ return locateDefaultNamespace(*ownerElement, prefix);
+ return nullAtom;
+ default:
+ if (auto* parent = node.parentElement())
+ return locateDefaultNamespace(*parent, prefix);
+ return nullAtom;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String Node::lookupPrefix(const AtomicString &namespaceURI) const
</del><ins>+// https://dom.spec.whatwg.org/#dom-node-isdefaultnamespace
+bool Node::isDefaultNamespace(const AtomicString& potentiallyEmptyNamespace) const
</ins><span class="cx"> {
</span><del>- // Implemented according to
- // http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/namespaces-algorithms.html#lookupNamespacePrefixAlgo
-
- if (namespaceURI.isEmpty())
- return String();
-
- switch (nodeType()) {
- case ELEMENT_NODE:
- return lookupNamespacePrefix(namespaceURI, static_cast<const Element *>(this));
- case DOCUMENT_NODE:
- if (Element* documentElement = downcast<Document>(*this).documentElement())
- return documentElement->lookupPrefix(namespaceURI);
- return String();
- case DOCUMENT_FRAGMENT_NODE:
- case DOCUMENT_TYPE_NODE:
- return String();
- case ATTRIBUTE_NODE: {
- const Attr *attr = static_cast<const Attr *>(this);
- if (attr->ownerElement())
- return attr->ownerElement()->lookupPrefix(namespaceURI);
- return String();
- }
- default:
- if (auto* parent = parentElement())
- return parent->lookupPrefix(namespaceURI);
- return String();
- }
</del><ins>+ const AtomicString& namespaceURI = potentiallyEmptyNamespace.isEmpty() ? nullAtom : potentiallyEmptyNamespace;
+ return locateDefaultNamespace(*this, nullAtom) == namespaceURI;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String Node::lookupNamespaceURI(const String &prefix) const
</del><ins>+// https://dom.spec.whatwg.org/#dom-node-lookupnamespaceuri
+const AtomicString& Node::lookupNamespaceURI(const AtomicString& potentiallyEmptyPrefix) const
</ins><span class="cx"> {
</span><del>- // Implemented according to
- // http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/namespaces-algorithms.html#lookupNamespaceURIAlgo
-
- if (!prefix.isNull() && prefix.isEmpty())
- return String();
-
- switch (nodeType()) {
- case ELEMENT_NODE: {
- const Element *elem = static_cast<const Element *>(this);
-
- if (!elem->namespaceURI().isNull() && elem->prefix() == prefix)
- return elem->namespaceURI();
-
- if (elem->hasAttributes()) {
- for (const Attribute& attribute : elem->attributesIterator()) {
-
- if (attribute.prefix() == xmlnsAtom && attribute.localName() == prefix) {
- if (!attribute.value().isEmpty())
- return attribute.value();
-
- return String();
- }
- if (attribute.localName() == xmlnsAtom && prefix.isNull()) {
- if (!attribute.value().isEmpty())
- return attribute.value();
-
- return String();
- }
- }
- }
- if (auto* parent = parentElement())
- return parent->lookupNamespaceURI(prefix);
- return String();
</del><ins>+ const AtomicString& prefix = potentiallyEmptyPrefix.isEmpty() ? nullAtom : potentiallyEmptyPrefix;
+ return locateDefaultNamespace(*this, prefix);
+}
+
+// https://dom.spec.whatwg.org/#locate-a-namespace-prefix
+static const AtomicString& locateNamespacePrefix(const Element& element, const AtomicString& namespaceURI)
+{
+ if (element.namespaceURI() == namespaceURI)
+ return element.prefix();
+
+ if (element.hasAttributes()) {
+ for (auto& attribute : element.attributesIterator()) {
+ if (attribute.prefix() == xmlnsAtom && attribute.value() == namespaceURI)
+ return attribute.localName();
</ins><span class="cx"> }
</span><del>- case DOCUMENT_NODE:
- if (Element* documentElement = downcast<Document>(*this).documentElement())
- return documentElement->lookupNamespaceURI(prefix);
- return String();
- case DOCUMENT_TYPE_NODE:
- case DOCUMENT_FRAGMENT_NODE:
- return String();
- case ATTRIBUTE_NODE: {
- const Attr *attr = static_cast<const Attr *>(this);
-
- if (attr->ownerElement())
- return attr->ownerElement()->lookupNamespaceURI(prefix);
- else
- return String();
- }
- default:
- if (auto* parent = parentElement())
- return parent->lookupNamespaceURI(prefix);
- return String();
</del><span class="cx"> }
</span><ins>+ auto* parent = element.parentElement();
+ return parent ? locateNamespacePrefix(*parent, namespaceURI) : nullAtom;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String Node::lookupNamespacePrefix(const AtomicString &_namespaceURI, const Element *originalElement) const
</del><ins>+// https://dom.spec.whatwg.org/#dom-node-lookupprefix
+const AtomicString& Node::lookupPrefix(const AtomicString& namespaceURI) const
</ins><span class="cx"> {
</span><del>- if (_namespaceURI.isNull())
- return String();
-
- if (originalElement->lookupNamespaceURI(prefix()) == _namespaceURI)
- return prefix();
</del><ins>+ if (namespaceURI.isEmpty())
+ return nullAtom;
</ins><span class="cx">
</span><del>- ASSERT(is<Element>(*this));
- const Element& thisElement = downcast<Element>(*this);
- if (thisElement.hasAttributes()) {
- for (const Attribute& attribute : thisElement.attributesIterator()) {
- if (attribute.prefix() == xmlnsAtom && attribute.value() == _namespaceURI
- && originalElement->lookupNamespaceURI(attribute.localName()) == _namespaceURI)
- return attribute.localName();
- }
</del><ins>+ switch (nodeType()) {
+ case ELEMENT_NODE:
+ return locateNamespacePrefix(downcast<Element>(*this), namespaceURI);
+ case DOCUMENT_NODE:
+ if (auto* documentElement = downcast<Document>(*this).documentElement())
+ return locateNamespacePrefix(*documentElement, namespaceURI);
+ return nullAtom;
+ case DOCUMENT_FRAGMENT_NODE:
+ case DOCUMENT_TYPE_NODE:
+ return nullAtom;
+ case ATTRIBUTE_NODE:
+ if (auto* ownerElement = downcast<Attr>(*this).ownerElement())
+ return locateNamespacePrefix(*ownerElement, namespaceURI);
+ return nullAtom;
+ default:
+ if (auto* parent = parentElement())
+ return locateNamespacePrefix(*parent, namespaceURI);
+ return nullAtom;
</ins><span class="cx"> }
</span><del>-
- if (auto* parent = parentElement())
- return parent->lookupNamespacePrefix(_namespaceURI, originalElement);
- return String();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void appendTextContent(const Node* node, bool convertBRsToNewlines, bool& isNullString, StringBuilder& content)
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (204535 => 204536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h 2016-08-16 22:51:27 UTC (rev 204535)
+++ trunk/Source/WebCore/dom/Node.h 2016-08-16 22:56:02 UTC (rev 204536)
</span><span class="lines">@@ -192,9 +192,8 @@
</span><span class="cx"> bool isSameNode(Node* other) const { return this == other; }
</span><span class="cx"> bool isEqualNode(Node*) const;
</span><span class="cx"> bool isDefaultNamespace(const AtomicString& namespaceURI) const;
</span><del>- String lookupPrefix(const AtomicString& namespaceURI) const;
- String lookupNamespaceURI(const String& prefix) const;
- String lookupNamespacePrefix(const AtomicString& namespaceURI, const Element* originalElement) const;
</del><ins>+ const AtomicString& lookupPrefix(const AtomicString& namespaceURI) const;
+ const AtomicString& lookupNamespaceURI(const AtomicString& prefix) const;
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT String textContent(bool convertBRsToNewlines = false) const;
</span><span class="cx"> WEBCORE_EXPORT void setTextContent(const String&, ExceptionCode&);
</span></span></pre></div>
<a id="trunkSourceWebCorexmlNativeXPathNSResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/NativeXPathNSResolver.cpp (204535 => 204536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/NativeXPathNSResolver.cpp 2016-08-16 22:51:27 UTC (rev 204535)
+++ trunk/Source/WebCore/xml/NativeXPathNSResolver.cpp 2016-08-16 22:56:02 UTC (rev 204536)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> if (prefix == "xml")
</span><span class="cx"> return XMLNames::xmlNamespaceURI;
</span><span class="cx">
</span><del>- return m_node ? m_node->lookupNamespaceURI(prefix) : String();
</del><ins>+ return m_node ? m_node->lookupNamespaceURI(prefix).string() : String();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>