[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 16432a633ac1b00aaaecaa4b5aa0af80b35d409b
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 19 08:11:20 2002 +0000

    	A couple of whitespace fixes.  What's really odd about these
    	fixes is that they *work* but only if you load the page by
    	hitting "Back".  I suspect that I've now fixed the bugs on
    	KHTML's end, and we have some sort of whitepsace dropping
    	problem on our end.
    
            * khtml/html/htmlparser.cpp:
            (KHTMLParser::insertNode):
            * khtml/html/htmltokenizer.cpp:
            (HTMLTokenizer::write):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2375 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 8c22044..9bcedf9 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-10-19  David Hyatt  <hyatt at apple.com>
+
+	A couple of whitespace fixes.  What's really odd about these
+	fixes is that they *work* but only if you load the page by
+	hitting "Back".  I suspect that I've now fixed the bugs on
+	KHTML's end, and we have some sort of whitepsace dropping
+	problem on our end.
+
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::insertNode):
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::write):
+
 2002-10-18  Richard Williamson   <rjw at apple.com>
 
         Fixed khtml to ignore <title> tags after the first tag.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8c22044..9bcedf9 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2002-10-19  David Hyatt  <hyatt at apple.com>
+
+	A couple of whitespace fixes.  What's really odd about these
+	fixes is that they *work* but only if you load the page by
+	hitting "Back".  I suspect that I've now fixed the bugs on
+	KHTML's end, and we have some sort of whitepsace dropping
+	problem on our end.
+
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::insertNode):
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::write):
+
 2002-10-18  Richard Williamson   <rjw at apple.com>
 
         Fixed khtml to ignore <title> tags after the first tag.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8c22044..9bcedf9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2002-10-19  David Hyatt  <hyatt at apple.com>
+
+	A couple of whitespace fixes.  What's really odd about these
+	fixes is that they *work* but only if you load the page by
+	hitting "Back".  I suspect that I've now fixed the bugs on
+	KHTML's end, and we have some sort of whitepsace dropping
+	problem on our end.
+
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::insertNode):
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::write):
+
 2002-10-18  Richard Williamson   <rjw at apple.com>
 
         Fixed khtml to ignore <title> tags after the first tag.
diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index 0e66959..f5717a5 100644
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -348,6 +348,11 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
             }
             if(n->renderer())
                 n->renderer()->close();
+                
+            // if n is inline, then go ahead and treat as though we're
+            // inline, since we know we're going to be wrapped anyway.
+            // e.g., <img> -dwh
+            if(n->isInline()) m_inline = true;
 #endif
         }
 
diff --git a/WebCore/khtml/html/htmltokenizer.cpp b/WebCore/khtml/html/htmltokenizer.cpp
index 81fc804..380035b 100644
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/khtml/html/htmltokenizer.cpp
@@ -1441,7 +1441,8 @@ void HTMLTokenizer::write( const QString &str, bool appendData )
                 else if ( !parser->selectMode() &&
                           ( !parser->noSpaces() || dest > buffer )) {
                     addPending();
-                    discard = AllDiscard;
+                    discard = NoneDiscard; // Set to NoneDiscard. AllDiscard will cause loss of 
+                                           // spaces in this case <tag> <img> <tag> -dwh
                 }
                 // just forget it
                 else

-- 
WebKit Debian packaging