Title: [281210] trunk/Source
- Revision
- 281210
- Author
- megan_gard...@apple.com
- Date
- 2021-08-18 14:17:26 -0700 (Wed, 18 Aug 2021)
Log Message
Remove unneeded UIKitSPI declarations
https://bugs.webkit.org/show_bug.cgi?id=210075
Reviewed by Wenson Hsieh.
Source/WebKit:
No code changes, just using the now fully public API.
* Platform/spi/ios/UIKitSPI.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _webTouchEventsRecognized:]):
(-[WKContentView _highlightLongPressRecognized:]):
(-[WKContentView _doubleTapRecognizedForDoubleClick:]):
(-[WKContentView _twoFingerSingleTapGestureRecognized:]):
(-[WKContentView _singleTapRecognized:]):
(gestureRecognizerModifierFlags): Deleted.
Source/WTF:
Remove unneeded feature define.
* wtf/PlatformHave.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (281209 => 281210)
--- trunk/Source/WTF/ChangeLog 2021-08-18 20:21:06 UTC (rev 281209)
+++ trunk/Source/WTF/ChangeLog 2021-08-18 21:17:26 UTC (rev 281210)
@@ -1,3 +1,14 @@
+2021-08-18 Megan Gardner <megan_gard...@apple.com>
+
+ Remove unneeded UIKitSPI declarations
+ https://bugs.webkit.org/show_bug.cgi?id=210075
+
+ Reviewed by Wenson Hsieh.
+
+ Remove unneeded feature define.
+
+ * wtf/PlatformHave.h:
+
2021-08-18 Xabier Rodriguez Calvar <calva...@igalia.com>
[GStreamer][EME] Try to parse XML init datas that could possibly come from MPD manifests
Modified: trunk/Source/WTF/wtf/PlatformHave.h (281209 => 281210)
--- trunk/Source/WTF/wtf/PlatformHave.h 2021-08-18 20:21:06 UTC (rev 281209)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2021-08-18 21:17:26 UTC (rev 281210)
@@ -501,10 +501,6 @@
#define HAVE_UI_POINTER_INTERACTION 1
#endif
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130400) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
-#define HAVE_UI_GESTURE_RECOGNIZER_MODIFIER_FLAGS 1
-#endif
-
#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130400) || PLATFORM(MACCATALYST)
#define HAVE_UIKIT_WITH_MOUSE_SUPPORT 1
#define HAVE_UI_PARALLAX_TRANSITION_GESTURE_RECOGNIZER 1
Modified: trunk/Source/WebKit/ChangeLog (281209 => 281210)
--- trunk/Source/WebKit/ChangeLog 2021-08-18 20:21:06 UTC (rev 281209)
+++ trunk/Source/WebKit/ChangeLog 2021-08-18 21:17:26 UTC (rev 281210)
@@ -1,3 +1,21 @@
+2021-08-18 Megan Gardner <megan_gard...@apple.com>
+
+ Remove unneeded UIKitSPI declarations
+ https://bugs.webkit.org/show_bug.cgi?id=210075
+
+ Reviewed by Wenson Hsieh.
+
+ No code changes, just using the now fully public API.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _webTouchEventsRecognized:]):
+ (-[WKContentView _highlightLongPressRecognized:]):
+ (-[WKContentView _doubleTapRecognizedForDoubleClick:]):
+ (-[WKContentView _twoFingerSingleTapGestureRecognized:]):
+ (-[WKContentView _singleTapRecognized:]):
+ (gestureRecognizerModifierFlags): Deleted.
+
2021-08-18 Youenn Fablet <you...@apple.com>
[MacOS] Use com.apple.webkit.microphone extension to gate microphone access in GPUProcess sandbox
Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (281209 => 281210)
--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2021-08-18 20:21:06 UTC (rev 281209)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2021-08-18 21:17:26 UTC (rev 281210)
@@ -456,12 +456,6 @@
- (CGSize)_legacy_sizeWithFont:(UIFont *)font minFontSize:(CGFloat)minFontSize actualFontSize:(CGFloat *)actualFontSize forWidth:(CGFloat)width lineBreakMode:(NSLineBreakMode)lineBreakMode;
@end
-@interface UIGestureRecognizer ()
-#if PLATFORM(IOS) && !defined(__IPHONE_13_4)
-@property (nonatomic, readonly, getter=_modifierFlags) UIKeyModifierFlags modifierFlags;
-#endif
-@end
-
#if HAVE(UI_HOVER_EVENT_RESPONDABLE)
@protocol _UIHoverEventRespondable <NSObject>
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (281209 => 281210)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2021-08-18 20:21:06 UTC (rev 281209)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2021-08-18 21:17:26 UTC (rev 281210)
@@ -1676,15 +1676,6 @@
return std::nullopt;
}
-inline static UIKeyModifierFlags gestureRecognizerModifierFlags(UIGestureRecognizer *recognizer)
-{
-#if HAVE(UI_GESTURE_RECOGNIZER_MODIFIER_FLAGS)
- return recognizer.modifierFlags;
-#else
- return [recognizer respondsToSelector:@selector(_modifierFlags)] ? [recognizer _modifierFlags] : 0;
-#endif
-}
-
- (BOOL)_touchEventsMustRequireGestureRecognizerToFail:(UIGestureRecognizer *)gestureRecognizer
{
auto webView = self.webView;
@@ -1719,7 +1710,7 @@
}
#if ENABLE(TOUCH_EVENTS)
- WebKit::NativeWebTouchEvent nativeWebTouchEvent { lastTouchEvent, gestureRecognizerModifierFlags(gestureRecognizer) };
+ WebKit::NativeWebTouchEvent nativeWebTouchEvent { lastTouchEvent, gestureRecognizer.modifierFlags };
nativeWebTouchEvent.setCanPreventNativeGestures(_touchEventsCanPreventNativeGestures || [gestureRecognizer isDefaultPrevented]);
[self _handleTouchActionsForTouchEvent:nativeWebTouchEvent];
@@ -3046,7 +3037,7 @@
break;
case UIGestureRecognizerStateEnded:
if (_longPressCanClick && _positionInformation.isElement) {
- [self _attemptSyntheticClickAtLocation:gestureRecognizer.startPoint modifierFlags:gestureRecognizerModifierFlags(gestureRecognizer)];
+ [self _attemptSyntheticClickAtLocation:gestureRecognizer.startPoint modifierFlags:gestureRecognizer.modifierFlags];
[self _finishInteraction];
} else
[self _cancelInteraction];
@@ -3063,7 +3054,7 @@
- (void)_doubleTapRecognizedForDoubleClick:(UITapGestureRecognizer *)gestureRecognizer
{
- _page->handleDoubleTapForDoubleClickAtPoint(WebCore::IntPoint(gestureRecognizer.location), WebKit::webEventModifierFlags(gestureRecognizerModifierFlags(gestureRecognizer)), _layerTreeTransactionIdAtLastInteractionStart);
+ _page->handleDoubleTapForDoubleClickAtPoint(WebCore::IntPoint(gestureRecognizer.location), WebKit::webEventModifierFlags(gestureRecognizer.modifierFlags), _layerTreeTransactionIdAtLastInteractionStart);
}
- (void)_twoFingerSingleTapGestureRecognized:(UITapGestureRecognizer *)gestureRecognizer
@@ -3070,7 +3061,7 @@
{
_isTapHighlightIDValid = YES;
_isExpectingFastSingleTapCommit = YES;
- _page->handleTwoFingerTapAtPoint(WebCore::roundedIntPoint(gestureRecognizer.centroid), WebKit::webEventModifierFlags(gestureRecognizerModifierFlags(gestureRecognizer) | UIKeyModifierCommand), ++_latestTapID);
+ _page->handleTwoFingerTapAtPoint(WebCore::roundedIntPoint(gestureRecognizer.centroid), WebKit::webEventModifierFlags(gestureRecognizer.modifierFlags | UIKeyModifierCommand), ++_latestTapID);
}
- (void)_longPressRecognized:(UILongPressGestureRecognizer *)gestureRecognizer
@@ -3209,7 +3200,7 @@
pointerId = [singleTapTouchIdentifier unsignedIntValue];
m_commitPotentialTapPointerId = pointerId;
}
- _page->commitPotentialTap(WebKit::webEventModifierFlags(gestureRecognizerModifierFlags(gestureRecognizer)), _layerTreeTransactionIdAtLastInteractionStart, pointerId);
+ _page->commitPotentialTap(WebKit::webEventModifierFlags(gestureRecognizer.modifierFlags), _layerTreeTransactionIdAtLastInteractionStart, pointerId);
if (!_isExpectingFastSingleTapCommit)
[self _finishInteraction];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
