[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 02917af9c7d93b20410343640760f9351b445eff
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 12 16:34:38 2003 +0000

    	Fix for 3373462, XML shows up as blank because the root is inline.  The fix is
    	to just disallow inline roots.
    
            Reviewed by kocienda
    
            * khtml/css/cssstyleselector.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4805 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f866cd5..16c9c2c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-08-12  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3373462, XML shows up as blank because the root is inline.  The fix is
+	to just disallow inline roots.
+	
+        Reviewed by kocienda
+
+        * khtml/css/cssstyleselector.cpp:
+
 2003-08-11  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3349142, blocks inside inlines with generated content cause the generated
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f866cd5..16c9c2c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-08-12  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3373462, XML shows up as blank because the root is inline.  The fix is
+	to just disallow inline roots.
+	
+        Reviewed by kocienda
+
+        * khtml/css/cssstyleselector.cpp:
+
 2003-08-11  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3349142, blocks inside inlines with generated content cause the generated
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index eb409fc..1143f1e 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -472,10 +472,11 @@ 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.  Cache the original display, since it
     // may be needed for positioned elements that have to compute their static normal flow
-    // positions.
+    // positions.  We also force inline-level roots to be block-level.
     style->setOriginalDisplay(style->display());
     if (style->display() != NONE && style->display() != BLOCK && style->display() != TABLE && style->display() != BOX &&
-        (style->position() == ABSOLUTE || style->position() == FIXED || style->floating() != FNONE)) {
+        (style->position() == ABSOLUTE || style->position() == FIXED || style->floating() != FNONE ||
+         e->getDocument()->documentElement() == e)) {
         if (style->display() == INLINE_TABLE)
             style->setDisplay(TABLE);
         else if (style->display() == INLINE_BOX)

-- 
WebKit Debian packaging