[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/khtml/rendering
From:       Germain Garand <germain () ebooksfrance ! com>
Date:       2006-09-23 20:34:38
Message-ID: 1159043678.268210.7097.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 587726 by ggarand:

Remove incorrect special casing of root block.
Webcore needs this hack because it still uses the old \
root-is-initial-containing-block model, but we don't, so there is no need to break \
the spec here.

BUG: 134518



 M  +2 -8      render_box.cpp  


--- branches/KDE/3.5/kdelibs/khtml/rendering/render_box.cpp #587725:587726
@@ -1628,11 +1628,8 @@
 
     // We don't use containingBlock(), since we may be positioned by an enclosing \
relpositioned inline.  const RenderObject* containerBlock = container();
+    const int containerHeight = containerBlock->height() - \
containerBlock->borderTop() - containerBlock->borderBottom();  
-    // Even in strict mode (where we don't grow the root to fill the viewport) other \
                browsers
-    // position as though the root fills the viewport.
-    const int containerHeight = containerBlock->isRoot() ? \
containerBlock->availableHeight() : (containerBlock->height() - \
                containerBlock->borderTop() - containerBlock->borderBottom());
-
     const int bordersPlusPadding = borderTop() + borderBottom() + paddingTop() + \
paddingBottom();  const Length marginTop = style()->marginTop();
     const Length marginBottom = style()->marginBottom();
@@ -2031,11 +2028,8 @@
 
     // We don't use containingBlock(), since we may be positioned by an enclosing \
relpositioned inline.  const RenderObject* containerBlock = container();
+    const int containerHeight = containerBlock->height() - \
containerBlock->borderTop() - containerBlock->borderBottom();  
-    // Even in strict mode (where we don't grow the root to fill the viewport)
-    // other browsers position as though the root fills the viewport.
-    const int containerHeight = containerBlock->isRoot() ? \
containerBlock->availableHeight() : (containerBlock->height() - \
                containerBlock->borderTop() - containerBlock->borderBottom());
-
     // Variables to solve.
     Length top = style()->top();
     Length bottom = style()->bottom();


[prev in list] [next in list] [prev in thread] [next in thread]