[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 54a00b9fde38bec8af3cd6c6e74507b7af70052a
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 10 22:34:27 2003 +0000

    	Fix for 3505846, overflow:auto region doesn't update when scrolled.  The child layers inside an overflow:auto
    	block were not updating their positions.
    
            Reviewed by john
    
            * khtml/khtmlview.cpp:
            (KHTMLView::layout):
            * khtml/rendering/render_layer.cpp:
            (RenderLayer::updateLayerPositions):
            (RenderLayer::scrollToOffset):
            * khtml/rendering/render_layer.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5746 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 735d6a8..b3699d6 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2003-12-10  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3505846, overflow:auto region doesn't update when scrolled.  The child layers inside an overflow:auto
+	block were not updating their positions.
+	
+        Reviewed by john
+
+        * khtml/khtmlview.cpp:
+        (KHTMLView::layout):
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::updateLayerPositions):
+        (RenderLayer::scrollToOffset):
+        * khtml/rendering/render_layer.h:
+
 2003-12-09  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index bf878ae..ec82ae0 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -608,7 +608,7 @@ void KHTMLView::layout()
 
     // Now update the positions of all layers.
 #ifdef INCREMENTAL_REPAINTING
-    layer->updateLayerPositions(layer, d->doFullRepaint);
+    layer->updateLayerPositions(d->doFullRepaint);
 #else
     layer->updateLayerPositions();
 #endif
diff --git a/WebCore/khtml/rendering/render_layer.cpp b/WebCore/khtml/rendering/render_layer.cpp
index d54a10b..213963f 100644
--- a/WebCore/khtml/rendering/render_layer.cpp
+++ b/WebCore/khtml/rendering/render_layer.cpp
@@ -125,7 +125,7 @@ void RenderLayer::computeRepaintRects()
 #endif
 
 #ifdef INCREMENTAL_REPAINTING
-void RenderLayer::updateLayerPositions(RenderLayer* rootLayer, bool doFullRepaint, bool checkForRepaint)
+void RenderLayer::updateLayerPositions(bool doFullRepaint, bool checkForRepaint)
 #else
 void RenderLayer::updateLayerPositions()
 #endif
@@ -146,7 +146,7 @@ void RenderLayer::updateLayerPositions()
         // Need to position the scrollbars.
         int x = 0;
         int y = 0;
-        convertToLayerCoords(rootLayer, x, y);
+        convertToLayerCoords(root(), x, y);
         QRect layerBounds = QRect(x,y,width(),height());
         positionScrollbars(layerBounds);
     }
@@ -158,7 +158,7 @@ void RenderLayer::updateLayerPositions()
     
     for	(RenderLayer* child = firstChild(); child; child = child->nextSibling())
 #ifdef INCREMENTAL_REPAINTING
-        child->updateLayerPositions(rootLayer, doFullRepaint, checkForRepaint);
+        child->updateLayerPositions(doFullRepaint, checkForRepaint);
 #else
         child->updateLayerPositions();
 #endif
@@ -457,6 +457,10 @@ RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool repaint)
 
     // FIXME: Fire the onscroll DOM event.
 
+    // Update the positions of our child layers.
+    for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
+        child->updateLayerPositions();
+    
 #if APPLE_CHANGES
     // Move our widgets.
     m_object->updateWidgetPositions();
diff --git a/WebCore/khtml/rendering/render_layer.h b/WebCore/khtml/rendering/render_layer.h
index 16c138d..8f2f660 100644
--- a/WebCore/khtml/rendering/render_layer.h
+++ b/WebCore/khtml/rendering/render_layer.h
@@ -204,7 +204,7 @@ public:
 
     void updateLayerPosition();
 #ifdef INCREMENTAL_REPAINTING
-    void updateLayerPositions(RenderLayer* rootLayer, bool doFullRepaint, bool checkForRepaint=true);
+    void updateLayerPositions(bool doFullRepaint = false, bool checkForRepaint=true);
     void computeRepaintRects();
     void relativePositionOffset(int& relX, int& relY) {
         relX += m_relX; relY += m_relY;

-- 
WebKit Debian packaging