Attachment 371878 Details for Bug 198767 – Patch

[patch] Patch

bug-198767-20190611141305.patch (text/plain), 3.05 KB, created by Megan Gardner on 2019-06-11 14:13:06 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Megan Gardner

Created: 2019-06-11 14:13:06 PDT

Size: 3.05 KB

patch

obsolete

>Subversion Revision: 246287
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index f6b7f042419051872dbcede8a22fa68b4b0b7c1b..b9ec65a45a7cc72ed7cc5e8e40545c1b429ce6f4 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-06-11  Megan Gardner  <megan_gardner@apple.com>
>+
>+        Integrate scrollbar gestures for iOS
>+        https://bugs.webkit.org/show_bug.cgi?id=198767
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/ios/WKContentViewInteraction.mm:
>+        (_WKGestureRecognizerIsBuiltInScrollViewGestureRecognizer):
>+        (-[WKContentView gestureRecognizer:canPreventGestureRecognizer:]):
>+
> 2019-06-10  Sam Weinig  <weinig@apple.com>
> 
>         Remove Dashboard support
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>index ca87bf3d2e6baf129c3f2191553d83551a7f8a16..dfbb9b18e94961fbd4959922d5cb656603818fea 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>@@ -1755,21 +1755,24 @@ - (CGRect)_selectionClipRect
>     return _page->editorState().postLayoutData().focusedElementRect;
> }
> 
>-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKContentViewInteractionWKInteraction.mm>)
>-#include <WebKitAdditions/WKContentViewInteractionWKInteraction.mm>
>-#else
>+static BOOL _WKGestureRecognizerIsBuiltInScrollViewGestureRecognizer(UIGestureRecognizer *recognizer)
>+{
>+    return ([recognizer isKindOfClass:NSClassFromString(@"UIScrollViewPanGestureRecognizer")]
>+        || [recognizer isKindOfClass:NSClassFromString(@"UIScrollViewPinchGestureRecognizer")]
>+        || [recognizer isKindOfClass:NSClassFromString(@"UIScrollViewKnobLongPressGestureRecognizer")]
>+        );
>+}
> 
> - (BOOL)gestureRecognizer:(UIGestureRecognizer *)preventingGestureRecognizer canPreventGestureRecognizer:(UIGestureRecognizer *)preventedGestureRecognizer
> {
>     // A long-press gesture can not be recognized while panning, but a pan can be recognized
>     // during a long-press gesture.
>     BOOL shouldNotPreventScrollViewGestures = preventingGestureRecognizer == _highlightLongPressGestureRecognizer || preventingGestureRecognizer == _longPressGestureRecognizer;
>-    return !(shouldNotPreventScrollViewGestures
>-        && ([preventedGestureRecognizer isKindOfClass:NSClassFromString(@"UIScrollViewPanGestureRecognizer")] || [preventedGestureRecognizer isKindOfClass:NSClassFromString(@"UIScrollViewPinchGestureRecognizer")]));
>+    BOOL conflictsWithBuiltInGesture = _WKGestureRecognizerIsBuiltInScrollViewGestureRecognizer(preventedGestureRecognizer);
>+    
>+    return !(shouldNotPreventScrollViewGestures && conflictsWithBuiltInGesture);
> }
> 
>-#endif
>-
> - (BOOL)gestureRecognizer:(UIGestureRecognizer *)preventedGestureRecognizer canBePreventedByGestureRecognizer:(UIGestureRecognizer *)preventingGestureRecognizer {
>     // Don't allow the highlight to be prevented by a selection gesture. Press-and-hold on a link should highlight the link, not select it.
>     bool isForcePressGesture = NO;

Flags:

wenson_hsieh: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 198767: 371878 | 371883