[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 18a7ce4a2eb579313a7b08653cd99a685e3bcce2
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 18 17:44:08 2003 +0000

    	Make sure display:none is ignored and not accidentally mutated
    	to display:block.
    
            Reviewed by darin
    
            * khtml/css/cssstyleselector.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4141 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 75ef671..ac48280 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-04-18  David Hyatt  <hyatt at apple.com>
+
+	Make sure display:none is ignored and not accidentally mutated
+	to display:block.
+	
+        Reviewed by darin
+
+        * khtml/css/cssstyleselector.cpp:
+
 2003-04-17  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 75ef671..ac48280 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-04-18  David Hyatt  <hyatt at apple.com>
+
+	Make sure display:none is ignored and not accidentally mutated
+	to display:block.
+	
+        Reviewed by darin
+
+        * khtml/css/cssstyleselector.cpp:
+
 2003-04-17  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 049df1b..594fc49 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -473,7 +473,7 @@ RenderStyle *CSSStyleSelector::styleForElement(ElementImpl *e)
 
     // Mutate the display to BLOCK or TABLE for certain cases, e.g., if someone attempts to
     // position or float an inline, compact, or run-in.
-    if (style->position() == ABSOLUTE || style->position() == FIXED || style->floating() != FNONE) {
+    if (style->display() != NONE && (style->position() == ABSOLUTE || style->position() == FIXED || style->floating() != FNONE)) {
         if (style->display() == INLINE_TABLE)
             style->setDisplay(TABLE);
         else if (style->display() == LIST_ITEM) {

-- 
WebKit Debian packaging