[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 a2e6c5d43f6c66345425fb4708c864b5eabb631f
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 3 23:15:09 2003 +0000

    	I messed up when i merged Lars' quirks color patch for CSS with
    	my original patch.  I'm now exactly matching Lars' patch, and this
    	now fixes bug 3181185.
    
            Reviewed by darin
    
            * khtml/css/cssparser.cpp:
            (CSSParser::parseColor):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3731 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5caa2a9..bff9ec9 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2003-03-03  David Hyatt  <hyatt at apple.com>
 
+	I messed up when i merged Lars' quirks color patch for CSS with
+	my original patch.  I'm now exactly matching Lars' patch, and this
+	now fixes bug 3181185.
+	
+        Reviewed by darin
+
+        * khtml/css/cssparser.cpp:
+        (CSSParser::parseColor):
+
+2003-03-03  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3179084.  Fix is to just dump our code so that the new
 	addHTMLColor code kicks in.  This code is very close to WinIE
 	on more-colortests.html.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5caa2a9..bff9ec9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-03-03  David Hyatt  <hyatt at apple.com>
 
+	I messed up when i merged Lars' quirks color patch for CSS with
+	my original patch.  I'm now exactly matching Lars' patch, and this
+	now fixes bug 3181185.
+	
+        Reviewed by darin
+
+        * khtml/css/cssparser.cpp:
+        (CSSParser::parseColor):
+
+2003-03-03  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3179084.  Fix is to just dump our code so that the new
 	addHTMLColor code kicks in.  This code is very close to WinIE
 	on more-colortests.html.
diff --git a/WebCore/khtml/css/cssparser.cpp b/WebCore/khtml/css/cssparser.cpp
index 2961d90..55e8de9 100644
--- a/WebCore/khtml/css/cssparser.cpp
+++ b/WebCore/khtml/css/cssparser.cpp
@@ -1517,7 +1517,6 @@ CSSPrimitiveValueImpl *CSSParser::parseColor()
         c = ::parseColor( str );
     } else if ( value->unit == CSSPrimitiveValue::CSS_RGBCOLOR ||
               value->unit == CSSPrimitiveValue::CSS_IDENT ||
-              value->unit == CSSPrimitiveValue::CSS_STRING ||
               value->unit == CSSPrimitiveValue::CSS_DIMENSION )
 	c = ::parseColor( qString( value->string ));
     else if ( value->unit == Value::Function &&

-- 
WebKit Debian packaging