[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 5c611c4d3e2f46474b30325b09863f21ff734f45
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 15 06:42:22 2003 +0000

            Reviewed by Maciej.
    
    	- fixed 3147036 -- words separated only by newlines are getting rammed together on XML page
    	- fixed 3147032 -- preformatted text is missing much whitespace on XML page
    
            * khtml/xml/xml_tokenizer.cpp: (XMLHandler::characters): Don't try to strip whitespace at all,
    	because it needs to be in the DOM.
    
    	- add support for more MIME types
    
            * khtml/khtml_part.cpp: (KHTMLPart::begin): Add "application/xml" and "application/xhtml+xml".
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3325 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c850aef..15ae2d5 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2003-01-14  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- fixed 3147036 -- words separated only by newlines are getting rammed together on XML page
+	- fixed 3147032 -- preformatted text is missing much whitespace on XML page
+
+        * khtml/xml/xml_tokenizer.cpp: (XMLHandler::characters): Don't try to strip whitespace at all,
+	because it needs to be in the DOM.
+
+	- add support for more MIME types
+
+        * khtml/khtml_part.cpp: (KHTMLPart::begin): Add "application/xml" and "application/xhtml+xml".
+
 2003-01-14  David Hyatt  <hyatt at apple.com>
 
 	Make FOUC work with XML.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c850aef..15ae2d5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2003-01-14  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- fixed 3147036 -- words separated only by newlines are getting rammed together on XML page
+	- fixed 3147032 -- preformatted text is missing much whitespace on XML page
+
+        * khtml/xml/xml_tokenizer.cpp: (XMLHandler::characters): Don't try to strip whitespace at all,
+	because it needs to be in the DOM.
+
+	- add support for more MIME types
+
+        * khtml/khtml_part.cpp: (KHTMLPart::begin): Add "application/xml" and "application/xhtml+xml".
+
 2003-01-14  David Hyatt  <hyatt at apple.com>
 
 	Make FOUC work with XML.
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 558c8b7..e33b5ff 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1366,7 +1366,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
 #endif
 
   // ### not sure if XHTML documents served as text/xml should use DocumentImpl or HTMLDocumentImpl
-  if (args.serviceType == "text/xml")
+  if (args.serviceType == "text/xml" || args.serviceType == "application/xml" || args.serviceType == "application/xhtml+xml")
     d->m_doc = DOMImplementationImpl::instance()->createDocument( d->m_view );
   else
     d->m_doc = DOMImplementationImpl::instance()->createHTMLDocument( d->m_view );
diff --git a/WebCore/khtml/xml/xml_tokenizer.cpp b/WebCore/khtml/xml/xml_tokenizer.cpp
index db4c190..7acfd27 100644
--- a/WebCore/khtml/xml/xml_tokenizer.cpp
+++ b/WebCore/khtml/xml/xml_tokenizer.cpp
@@ -151,29 +151,14 @@ bool XMLHandler::endCDATA()
 
 bool XMLHandler::characters( const QString& ch )
 {
-    if (ch.stripWhiteSpace().isEmpty())
-        return true;
-
     if (m_currentNode->nodeType() == Node::TEXT_NODE ||
         m_currentNode->nodeType() == Node::CDATA_SECTION_NODE ||
         enterText()) {
 
-        unsigned short parentId = m_currentNode->parentNode() ? m_currentNode->parentNode()->id() : 0;
-        if (parentId == ID_SCRIPT || parentId == ID_STYLE || parentId == ID_XMP || parentId == ID_TEXTAREA) {
-            // ### hack.. preserve whitespace for script, style, xmp and textarea... is this the correct
-            // way of doing this?
-            int exceptioncode = 0;
-            static_cast<TextImpl*>(m_currentNode)->appendData(ch,exceptioncode);
-            if (exceptioncode)
-                return false;
-        }
-        else {
-            // for all others, simplify the whitespace
-            int exceptioncode = 0;
-            static_cast<TextImpl*>(m_currentNode)->appendData(ch.simplifyWhiteSpace(),exceptioncode);
-            if (exceptioncode)
-                return false;
-        }
+        int exceptioncode = 0;
+        static_cast<TextImpl*>(m_currentNode)->appendData(ch,exceptioncode);
+        if (exceptioncode)
+            return false;
         return true;
     }
     else

-- 
WebKit Debian packaging