Title: [258751] trunk/Source/WebKit
- Revision
- 258751
- Author
- timothy_hor...@apple.com
- Date
- 2020-03-19 21:41:23 -0700 (Thu, 19 Mar 2020)
Log Message
Unable to build WebKit with iOS 13.4 SDK
https://bugs.webkit.org/show_bug.cgi?id=209317
Reviewed by Simon Fraser.
* Platform/spi/ios/UIKitSPI.h:
* UIProcess/ios/WKMouseGestureRecognizer.mm:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (258750 => 258751)
--- trunk/Source/WebKit/ChangeLog 2020-03-20 03:05:51 UTC (rev 258750)
+++ trunk/Source/WebKit/ChangeLog 2020-03-20 04:41:23 UTC (rev 258751)
@@ -1,3 +1,13 @@
+2020-03-19 Tim Horton <timothy_hor...@apple.com>
+
+ Unable to build WebKit with iOS 13.4 SDK
+ https://bugs.webkit.org/show_bug.cgi?id=209317
+
+ Reviewed by Simon Fraser.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/ios/WKMouseGestureRecognizer.mm:
+
2020-03-19 Brent Fulgham <bfulg...@apple.com>
[macoOS] Remove access to 'apple-extension-services' from the WebContent sandbox
Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (258750 => 258751)
--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2020-03-20 03:05:51 UTC (rev 258750)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2020-03-20 04:41:23 UTC (rev 258751)
@@ -228,11 +228,17 @@
kUIKeyboardInputPreProcessed = 1 << 7,
} UIKeyboardInputFlags;
+typedef NS_OPTIONS(NSInteger, UIEventButtonMask) {
+ UIEventButtonMaskPrimary = 1 << 0,
+ UIEventButtonMaskSecondary = 1 << 1,
+};
+
@interface UIEvent ()
- (void *)_hidEvent;
- (NSString *)_unmodifiedInput;
- (NSString *)_modifiedInput;
- (BOOL)_isKeyDown;
+- (UIEventButtonMask)_buttonMask;
@end
typedef enum {
@@ -404,6 +410,11 @@
@interface UIGestureRecognizer ()
@property (nonatomic, readonly, getter=_modifierFlags) UIKeyModifierFlags modifierFlags;
+
+- (void)_hoverEntered:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event;
+- (void)_hoverMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event;
+- (void)_hoverExited:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event;
+- (void)_hoverCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event;
@end
@interface UITapGestureRecognizer ()
@@ -997,6 +1008,7 @@
@interface UIDragInteraction ()
@property (nonatomic, assign, getter=_liftDelay, setter=_setLiftDelay:) NSTimeInterval liftDelay;
+- (void)_setAllowsPointerDragBeforeLiftDelay:(BOOL)allowsPointerDragBeforeLiftDelay;
@end
@interface UIDragItem ()
@@ -1015,6 +1027,9 @@
+ (instancetype)viewWithTitle:(NSString *)title URL:(NSURL *)url;
@end
+@interface _UIParallaxTransitionPanGestureRecognizer : UIScreenEdgePanGestureRecognizer
+@end
+
#endif
@interface UIKeyboardPreferencesController : NSObject
@@ -1149,7 +1164,8 @@
@property (readonly) BOOL isLowConfidence;
@end
-@protocol _UICursorInteractionDelegate;
+@protocol _UICursorInteractionDelegate
+@end
@interface _UICursorInteraction : NSObject <UIInteraction>
- (instancetype)initWithDelegate:(id <_UICursorInteractionDelegate>)delegate;
@@ -1159,6 +1175,7 @@
@interface _UICursorRegion : NSObject <NSCopying>
+ (instancetype)regionWithIdentifier:(id <NSObject>)identifier rect:(CGRect)rect;
+- (id <NSObject>)identifier;
@end
@interface _UICursor : NSObject
@@ -1166,6 +1183,14 @@
+ (instancetype)linkCursor;
@end
+@interface _UICursorStyle : NSObject
++ (instancetype)styleWithCursor:(_UICursor *)cursor constrainedAxes:(UIAxis)axes;
+@end
+
+@interface UITouch ()
+- (BOOL)_isPointerTouch;
+@end
+
#endif // USE(APPLE_INTERNAL_SDK)
#define UIWKDocumentRequestMarkedTextRects (1 << 5)
Modified: trunk/Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.mm (258750 => 258751)
--- trunk/Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.mm 2020-03-20 03:05:51 UTC (rev 258750)
+++ trunk/Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.mm 2020-03-20 04:41:23 UTC (rev 258751)
@@ -30,6 +30,7 @@
#import "NativeWebMouseEvent.h"
#import "UIKitSPI.h"
+#import <pal/spi/ios/GraphicsServicesSPI.h>
#import <wtf/Optional.h>
static OptionSet<WebKit::WebEvent::Modifier> webEventModifiersForUIKeyModifierFlags(UIKeyModifierFlags flags)
@@ -77,8 +78,8 @@
[super setView:view];
- if (view._window) {
- UIHoverEvent *hoverEvent = [UIApp _hoverEventForWindow:view._window];
+ if (view.window) {
+ UIHoverEvent *hoverEvent = [UIApp _hoverEventForWindow:view.window];
[hoverEvent setNeedsHitTestReset];
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
