[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 78920c14c52397cf1becbdc25bdfd53808347774
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat May 10 00:14:49 2003 +0000

    	Always allow KONQ_TEXT as a valid value, and don't restrict its
    	use to lax CSS parsing.  (We want our UA sheets to be parsed
    	strictly.)
    
    	Fixes bug 3224791, color inheritance not being properly cut off
    	in tables in quirks mode.
    
            Reviewed by mjs and darin
    
            * khtml/css/cssparser.cpp:
            (CSSParser::parseValue):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4338 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9a3b5d5..9caa131 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,19 @@
 2003-05-09  David Hyatt  <hyatt at apple.com>
 
+	Always allow KONQ_TEXT as a valid value, and don't restrict its
+	use to lax CSS parsing.  (We want our UA sheets to be parsed
+	strictly.)
+
+	Fixes bug 3224791, color inheritance not being properly cut off
+	in tables in quirks mode.
+	
+        Reviewed by mjs and darin
+
+        * khtml/css/cssparser.cpp:
+        (CSSParser::parseValue):
+
+2003-05-09  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3253695, XML pages with <style>@import...</style> don't
 	render.  The XML tokenizer is getting text in small chunks, and
 	so it tries to load the sheet multiple times.  This fix patches
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9a3b5d5..9caa131 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,19 @@
 2003-05-09  David Hyatt  <hyatt at apple.com>
 
+	Always allow KONQ_TEXT as a valid value, and don't restrict its
+	use to lax CSS parsing.  (We want our UA sheets to be parsed
+	strictly.)
+
+	Fixes bug 3224791, color inheritance not being properly cut off
+	in tables in quirks mode.
+	
+        Reviewed by mjs and darin
+
+        * khtml/css/cssparser.cpp:
+        (CSSParser::parseValue):
+
+2003-05-09  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3253695, XML pages with <style>@import...</style> don't
 	render.  The XML tokenizer is getting text in small chunks, and
 	so it tries to load the sheet multiple times.  This fix patches
diff --git a/WebCore/khtml/css/cssparser.cpp b/WebCore/khtml/css/cssparser.cpp
index f0ae1da..2f51aa0 100644
--- a/WebCore/khtml/css/cssparser.cpp
+++ b/WebCore/khtml/css/cssparser.cpp
@@ -727,8 +727,11 @@ bool CSSParser::parseValue( int propId, bool important )
         /* fall through */
     case CSS_PROP_COLOR:                // <color> | inherit
     case CSS_PROP_TEXT_DECORATION_COLOR:
-	if ( id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT || id == CSS_VAL_MENU ||
-	     (id >= CSS_VAL_GREY && id <= CSS_VAL__KONQ_TEXT && (nonCSSHint|!strict)) ) {
+        if (id == CSS_VAL__KONQ_TEXT)
+            valid_primitive = true; // Always allow this, even when strict parsing is on,
+                                    // since we use this in our UA sheets.
+	else if ( id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT || id == CSS_VAL_MENU ||
+	     (id >= CSS_VAL_GREY && id < CSS_VAL__KONQ_TEXT && (nonCSSHint|!strict)) ) {
 	    valid_primitive = true;
 	} else {
 	    parsedValue = parseColor();

-- 
WebKit Debian packaging