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

Sat Sep 26 08:37:07 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit a0d59822d77926a37cfc815dda36f7a540adefe6
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Apr 26 21:16:21 2004 +0000

    	Implement the quirk that makes the <body> and <html> size to fill the viewport in quirks mode.  This
    	matches WinIE.
    
            Reviewed by john
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::calcHeight):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6486 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 43d2267..8b4a850 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-04-26  David Hyatt  <hyatt at apple.com>
+
+	Implement the quirk that makes the <body> and <html> size to fill the viewport in quirks mode.  This
+	matches WinIE.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcHeight):
+
 2004-04-26  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by John
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 74b7771..43c9c4e 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -941,6 +941,22 @@ void RenderBox::calcHeight()
         m_layer->marquee()->setEnd(m_height);
         m_height = kMin(m_height, m_layer->marquee()->unfurlPos());
     }
+    
+    // WinIE quirk: The <html> block always fills the entire canvas in quirks mode.  The <body> always fills the
+    // <html> block in quirks mode.  Only apply this quirk if the block is normal flow and no height
+    // is specified.
+    if (style()->htmlHacks() && style()->height().isVariable() &&
+        !isFloatingOrPositioned() && (isRoot() || isBody())) {
+        int margins = collapsedMarginTop() + collapsedMarginBottom();
+        int visHeight = canvas()->view()->visibleHeight();
+        if (isRoot())
+            m_height = kMax(m_height, visHeight - margins);
+        else
+            m_height = kMax(m_height, visHeight - 
+                            (margins + parent()->marginTop() + parent()->marginBottom() + 
+                             parent()->borderTop() + parent()->borderBottom() +
+                             parent()->paddingTop() + parent()->paddingBottom()));
+    }
 }
 
 int RenderBox::calcHeightUsing(const Length& h)

-- 
WebKit Debian packaging

