[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 3449a866cccfbaf2fb5751a6b969354f1483c295
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 20:35:21 2004 +0000

    	Fix for layer positioning error that occurs when absolute positioned blocks are inside static positioned overflow:auto
    	elements.
    
            Reviewed by john
    
            * khtml/rendering/render_layer.cpp:
            (RenderLayer::updateLayerPosition):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7065 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 140699d..114520d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-07-20  David Hyatt  <hyatt at apple.com>
+
+	Fix for layer positioning error that occurs when absolute positioned blocks are inside static positioned overflow:auto
+	elements.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::updateLayerPosition):
+
 2004-07-20  Trey Matteson  <trey at apple.com>
 
 	3705624	REGRESSION: can't rearrange photos on homepage.mac.com album
diff --git a/WebCore/khtml/rendering/render_layer.cpp b/WebCore/khtml/rendering/render_layer.cpp
index 6cd406b..7e27d58 100644
--- a/WebCore/khtml/rendering/render_layer.cpp
+++ b/WebCore/khtml/rendering/render_layer.cpp
@@ -182,7 +182,10 @@ void RenderLayer::updateLayerPosition()
     }
     
     // Subtract our parent's scroll offset.
-    if (parent())
+    if (m_object->isPositioned())
+        // For positioned layers, we subtract out the enclosing positioned layer's scroll offset.
+        enclosingPositionedAncestor()->subtractScrollOffset(x, y);
+    else
         parent()->subtractScrollOffset(x, y);
     
     setPos(x,y);

-- 
WebKit Debian packaging