[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 58a70802c9471fa3a79dd33e116d5b868c53b8fb
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 18 00:54:58 2003 +0000

    	Fix for 3486441, don't use the visibleWidth when computing the containingBlockWidth().  No need to
    	query the view, since the canvas's width has been set to the proper size (when printing).
    
            Reviewed by john
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::containingBlockWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5554 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 52b8df7..b40e0a5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-11-17  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3486441, don't use the visibleWidth when computing the containingBlockWidth().  No need to
+	query the view, since the canvas's width has been set to the proper size (when printing).
+	
+        Reviewed by john
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::containingBlockWidth):
+
 2003-11-17  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index c08fbcb..ff1bd7e 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -509,9 +509,6 @@ QRect RenderBox::getClipRect(int tx, int ty)
 
 short RenderBox::containingBlockWidth() const
 {
-    if (isRoot() && canvas()->view())
-        return canvas()->view()->visibleWidth();
-    
     RenderBlock* cb = containingBlock();
     if (usesLineWidth())
         return cb->lineWidth(m_y);

-- 
WebKit Debian packaging