[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 1579eda2cecb90639c031e35e501ef3ae30072c2
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Apr 14 22:43:59 2003 +0000

            Reviewed by darin
    
            * ChangeLog:
            * khtml/css/cssstyleselector.cpp:
            * khtml/html/htmltokenizer.cpp:
            (HTMLTokenizer::parseComment):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4103 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 756efbc..993d436 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,21 @@
+2003-04-11  David Hyatt  <hyatt at apple.com>
+
+        Reviewed by darin
+
+        * ChangeLog:
+        * khtml/css/cssstyleselector.cpp:
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::parseComment):
+
+2003-04-11  David Hyatt  <hyatt at apple.com>
+
+	Refine the code that sets the display of floating and positioned
+	elements to block.
+	
+        Reviewed by darin
+
+        * khtml/css/cssstyleselector.cpp:
+
 2003-04-14  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed build failure.
@@ -116,7 +134,7 @@
         if you searched for a non-ASCII character in a string that had ASCII valid and
         not Unicode valid.
         (QString::replace): Added replace(QChar, QChar).
-        
+
 === Safari-73 ===
 
 2003-04-10  Trey Matteson  <trey at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 756efbc..993d436 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2003-04-11  David Hyatt  <hyatt at apple.com>
+
+        Reviewed by darin
+
+        * ChangeLog:
+        * khtml/css/cssstyleselector.cpp:
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::parseComment):
+
+2003-04-11  David Hyatt  <hyatt at apple.com>
+
+	Refine the code that sets the display of floating and positioned
+	elements to block.
+	
+        Reviewed by darin
+
+        * khtml/css/cssstyleselector.cpp:
+
 2003-04-14  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed build failure.
@@ -116,7 +134,7 @@
         if you searched for a non-ASCII character in a string that had ASCII valid and
         not Unicode valid.
         (QString::replace): Added replace(QChar, QChar).
-        
+
 === Safari-73 ===
 
 2003-04-10  Trey Matteson  <trey at apple.com>
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index cede2fd..d2aace0 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -178,6 +178,7 @@
 </dict>
 </plist>
 ";
+			shouldUseHeadermap = 0;
 		};
 		0867D69DFE84028FC02AAC07 = {
 			buildActionMask = 2147483647;
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 89a57da..2335ff0 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -474,11 +474,17 @@ RenderStyle *CSSStyleSelector::styleForElement(ElementImpl *e)
     // Mutate the display to BLOCK or TABLE for certain cases, e.g., if someone attempts to
     // position or float an inline, compact, or run-in.
     if (style->position() == ABSOLUTE || style->position() == FIXED || style->floating() != FNONE) {
-        if (style->display() == INLINE || style->display() == COMPACT ||
-            style->display() == RUN_IN) // || style->display() == INLINE_BLOCK) FIXME!!!
-            style->setDisplay(BLOCK);
-        else if (style->display() == INLINE_TABLE)
+        if (style->display() == INLINE_TABLE)
             style->setDisplay(TABLE);
+        else if (style->display() == LIST_ITEM) {
+            // It is a WinIE bug that floated list items lose their bullets, so we'll emulate the quirk,
+            // but only in quirks mode.
+            if (!strictParsing && style->floating() != FNONE)
+                style->setDisplay(BLOCK);
+        }
+        else
+            style->setDisplay(BLOCK);
+        
     }
 
     // Finally update our text decorations in effect, but don't allow text-decoration to percolate through
@@ -1734,9 +1740,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         default:
             return;
         }
-        if (f!=FNONE && style->display()==LIST_ITEM)
-            style->setDisplay(BLOCK);
-
+        
         style->setFloating(f);
         break;
     }
diff --git a/WebCore/khtml/html/htmltokenizer.cpp b/WebCore/khtml/html/htmltokenizer.cpp
index 5fbf376..ad5a593 100644
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/khtml/html/htmltokenizer.cpp
@@ -580,7 +580,12 @@ void HTMLTokenizer::parseComment(DOMStringIt &src)
         if (src->unicode() == '>' &&
             ( ( brokenComments && !( script || style ) ) ||
               ( scriptCodeSize > 2 && scriptCode[scriptCodeSize-3] == '-' &&
-                scriptCode[scriptCodeSize-2] == '-' ) ) ) {
+                scriptCode[scriptCodeSize-2] == '-' ) ||
+              // Other browsers will accept --!> as a close comment, even though it's
+              // not technically valid.
+              ( scriptCodeSize > 3 && scriptCode[scriptCodeSize-4] == '-' &&
+                scriptCode[scriptCodeSize-3] == '-' &&
+                scriptCode[scriptCodeSize-2] == '!' ) ) ) {
             ++src;
             if ( !( script || xmp || textarea || style) ) {
 #ifdef COMMENTS_IN_DOM

-- 
WebKit Debian packaging