[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 462167887b0e8dbf55d512ed75af4fe053064542
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 18 21:20:02 2003 +0000

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

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 78e5858..e88e19a 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:table is not accidentally mutated to
+	display:block.
+	
+        Reviewed by darin
+
+        * khtml/css/cssstyleselector.cpp:
+
 2003-04-18  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 78e5858..e88e19a 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:table is not accidentally mutated to
+	display:block.
+	
+        Reviewed by darin
+
+        * khtml/css/cssstyleselector.cpp:
+
 2003-04-18  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 594fc49..d168f51 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -473,7 +473,8 @@ 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->display() != NONE && (style->position() == ABSOLUTE || style->position() == FIXED || style->floating() != FNONE)) {
+    if (style->display() != NONE && style->display() != BLOCK && style->display() != TABLE &&
+        (style->position() == ABSOLUTE || style->position() == FIXED || style->floating() != FNONE)) {
         if (style->display() == INLINE_TABLE)
             style->setDisplay(TABLE);
         else if (style->display() == LIST_ITEM) {
@@ -484,7 +485,6 @@ RenderStyle *CSSStyleSelector::styleForElement(ElementImpl *e)
         }
         else
             style->setDisplay(BLOCK);
-        
     }
 
     // Finally update our text decorations in effect, but don't allow text-decoration to percolate through

-- 
WebKit Debian packaging