Changeset 249681 in webkit
- Timestamp:
- Sep 9, 2019 6:01:45 PM (5 years ago)
- Location:
- trunk/Source
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WTF/ChangeLog
r249628 r249681 1 2019-09-09 Tim Horton <timothy_horton@apple.com> 2 3 Clarify some macCatalyst feature flags 4 https://bugs.webkit.org/show_bug.cgi?id=201619 5 <rdar://problem/54615618> 6 7 Reviewed by Megan Gardner. 8 9 * wtf/Platform.h: 10 We prefer specific flags over platform checks. 11 1 12 2019-09-07 David Quesada <david_quesada@apple.com> 2 13 -
trunk/Source/WTF/wtf/Platform.h
r249343 r249681 1556 1556 #if PLATFORM(MACCATALYST) 1557 1557 #define ENABLE_PLATFORM_DRIVEN_TEXT_CHECKING 1 1558 #define HAVE_HOVER_GESTURE_RECOGNIZER 1 1558 1559 #endif 1559 1560 -
trunk/Source/WebKit/ChangeLog
r249675 r249681 1 2019-09-09 Tim Horton <timothy_horton@apple.com> 2 3 Clarify some macCatalyst feature flags 4 https://bugs.webkit.org/show_bug.cgi?id=201619 5 <rdar://problem/54615618> 6 7 Reviewed by Megan Gardner. 8 9 * UIProcess/ios/WKContentViewInteraction.h: 10 * UIProcess/ios/WKContentViewInteraction.mm: 11 (-[WKContentView setupInteraction]): 12 (-[WKContentView cleanupInteraction]): 13 (-[WKContentView _removeDefaultGestureRecognizers]): 14 (-[WKContentView _addDefaultGestureRecognizers]): 15 (-[WKContentView gestureRecognizer:shouldRecognizeSimultaneouslyWithGestureRecognizer:]): 16 (-[WKContentView _showShareSheet:inRect:completionHandler:]): 17 We prefer specific flags over platform checks. 18 1 19 2019-09-09 Chris Dumez <cdumez@apple.com> 2 20 -
trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
r249368 r249681 229 229 230 230 #if PLATFORM(MACCATALYST) 231 RetainPtr<_UILookupGestureRecognizer> _lookupGestureRecognizer; 232 #endif 233 234 #if HAVE(HOVER_GESTURE_RECOGNIZER) 231 235 RetainPtr<UIHoverGestureRecognizer> _hoverGestureRecognizer; 232 RetainPtr<_UILookupGestureRecognizer> _lookupGestureRecognizer;233 236 CGPoint _lastHoverLocation; 234 237 #endif -
trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
r249514 r249681 129 129 130 130 #if PLATFORM(MACCATALYST) 131 #import <UIKit/_UILookupGestureRecognizer.h> 132 #endif 133 134 #if HAVE(HOVER_GESTURE_RECOGNIZER) 131 135 #import "NativeWebMouseEvent.h" 132 136 #import <UIKit/UIHoverGestureRecognizer.h> 133 #import <UIKit/_UILookupGestureRecognizer.h>134 137 #endif 135 138 … … 718 721 [self addGestureRecognizer:_touchEventGestureRecognizer.get()]; 719 722 720 #if PLATFORM(MACCATALYST)723 #if HAVE(HOVER_GESTURE_RECOGNIZER) 721 724 _hoverGestureRecognizer = adoptNS([[UIHoverGestureRecognizer alloc] initWithTarget:self action:@selector(_hoverGestureRecognizerChanged:)]); 722 725 [_hoverGestureRecognizer setDelegate:self]; 723 726 [self addGestureRecognizer:_hoverGestureRecognizer.get()]; 724 727 #endif 728 729 #if PLATFORM(MACCATALYST) 725 730 _lookupGestureRecognizer = adoptNS([[_UILookupGestureRecognizer alloc] initWithTarget:self action:@selector(_lookupGestureRecognized:)]); 726 731 [_lookupGestureRecognizer setDelegate:self]; … … 868 873 [self removeGestureRecognizer:_touchEventGestureRecognizer.get()]; 869 874 870 #if PLATFORM(MACCATALYST)875 #if HAVE(HOVER_GESTURE_RECOGNIZER) 871 876 [_hoverGestureRecognizer setDelegate:nil]; 872 877 [self removeGestureRecognizer:_hoverGestureRecognizer.get()]; 873 878 #endif 879 880 #if PLATFORM(MACCATALYST) 874 881 [_lookupGestureRecognizer setDelegate:nil]; 875 882 [self removeGestureRecognizer:_lookupGestureRecognizer.get()]; … … 979 986 [self removeGestureRecognizer:_twoFingerSingleTapGestureRecognizer.get()]; 980 987 [self removeGestureRecognizer:_stylusSingleTapGestureRecognizer.get()]; 988 #if HAVE(HOVER_GESTURE_RECOGNIZER) 989 [self removeGestureRecognizer:_hoverGestureRecognizer.get()]; 990 #endif 981 991 #if PLATFORM(MACCATALYST) 982 [self removeGestureRecognizer:_hoverGestureRecognizer.get()];983 992 [self removeGestureRecognizer:_lookupGestureRecognizer.get()]; 984 993 #endif … … 999 1008 [self addGestureRecognizer:_twoFingerSingleTapGestureRecognizer.get()]; 1000 1009 [self addGestureRecognizer:_stylusSingleTapGestureRecognizer.get()]; 1010 #if HAVE(HOVER_GESTURE_RECOGNIZER) 1011 [self addGestureRecognizer:_hoverGestureRecognizer.get()]; 1012 #endif 1001 1013 #if PLATFORM(MACCATALYST) 1002 [self addGestureRecognizer:_hoverGestureRecognizer.get()];1003 1014 [self addGestureRecognizer:_lookupGestureRecognizer.get()]; 1004 1015 #endif … … 1882 1893 return YES; 1883 1894 1895 #if HAVE(HOVER_GESTURE_RECOGNIZER) 1896 if ([gestureRecognizer isKindOfClass:[UIHoverGestureRecognizer class]] || [otherGestureRecognizer isKindOfClass:[UIHoverGestureRecognizer class]]) 1897 return YES; 1898 #endif 1899 1884 1900 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000 1885 1901 #if PLATFORM(MACCATALYST) … … 1890 1906 return YES; 1891 1907 1892 if ([gestureRecognizer isKindOfClass:[UIHoverGestureRecognizer class]] || [otherGestureRecognizer isKindOfClass:[UIHoverGestureRecognizer class]])1893 return YES;1894 1895 1908 if (([gestureRecognizer isKindOfClass:[_UILookupGestureRecognizer class]] && [otherGestureRecognizer isKindOfClass:[UILongPressGestureRecognizer class]]) || ([otherGestureRecognizer isKindOfClass:[UILongPressGestureRecognizer class]] && [gestureRecognizer isKindOfClass:[_UILookupGestureRecognizer class]])) 1896 1909 return YES; 1897 1898 1910 #endif 1899 1911 if (isSamePair(gestureRecognizer, otherGestureRecognizer, _highlightLongPressGestureRecognizer.get(), _textSelectionAssistant.get().forcePressGesture)) … … 6227 6239 [_shareSheet setDelegate:self]; 6228 6240 6229 #if PLATFORM(MACCATALYST)6241 #if HAVE(HOVER_GESTURE_RECOGNIZER) 6230 6242 if (!rect) { 6231 6243 auto hoverLocationInWebView = [self convertPoint:_lastHoverLocation toView:_webView]; … … 7515 7527 _page->performDictionaryLookupAtLocation(WebCore::FloatPoint(locationInViewCoordinates)); 7516 7528 } 7517 7529 #endif 7530 7531 #if HAVE(HOVER_GESTURE_RECOGNIZER) 7518 7532 static WebEventFlags webEventFlagsForUIKeyModifierFlags(UIKeyModifierFlags flags) 7519 7533 {
Note: See TracChangeset
for help on using the changeset viewer.