Add support for Atom and RSS MIME types to the set of XML types.
authorhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 Aug 2004 20:23:23 +0000 (20:23 +0000)
committerhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 Aug 2004 20:23:23 +0000 (20:23 +0000)
        Reviewed by rjw

        * khtml/ecma/xmlhttprequest.cpp:
        (KJS::XMLHttpRequest::getValueProperty):
        * khtml/khtml_part.cpp:
        (KHTMLPart::begin):
        * khtml/misc/loader.cpp:
        (CachedXSLStyleSheet::CachedXSLStyleSheet):
        (CachedXBLDocument::CachedXBLDocument):
        * khtml/xml/dom_xmlimpl.cpp:
        (DOM::ProcessingInstructionImpl::checkStyleSheet):

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

WebCore/ChangeLog-2005-08-23
WebCore/khtml/ecma/xmlhttprequest.cpp
WebCore/khtml/khtml_part.cpp
WebCore/khtml/misc/loader.cpp
WebCore/khtml/xml/dom_xmlimpl.cpp

index 8cf5d557922683f917e97b893253f4ad14e944f2..f8e5b5bcb887163ebcbd7697af681b3ee38b534a 100644 (file)
@@ -1,3 +1,19 @@
+2004-08-24  David Hyatt  <hyatt@apple.com>
+
+       Add support for Atom and RSS MIME types to the set of XML types.
+       
+        Reviewed by rjw
+
+        * khtml/ecma/xmlhttprequest.cpp:
+        (KJS::XMLHttpRequest::getValueProperty):
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::begin):
+        * khtml/misc/loader.cpp:
+        (CachedXSLStyleSheet::CachedXSLStyleSheet):
+        (CachedXBLDocument::CachedXBLDocument):
+        * khtml/xml/dom_xmlimpl.cpp:
+        (DOM::ProcessingInstructionImpl::checkStyleSheet):
+
 2004-08-24  Chris Blumenberg  <cblu@apple.com>
 
        Fixed: <rdar://problem/3746447> hang loading geocities.com/cinemaorchestra
index b7b404855030285036a8db80d8944add1d3fb5b7..56ef853d8c146d34d5cbf71cc3635aa046adfa1d 100644 (file)
@@ -150,7 +150,7 @@ Value XMLHttpRequest::getValueProperty(ExecState *exec, int token) const
       }
       
       if (mimeType == "text/xml" || mimeType == "application/xml" || mimeType == "application/xhtml+xml" ||
-          mimeType == "text/xsl") {
+          mimeType == "text/xsl" || mimeType == "application/rss+xml" || mimeType == "application/atom+xml") {
        responseXML = DOM::Document(doc->implementation()->createDocument());
 
        DOM::DocumentImpl *docImpl = static_cast<DOM::DocumentImpl *>(responseXML.handle());
index 7cd852ce4f4b90d5ba9e0ebcc14b151452af3175..66532000897444df475a61674cf8738f8034231a 100644 (file)
@@ -1518,7 +1518,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
 #endif
 
   if (args.serviceType == "text/xml" || args.serviceType == "application/xml" || args.serviceType == "application/xhtml+xml" ||
-      args.serviceType == "text/xsl")
+      args.serviceType == "text/xsl" || args.serviceType == "application/rss+xml" || args.serviceType == "application/atom+xml")
     d->m_doc = DOMImplementationImpl::instance()->createDocument( d->m_view );
   else
     d->m_doc = DOMImplementationImpl::instance()->createHTMLDocument( d->m_view );
index 548dff9ba51413ce1934ceb293826ab96ee30403..b0193b0209a9150dd32ad3b060a17b6f249a1ccc 100644 (file)
@@ -991,7 +991,7 @@ CachedXSLStyleSheet::CachedXSLStyleSheet(DocLoader* dl, const DOMString &url, KI
 : CachedObject(url, XSLStyleSheet, _cachePolicy, _expireDate)
 {
     // It's XML we want.
-    setAccept(QString::fromLatin1("text/xml, application/xml, application/xml+xhtml, text/xsl"));
+    setAccept(QString::fromLatin1("text/xml, application/xml, application/xhtml+xml, text/xsl, application/rss+xml, application/atom+xml"));
     
     // load the file
     Cache::loader()->load(dl, this, false);
@@ -1055,7 +1055,7 @@ CachedXBLDocument::CachedXBLDocument(DocLoader* dl, const DOMString &url, KIO::C
 : CachedObject(url, XBL, _cachePolicy, _expireDate), m_document(0)
 {
     // It's XML we want.
-    setAccept( QString::fromLatin1("text/xml, application/xml, application/xml+xhtml, text/xsl") );
+    setAccept( QString::fromLatin1("text/xml, application/xml, application/xhtml+xml, text/xsl, application/rss+xml, application/atom+xml") );
     
     // Load the file
     Cache::loader()->load(dl, this, false);
index 79cb2cfaabd042502e4725f52cb8e6a3799c5bb6..8ec9db58e2e71ff9a219f19234344f48360fe73d 100644 (file)
@@ -420,7 +420,7 @@ bool ProcessingInstructionImpl::checkStyleSheet()
         bool isCSS = type.isEmpty() || type == "text/css";
 #ifdef KHTML_XSLT
         m_isXSL = (type == "text/xml" || type == "text/xsl" || type == "application/xml" ||
-                   type == "application/xml+xhtml");
+                   type == "application/xhtml+xml" || type == "application/rss+xml" || type == "application/atom=xml");
         if (!isCSS && !m_isXSL)
 #else
         if (!isCSS)