Title: [261503] branches/safari-610.1.12-branch/Source/WebKit
- Revision
- 261503
- Author
- repst...@apple.com
- Date
- 2020-05-11 16:22:06 -0700 (Mon, 11 May 2020)
Log Message
Cherry-pick r261452. rdar://problem/63055916
Attemp to fix internal iOS build
* Platform/spi/ios/UIKitSPI.h:
- Define @class UIHoverEvent using header if available, else
fall back to local class definition.
- Define methods separately from class definition.
* UIProcess/ios/WKMouseGestureRecognizer.mm:
(-[WKMouseGestureRecognizer setView:]):
- Use new method if it is available.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@261452 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.12-branch/Source/WebKit/ChangeLog (261502 => 261503)
--- branches/safari-610.1.12-branch/Source/WebKit/ChangeLog 2020-05-11 23:19:37 UTC (rev 261502)
+++ branches/safari-610.1.12-branch/Source/WebKit/ChangeLog 2020-05-11 23:22:06 UTC (rev 261503)
@@ -1,3 +1,31 @@
+2020-05-11 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r261452. rdar://problem/63055916
+
+ Attemp to fix internal iOS build
+
+ * Platform/spi/ios/UIKitSPI.h:
+ - Define @class UIHoverEvent using header if available, else
+ fall back to local class definition.
+ - Define methods separately from class definition.
+ * UIProcess/ios/WKMouseGestureRecognizer.mm:
+ (-[WKMouseGestureRecognizer setView:]):
+ - Use new method if it is available.
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@261452 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-05-09 David Kilzer <ddkil...@apple.com>
+
+ Attemp to fix internal iOS build
+
+ * Platform/spi/ios/UIKitSPI.h:
+ - Define @class UIHoverEvent using header if available, else
+ fall back to local class definition.
+ - Define methods separately from class definition.
+ * UIProcess/ios/WKMouseGestureRecognizer.mm:
+ (-[WKMouseGestureRecognizer setView:]):
+ - Use new method if it is available.
+
2020-05-08 Alan Coon <alanc...@apple.com>
Revert r260642. rdar://problem/63037576
Modified: branches/safari-610.1.12-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h (261502 => 261503)
--- branches/safari-610.1.12-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2020-05-11 23:19:37 UTC (rev 261502)
+++ branches/safari-610.1.12-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2020-05-11 23:22:06 UTC (rev 261503)
@@ -133,6 +133,13 @@
#import <UIKit/_UICursorStyle_Private.h>
#endif
+#if __has_include(<UIKit/UIHoverEvent_Private.h>)
+#import <UIKit/UIHoverEvent_Private.h>
+#else
+@interface UIHoverEvent : UIEvent
+@end
+#endif
+
#else // USE(APPLE_INTERNAL_SDK)
#if ENABLE(DRAG_SUPPORT)
@@ -1212,6 +1219,9 @@
- (BOOL)_isPointerTouch;
@end
+@interface UIHoverEvent : UIEvent
+@end
+
#endif // USE(APPLE_INTERNAL_SDK)
#define UIWKDocumentRequestMarkedTextRects (1 << 5)
@@ -1293,8 +1303,12 @@
@property (nonatomic, readonly, getter=_modifierFlags) UIKeyModifierFlags modifierFlags;
@end
-@interface UIHoverEvent : UIEvent
+@interface UIHoverEvent (IPI)
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 140000 || PLATFORM(MACCATALYST)
- (void)setNeedsHitTestReset;
+#else
+- (void)setNeedsHitTestResetForWindow:(UIWindow *)window;
+#endif
@end
@interface UIApplication (IPI)
Modified: branches/safari-610.1.12-branch/Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.mm (261502 => 261503)
--- branches/safari-610.1.12-branch/Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.mm 2020-05-11 23:19:37 UTC (rev 261502)
+++ branches/safari-610.1.12-branch/Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.mm 2020-05-11 23:22:06 UTC (rev 261503)
@@ -80,7 +80,11 @@
if (view.window) {
UIHoverEvent *hoverEvent = [UIApp _hoverEventForWindow:view.window];
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 140000 || PLATFORM(MACCATALYST)
[hoverEvent setNeedsHitTestReset];
+#else
+ [hoverEvent setNeedsHitTestResetForWindow:view.window];
+#endif
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
