Patch by Anders Carlsson <andersca@mac.com>

        Fixes <http://bugzilla.opendarwin.org/show_bug.cgi?id=4330>
            hasFeature('xhtml', ...) should return true

        Reviewed by darin

        Test cases updated:
        * layout-tests/dom/html/level2/html/HTMLBodyElement09-expected.txt:
        * layout-tests/dom/html/level2/html/HTMLBodyElement10-expected.txt:
        * layout-tests/dom/html/level2/html/HTMLDocument24-expected.txt:
        * layout-tests/dom/html/level2/html/HTMLDocument25-expected.txt:
        * layout-tests/dom/html/level2/html/hasFeature03-expected.txt:
        * layout-tests/dom/html/level2/html/hasFeature04-expected.txt:
        These are successful now.

        * khtml/xml/dom_docimpl.cpp:
        (DOMImplementationImpl::hasFeature):
        Support "xhtml".

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@10112 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/dom/html/level2/html/HTMLBodyElement09-expected.txt b/LayoutTests/dom/html/level2/html/HTMLBodyElement09-expected.txt
index c42cb7fbca6ff8f347820b0d905b1405e4023a3b..531403711ac46347e674a5b600b775a40b9a3fb4 100644 (file)
--- a/LayoutTests/dom/html/level2/html/HTMLBodyElement09-expected.txt
+++ b/LayoutTests/dom/html/level2/html/HTMLBodyElement09-expected.txt
@@ -1,3 +1,2 @@
-Test:  http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLBodyElement09     
-Status:        failure
-Detail:        isSupportedXHTML: assertEquals failed, actual false, expected true.
+Test:  http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLBodyElement09
+Status:        Success

diff --git a/LayoutTests/dom/html/level2/html/HTMLBodyElement10-expected.txt b/LayoutTests/dom/html/level2/html/HTMLBodyElement10-expected.txt
index a8e3228cbff363dc5b521ed4e47c05c71e77f51e..79765a144f342689ff0c386db751e0ddc5bbdb76 100644 (file)
--- a/LayoutTests/dom/html/level2/html/HTMLBodyElement10-expected.txt
+++ b/LayoutTests/dom/html/level2/html/HTMLBodyElement10-expected.txt
@@ -1,3 +1,2 @@
-Test:  http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLBodyElement10     
-Status:        failure
-Detail:        isSupportedXHTML: assertEquals failed, actual false, expected true.
+Test:  http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLBodyElement10
+Status:        Success

diff --git a/LayoutTests/dom/html/level2/html/HTMLDocument24-expected.txt b/LayoutTests/dom/html/level2/html/HTMLDocument24-expected.txt
index 1abc8861fb04bf7f5c8f6232297217225f9c6c49..701e4b6db3171622ef3c50f26c9901e5e4429836 100644 (file)
--- a/LayoutTests/dom/html/level2/html/HTMLDocument24-expected.txt
+++ b/LayoutTests/dom/html/level2/html/HTMLDocument24-expected.txt
@@ -1,3 +1,2 @@
-Test:  http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLDocument24        
-Status:        failure
-Detail:        isSupportedXHTML: assertEquals failed, actual false, expected true.
+Test:  http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLDocument24
+Status:        Success

diff --git a/LayoutTests/dom/html/level2/html/HTMLDocument25-expected.txt b/LayoutTests/dom/html/level2/html/HTMLDocument25-expected.txt
index 7f58f007bc0e7fc2638498ca06e05904e7082a29..78b251ff60504cc41eac908ad7c0670d744c8898 100644 (file)
--- a/LayoutTests/dom/html/level2/html/HTMLDocument25-expected.txt
+++ b/LayoutTests/dom/html/level2/html/HTMLDocument25-expected.txt
@@ -1,3 +1,2 @@
-Test:  http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLDocument25        
-Status:        failure
-Detail:        isSupportedXHTML: assertEquals failed, actual false, expected true.
+Test:  http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLDocument25
+Status:        Success

diff --git a/LayoutTests/dom/html/level2/html/hasFeature03-expected.txt b/LayoutTests/dom/html/level2/html/hasFeature03-expected.txt
index 89a4e7f9f4c4a731f955d8c3267eaf1c49c5cf7c..b429946f0a26c07392f70eaea70d5dfd85fbc480 100644 (file)
--- a/LayoutTests/dom/html/level2/html/hasFeature03-expected.txt
+++ b/LayoutTests/dom/html/level2/html/hasFeature03-expected.txt
@@ -1,3 +1,2 @@
-Test:  http://www.w3.org/2001/DOM-Test-Suite/level2/html/hasFeature03  
-Status:        failure
-Detail:        hasXHTML: assertEquals failed, actual false, expected true.
+Test:  http://www.w3.org/2001/DOM-Test-Suite/level2/html/hasFeature03
+Status:        Success

diff --git a/LayoutTests/dom/html/level2/html/hasFeature04-expected.txt b/LayoutTests/dom/html/level2/html/hasFeature04-expected.txt
index 20a0f4f80e86a82f0af5d3a7e27f481f1dfe2757..7dce7c52582a1286a20e5e05b019f571f7c1822f 100644 (file)
--- a/LayoutTests/dom/html/level2/html/hasFeature04-expected.txt
+++ b/LayoutTests/dom/html/level2/html/hasFeature04-expected.txt
@@ -1,3 +1,2 @@
-Test:  http://www.w3.org/2001/DOM-Test-Suite/level2/html/hasFeature04  
-Status:        failure
-Detail:        hasXHTML: assertEquals failed, actual false, expected true.
+Test:  http://www.w3.org/2001/DOM-Test-Suite/level2/html/hasFeature04
+Status:        Success

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index fce2c8a97af7b3dbbd3ab6d78efe8d2de9255b95..d366463f534347f93663151cabe402a5f9a5da20 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,25 @@
+2005-08-09  Justin Garcia  <justin.garcia@apple.com>
+
+        Patch by Anders Carlsson <andersca@mac.com>
+        
+        Fixes <http://bugzilla.opendarwin.org/show_bug.cgi?id=4330>
+            hasFeature('xhtml', ...) should return true
+
+        Reviewed by darin
+
+        Test cases updated:
+        * layout-tests/dom/html/level2/html/HTMLBodyElement09-expected.txt:
+        * layout-tests/dom/html/level2/html/HTMLBodyElement10-expected.txt:
+        * layout-tests/dom/html/level2/html/HTMLDocument24-expected.txt:
+        * layout-tests/dom/html/level2/html/HTMLDocument25-expected.txt:
+        * layout-tests/dom/html/level2/html/hasFeature03-expected.txt:
+        * layout-tests/dom/html/level2/html/hasFeature04-expected.txt:
+        These are successful now.
+        
+        * khtml/xml/dom_docimpl.cpp:
+        (DOMImplementationImpl::hasFeature):
+        Support "xhtml".
+
 2005-08-09  Justin Garcia  <justin.garcia@apple.com>
 
         Patch by Anders Carlsson <andersca@mac.com>

diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index 4da5abfb0473be579ba2968bde8b6c6eeae9f055..2f70b7b4087f957a484e7807dede1f1eed003acf 100644 (file)
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -115,7 +115,7 @@ DOMImplementationImpl::~DOMImplementationImpl()
 bool DOMImplementationImpl::hasFeature ( const DOMString &feature, const DOMString &version )
 {
     QString lower = feature.string().lower();
-    if (lower == "core" || lower == "html" || lower == "xml")
+    if (lower == "core" || lower == "html" || lower == "xml" || lower == "xhtml")
         return version.isEmpty() || version == "1.0" || version == "2.0";
     if (lower == "css"
             || lower == "css2"