[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 dd93668d78d9c66e16d218aed1bbc54eba1e5554
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 17 10:38:25 2002 +0000

    	Don't discard linefeeds after elements with no close tag
    	(e.g., <img> or <input>).
    
            * khtml/html/htmltokenizer.cpp:
            (HTMLTokenizer::parseTag):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2717 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index b47ccd9..da427aa 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-11-17  David Hyatt  <hyatt at apple.com>
 
+	Don't discard linefeeds after elements with no close tag
+	(e.g., <img> or <input>).
+	
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::parseTag):
+
+2002-11-17  David Hyatt  <hyatt at apple.com>
+
 	Fix for slashdot table mispositioning in the upper right.
 	Now that we fixed <td> to set to -konq-center when align="center"
 	is specified, the style rules are no longer necessary in
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b47ccd9..da427aa 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-11-17  David Hyatt  <hyatt at apple.com>
 
+	Don't discard linefeeds after elements with no close tag
+	(e.g., <img> or <input>).
+	
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::parseTag):
+
+2002-11-17  David Hyatt  <hyatt at apple.com>
+
 	Fix for slashdot table mispositioning in the upper right.
 	Now that we fixed <td> to set to -konq-center when align="center"
 	is specified, the style rules are no longer necessary in
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b47ccd9..da427aa 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-11-17  David Hyatt  <hyatt at apple.com>
 
+	Don't discard linefeeds after elements with no close tag
+	(e.g., <img> or <input>).
+	
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::parseTag):
+
+2002-11-17  David Hyatt  <hyatt at apple.com>
+
 	Fix for slashdot table mispositioning in the upper right.
 	Now that we fixed <td> to set to -konq-center when align="center"
 	is specified, the style rules are no longer necessary in
diff --git a/WebCore/khtml/html/htmltokenizer.cpp b/WebCore/khtml/html/htmltokenizer.cpp
index e672556..cb69db5 100644
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/khtml/html/htmltokenizer.cpp
@@ -1251,6 +1251,11 @@ void HTMLTokenizer::parseTag(DOMStringIt &src)
                 plaintext = beginTag;
                 break;
             }
+            
+            if (beginTag && endTag[tagID] == FORBIDDEN)
+                // Don't discard LFs since this element has no end tag.
+                discard = NoneDiscard;
+                
             return; // Finished parsing tag!
         }
         } // end switch

-- 
WebKit Debian packaging