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

[gramps]

The following commit has been merged in the debian/unstable branch:
commit 91da0bd928e85e937c720d1614a29655f742d293
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 28 21:28:30 2002 +0000

    * khtml/html/htmlparser.cpp:
    (KHTMLParser::insertNode):
    * khtml/html/htmltokenizer.cpp:
    (HTMLTokenizer::write):
    
    Backed our Dave's whitespace hack because it was adding newlines, i.e.
    vertical margins, to web pages all over.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2493 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 6c43f03..e944015 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-10-28  Don Melton  <gramps at apple.com>
+
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::insertNode):
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::write):
+
+	Backed our Dave's whitespace hack because it was adding newlines, i.e.
+	vertical margins, to web pages all over.
+
 2002-10-28  Darin Adler  <darin at apple.com>
 
 	- fixed 3015800 -- bad URL error - unescaped # in URL
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6c43f03..e944015 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-10-28  Don Melton  <gramps at apple.com>
+
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::insertNode):
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::write):
+
+	Backed our Dave's whitespace hack because it was adding newlines, i.e.
+	vertical margins, to web pages all over.
+
 2002-10-28  Darin Adler  <darin at apple.com>
 
 	- fixed 3015800 -- bad URL error - unescaped # in URL
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6c43f03..e944015 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-10-28  Don Melton  <gramps at apple.com>
+
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::insertNode):
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::write):
+
+	Backed our Dave's whitespace hack because it was adding newlines, i.e.
+	vertical margins, to web pages all over.
+
 2002-10-28  Darin Adler  <darin at apple.com>
 
 	- fixed 3015800 -- bad URL error - unescaped # in URL
diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index 2715cd0..ef7cfde 100644
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -347,11 +347,6 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
                 if (!state.isNull()) n->restoreState(state);
             }
             n->closeRenderer();
-                
-            // 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 bcf77f9..23584f6 100644
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/khtml/html/htmltokenizer.cpp
@@ -1441,8 +1441,7 @@ void HTMLTokenizer::write( const QString &str, bool appendData )
                 else if ( !parser->selectMode() &&
                           ( !parser->noSpaces() || dest > buffer )) {
                     addPending();
-                    discard = NoneDiscard; // Set to NoneDiscard. AllDiscard will cause loss of 
-                                           // spaces in this case <tag> <img> <tag> -dwh
+                    discard = AllDiscard;
                 }
                 // just forget it
                 else

-- 
WebKit Debian packaging