[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit fdf85dbb39f6d8987094f4acc770fdc266281195
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 14 22:44:23 2004 +0000

            Reviewed by Dave.
    
            - fixed <rdar://problem/3650026>: "background property doesn't work right on webdevtips.com due to background:inherit"
    
            * khtml/css/cssstyleselector.cpp: (khtml::CSSStyleSelector::applyDeclarations):
            Added CSS_PROP_BACKGROUND to the list of properties that must be applied in the first pass.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6604 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 489caa5..e25f6eb 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-05-14  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - fixed <rdar://problem/3650026>: "background property doesn't work right on webdevtips.com due to background:inherit"
+
+        * khtml/css/cssstyleselector.cpp: (khtml::CSSStyleSelector::applyDeclarations):
+        Added CSS_PROP_BACKGROUND to the list of properties that must be applied in the first pass.
+
 2004-05-13  David Hyatt  <hyatt at apple.com>
 
 	Fix image loading for <input type=image> and <object>.  Make sure it works dynamically and make sure
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index b2bbda0..64bfdf6 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -1632,14 +1632,15 @@ void CSSStyleSelector::applyDeclarations(bool applyFirst, bool isImportant,
                     bool first;
                     switch(current->id())
                     {
-                        case CSS_PROP_FONT_STYLE:
-                        case CSS_PROP_FONT_SIZE:
-                        case CSS_PROP_FONT_WEIGHT:
-                        case CSS_PROP_FONT_FAMILY:
-                        case CSS_PROP_FONT:
-                        case CSS_PROP_COLOR:
+                        case CSS_PROP_BACKGROUND:
                         case CSS_PROP_BACKGROUND_IMAGE:
+                        case CSS_PROP_COLOR:
                         case CSS_PROP_DISPLAY:
+                        case CSS_PROP_FONT:
+                        case CSS_PROP_FONT_SIZE:
+                        case CSS_PROP_FONT_STYLE:
+                        case CSS_PROP_FONT_FAMILY:
+                        case CSS_PROP_FONT_WEIGHT:
                             // these have to be applied first, because other properties use the computed
                             // values of these porperties.
                             first = true;

-- 
WebKit Debian packaging