[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 8bea15b0d20ba7ea621c375d38b49d1465063094
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 19 02:10:15 2004 +0000

    	Fix for 3532569, bugzilla patch viewer doesn't work.  My previous fix for 3531983 caused moves to happen
    	when they should not have, due to childX and childY not being implemented at all on KWQScrollView.
    
            Reviewed by darin
    
            * kwq/KWQScrollView.mm:
            (QScrollView::childX):
            (QScrollView::childY):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5924 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5b8824c..49009a0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-01-18  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3532569, bugzilla patch viewer doesn't work.  My previous fix for 3531983 caused moves to happen
+	when they should not have, due to childX and childY not being implemented at all on KWQScrollView.
+
+        Reviewed by darin
+	
+        * kwq/KWQScrollView.mm:
+        (QScrollView::childX):
+        (QScrollView::childY):
+
 === Safari-124 ===
 
 2004-01-16  David Hyatt  <hyatt at apple.com>
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index 2794a53..e231ac0 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -157,14 +157,14 @@ int QScrollView::contentsY() const
     return 0;
 }
 
-int QScrollView::childX(QWidget *)
+int QScrollView::childX(QWidget* w)
 {
-    return 0;
+    return w->x();
 }
 
-int QScrollView::childY(QWidget *)
+int QScrollView::childY(QWidget* w)
 {
-    return 0;
+    return w->y();
 }
 
 void QScrollView::scrollBy(int dx, int dy)

-- 
WebKit Debian packaging