[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 125707db0f890a50413a28da3fbcbb9ec6996786
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 22 18:21:12 2003 +0000

    	Make sure the overflow clip rect clips out the scrollbars
    	so that child layers aren't able to draw on top of the
    	scrollbars.
    
    	Also fix scrollbars so that they are painted before the
    	overflow clip rect is applied (just as backgrounds and borders
    	are).
    
    	These two fixes make the divtest example from Yahoo (sent by Mark
    	Malone) work.
    
            Reviewed by john
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::getOverflowClipRect):
            * khtml/rendering/render_layer.cpp:
            (RenderLayer::paint):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4414 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b4b9566..b322f09 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,23 @@
+2003-05-22  David Hyatt  <hyatt at apple.com>
+
+	Make sure the overflow clip rect clips out the scrollbars
+	so that child layers aren't able to draw on top of the
+	scrollbars.
+
+	Also fix scrollbars so that they are painted before the
+	overflow clip rect is applied (just as backgrounds and borders
+	are).
+
+	These two fixes make the divtest example from Yahoo (sent by Mark
+	Malone) work.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::getOverflowClipRect):
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::paint):
+
 2003-05-22  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b4b9566..b322f09 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,23 @@
+2003-05-22  David Hyatt  <hyatt at apple.com>
+
+	Make sure the overflow clip rect clips out the scrollbars
+	so that child layers aren't able to draw on top of the
+	scrollbars.
+
+	Also fix scrollbars so that they are painted before the
+	overflow clip rect is applied (just as backgrounds and borders
+	are).
+
+	These two fixes make the divtest example from Yahoo (sent by Mark
+	Malone) work.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::getOverflowClipRect):
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::paint):
+
 2003-05-22  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 0286c07..9f2679b 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -433,6 +433,11 @@ QRect RenderBox::getOverflowClipRect(int tx, int ty)
     int clipw = m_width-bl-br;
     int cliph = m_height-bt-bb;
 
+    // Subtract out scrollbars if we have them.
+    if (m_layer) {
+        clipw -= m_layer->verticalScrollbarWidth();
+        cliph -= m_layer->horizontalScrollbarHeight();
+    }
     return QRect(clipx,clipy,clipw,cliph);
 }
 
diff --git a/WebCore/khtml/rendering/render_layer.cpp b/WebCore/khtml/rendering/render_layer.cpp
index 9f44523..69be117 100644
--- a/WebCore/khtml/rendering/render_layer.cpp
+++ b/WebCore/khtml/rendering/render_layer.cpp
@@ -573,11 +573,20 @@ RenderLayer::paint(QPainter *p, int x, int y, int w, int h, bool selectionOnly)
             }
             
             // A clip is in effect.  The clip is never allowed to clip our render object's
-            // background or borders.  Go ahead and draw those now without our clip (that will
+            // background, borders or scrollbars.  Go ahead and draw those now without our clip (that will
             // be used for our children) in effect.
             elt->layer->renderer()->paintBoxDecorations(p, x, y, w, h,
                                 elt->absBounds.x(),
                                 elt->absBounds.y());
+
+            // Position our scrollbars prior to painting.
+            elt->layer->positionScrollbars(elt->absBounds);
+
+#if APPLE_CHANGES
+            // Our scrollbar widgets paint exactly when we tell them to, so that they work properly with
+            // z-index.
+            elt->layer->paintScrollbars(p, x, y, w, h);
+#endif
         }
         
         if (elt->clipRect != currRect) {
@@ -636,16 +645,6 @@ RenderLayer::paint(QPainter *p, int x, int y, int w, int h, bool selectionOnly)
                                             elt->absBounds.x() - elt->layer->renderer()->xPos(),
                                             elt->absBounds.y() - elt->layer->renderer()->yPos(),
                                             PaintActionForeground);
-
-                
-                // Position our scrollbars.
-                elt->layer->positionScrollbars(elt->absBounds);
-    
-#if APPLE_CHANGES
-                // Our widgets paint exactly when we tell them to, so that they work properly with
-                // z-index.
-                elt->layer->paintScrollbars(p, x, y, w, h);
-#endif
             }
         }
     }

-- 
WebKit Debian packaging