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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 999a3261c8df860aca5a23e93d62231dee70ee22
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 5 23:51:48 2002 +0000

            Various scrolling, hit detection, and goto anchor fixes to account for frames being
            translated in scroll views.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@979 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 73a7b95..6729b2c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-04-05  Richard Williamson  <rjw at apple.com>
+
+        Various scrolling, hit detection, and goto anchor fixes to account for frames being
+        translated in scroll views.
+        
+	* src/kwq/KWQScrollView.mm: (QScrollView::setContentsPos),
+	(QScrollView::viewportToContents):
+
 2002-04-05  Chris Blumenberg  <cblu at apple.com>
 
 	* src/kwq/WCPluginWidget.h:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 73a7b95..6729b2c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-04-05  Richard Williamson  <rjw at apple.com>
+
+        Various scrolling, hit detection, and goto anchor fixes to account for frames being
+        translated in scroll views.
+        
+	* src/kwq/KWQScrollView.mm: (QScrollView::setContentsPos),
+	(QScrollView::viewportToContents):
+
 2002-04-05  Chris Blumenberg  <cblu at apple.com>
 
 	* src/kwq/WCPluginWidget.h:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 73a7b95..6729b2c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-04-05  Richard Williamson  <rjw at apple.com>
+
+        Various scrolling, hit detection, and goto anchor fixes to account for frames being
+        translated in scroll views.
+        
+	* src/kwq/KWQScrollView.mm: (QScrollView::setContentsPos),
+	(QScrollView::viewportToContents):
+
 2002-04-05  Chris Blumenberg  <cblu at apple.com>
 
 	* src/kwq/WCPluginWidget.h:
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index 67cb172..59f304c 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -114,11 +114,15 @@ void QScrollView::scrollBy(int dx, int dy)
 
 void QScrollView::setContentsPos(int x, int y)
 {
+    NSView *view = getView();    
+    if ([view isKindOfClass: [NSScrollView class]])
+        view = [(NSScrollView *)view documentView];
+
     if (x < 0)
         x = 0;
     if (y < 0)
         y = 0;
-    [getView() scrollPoint: NSMakePoint (x,y)];
+    [view scrollPoint: NSMakePoint (x,y)];
 }
 
 
@@ -225,8 +229,13 @@ QPoint QScrollView::contentsToViewport(const QPoint &)
 
 void QScrollView::viewportToContents(int vx, int vy, int& x, int& y)
 {
-    NSPoint p = NSMakePoint (vx, vy);
-    NSPoint np = [getView() convertPoint: NSMakePoint (vx, vy) fromView: nil];
+    NSView *view = getView();    
+    if ([view isKindOfClass: [NSScrollView class]])
+        view = [(NSScrollView *)view documentView];
+        
+    NSPoint np = [view convertPoint: NSMakePoint (vx, vy) fromView: nil];
+
+    
     x = (int)np.x;
     y = (int)np.y;
 }
diff --git a/WebCore/src/kwq/KWQScrollView.mm b/WebCore/src/kwq/KWQScrollView.mm
index 67cb172..59f304c 100644
--- a/WebCore/src/kwq/KWQScrollView.mm
+++ b/WebCore/src/kwq/KWQScrollView.mm
@@ -114,11 +114,15 @@ void QScrollView::scrollBy(int dx, int dy)
 
 void QScrollView::setContentsPos(int x, int y)
 {
+    NSView *view = getView();    
+    if ([view isKindOfClass: [NSScrollView class]])
+        view = [(NSScrollView *)view documentView];
+
     if (x < 0)
         x = 0;
     if (y < 0)
         y = 0;
-    [getView() scrollPoint: NSMakePoint (x,y)];
+    [view scrollPoint: NSMakePoint (x,y)];
 }
 
 
@@ -225,8 +229,13 @@ QPoint QScrollView::contentsToViewport(const QPoint &)
 
 void QScrollView::viewportToContents(int vx, int vy, int& x, int& y)
 {
-    NSPoint p = NSMakePoint (vx, vy);
-    NSPoint np = [getView() convertPoint: NSMakePoint (vx, vy) fromView: nil];
+    NSView *view = getView();    
+    if ([view isKindOfClass: [NSScrollView class]])
+        view = [(NSScrollView *)view documentView];
+        
+    NSPoint np = [view convertPoint: NSMakePoint (vx, vy) fromView: nil];
+
+    
     x = (int)np.x;
     y = (int)np.y;
 }

-- 
WebKit Debian packaging