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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 0c916a083a39c7eb27b5e793ced90751c23d8b53
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 11 22:15:33 2004 +0000

    	Fixed some spacing issues in reconstructed source and web archives that were caused by a malformed doc type string that we were constructing.
    
            Reviewed by darin.
    
            * khtml/html/html_documentimpl.cpp:
            (HTMLDocumentImpl::determineParseMode): set the public ID and system ID on the doc type
            * khtml/xml/dom_docimpl.cpp:
            (DocumentTypeImpl::toString): put a space between DOCTYPE and the name
            * khtml/xml/dom_docimpl.h:
            (DOM::DocumentTypeImpl::setPublicId): new
            (DOM::DocumentTypeImpl::setSystemId): new
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6209 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6de2d68..08b8b10 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2004-03-11  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed some spacing issues in reconstructed source and web archives that were caused by a malformed doc type string that we were constructing.
+
+        Reviewed by darin.
+
+        * khtml/html/html_documentimpl.cpp:
+        (HTMLDocumentImpl::determineParseMode): set the public ID and system ID on the doc type
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentTypeImpl::toString): put a space between DOCTYPE and the name
+        * khtml/xml/dom_docimpl.h:
+        (DOM::DocumentTypeImpl::setPublicId): new
+        (DOM::DocumentTypeImpl::setSystemId): new
+
 2004-03-10  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3584646, AxWebArea should encompass all children (its AxSize should).
diff --git a/WebCore/khtml/html/html_documentimpl.cpp b/WebCore/khtml/html/html_documentimpl.cpp
index 25f6e83..c847e09 100644
--- a/WebCore/khtml/html/html_documentimpl.cpp
+++ b/WebCore/khtml/html/html_documentimpl.cpp
@@ -510,6 +510,8 @@ void HTMLDocumentImpl::determineParseMode( const QString &str )
     int resultFlags = 0;
     if (parseDocTypeDeclaration(str, &resultFlags, publicID, systemID)) {
         m_doctype->setName("HTML");
+        m_doctype->setPublicId(publicID);
+        m_doctype->setSystemId(systemID);
         if (!(resultFlags & PARSEMODE_HAVE_DOCTYPE)) {
             // No doctype found at all.  Default to quirks mode and Html4.
             pMode = Compat;
diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index be79dae..f0f181e 100644
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -2710,7 +2710,10 @@ void DocumentTypeImpl::copyFrom(const DocumentTypeImpl& other)
 DOMString DocumentTypeImpl::toString() const
 {
     DOMString result = "<!DOCTYPE";
-    result += m_qualifiedName;
+    if (!m_qualifiedName.isEmpty()) {
+        result += " ";
+        result += m_qualifiedName;
+    }
     if (!m_publicId.isEmpty()) {
 	result += " PUBLIC \"";
 	result += m_publicId;
@@ -2722,15 +2725,12 @@ DOMString DocumentTypeImpl::toString() const
 	result += m_systemId;
 	result += "\"";
     }
-
     if (!m_subset.isEmpty()) {
 	result += " [";
 	result += m_subset;
 	result += "]";
     }
-
     result += ">";
-
     return result;
 }
 
diff --git a/WebCore/khtml/xml/dom_docimpl.h b/WebCore/khtml/xml/dom_docimpl.h
index 5579148..fce34fe 100644
--- a/WebCore/khtml/xml/dom_docimpl.h
+++ b/WebCore/khtml/xml/dom_docimpl.h
@@ -684,6 +684,8 @@ public:
 
     // Other methods (not part of DOM)
     void setName(const DOMString& n) { m_qualifiedName = n; }
+    void setPublicId(const DOMString& publicId) { m_publicId = publicId; }
+    void setSystemId(const DOMString& systemId) { m_systemId = systemId; }
     DOMImplementationImpl *implementation() const { return m_implementation; }
     void copyFrom(const DocumentTypeImpl&);
 

-- 
WebKit Debian packaging