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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 372ae037813ed1621ff83701125b02a60efeb4a5
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 24 21:26:19 2002 +0000

    	- fixed 3056158 -- REGRESSION: Page up/down should scroll one
    	whole contentView minus at least one readable line of text
    
    	This was broken a while back when the keyboard scrolling code
    	migrated into WebKit.
    
            * WebView.subproj/WebViewPrivate.m:
            (-[WebView _verticalKeyboardScrollAmount]),
            (-[WebView _horizontalKeyboardScrollAmount]):
    	New private methods, return one arrow key's worth of scrolling.
            (-[WebView _scrollLineVertically:]),
            (-[WebView _scrollLineHorizontally:]):
    	Now use the broken-out methods.
            (-[WebView _pageVertically:]),
            (-[WebView _pageHorizontally:]):
    	overlap by one arrow key's worth of scrolling instead of the
    	teensy-weensy one click's worth.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2146 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4aed807..51b74b6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,23 @@
+2002-09-24  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3056158 -- REGRESSION: Page up/down should scroll one 
+	whole contentView minus at least one readable line of text
+
+	This was broken a while back when the keyboard scrolling code
+	migrated into WebKit.
+
+        * WebView.subproj/WebViewPrivate.m:
+        (-[WebView _verticalKeyboardScrollAmount]),
+        (-[WebView _horizontalKeyboardScrollAmount]):
+	New private methods, return one arrow key's worth of scrolling.
+        (-[WebView _scrollLineVertically:]),
+        (-[WebView _scrollLineHorizontally:]):
+	Now use the broken-out methods.
+        (-[WebView _pageVertically:]),
+        (-[WebView _pageHorizontally:]):
+	overlap by one arrow key's worth of scrolling instead of the
+	teensy-weensy one click's worth.
+
 2002-09-24  Chris Blumenberg  <cblu at apple.com>
 
 	Documentation for WebHTMLView
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4aed807..51b74b6 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,23 @@
+2002-09-24  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3056158 -- REGRESSION: Page up/down should scroll one 
+	whole contentView minus at least one readable line of text
+
+	This was broken a while back when the keyboard scrolling code
+	migrated into WebKit.
+
+        * WebView.subproj/WebViewPrivate.m:
+        (-[WebView _verticalKeyboardScrollAmount]),
+        (-[WebView _horizontalKeyboardScrollAmount]):
+	New private methods, return one arrow key's worth of scrolling.
+        (-[WebView _scrollLineVertically:]),
+        (-[WebView _scrollLineHorizontally:]):
+	Now use the broken-out methods.
+        (-[WebView _pageVertically:]),
+        (-[WebView _pageHorizontally:]):
+	overlap by one arrow key's worth of scrolling instead of the
+	teensy-weensy one click's worth.
+
 2002-09-24  Chris Blumenberg  <cblu at apple.com>
 
 	Documentation for WebHTMLView
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 8aa690a..7243c8e 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -105,9 +105,25 @@
     [[self _contentView] scrollPoint: point];
 }
 
+- (float)_verticalKeyboardScrollAmount
+{
+    // verticalLineScroll is quite small, to make scrolling from the scroll bar
+    // arrows relatively smooth. But this seemed too small for scrolling with
+    // the arrow keys, so we bump up the number here. Cheating? Perhaps.
+    return [[self frameScrollView] verticalLineScroll] * 4;
+}
+
+- (float)_horizontalKeyboardScrollAmount
+{
+    // verticalLineScroll is quite small, to make scrolling from the scroll bar
+    // arrows relatively smooth. But this seemed too small for scrolling with
+    // the arrow keys, so we bump up the number here. Cheating? Perhaps.
+    return [[self frameScrollView] horizontalLineScroll] * 4;
+}
+
 - (void)_pageVertically: (BOOL)up
 {
-    float pageOverlap = [[self frameScrollView] verticalPageScroll];
+    float pageOverlap = [self _verticalKeyboardScrollAmount];
     float delta = [[self _contentView] bounds].size.height;
     
     delta = (delta < pageOverlap) ? delta / 2.0 : delta - pageOverlap;
@@ -121,7 +137,7 @@
 
 - (void)_pageHorizontally: (BOOL)left
 {
-    float pageOverlap = [[self frameScrollView] horizontalPageScroll];
+    float pageOverlap = [self _horizontalKeyboardScrollAmount];
     float delta = [[self _contentView] bounds].size.width;
     
     delta = (delta < pageOverlap) ? delta / 2.0 : delta - pageOverlap;
@@ -135,10 +151,7 @@
 
 - (void)_scrollLineVertically: (BOOL)up
 {
-    // verticalLineScroll is quite small, to make scrolling from the scroll bar
-    // arrows relatively smooth. But this seemed too small for scrolling with
-    // the arrow keys, so we bump up the number here. Cheating? Perhaps.
-    float delta = [[self frameScrollView] verticalLineScroll] * 4;
+    float delta = [self _verticalKeyboardScrollAmount];
 
     if (up) {
         delta = -delta;
@@ -149,7 +162,7 @@
 
 - (void)_scrollLineHorizontally: (BOOL)left
 {
-    float delta = [[self frameScrollView] horizontalLineScroll] * 4;
+    float delta = [self _horizontalKeyboardScrollAmount];
 
     if (left) {
         delta = -delta;

-- 
WebKit Debian packaging