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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 80506384a571c21ca316275ec5fcc9313927ea3f
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 24 19:13:58 2004 +0000

    	Polish the error message from the xml tokenizer.
    
            * khtml/xml/xml_tokenizer.cpp:
            (XMLTokenizer::finish):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5973 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8435b42..de68b6f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2004-01-24  David Hyatt  <hyatt at apple.com>
+
+	Polish the error message from the xml tokenizer.
+
+        * khtml/xml/xml_tokenizer.cpp:
+        (XMLTokenizer::finish):
+
 2004-01-23  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Richard
diff --git a/WebCore/khtml/xml/xml_tokenizer.cpp b/WebCore/khtml/xml/xml_tokenizer.cpp
index 016c829..480b127 100644
--- a/WebCore/khtml/xml/xml_tokenizer.cpp
+++ b/WebCore/khtml/xml/xml_tokenizer.cpp
@@ -429,12 +429,19 @@ void XMLTokenizer::finish()
         }
 
         ElementImpl* reportDiv = doc->createElementNS(XHTML_NAMESPACE, "div", exceptioncode);
-        reportDiv->setAttribute(ATTR_STYLE, "white-space: pre; border: 2px solid #c77; padding: 0 1em 1em 1em; margin: 1em; background-color: #fdd; color: black");
-        NodeImpl* h3 = doc->createElementNS(XHTML_NAMESPACE, "h3", exceptioncode);
+        reportDiv->setAttribute(ATTR_STYLE, "white-space: pre; border: 2px solid #c77; padding: 0 1em 0 1em; margin: 1em; background-color: #fdd; color: black");
+        ElementImpl* h3 = doc->createElementNS(XHTML_NAMESPACE, "h3", exceptioncode);
         h3->appendChild(doc->createTextNode("This page contains the following errors:"), exceptioncode);
         reportDiv->appendChild(h3, exceptioncode);
+        ElementImpl* fixed = doc->createElementNS(XHTML_NAMESPACE, "div", exceptioncode);
+        fixed->setAttribute(ATTR_STYLE, "font-family:monospace;font-size:12px");
         NodeImpl* textNode = doc->createTextNode(handler->errorProtocol());
-        reportDiv->appendChild(textNode, exceptioncode);
+        fixed->appendChild(textNode, exceptioncode);
+        reportDiv->appendChild(fixed, exceptioncode);
+        h3 = doc->createElementNS(XHTML_NAMESPACE, "h3", exceptioncode);
+        h3->appendChild(doc->createTextNode("Below is a rendering of the page up to the first error."), exceptioncode);
+        reportDiv->appendChild(h3, exceptioncode);
+        
         root->insertBefore(reportDiv, root->firstChild(), exceptioncode);
 
         m_doc->document()->recalcStyle( NodeImpl::Inherit );

-- 
WebKit Debian packaging