Changeset 242695 in webkit

Timestamp:

Mar 10, 2019, 7:54:55 PM (7 years ago)

Author:

timothy_horton@apple.com

Message:

iOS: Using ⌥ to scroll horizontally is no different than arrow key
​https://bugs.webkit.org/show_bug.cgi?id=195268
<rdar://problem/48326682>

Reviewed by Brent Fulgham.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView keyboardScrollViewAnimator:distanceForIncrement:inDirection:]):
(-[WKContentView keyboardScrollViewAnimator:distanceForIncrement:]): Deleted.

• UIProcess/ios/WKKeyboardScrollingAnimator.h:
• UIProcess/ios/WKKeyboardScrollingAnimator.mm:

(-[WKKeyboardScrollingAnimator keyboardScrollForEvent:]):
(-[WKKeyboardScrollViewAnimator setDelegate:]):
(-[WKKeyboardScrollViewAnimator distanceForIncrement:inDirection:]):
(-[WKKeyboardScrollViewAnimator distanceForIncrement:]): Deleted.
Add a direction parameter to -distanceForIncrement:, so the client
can return a different page/document size based on the scrolling axis.
Adopt it both in the default implementation and in WKContentViewInteraction.
Make the option key scroll by page when scrolling horizontally, like it
does when scrolling vertically.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)
• UIProcess/ios/WKKeyboardScrollingAnimator.h (modified) (2 diffs)
• UIProcess/ios/WKKeyboardScrollingAnimator.mm (modified) (8 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-10  Tim Horton  <timothy_horton@apple.com>
+
+        iOS: Using ⌥ to scroll horizontally is no different than arrow key
+        https://bugs.webkit.org/show_bug.cgi?id=195268
+        <rdar://problem/48326682>
+
+        Reviewed by Brent Fulgham.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView keyboardScrollViewAnimator:distanceForIncrement:inDirection:]):
+        (-[WKContentView keyboardScrollViewAnimator:distanceForIncrement:]): Deleted.
+        * UIProcess/ios/WKKeyboardScrollingAnimator.h:
+        * UIProcess/ios/WKKeyboardScrollingAnimator.mm:
+        (-[WKKeyboardScrollingAnimator keyboardScrollForEvent:]):
+        (-[WKKeyboardScrollViewAnimator setDelegate:]):
+        (-[WKKeyboardScrollViewAnimator distanceForIncrement:inDirection:]):
+        (-[WKKeyboardScrollViewAnimator distanceForIncrement:]): Deleted.
+        Add a direction parameter to -distanceForIncrement:, so the client
+        can return a different page/document size based on the scrolling axis.
+        Adopt it both in the default implementation and in WKContentViewInteraction.
+        Make the option key scroll by page when scrolling horizontally, like it
+        does when scrolling vertically.
+
 2019-03-10  David Quesada  <david_quesada@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -4433 +4433 @@
 }
 
-- (CGFloat)keyboardScrollViewAnimator:(WKKeyboardScrollViewAnimator *)animator distanceForIncrement:(WebKit::ScrollingIncrement)increment
-{
+- (CGFloat)keyboardScrollViewAnimator:(WKKeyboardScrollViewAnimator *)animator distanceForIncrement:(WebKit::ScrollingIncrement)increment inDirection:(WebKit::ScrollingDirection)direction
+{
+    BOOL directionIsHorizontal = direction == WebKit::ScrollingDirection::Left || direction == WebKit::ScrollingDirection::Right;
+
     switch (increment) {
-    case WebKit::ScrollingIncrement::Document:
-        return [self convertRect:self.bounds toView:_webView].size.height;
-    case WebKit::ScrollingIncrement::Page:
-        return [self convertSize:CGSizeMake(0, WebCore::Scrollbar::pageStep(_page->unobscuredContentRect().height(), self.bounds.size.height)) toView:_webView].height;
+    case WebKit::ScrollingIncrement::Document: {
+        CGSize documentSize = [self convertRect:self.bounds toView:_webView].size;
+        return directionIsHorizontal ? documentSize.width : documentSize.height;
+    }
+    case WebKit::ScrollingIncrement::Page: {
+        CGSize pageSize = [self convertSize:CGSizeMake(0, WebCore::Scrollbar::pageStep(_page->unobscuredContentRect().height(), self.bounds.size.height)) toView:_webView];
+        return directionIsHorizontal ? pageSize.width : pageSize.height;
+    }
     case WebKit::ScrollingIncrement::Line:
         return [self convertSize:CGSizeMake(0, WebCore::Scrollbar::pixelsPerLineStep()) toView:_webView].height;

trunk/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.h

@@ -38 +38 @@
 };
 
+enum class ScrollingDirection : uint8_t {
+    Up,
+    Down,
+    Left,
+    Right
+};
+
 }
 
@@ -63 +70 @@
 @optional
 - (BOOL)isScrollableForKeyboardScrollViewAnimator:(WKKeyboardScrollViewAnimator *)animator;
-- (CGFloat)keyboardScrollViewAnimator:(WKKeyboardScrollViewAnimator *)animator distanceForIncrement:(WebKit::ScrollingIncrement)increment;
+- (CGFloat)keyboardScrollViewAnimator:(WKKeyboardScrollViewAnimator *)animator distanceForIncrement:(WebKit::ScrollingIncrement)increment inDirection:(WebKit::ScrollingDirection)direction;
 - (void)keyboardScrollViewAnimatorWillScroll:(WKKeyboardScrollViewAnimator *)animator;
 - (void)keyboardScrollViewAnimatorDidFinishScrolling:(WKKeyboardScrollViewAnimator *)animator;

trunk/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm

@@ -43 +43 @@
 namespace WebKit {
 
-enum class ScrollingDirection : uint8_t { Up, Down, Left, Right };
-
 struct KeyboardScroll {
     WebCore::FloatSize offset; // Points per increment.
@@ -70 +68 @@
 @required
 - (BOOL)isKeyboardScrollable;
-- (CGFloat)distanceForIncrement:(WebKit::ScrollingIncrement)increment;
+- (CGFloat)distanceForIncrement:(WebKit::ScrollingIncrement)increment inDirection:(WebKit::ScrollingDirection)direction;
 - (void)scrollToContentOffset:(WebCore::FloatPoint)offset animated:(BOOL)animated;
 - (void)scrollWithScrollToExtentAnimationTo:(CGPoint)offset;
@@ -234 +232 @@
         case Key::LeftArrow:
         case Key::RightArrow:
+            if (altPressed)
+                return WebKit::ScrollingIncrement::Page;
             return WebKit::ScrollingIncrement::Line;
         case Key::UpArrow:
@@ -272 +272 @@
     }();
 
-    CGFloat scrollDistance = [_scrollable distanceForIncrement:increment];
+    CGFloat scrollDistance = [_scrollable distanceForIncrement:increment inDirection:direction];
 
     WebKit::KeyboardScroll scroll;
@@ -545 +545 @@
 
     _delegateRespondsToIsKeyboardScrollable = [_delegate respondsToSelector:@selector(isScrollableForKeyboardScrollViewAnimator:)];
-    _delegateRespondsToDistanceForIncrement = [_delegate respondsToSelector:@selector(keyboardScrollViewAnimator:distanceForIncrement:)];
+    _delegateRespondsToDistanceForIncrement = [_delegate respondsToSelector:@selector(keyboardScrollViewAnimator:distanceForIncrement:inDirection:)];
     _delegateRespondsToWillScroll = [_delegate respondsToSelector:@selector(keyboardScrollViewAnimatorWillScroll:)];
     _delegateRespondsToDidFinishScrolling = [_delegate respondsToSelector:@selector(keyboardScrollViewAnimatorDidFinishScrolling:)];
@@ -572 +572 @@
 }
 
-- (CGFloat)distanceForIncrement:(WebKit::ScrollingIncrement)increment
+- (CGFloat)distanceForIncrement:(WebKit::ScrollingIncrement)increment inDirection:(WebKit::ScrollingDirection)direction
 {
     auto scrollView = _scrollView.getAutoreleased();
@@ -580 +580 @@
     const CGFloat defaultPageScrollFraction = 0.8;
     const CGFloat defaultLineScrollHeight = 40;
+
+    BOOL directionIsHorizontal = direction == WebKit::ScrollingDirection::Left || direction == WebKit::ScrollingDirection::Right;
 
     if (!_delegateRespondsToDistanceForIncrement) {
         switch (increment) {
         case WebKit::ScrollingIncrement::Document:
-            return scrollView.contentSize.height;
+            return directionIsHorizontal ? scrollView.contentSize.width : scrollView.contentSize.height;
         case WebKit::ScrollingIncrement::Page:
-            return scrollView.frame.size.height * defaultPageScrollFraction;
+            return (directionIsHorizontal ? scrollView.frame.size.width : scrollView.frame.size.height) * defaultPageScrollFraction;
         case WebKit::ScrollingIncrement::Line:
             return defaultLineScrollHeight * scrollView.zoomScale;
@@ -594 +596 @@
     }
 
-    return [_delegate keyboardScrollViewAnimator:self distanceForIncrement:increment];
+    return [_delegate keyboardScrollViewAnimator:self distanceForIncrement:increment inDirection:direction];
 }