[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 1a273511dd06d72aaf975e00075b2975b080d987
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 23 22:56:37 2003 +0000

    	Fix for 3340885, invalid colors were being mapped to transparentColor,
    	thus causing invisible text!
    
            Reviewed by kocienda
    
            * khtml/css/cssparser.cpp:
            (CSSParser::parseColorFromValue):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4695 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 98988dd..8f767f6 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-07-23  Dave Hyatt  <hyatt at apple.com>
+
+	Fix for 3340885, invalid colors were being mapped to transparentColor,
+	thus causing invisible text!
+	
+        Reviewed by kocienda
+
+        * khtml/css/cssparser.cpp:
+        (CSSParser::parseColorFromValue):
+
 2003-07-23  Richard Williamson   <rjw at apple.com>
 
 	Fixed for 3259840.  Use ATSU for scripts we don't handle internally,
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 98988dd..8f767f6 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-07-23  Dave Hyatt  <hyatt at apple.com>
+
+	Fix for 3340885, invalid colors were being mapped to transparentColor,
+	thus causing invisible text!
+	
+        Reviewed by kocienda
+
+        * khtml/css/cssparser.cpp:
+        (CSSParser::parseColorFromValue):
+
 2003-07-23  Richard Williamson   <rjw at apple.com>
 
 	Fixed for 3259840.  Use ATSU for scripts we don't handle internally,
diff --git a/WebCore/khtml/css/cssparser.cpp b/WebCore/khtml/css/cssparser.cpp
index 6ed8784..6e7f3ae 100644
--- a/WebCore/khtml/css/cssparser.cpp
+++ b/WebCore/khtml/css/cssparser.cpp
@@ -1675,7 +1675,9 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value)
         b = QMAX( 0, QMIN( 255, b ) );
         int a = (int)(QMAX( 0, QMIN( 1.0f, v->fValue ) ) * 255);
         c = qRgba( r, g, b, a );
-    }    
+    }
+    else
+        return 0;
 
     return new CSSPrimitiveValueImpl(c);
 }

-- 
WebKit Debian packaging