[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 c29a10787ccf23a1f32b02407fc7117f4acbb7fc
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun May 11 19:15:41 2003 +0000

    	The root element (HTML) tries to set itself to the lowest position
    	of the canvas, before the canvas has necessarily even determined
    	the correct lowest position.  This creates a timing problem.
    
    	This code is legacy code anyyway, left over from before KHTML
    	understood about overflow.  The HTML should not be resizing itself
    	to enclose positioned content or floats.  They should just spill
    	out of the HTML object, so the fix is easy: kill the legacy code.
    
    	There's a second fix required as well, which is to make the canvas
    	avoid scanning its positioned objects list when computing its
    	lowest and rightmost position.  Fixed positioned objects can't
    	be scrolled, so it's incorrect to show scrollbars because of
    	fixed positioned objects (since they are locked to the viewport).
    
            Reviewed by darin/gramps
    
            * khtml/rendering/render_block.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4351 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index aaa283b..5574e8d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -30,7 +30,6 @@
         nodes at each level of the tree, so our recursion is O(depth of tree) rather
         than O(size of tree).
 
->>>>>>> 1.1706
 2003-05-10  David Hyatt  <hyatt at apple.com>
 
 	Fix the misrendering at the top of cnn.com (the extra tearing
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index aaa283b..5574e8d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -30,7 +30,6 @@
         nodes at each level of the tree, so our recursion is O(depth of tree) rather
         than O(size of tree).
 
->>>>>>> 1.1706
 2003-05-10  David Hyatt  <hyatt at apple.com>
 
 	Fix the misrendering at the top of cnn.com (the extra tearing

-- 
WebKit Debian packaging