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

hyatt hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:26:48 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit d17fee57a989486a686e375ef3e055ab4b848489
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 24 02:46:05 2002 +0000

    	Fix bug 2803155 - images not displayed on http://bscw.gmd.de.
    	My fix is to use our newfound quirks mode to implement a comment
    	parsing quirk (this is how Mozilla handles this same issue).
    	Only in quirks mode, the tokenizer will treat <!--> atomically as
    	a complete comment.
    
    	This is bug 34302 on bugs.kde.org, for those who are curious.
    
            * khtml/html/htmltokenizer.cpp:
            (HTMLTokenizer::parseTag):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1647 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 158e331..a351460 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-07-23  David Hyatt  <hyatt at apple.com>
+
+	Fix bug 2803155 - images not displayed on http://bscw.gmd.de.
+	My fix is to use our newfound quirks mode to implement a comment
+	parsing quirk (this is how Mozilla handles this same issue).
+	Only in quirks mode, the tokenizer will treat <!--> atomically as
+	a complete comment.
+
+	This is bug 34302 on bugs.kde.org, for those who are curious.
+	
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::parseTag):
+
 2002-07-23  Chris Blumenberg  <cblu at apple.com>
 
 	Initial plumbing for contextual menu support.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 158e331..a351460 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2002-07-23  David Hyatt  <hyatt at apple.com>
+
+	Fix bug 2803155 - images not displayed on http://bscw.gmd.de.
+	My fix is to use our newfound quirks mode to implement a comment
+	parsing quirk (this is how Mozilla handles this same issue).
+	Only in quirks mode, the tokenizer will treat <!--> atomically as
+	a complete comment.
+
+	This is bug 34302 on bugs.kde.org, for those who are curious.
+	
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::parseTag):
+
 2002-07-23  Chris Blumenberg  <cblu at apple.com>
 
 	Initial plumbing for contextual menu support.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 158e331..a351460 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2002-07-23  David Hyatt  <hyatt at apple.com>
+
+	Fix bug 2803155 - images not displayed on http://bscw.gmd.de.
+	My fix is to use our newfound quirks mode to implement a comment
+	parsing quirk (this is how Mozilla handles this same issue).
+	Only in quirks mode, the tokenizer will treat <!--> atomically as
+	a complete comment.
+
+	This is bug 34302 on bugs.kde.org, for those who are curious.
+	
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::parseTag):
+
 2002-07-23  Chris Blumenberg  <cblu at apple.com>
 
 	Initial plumbing for contextual menu support.
diff --git a/WebCore/khtml/html/htmltokenizer.cpp b/WebCore/khtml/html/htmltokenizer.cpp
index 66c8600..0e72db9 100644
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/khtml/html/htmltokenizer.cpp
@@ -773,9 +773,19 @@ void HTMLTokenizer::parseTag(DOMStringIt &src)
                         dest = buffer; // ignore the previous part of this tag
                         comment = true;
                         tag = NoTag;
-                        parseComment(src);
 
-                        return; // Finished parsing tag!
+			// Fix bug 34302 at kde.bugs.org.  Go ahead and treat
+			// <!--> as a valid comment, since both mozilla and IE on windows
+			// can handle this case.  Only do this in quirks mode. -dwh
+			if (*src == '>' && parser->doc()->parseMode() != DocumentImpl::Strict) {
+			  comment = false;
+			  ++src;
+			  cBuffer[cBufferPos++] = src->cell();
+			}
+		        else
+			  parseComment(src);
+			  
+			return; // Finished parsing tag!
                     }
                     // cuts of high part, is okay
                     cBuffer[cBufferPos++] = src->cell();

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list