[webkit-changes] [195485] trunk

Fri, 22 Jan 2016 15:22:33 -0800

Title: [195485] trunk
Revision
195485
Author
[email protected]
Date
2016-01-22 15:22:07 -0800 (Fri, 22 Jan 2016)

Log Message

Document.URL / Document.documentURI should return "about:blank" instead of empty string / null
https://bugs.webkit.org/show_bug.cgi?id=153363
<rdar://problem/22549736>

Reviewed by Ryosuke Niwa.

LayoutTests/imported/w3c:

Rebaseline several W3C tests now that more checks are passing.

* web-platform-tests/dom/interfaces-expected.txt:
* web-platform-tests/dom/nodes/DOMImplementation-createDocument-expected.txt:
* web-platform-tests/dom/nodes/DOMImplementation-createHTMLDocument-expected.txt:
* web-platform-tests/dom/nodes/Document-constructor-expected.txt:
* web-platform-tests/dom/nodes/Node-properties-expected.txt:
* web-platform-tests/html/dom/interfaces-expected.txt:

Source/WebCore:

Document.URL / Document.documentURI should return "about:blank" instead
of empty string / null, as per the specification:
- https://dom.spec.whatwg.org/#dom-document-url
- https://dom.spec.whatwg.org/#concept-document-url

Also, Document.documentURI should be an alias for Document.URL as per:
- https://dom.spec.whatwg.org/#dom-document-url

Firefox matches the specification.

No new tests, already covered by existing W3C tests.

* dom/Document.h:
(WebCore::Document::urlForBindings):
* dom/Document.idl:

LayoutTests:

Drop outdated tests.

* dom/xhtml/level3/core/documentgetdocumenturi02-expected.txt: Removed.
* dom/xhtml/level3/core/documentgetdocumenturi02.js: Removed.
* dom/xhtml/level3/core/documentgetdocumenturi02.xhtml: Removed.
* dom/xhtml/level3/core/documentgetdocumenturi03-expected.txt: Removed.
* dom/xhtml/level3/core/documentgetdocumenturi03.js: Removed.
* dom/xhtml/level3/core/documentgetdocumenturi03.xhtml: Removed.
* dom/xhtml/level3/core/documentsetdocumenturi03-expected.txt: Removed.
* dom/xhtml/level3/core/documentsetdocumenturi03.js: Removed.
* dom/xhtml/level3/core/documentsetdocumenturi03.xhtml: Removed.
* fast/dom/document-attribute-js-null-expected.txt:
* fast/dom/document-attribute-js-null.html:

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (195484 => 195485)


--- trunk/LayoutTests/ChangeLog	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/ChangeLog	2016-01-22 23:22:07 UTC (rev 195485)
@@ -1,3 +1,25 @@
+2016-01-22  Chris Dumez  <[email protected]>
+
+        Document.URL / Document.documentURI should return "about:blank" instead of empty string / null
+        https://bugs.webkit.org/show_bug.cgi?id=153363
+        <rdar://problem/22549736>
+
+        Reviewed by Ryosuke Niwa.
+
+        Drop outdated tests.
+
+        * dom/xhtml/level3/core/documentgetdocumenturi02-expected.txt: Removed.
+        * dom/xhtml/level3/core/documentgetdocumenturi02.js: Removed.
+        * dom/xhtml/level3/core/documentgetdocumenturi02.xhtml: Removed.
+        * dom/xhtml/level3/core/documentgetdocumenturi03-expected.txt: Removed.
+        * dom/xhtml/level3/core/documentgetdocumenturi03.js: Removed.
+        * dom/xhtml/level3/core/documentgetdocumenturi03.xhtml: Removed.
+        * dom/xhtml/level3/core/documentsetdocumenturi03-expected.txt: Removed.
+        * dom/xhtml/level3/core/documentsetdocumenturi03.js: Removed.
+        * dom/xhtml/level3/core/documentsetdocumenturi03.xhtml: Removed.
+        * fast/dom/document-attribute-js-null-expected.txt:
+        * fast/dom/document-attribute-js-null.html:
+
 2016-01-22  Tim Horton  <[email protected]>
 
         Add a test for iOS arrow-key repeat

Deleted: trunk/LayoutTests/dom/xhtml/level3/core/documentgetdocumenturi02-expected.txt (195484 => 195485)


--- trunk/LayoutTests/dom/xhtml/level3/core/documentgetdocumenturi02-expected.txt	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/dom/xhtml/level3/core/documentgetdocumenturi02-expected.txt	2016-01-22 23:22:07 UTC (rev 195485)
@@ -1,2 +0,0 @@
-Test	http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentgetdocumenturi02
-Status	Success

Deleted: trunk/LayoutTests/dom/xhtml/level3/core/documentgetdocumenturi02.js (195484 => 195485)


--- trunk/LayoutTests/dom/xhtml/level3/core/documentgetdocumenturi02.js	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/dom/xhtml/level3/core/documentgetdocumenturi02.js	2016-01-22 23:22:07 UTC (rev 195485)
@@ -1,121 +0,0 @@
-
-/*
-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/documentgetdocumenturi02";
-   }
-
-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", "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';
-    }
-}
-
-
-/**
-* 
-	Create a new Document, retreive its documentURI, and verify if it is null.
-
-* @author IBM
-* @author Neil Delima
-* @see http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core#Document3-documentURI
-*/
-function documentgetdocumenturi02() {
-   var success;
-    if(checkInitialization(builder, "documentgetdocumenturi02") != null) return;
-    var doc;
-      var newDoc;
-      var docURI;
-      var domImpl;
-      var nullDocType = null;
-
-      var docElem;
-      var rootNS;
-      var rootName;
-      
-      var docRef = null;
-      if (typeof(this.doc) != 'undefined') {
-        docRef = this.doc;
-      }
-      doc = load(docRef, "doc", "hc_staff");
-      docElem = doc.documentElement;
-
-      rootNS = docElem.namespaceURI;
-
-      rootName = docElem.tagName;
-
-      domImpl = doc.implementation;
-newDoc = domImpl.createDocument(rootNS,rootName,nullDocType);
-      docURI = newDoc.documentURI;
-
-      assertNull("documentgetdocumenturi02",docURI);
-    
-}
-
-
-
-
-function runTest() {
-   documentgetdocumenturi02();
-}

Deleted: trunk/LayoutTests/dom/xhtml/level3/core/documentgetdocumenturi02.xhtml (195484 => 195485)


--- trunk/LayoutTests/dom/xhtml/level3/core/documentgetdocumenturi02.xhtml	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/dom/xhtml/level3/core/documentgetdocumenturi02.xhtml	2016-01-22 23:22:07 UTC (rev 195485)
@@ -1,73 +0,0 @@
-<?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="" charset="UTF-8" type="text/_javascript_" src="" 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>

Deleted: trunk/LayoutTests/dom/xhtml/level3/core/documentgetdocumenturi03-expected.txt (195484 => 195485)


--- trunk/LayoutTests/dom/xhtml/level3/core/documentgetdocumenturi03-expected.txt	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/dom/xhtml/level3/core/documentgetdocumenturi03-expected.txt	2016-01-22 23:22:07 UTC (rev 195485)
@@ -1,2 +0,0 @@
-Test	http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentgetdocumenturi03
-Status	Success

Deleted: trunk/LayoutTests/dom/xhtml/level3/core/documentgetdocumenturi03.js (195484 => 195485)


--- trunk/LayoutTests/dom/xhtml/level3/core/documentgetdocumenturi03.js	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/dom/xhtml/level3/core/documentgetdocumenturi03.js	2016-01-22 23:22:07 UTC (rev 195485)
@@ -1,127 +0,0 @@
-
-/*
-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/documentgetdocumenturi03";
-   }
-
-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", "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';
-    }
-}
-
-
-/**
-* 
-	Import the documentElement node of this document into a new document.  Since this node is
-	now owned by the importing document, its documentURI attribute value should be null
-
-* @author IBM
-* @author Neil Delima
-* @see http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core#Document3-documentURI
-*/
-function documentgetdocumenturi03() {
-   var success;
-    if(checkInitialization(builder, "documentgetdocumenturi03") != null) return;
-    var doc;
-      var newDoc;
-      var importedOwner;
-      var docElem;
-      var docElemImported;
-      var docURI;
-      var domImpl;
-      var nullDocType = null;
-
-      var rootNS;
-      var rootName;
-      
-      var docRef = null;
-      if (typeof(this.doc) != 'undefined') {
-        docRef = this.doc;
-      }
-      doc = load(docRef, "doc", "hc_staff");
-      domImpl = doc.implementation;
-docElem = doc.documentElement;
-
-      rootNS = docElem.namespaceURI;
-
-      rootName = docElem.tagName;
-
-      newDoc = domImpl.createDocument(rootNS,rootName,nullDocType);
-      docElemImported = newDoc.importNode(docElem,false);
-      importedOwner = docElemImported.ownerDocument;
-
-      docURI = importedOwner.documentURI;
-
-      assertNull("documentgetdocumenturi03",docURI);
-    
-}
-
-
-
-
-function runTest() {
-   documentgetdocumenturi03();
-}

Deleted: trunk/LayoutTests/dom/xhtml/level3/core/documentgetdocumenturi03.xhtml (195484 => 195485)


--- trunk/LayoutTests/dom/xhtml/level3/core/documentgetdocumenturi03.xhtml	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/dom/xhtml/level3/core/documentgetdocumenturi03.xhtml	2016-01-22 23:22:07 UTC (rev 195485)
@@ -1,73 +0,0 @@
-<?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="" charset="UTF-8" type="text/_javascript_" src="" 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>

Deleted: trunk/LayoutTests/dom/xhtml/level3/core/documentsetdocumenturi03-expected.txt (195484 => 195485)


--- trunk/LayoutTests/dom/xhtml/level3/core/documentsetdocumenturi03-expected.txt	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/dom/xhtml/level3/core/documentsetdocumenturi03-expected.txt	2016-01-22 23:22:07 UTC (rev 195485)
@@ -1,3 +0,0 @@
-Test	http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentsetdocumenturi03
-Status	failure
-Message	documentsetdocumenturi03: assertEquals failed, actual null, expected somestring.

Deleted: trunk/LayoutTests/dom/xhtml/level3/core/documentsetdocumenturi03.js (195484 => 195485)


--- trunk/LayoutTests/dom/xhtml/level3/core/documentsetdocumenturi03.js	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/dom/xhtml/level3/core/documentsetdocumenturi03.js	2016-01-22 23:22:07 UTC (rev 195485)
@@ -1,126 +0,0 @@
-
-/*
-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/documentsetdocumenturi03";
-   }
-
-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';
-    }
-}
-
-
-/**
-* 
-	The setDocmentURI method set the location of the document.
-	    
-	Create a new document and set its documentURI to a valid string.  Retreive the documentURI 
-	and verify if it is was correctly set.
-
-* @author IBM
-* @author Neil Delima
-* @see http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core#Document3-documentURI
-*/
-function documentsetdocumenturi03() {
-   var success;
-    if(checkInitialization(builder, "documentsetdocumenturi03") != null) return;
-    var doc;
-      var newDoc;
-      var domImpl;
-      var docURI;
-      var nullDocType = null;
-
-      var docElem;
-      var rootNS;
-      var rootName;
-      
-      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);
-      newDoc.documentURI = "somestring";
-
-      docURI = newDoc.documentURI;
-
-      assertEquals("documentsetdocumenturi03","somestring",docURI);
-       
-}
-
-
-
-
-function runTest() {
-   documentsetdocumenturi03();
-}

Deleted: trunk/LayoutTests/dom/xhtml/level3/core/documentsetdocumenturi03.xhtml (195484 => 195485)


--- trunk/LayoutTests/dom/xhtml/level3/core/documentsetdocumenturi03.xhtml	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/dom/xhtml/level3/core/documentsetdocumenturi03.xhtml	2016-01-22 23:22:07 UTC (rev 195485)
@@ -1,25 +0,0 @@
-<!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=''></script><script charset='UTF-8' type='text/_javascript_' src=''></script><script type='text/_javascript_'>function loadComplete() { startTest(); }</script></head>
-<body _onload_="loadComplete()">
-<p>bar</p>
-</body>
-</html>

Modified: trunk/LayoutTests/fast/dom/document-attribute-js-null-expected.txt (195484 => 195485)


--- trunk/LayoutTests/fast/dom/document-attribute-js-null-expected.txt	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/fast/dom/document-attribute-js-null-expected.txt	2016-01-22 23:22:07 UTC (rev 195485)
@@ -1,7 +1,6 @@
 This test setting various attributes of documents to _javascript_ null.
 
 TEST SUCCEEDED: Got the expected exception (9). [tested Document.xmlVersion]
-TEST SUCCEEDED: The value was null. [tested Document.documentURI]
 TEST SUCCEEDED: The value was undefined. [tested Document.charset]
 TEST SUCCEEDED: The value was null. [tested Document.selectedStylesheetSet]

Modified: trunk/LayoutTests/fast/dom/document-attribute-js-null.html (195484 => 195485)


--- trunk/LayoutTests/fast/dom/document-attribute-js-null.html	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/fast/dom/document-attribute-js-null.html	2016-01-22 23:22:07 UTC (rev 195485)
@@ -65,7 +65,6 @@
                     docToUse: xmlDoc,
                     attributes: [
                         {name: 'xmlVersion', expectedExceptionCode: 9},
-                        {name: 'documentURI', expectedNull: null},
                         {name: 'charset', expectedNull: undefined},
                         {name: 'selectedStylesheetSet', expectedNull: null}
                     ]

Modified: trunk/LayoutTests/imported/w3c/ChangeLog (195484 => 195485)


--- trunk/LayoutTests/imported/w3c/ChangeLog	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2016-01-22 23:22:07 UTC (rev 195485)
@@ -1,3 +1,20 @@
+2016-01-22  Chris Dumez  <[email protected]>
+
+        Document.URL / Document.documentURI should return "about:blank" instead of empty string / null
+        https://bugs.webkit.org/show_bug.cgi?id=153363
+        <rdar://problem/22549736>
+
+        Reviewed by Ryosuke Niwa.
+
+        Rebaseline several W3C tests now that more checks are passing.
+
+        * web-platform-tests/dom/interfaces-expected.txt:
+        * web-platform-tests/dom/nodes/DOMImplementation-createDocument-expected.txt:
+        * web-platform-tests/dom/nodes/DOMImplementation-createHTMLDocument-expected.txt:
+        * web-platform-tests/dom/nodes/Document-constructor-expected.txt:
+        * web-platform-tests/dom/nodes/Node-properties-expected.txt:
+        * web-platform-tests/html/dom/interfaces-expected.txt:
+
 2016-01-21  Brady Eidson  <[email protected]>
 
         Modern IDB: Make -private copies of each w3c IDB test.

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt (195484 => 195485)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt	2016-01-22 23:22:07 UTC (rev 195485)
@@ -482,7 +482,7 @@
 FAIL Stringification of xmlDoc assert_equals: class string of xmlDoc expected "[object XMLDocument]" but got "[object Document]"
 PASS Document interface: xmlDoc must inherit property "implementation" with the proper type (0) 
 PASS Document interface: xmlDoc must inherit property "URL" with the proper type (1) 
-FAIL Document interface: xmlDoc must inherit property "documentURI" with the proper type (2) assert_equals: expected "string" but got "object"
+PASS Document interface: xmlDoc must inherit property "documentURI" with the proper type (2) 
 PASS Document interface: xmlDoc must inherit property "origin" with the proper type (3) 
 PASS Document interface: xmlDoc must inherit property "compatMode" with the proper type (4) 
 PASS Document interface: xmlDoc must inherit property "characterSet" with the proper type (5)

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/DOMImplementation-createDocument-expected.txt (195484 => 195485)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/DOMImplementation-createDocument-expected.txt	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/DOMImplementation-createDocument-expected.txt	2016-01-22 23:22:07 UTC (rev 195485)
@@ -1,17 +1,17 @@
 
 PASS DOMImplementation.createDocument(namespace, qualifiedName, doctype) 
 PASS createDocument test 0: null,undefined,null,null 
-FAIL createDocument test 0: metadata for null,undefined,null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 0: metadata for null,undefined,null 
 FAIL createDocument test 0: characterSet aliases for null,undefined,null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 1: null,"foo",null,null 
-FAIL createDocument test 1: metadata for null,"foo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 1: metadata for null,"foo",null 
 FAIL createDocument test 1: characterSet aliases for null,"foo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 2: null,"1foo",null,"INVALID_CHARACTER_ERR" 
 PASS createDocument test 3: null,"f1oo",null,null 
-FAIL createDocument test 3: metadata for null,"f1oo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 3: metadata for null,"f1oo",null 
 FAIL createDocument test 3: characterSet aliases for null,"f1oo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 4: null,"foo1",null,null 
-FAIL createDocument test 4: metadata for null,"foo1",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 4: metadata for null,"foo1",null 
 FAIL createDocument test 4: characterSet aliases for null,"foo1",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 5: null,"1foo",null,"INVALID_CHARACTER_ERR" 
 PASS createDocument test 6: null,"̀foo",null,"INVALID_CHARACTER_ERR" 
@@ -31,11 +31,11 @@
 PASS createDocument test 20: null,"foo:",null,"NAMESPACE_ERR" 
 PASS createDocument test 21: null,":",null,"NAMESPACE_ERR" 
 PASS createDocument test 22: null,"xml",null,null 
-FAIL createDocument test 22: metadata for null,"xml",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 22: metadata for null,"xml",null 
 FAIL createDocument test 22: characterSet aliases for null,"xml",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 23: null,"xmlns",null,"NAMESPACE_ERR" 
 PASS createDocument test 24: null,"xmlfoo",null,null 
-FAIL createDocument test 24: metadata for null,"xmlfoo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 24: metadata for null,"xmlfoo",null 
 FAIL createDocument test 24: characterSet aliases for null,"xmlfoo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 25: null,"xml:foo",null,"NAMESPACE_ERR" 
 PASS createDocument test 26: null,"xmlns:foo",null,"NAMESPACE_ERR" 
@@ -45,96 +45,96 @@
 PASS createDocument test 30: "","f:oo",null,"NAMESPACE_ERR" 
 PASS createDocument test 31: "","foo:",null,"NAMESPACE_ERR" 
 PASS createDocument test 32: undefined,undefined,null,null 
-FAIL createDocument test 32: metadata for undefined,undefined,null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 32: metadata for undefined,undefined,null 
 FAIL createDocument test 32: characterSet aliases for undefined,undefined,null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 33: undefined,"foo",null,null 
-FAIL createDocument test 33: metadata for undefined,"foo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 33: metadata for undefined,"foo",null 
 FAIL createDocument test 33: characterSet aliases for undefined,"foo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 34: undefined,"1foo",null,"INVALID_CHARACTER_ERR" 
 PASS createDocument test 35: undefined,"f1oo",null,null 
-FAIL createDocument test 35: metadata for undefined,"f1oo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 35: metadata for undefined,"f1oo",null 
 FAIL createDocument test 35: characterSet aliases for undefined,"f1oo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 36: undefined,"foo1",null,null 
-FAIL createDocument test 36: metadata for undefined,"foo1",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 36: metadata for undefined,"foo1",null 
 FAIL createDocument test 36: characterSet aliases for undefined,"foo1",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 37: undefined,":foo",null,"NAMESPACE_ERR" 
 PASS createDocument test 38: undefined,"f:oo",null,"NAMESPACE_ERR" 
 PASS createDocument test 39: undefined,"foo:",null,"NAMESPACE_ERR" 
 PASS createDocument test 40: undefined,"xml",null,null 
-FAIL createDocument test 40: metadata for undefined,"xml",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 40: metadata for undefined,"xml",null 
 FAIL createDocument test 40: characterSet aliases for undefined,"xml",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 41: undefined,"xmlns",null,"NAMESPACE_ERR" 
 PASS createDocument test 42: undefined,"xmlfoo",null,null 
-FAIL createDocument test 42: metadata for undefined,"xmlfoo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 42: metadata for undefined,"xmlfoo",null 
 FAIL createDocument test 42: characterSet aliases for undefined,"xmlfoo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 43: undefined,"xml:foo",null,"NAMESPACE_ERR" 
 PASS createDocument test 44: undefined,"xmlns:foo",null,"NAMESPACE_ERR" 
 PASS createDocument test 45: undefined,"xmlfoo:bar",null,"NAMESPACE_ERR" 
 PASS createDocument test 46: "http://example.com/","foo",null,null 
-FAIL createDocument test 46: metadata for "http://example.com/","foo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 46: metadata for "http://example.com/","foo",null 
 FAIL createDocument test 46: characterSet aliases for "http://example.com/","foo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 47: "http://example.com/","1foo",null,"INVALID_CHARACTER_ERR" 
 PASS createDocument test 48: "http://example.com/","f1oo",null,null 
-FAIL createDocument test 48: metadata for "http://example.com/","f1oo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 48: metadata for "http://example.com/","f1oo",null 
 FAIL createDocument test 48: characterSet aliases for "http://example.com/","f1oo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 49: "http://example.com/","foo1",null,null 
-FAIL createDocument test 49: metadata for "http://example.com/","foo1",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 49: metadata for "http://example.com/","foo1",null 
 FAIL createDocument test 49: characterSet aliases for "http://example.com/","foo1",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 50: "http://example.com/",":foo",null,"NAMESPACE_ERR" 
 PASS createDocument test 51: "http://example.com/","f:oo",null,null 
-FAIL createDocument test 51: metadata for "http://example.com/","f:oo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 51: metadata for "http://example.com/","f:oo",null 
 FAIL createDocument test 51: characterSet aliases for "http://example.com/","f:oo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 52: "http://example.com/","foo:",null,"NAMESPACE_ERR" 
 PASS createDocument test 53: "http://example.com/","_:_",null,null 
-FAIL createDocument test 53: metadata for "http://example.com/","_:_",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 53: metadata for "http://example.com/","_:_",null 
 FAIL createDocument test 53: characterSet aliases for "http://example.com/","_:_",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 54: "http://example.com/","_:h0",null,null 
-FAIL createDocument test 54: metadata for "http://example.com/","_:h0",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 54: metadata for "http://example.com/","_:h0",null 
 FAIL createDocument test 54: characterSet aliases for "http://example.com/","_:h0",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 55: "http://example.com/","_:test",null,null 
-FAIL createDocument test 55: metadata for "http://example.com/","_:test",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 55: metadata for "http://example.com/","_:test",null 
 FAIL createDocument test 55: characterSet aliases for "http://example.com/","_:test",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 56: "http://example.com/","l_:_",null,null 
-FAIL createDocument test 56: metadata for "http://example.com/","l_:_",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 56: metadata for "http://example.com/","l_:_",null 
 FAIL createDocument test 56: characterSet aliases for "http://example.com/","l_:_",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 57: "http://example.com/","ns:_0",null,null 
-FAIL createDocument test 57: metadata for "http://example.com/","ns:_0",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 57: metadata for "http://example.com/","ns:_0",null 
 FAIL createDocument test 57: characterSet aliases for "http://example.com/","ns:_0",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 58: "http://example.com/","ns:a0",null,null 
-FAIL createDocument test 58: metadata for "http://example.com/","ns:a0",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 58: metadata for "http://example.com/","ns:a0",null 
 FAIL createDocument test 58: characterSet aliases for "http://example.com/","ns:a0",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 59: "http://example.com/","ns0:test",null,null 
-FAIL createDocument test 59: metadata for "http://example.com/","ns0:test",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 59: metadata for "http://example.com/","ns0:test",null 
 FAIL createDocument test 59: characterSet aliases for "http://example.com/","ns0:test",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 60: "http://example.com/","a.b:c",null,null 
-FAIL createDocument test 60: metadata for "http://example.com/","a.b:c",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 60: metadata for "http://example.com/","a.b:c",null 
 FAIL createDocument test 60: characterSet aliases for "http://example.com/","a.b:c",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 61: "http://example.com/","a-b:c",null,null 
-FAIL createDocument test 61: metadata for "http://example.com/","a-b:c",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 61: metadata for "http://example.com/","a-b:c",null 
 FAIL createDocument test 61: characterSet aliases for "http://example.com/","a-b:c",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 62: "http://example.com/","a-b:c",null,null 
-FAIL createDocument test 62: metadata for "http://example.com/","a-b:c",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 62: metadata for "http://example.com/","a-b:c",null 
 FAIL createDocument test 62: characterSet aliases for "http://example.com/","a-b:c",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 63: "http://example.com/","xml",null,null 
-FAIL createDocument test 63: metadata for "http://example.com/","xml",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 63: metadata for "http://example.com/","xml",null 
 FAIL createDocument test 63: characterSet aliases for "http://example.com/","xml",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 64: "http://example.com/","xmlns",null,"NAMESPACE_ERR" 
 PASS createDocument test 65: "http://example.com/","XMLNS",null,null 
-FAIL createDocument test 65: metadata for "http://example.com/","XMLNS",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 65: metadata for "http://example.com/","XMLNS",null 
 FAIL createDocument test 65: characterSet aliases for "http://example.com/","XMLNS",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 66: "http://example.com/","xmlfoo",null,null 
-FAIL createDocument test 66: metadata for "http://example.com/","xmlfoo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 66: metadata for "http://example.com/","xmlfoo",null 
 FAIL createDocument test 66: characterSet aliases for "http://example.com/","xmlfoo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 67: "http://example.com/","xml:foo",null,"NAMESPACE_ERR" 
 PASS createDocument test 68: "http://example.com/","XML:foo",null,null 
-FAIL createDocument test 68: metadata for "http://example.com/","XML:foo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 68: metadata for "http://example.com/","XML:foo",null 
 FAIL createDocument test 68: characterSet aliases for "http://example.com/","XML:foo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 69: "http://example.com/","xmlns:foo",null,"NAMESPACE_ERR" 
 PASS createDocument test 70: "http://example.com/","XMLNS:foo",null,null 
-FAIL createDocument test 70: metadata for "http://example.com/","XMLNS:foo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 70: metadata for "http://example.com/","XMLNS:foo",null 
 FAIL createDocument test 70: characterSet aliases for "http://example.com/","XMLNS:foo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 71: "http://example.com/","xmlfoo:bar",null,null 
-FAIL createDocument test 71: metadata for "http://example.com/","xmlfoo:bar",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 71: metadata for "http://example.com/","xmlfoo:bar",null 
 FAIL createDocument test 71: characterSet aliases for "http://example.com/","xmlfoo:bar",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 72: "http://example.com/","prefix::local",null,"NAMESPACE_ERR" 
 PASS createDocument test 73: "http://example.com/","namespaceURI:{",null,"INVALID_CHARACTER_ERR" 
@@ -165,60 +165,60 @@
 PASS createDocument test 98: "http://example.com/","namespaceURI:a ",null,"INVALID_CHARACTER_ERR" 
 PASS createDocument test 99: "http://example.com/","namespaceURI:\"",null,"INVALID_CHARACTER_ERR" 
 PASS createDocument test 100: "/","foo",null,null 
-FAIL createDocument test 100: metadata for "/","foo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 100: metadata for "/","foo",null 
 FAIL createDocument test 100: characterSet aliases for "/","foo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 101: "/","1foo",null,"INVALID_CHARACTER_ERR" 
 PASS createDocument test 102: "/","f1oo",null,null 
-FAIL createDocument test 102: metadata for "/","f1oo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 102: metadata for "/","f1oo",null 
 FAIL createDocument test 102: characterSet aliases for "/","f1oo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 103: "/","foo1",null,null 
-FAIL createDocument test 103: metadata for "/","foo1",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 103: metadata for "/","foo1",null 
 FAIL createDocument test 103: characterSet aliases for "/","foo1",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 104: "/",":foo",null,"NAMESPACE_ERR" 
 PASS createDocument test 105: "/","f:oo",null,null 
-FAIL createDocument test 105: metadata for "/","f:oo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 105: metadata for "/","f:oo",null 
 FAIL createDocument test 105: characterSet aliases for "/","f:oo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 106: "/","foo:",null,"NAMESPACE_ERR" 
 PASS createDocument test 107: "/","xml",null,null 
-FAIL createDocument test 107: metadata for "/","xml",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 107: metadata for "/","xml",null 
 FAIL createDocument test 107: characterSet aliases for "/","xml",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 108: "/","xmlns",null,"NAMESPACE_ERR" 
 PASS createDocument test 109: "/","xmlfoo",null,null 
-FAIL createDocument test 109: metadata for "/","xmlfoo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 109: metadata for "/","xmlfoo",null 
 FAIL createDocument test 109: characterSet aliases for "/","xmlfoo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 110: "/","xml:foo",null,"NAMESPACE_ERR" 
 PASS createDocument test 111: "/","xmlns:foo",null,"NAMESPACE_ERR" 
 PASS createDocument test 112: "/","xmlfoo:bar",null,null 
-FAIL createDocument test 112: metadata for "/","xmlfoo:bar",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 112: metadata for "/","xmlfoo:bar",null 
 FAIL createDocument test 112: characterSet aliases for "/","xmlfoo:bar",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 113: "http://www.w3.org/XML/1998/namespace","foo",null,null 
-FAIL createDocument test 113: metadata for "http://www.w3.org/XML/1998/namespace","foo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 113: metadata for "http://www.w3.org/XML/1998/namespace","foo",null 
 FAIL createDocument test 113: characterSet aliases for "http://www.w3.org/XML/1998/namespace","foo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 114: "http://www.w3.org/XML/1998/namespace","1foo",null,"INVALID_CHARACTER_ERR" 
 PASS createDocument test 115: "http://www.w3.org/XML/1998/namespace","f1oo",null,null 
-FAIL createDocument test 115: metadata for "http://www.w3.org/XML/1998/namespace","f1oo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 115: metadata for "http://www.w3.org/XML/1998/namespace","f1oo",null 
 FAIL createDocument test 115: characterSet aliases for "http://www.w3.org/XML/1998/namespace","f1oo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 116: "http://www.w3.org/XML/1998/namespace","foo1",null,null 
-FAIL createDocument test 116: metadata for "http://www.w3.org/XML/1998/namespace","foo1",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 116: metadata for "http://www.w3.org/XML/1998/namespace","foo1",null 
 FAIL createDocument test 116: characterSet aliases for "http://www.w3.org/XML/1998/namespace","foo1",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 117: "http://www.w3.org/XML/1998/namespace",":foo",null,"NAMESPACE_ERR" 
 PASS createDocument test 118: "http://www.w3.org/XML/1998/namespace","f:oo",null,null 
-FAIL createDocument test 118: metadata for "http://www.w3.org/XML/1998/namespace","f:oo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 118: metadata for "http://www.w3.org/XML/1998/namespace","f:oo",null 
 FAIL createDocument test 118: characterSet aliases for "http://www.w3.org/XML/1998/namespace","f:oo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 119: "http://www.w3.org/XML/1998/namespace","foo:",null,"NAMESPACE_ERR" 
 PASS createDocument test 120: "http://www.w3.org/XML/1998/namespace","xml",null,null 
-FAIL createDocument test 120: metadata for "http://www.w3.org/XML/1998/namespace","xml",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 120: metadata for "http://www.w3.org/XML/1998/namespace","xml",null 
 FAIL createDocument test 120: characterSet aliases for "http://www.w3.org/XML/1998/namespace","xml",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 121: "http://www.w3.org/XML/1998/namespace","xmlns",null,"NAMESPACE_ERR" 
 PASS createDocument test 122: "http://www.w3.org/XML/1998/namespace","xmlfoo",null,null 
-FAIL createDocument test 122: metadata for "http://www.w3.org/XML/1998/namespace","xmlfoo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 122: metadata for "http://www.w3.org/XML/1998/namespace","xmlfoo",null 
 FAIL createDocument test 122: characterSet aliases for "http://www.w3.org/XML/1998/namespace","xmlfoo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 123: "http://www.w3.org/XML/1998/namespace","xml:foo",null,null 
-FAIL createDocument test 123: metadata for "http://www.w3.org/XML/1998/namespace","xml:foo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 123: metadata for "http://www.w3.org/XML/1998/namespace","xml:foo",null 
 FAIL createDocument test 123: characterSet aliases for "http://www.w3.org/XML/1998/namespace","xml:foo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 124: "http://www.w3.org/XML/1998/namespace","xmlns:foo",null,"NAMESPACE_ERR" 
 PASS createDocument test 125: "http://www.w3.org/XML/1998/namespace","xmlfoo:bar",null,null 
-FAIL createDocument test 125: metadata for "http://www.w3.org/XML/1998/namespace","xmlfoo:bar",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 125: metadata for "http://www.w3.org/XML/1998/namespace","xmlfoo:bar",null 
 FAIL createDocument test 125: characterSet aliases for "http://www.w3.org/XML/1998/namespace","xmlfoo:bar",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 126: "http://www.w3.org/XML/1998/namespaces","xml:foo",null,"NAMESPACE_ERR" 
 PASS createDocument test 127: "http://www.w3.org/xml/1998/namespace","xml:foo",null,"NAMESPACE_ERR" 
@@ -231,110 +231,110 @@
 PASS createDocument test 134: "http://www.w3.org/2000/xmlns/","foo:",null,"NAMESPACE_ERR" 
 PASS createDocument test 135: "http://www.w3.org/2000/xmlns/","xml",null,"NAMESPACE_ERR" 
 PASS createDocument test 136: "http://www.w3.org/2000/xmlns/","xmlns",null,null 
-FAIL createDocument test 136: metadata for "http://www.w3.org/2000/xmlns/","xmlns",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 136: metadata for "http://www.w3.org/2000/xmlns/","xmlns",null 
 FAIL createDocument test 136: characterSet aliases for "http://www.w3.org/2000/xmlns/","xmlns",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 137: "http://www.w3.org/2000/xmlns/","xmlfoo",null,"NAMESPACE_ERR" 
 PASS createDocument test 138: "http://www.w3.org/2000/xmlns/","xml:foo",null,"NAMESPACE_ERR" 
 PASS createDocument test 139: "http://www.w3.org/2000/xmlns/","xmlns:foo",null,null 
-FAIL createDocument test 139: metadata for "http://www.w3.org/2000/xmlns/","xmlns:foo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 139: metadata for "http://www.w3.org/2000/xmlns/","xmlns:foo",null 
 FAIL createDocument test 139: characterSet aliases for "http://www.w3.org/2000/xmlns/","xmlns:foo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 140: "http://www.w3.org/2000/xmlns/","xmlfoo:bar",null,"NAMESPACE_ERR" 
 PASS createDocument test 141: "http://www.w3.org/2000/xmlns/","foo:xmlns",null,"NAMESPACE_ERR" 
 PASS createDocument test 142: "foo:","foo",null,null 
-FAIL createDocument test 142: metadata for "foo:","foo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 142: metadata for "foo:","foo",null 
 FAIL createDocument test 142: characterSet aliases for "foo:","foo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 143: "foo:","1foo",null,"INVALID_CHARACTER_ERR" 
 PASS createDocument test 144: "foo:","f1oo",null,null 
-FAIL createDocument test 144: metadata for "foo:","f1oo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 144: metadata for "foo:","f1oo",null 
 FAIL createDocument test 144: characterSet aliases for "foo:","f1oo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 145: "foo:","foo1",null,null 
-FAIL createDocument test 145: metadata for "foo:","foo1",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 145: metadata for "foo:","foo1",null 
 FAIL createDocument test 145: characterSet aliases for "foo:","foo1",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 146: "foo:",":foo",null,"NAMESPACE_ERR" 
 PASS createDocument test 147: "foo:","f:oo",null,null 
-FAIL createDocument test 147: metadata for "foo:","f:oo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 147: metadata for "foo:","f:oo",null 
 FAIL createDocument test 147: characterSet aliases for "foo:","f:oo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 148: "foo:","foo:",null,"NAMESPACE_ERR" 
 PASS createDocument test 149: "foo:","xml",null,null 
-FAIL createDocument test 149: metadata for "foo:","xml",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 149: metadata for "foo:","xml",null 
 FAIL createDocument test 149: characterSet aliases for "foo:","xml",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 150: "foo:","xmlns",null,"NAMESPACE_ERR" 
 PASS createDocument test 151: "foo:","xmlfoo",null,null 
-FAIL createDocument test 151: metadata for "foo:","xmlfoo",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 151: metadata for "foo:","xmlfoo",null 
 FAIL createDocument test 151: characterSet aliases for "foo:","xmlfoo",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 152: "foo:","xml:foo",null,"NAMESPACE_ERR" 
 PASS createDocument test 153: "foo:","xmlns:foo",null,"NAMESPACE_ERR" 
 PASS createDocument test 154: "foo:","xmlfoo:bar",null,null 
-FAIL createDocument test 154: metadata for "foo:","xmlfoo:bar",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 154: metadata for "foo:","xmlfoo:bar",null 
 FAIL createDocument test 154: characterSet aliases for "foo:","xmlfoo:bar",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 FAIL createDocument test 155: null,null,false,object "TypeError" assert_throws: function "function () { document.implementation.createDocument(name..." did not throw
 PASS createDocument test 156: null,null,null,null 
-FAIL createDocument test 156: metadata for null,null,null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 156: metadata for null,null,null 
 FAIL createDocument test 156: characterSet aliases for null,null,null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 157: null,"",null,null 
-FAIL createDocument test 157: metadata for null,"",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 157: metadata for null,"",null 
 FAIL createDocument test 157: characterSet aliases for null,"",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 158: undefined,null,undefined,null 
-FAIL createDocument test 158: metadata for undefined,null,undefined assert_equals: expected "about:blank" but got ""
+PASS createDocument test 158: metadata for undefined,null,undefined 
 FAIL createDocument test 158: characterSet aliases for undefined,null,undefined assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 159: undefined,undefined,undefined,null 
-FAIL createDocument test 159: metadata for undefined,undefined,undefined assert_equals: expected "about:blank" but got ""
+PASS createDocument test 159: metadata for undefined,undefined,undefined 
 FAIL createDocument test 159: characterSet aliases for undefined,undefined,undefined assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 160: undefined,"",undefined,null 
-FAIL createDocument test 160: metadata for undefined,"",undefined assert_equals: expected "about:blank" but got ""
+PASS createDocument test 160: metadata for undefined,"",undefined 
 FAIL createDocument test 160: characterSet aliases for undefined,"",undefined assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 161: "http://example.com/",null,null,null 
-FAIL createDocument test 161: metadata for "http://example.com/",null,null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 161: metadata for "http://example.com/",null,null 
 FAIL createDocument test 161: characterSet aliases for "http://example.com/",null,null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 162: "http://example.com/","",null,null 
-FAIL createDocument test 162: metadata for "http://example.com/","",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 162: metadata for "http://example.com/","",null 
 FAIL createDocument test 162: characterSet aliases for "http://example.com/","",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 163: "/",null,null,null 
-FAIL createDocument test 163: metadata for "/",null,null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 163: metadata for "/",null,null 
 FAIL createDocument test 163: characterSet aliases for "/",null,null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 164: "/","",null,null 
-FAIL createDocument test 164: metadata for "/","",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 164: metadata for "/","",null 
 FAIL createDocument test 164: characterSet aliases for "/","",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 165: "http://www.w3.org/XML/1998/namespace",null,null,null 
-FAIL createDocument test 165: metadata for "http://www.w3.org/XML/1998/namespace",null,null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 165: metadata for "http://www.w3.org/XML/1998/namespace",null,null 
 FAIL createDocument test 165: characterSet aliases for "http://www.w3.org/XML/1998/namespace",null,null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 166: "http://www.w3.org/XML/1998/namespace","",null,null 
-FAIL createDocument test 166: metadata for "http://www.w3.org/XML/1998/namespace","",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 166: metadata for "http://www.w3.org/XML/1998/namespace","",null 
 FAIL createDocument test 166: characterSet aliases for "http://www.w3.org/XML/1998/namespace","",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 167: "http://www.w3.org/2000/xmlns/",null,null,null 
-FAIL createDocument test 167: metadata for "http://www.w3.org/2000/xmlns/",null,null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 167: metadata for "http://www.w3.org/2000/xmlns/",null,null 
 FAIL createDocument test 167: characterSet aliases for "http://www.w3.org/2000/xmlns/",null,null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 168: "http://www.w3.org/2000/xmlns/","",null,null 
-FAIL createDocument test 168: metadata for "http://www.w3.org/2000/xmlns/","",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 168: metadata for "http://www.w3.org/2000/xmlns/","",null 
 FAIL createDocument test 168: characterSet aliases for "http://www.w3.org/2000/xmlns/","",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 169: "foo:",null,null,null 
-FAIL createDocument test 169: metadata for "foo:",null,null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 169: metadata for "foo:",null,null 
 FAIL createDocument test 169: characterSet aliases for "foo:",null,null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 170: "foo:","",null,null 
-FAIL createDocument test 170: metadata for "foo:","",null assert_equals: expected "about:blank" but got ""
+PASS createDocument test 170: metadata for "foo:","",null 
 FAIL createDocument test 170: characterSet aliases for "foo:","",null assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 171: null,null,DocumentType node,null 
-FAIL createDocument test 171: metadata for null,null,DocumentType node assert_equals: expected "about:blank" but got ""
+PASS createDocument test 171: metadata for null,null,DocumentType node 
 FAIL createDocument test 171: characterSet aliases for null,null,DocumentType node assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 172: null,null,DocumentType node,null 
-FAIL createDocument test 172: metadata for null,null,DocumentType node assert_equals: expected "about:blank" but got ""
+PASS createDocument test 172: metadata for null,null,DocumentType node 
 FAIL createDocument test 172: characterSet aliases for null,null,DocumentType node assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 173: null,null,DocumentType node,null 
-FAIL createDocument test 173: metadata for null,null,DocumentType node assert_equals: expected "about:blank" but got ""
+PASS createDocument test 173: metadata for null,null,DocumentType node 
 FAIL createDocument test 173: characterSet aliases for null,null,DocumentType node assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 174: null,null,DocumentType node,null 
-FAIL createDocument test 174: metadata for null,null,DocumentType node assert_equals: expected "about:blank" but got ""
+PASS createDocument test 174: metadata for null,null,DocumentType node 
 FAIL createDocument test 174: characterSet aliases for null,null,DocumentType node assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 175: null,null,DocumentType node,null 
-FAIL createDocument test 175: metadata for null,null,DocumentType node assert_equals: expected "about:blank" but got ""
+PASS createDocument test 175: metadata for null,null,DocumentType node 
 FAIL createDocument test 175: characterSet aliases for null,null,DocumentType node assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 176: null,"foo",DocumentType node,null 
-FAIL createDocument test 176: metadata for null,"foo",DocumentType node assert_equals: expected "about:blank" but got ""
+PASS createDocument test 176: metadata for null,"foo",DocumentType node 
 FAIL createDocument test 176: characterSet aliases for null,"foo",DocumentType node assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 177: "foo",null,DocumentType node,null 
-FAIL createDocument test 177: metadata for "foo",null,DocumentType node assert_equals: expected "about:blank" but got ""
+PASS createDocument test 177: metadata for "foo",null,DocumentType node 
 FAIL createDocument test 177: characterSet aliases for "foo",null,DocumentType node assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createDocument test 178: "foo","bar",DocumentType node,null 
-FAIL createDocument test 178: metadata for "foo","bar",DocumentType node assert_equals: expected "about:blank" but got ""
+PASS createDocument test 178: metadata for "foo","bar",DocumentType node 
 FAIL createDocument test 178: characterSet aliases for "foo","bar",DocumentType node assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/DOMImplementation-createHTMLDocument-expected.txt (195484 => 195485)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/DOMImplementation-createHTMLDocument-expected.txt	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/DOMImplementation-createHTMLDocument-expected.txt	2016-01-22 23:22:07 UTC (rev 195485)
@@ -8,7 +8,7 @@
 PASS createHTMLDocument test 6: "foo\f\fbar baz","foo\f\fbar baz","foo bar baz" 
 PASS createHTMLDocument test 7: "foo\r\rbar baz","foo\r\rbar baz","foo bar baz" 
 PASS Missing title argument 
-FAIL createHTMLDocument(): metadata assert_equals: expected "about:blank" but got ""
+PASS createHTMLDocument(): metadata 
 FAIL createHTMLDocument(): characterSet aliases assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 PASS createHTMLDocument(): URL parsing

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Document-constructor-expected.txt (195484 => 195485)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Document-constructor-expected.txt	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Document-constructor-expected.txt	2016-01-22 23:22:07 UTC (rev 195485)
@@ -1,7 +1,7 @@
 
 FAIL new Document(): interfaces assert_false: Should not be an XMLDocument expected false got true
 PASS new Document(): children 
-FAIL new Document(): metadata assert_equals: expected "about:blank" but got ""
+PASS new Document(): metadata 
 FAIL new Document(): characterSet aliases assert_equals: charset expected (string) "UTF-8" but got (undefined) undefined
 FAIL new Document(): URL parsing assert_equals: expected "http://example.org/?%C3%A4" but got "http://example.org/?ä"

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Node-properties-expected.txt (195484 => 195485)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Node-properties-expected.txt	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Node-properties-expected.txt	2016-01-22 23:22:07 UTC (rev 195485)
@@ -141,7 +141,7 @@
 PASS foreignDoc.childNodes[0] 
 PASS foreignDoc.childNodes[1] 
 PASS foreignDoc.childNodes[2] 
-FAIL foreignDoc.URL assert_equals: expected "about:blank" but got ""
+PASS foreignDoc.URL 
 PASS foreignDoc.compatMode 
 PASS foreignDoc.characterSet 
 PASS foreignDoc.contentType 
@@ -153,7 +153,7 @@
 PASS foreignDoc.parentElement 
 PASS foreignDoc.parentNode 
 PASS foreignDoc.ownerDocument 
-FAIL foreignDoc.documentURI assert_equals: expected (string) "about:blank" but got (object) null
+PASS foreignDoc.documentURI 
 PASS foreignDoc.inputEncoding 
 FAIL foreignDoc.charset assert_equals: expected (string) "UTF-8" but got (undefined) undefined
 PASS foreignDoc.firstChild 
@@ -215,7 +215,7 @@
 PASS xmlDoc.childNodes[1] 
 PASS xmlDoc.childNodes[2] 
 PASS xmlDoc.childNodes[3] 
-FAIL xmlDoc.URL assert_equals: expected "about:blank" but got ""
+PASS xmlDoc.URL 
 PASS xmlDoc.compatMode 
 PASS xmlDoc.characterSet 
 PASS xmlDoc.contentType 
@@ -227,7 +227,7 @@
 PASS xmlDoc.parentElement 
 PASS xmlDoc.parentNode 
 PASS xmlDoc.ownerDocument 
-FAIL xmlDoc.documentURI assert_equals: expected (string) "about:blank" but got (object) null
+PASS xmlDoc.documentURI 
 PASS xmlDoc.inputEncoding 
 FAIL xmlDoc.charset assert_equals: expected (string) "UTF-8" but got (undefined) undefined
 PASS xmlDoc.firstChild

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt (195484 => 195485)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt	2016-01-22 23:22:07 UTC (rev 195485)
@@ -1259,7 +1259,7 @@
 FAIL XMLDocument interface: calling load(DOMString) on document.implementation.createDocument(null, "", null) with too few arguments must throw TypeError assert_inherits: property "load" not found in prototype chain
 PASS Document interface: document.implementation.createDocument(null, "", null) must inherit property "implementation" with the proper type (0) 
 PASS Document interface: document.implementation.createDocument(null, "", null) must inherit property "URL" with the proper type (1) 
-FAIL Document interface: document.implementation.createDocument(null, "", null) must inherit property "documentURI" with the proper type (2) assert_equals: expected "string" but got "object"
+PASS Document interface: document.implementation.createDocument(null, "", null) must inherit property "documentURI" with the proper type (2) 
 PASS Document interface: document.implementation.createDocument(null, "", null) must inherit property "origin" with the proper type (3) 
 PASS Document interface: document.implementation.createDocument(null, "", null) must inherit property "compatMode" with the proper type (4) 
 PASS Document interface: document.implementation.createDocument(null, "", null) must inherit property "characterSet" with the proper type (5)

Modified: trunk/Source/WebCore/ChangeLog (195484 => 195485)


--- trunk/Source/WebCore/ChangeLog	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/Source/WebCore/ChangeLog	2016-01-22 23:22:07 UTC (rev 195485)
@@ -1,3 +1,27 @@
+2016-01-22  Chris Dumez  <[email protected]>
+
+        Document.URL / Document.documentURI should return "about:blank" instead of empty string / null
+        https://bugs.webkit.org/show_bug.cgi?id=153363
+        <rdar://problem/22549736>
+
+        Reviewed by Ryosuke Niwa.
+
+        Document.URL / Document.documentURI should return "about:blank" instead
+        of empty string / null, as per the specification:
+        - https://dom.spec.whatwg.org/#dom-document-url
+        - https://dom.spec.whatwg.org/#concept-document-url
+
+        Also, Document.documentURI should be an alias for Document.URL as per:
+        - https://dom.spec.whatwg.org/#dom-document-url
+
+        Firefox matches the specification.
+
+        No new tests, already covered by existing W3C tests.
+
+        * dom/Document.h:
+        (WebCore::Document::urlForBindings):
+        * dom/Document.idl:
+
 2016-01-22  Brent Fulgham  <[email protected]>
 
         Don't ignore the return value of CCRandomCopyBytes

Modified: trunk/Source/WebCore/dom/Document.h (195484 => 195485)


--- trunk/Source/WebCore/dom/Document.h	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/Source/WebCore/dom/Document.h	2016-01-22 23:22:07 UTC (rev 195485)
@@ -650,6 +650,7 @@
 
     virtual const URL& url() const override final { return m_url; }
     void setURL(const URL&);
+    const URL& urlForBindings() const { return m_url.isEmpty() ? blankURL() : m_url; }
 
     // To understand how these concepts relate to one another, please see the
     // comments surrounding their declaration.

Modified: trunk/Source/WebCore/dom/Document.idl (195484 => 195485)


--- trunk/Source/WebCore/dom/Document.idl	2016-01-22 22:52:42 UTC (rev 195484)
+++ trunk/Source/WebCore/dom/Document.idl	2016-01-22 23:22:07 UTC (rev 195485)
@@ -82,7 +82,7 @@
     // read-only for other clients.
              [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] attribute DOMString documentURI;
 #else
-    [TreatReturnedNullStringAs=Null] readonly attribute DOMString documentURI;
+    [ImplementedAs=urlForBindings] readonly attribute DOMString documentURI;
 #endif
 
     // DOM Level 2 Events (DocumentEvents interface)
@@ -165,7 +165,7 @@
 #else
     readonly attribute DOMString domain;
 #endif
-    readonly attribute DOMString URL;
+    [ImplementedAs=urlForBindings] readonly attribute DOMString URL;
 
     [TreatNullAs=NullString, GetterRaisesException, SetterRaisesException] attribute DOMString cookie;
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to