[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 674e12cdaef9234b39f671a42cd651085f51bb02
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Apr 7 21:43:53 2003 +0000

            Reviewed by Dave.
    
            - fixed 3220490 -- REGRESSION: MALLORY horiz scrollbar incorrectly appears with abs positioned content
    
            * khtml/rendering/render_block.cpp: (RenderBlock::rightmostPosition):
            Fix a place where I had xPos instead of yPos.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4033 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5c81308..b428b0d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-04-07  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - fixed 3220490 -- REGRESSION: MALLORY horiz scrollbar incorrectly appears with abs positioned content
+
+        * khtml/rendering/render_block.cpp: (RenderBlock::rightmostPosition):
+        Fix a place where I had xPos instead of yPos.
+
 === Safari-71 ===
 
 2003-04-04  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5c81308..b428b0d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-04-07  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - fixed 3220490 -- REGRESSION: MALLORY horiz scrollbar incorrectly appears with abs positioned content
+
+        * khtml/rendering/render_block.cpp: (RenderBlock::rightmostPosition):
+        Fix a place where I had xPos instead of yPos.
+
 === Safari-71 ===
 
 2003-04-04  Darin Adler  <darin at apple.com>
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 6920c7b..959670a 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -1552,7 +1552,7 @@ int RenderBlock::rightmostPosition() const
         RenderObject* r;
         QPtrListIterator<RenderObject> it(*m_positionedObjects);
         for ( ; (r = it.current()); ++it ) {
-            int rp = r->yPos() + r->rightmostPosition();
+            int rp = r->xPos() + r->rightmostPosition();
             right = QMAX(right, rp);
         }
     }

-- 
WebKit Debian packaging