| Index: LayoutTests/dom/xhtml/level1/core/hc_documentgetdoctype.js
|
| diff --git a/LayoutTests/dom/xhtml/level1/core/hc_documentgetdoctype.js b/LayoutTests/dom/xhtml/level1/core/hc_documentgetdoctype.js
|
| index c3aa3c5b1ab13c9a6bf07e98222faf2fcf5575cb..d2870a3a5fa2104acd46aaeeaf44ae99bf4416f8 100644
|
| --- a/LayoutTests/dom/xhtml/level1/core/hc_documentgetdoctype.js
|
| +++ b/LayoutTests/dom/xhtml/level1/core/hc_documentgetdoctype.js
|
| @@ -1,17 +1,14 @@
|
| -
|
| /*
|
| -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.
|
| +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
|
| @@ -41,26 +38,24 @@ function setUpPage() {
|
| 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);
|
| + catchInitializationError(builder, ex);
|
| setUpPageStatus = 'complete';
|
| }
|
| }
|
|
|
| -
|
| -
|
| //
|
| -// This method is called on the completion of
|
| +// This method is called on the completion of
|
| // each asychronous load started in setUpTests.
|
| //
|
| // When every synchronous loaded document has completed,
|
| @@ -72,9 +67,8 @@ function loadComplete() {
|
| }
|
| }
|
|
|
| -
|
| /**
|
| -*
|
| +*
|
| Access Document.doctype for hc_staff, if not text/html should return DocumentType node.
|
| HTML implementations may return null.
|
|
|
| @@ -89,7 +83,7 @@ function hc_documentgetdoctype() {
|
| var docTypeName;
|
| var nodeValue;
|
| var attributes;
|
| -
|
| +
|
| var docRef = null;
|
| if (typeof(this.doc) != 'undefined') {
|
| docRef = this.doc;
|
| @@ -97,52 +91,47 @@ function hc_documentgetdoctype() {
|
| doc = load(docRef, "doc", "hc_staff");
|
| docType = doc.doctype;
|
|
|
| -
|
| - if(
|
| -
|
| - !(
|
| - (builder.contentType == "text/html")
|
| + if(
|
| +
|
| + !(
|
| + (builder.contentType == "text/html")
|
| )
|
|
|
| - ) {
|
| - assertNotNull("docTypeNotNull",docType);
|
| -
|
| - }
|
| -
|
| - if(
|
| -
|
| - (docType != null)
|
| -
|
| - ) {
|
| - docTypeName = docType.name;
|
| -
|
| -
|
| - if(
|
| -
|
| - (builder.contentType == "image/svg+xml")
|
| -
|
| - ) {
|
| - assertEquals("nodeNameSVG","svg",docTypeName);
|
| -
|
| - }
|
| -
|
| - else {
|
| - assertEquals("nodeName","html",docTypeName);
|
| -
|
| - }
|
| - nodeValue = docType.nodeValue;
|
| + ) {
|
| + assertNotNull("docTypeNotNull",docType);
|
| +
|
| + }
|
| +
|
| + if(
|
| +
|
| + (docType != null)
|
| +
|
| + ) {
|
| + docTypeName = docType.name;
|
| +
|
| + if(
|
| +
|
| + (builder.contentType == "image/svg+xml")
|
| +
|
| + ) {
|
| + assertEquals("nodeNameSVG","svg",docTypeName);
|
| +
|
| + }
|
| +
|
| + else {
|
| + assertEquals("nodeName","html",docTypeName);
|
| +
|
| + }
|
| + nodeValue = docType.nodeValue;
|
|
|
| assertNull("nodeValue",nodeValue);
|
| attributes = docType.attributes;
|
|
|
| assertNull("attributes",attributes);
|
| -
|
| - }
|
| -
|
| -}
|
| -
|
|
|
| + }
|
|
|
| +}
|
|
|
| function runTest() {
|
| hc_documentgetdoctype();
|
|
|