[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 34c3b94f81a447bf4ad698396595f3ee1265efee
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 31 21:44:23 2003 +0000

    	Fix for 3211849.  I accidentally removed a BORDER_COLOR case
    	from the switch when I removed the transparency check for
    	the shorthand.  The case originally fell through to the case
    	below it, so a straight removal was wrong.  I needed to add
    	it to the following set of case labels.
    
            Reviewed by darin
    
            * khtml/css/cssstyleselector.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3973 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a1a4f2e..6ace94d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,17 @@
 2003-03-31  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3211849.  I accidentally removed a BORDER_COLOR case
+	from the switch when I removed the transparency check for
+	the shorthand.  The case originally fell through to the case
+	below it, so a straight removal was wrong.  I needed to add
+	it to the following set of case labels.
+	
+        Reviewed by darin
+
+        * khtml/css/cssstyleselector.cpp:
+
+2003-03-31  David Hyatt  <hyatt at apple.com>
+
 	First-letter can be floated.  Make sure we mutate the display
 	to BLOCK so that we don't make an inline when we're floating.
 	Fixes bug 3186004.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a1a4f2e..6ace94d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,17 @@
 2003-03-31  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3211849.  I accidentally removed a BORDER_COLOR case
+	from the switch when I removed the transparency check for
+	the shorthand.  The case originally fell through to the case
+	below it, so a straight removal was wrong.  I needed to add
+	it to the following set of case labels.
+	
+        Reviewed by darin
+
+        * khtml/css/cssstyleselector.cpp:
+
+2003-03-31  David Hyatt  <hyatt at apple.com>
+
 	First-letter can be floated.  Make sure we mutate the display
 	to BLOCK so that we don't make an inline when we're floating.
 	Fixes bug 3186004.
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 64774e9..bae0c28 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -2997,6 +2997,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
     case CSS_PROP_BORDER:
     case CSS_PROP_BORDER_STYLE:
     case CSS_PROP_BORDER_WIDTH:
+    case CSS_PROP_BORDER_COLOR:
         if(value->cssValueType() != CSSValue::CSS_INHERIT || !parentNode) return;
 
         if(id == CSS_PROP_BORDER || id == CSS_PROP_BORDER_COLOR)

-- 
WebKit Debian packaging