Title: [256219] branches/safari-609.1.17.2-branch/Source/WebKit
- Revision
- 256219
- Author
- [email protected]
- Date
- 2020-02-10 14:43:51 -0800 (Mon, 10 Feb 2020)
Log Message
Cherry-pick r256105. rdar://problem/59301764
Fix the watchOS build after <rdar://problem/56134081>
https://bugs.webkit.org/show_bug.cgi?id=207443
<rdar://problem/59295173>
Reviewed by Maciej Stachowiak.
Use the version of the SPI that's guaranteed to be available across all platforms.
* UIProcess/ios/WKContentViewInteraction.mm:
(gestureRecognizerModifierFlags):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256105 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609.1.17.2-branch/Source/WebKit/ChangeLog (256218 => 256219)
--- branches/safari-609.1.17.2-branch/Source/WebKit/ChangeLog 2020-02-10 22:42:14 UTC (rev 256218)
+++ branches/safari-609.1.17.2-branch/Source/WebKit/ChangeLog 2020-02-10 22:43:51 UTC (rev 256219)
@@ -1,3 +1,34 @@
+2020-02-10 Russell Epstein <[email protected]>
+
+ Cherry-pick r256105. rdar://problem/59301764
+
+ Fix the watchOS build after <rdar://problem/56134081>
+ https://bugs.webkit.org/show_bug.cgi?id=207443
+ <rdar://problem/59295173>
+
+ Reviewed by Maciej Stachowiak.
+
+ Use the version of the SPI that's guaranteed to be available across all platforms.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (gestureRecognizerModifierFlags):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256105 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-02-09 Wenson Hsieh <[email protected]>
+
+ Fix the watchOS build after <rdar://problem/56134081>
+ https://bugs.webkit.org/show_bug.cgi?id=207443
+ <rdar://problem/59295173>
+
+ Reviewed by Maciej Stachowiak.
+
+ Use the version of the SPI that's guaranteed to be available across all platforms.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (gestureRecognizerModifierFlags):
+
2020-02-05 Russell Epstein <[email protected]>
Cherry-pick r254873. rdar://problem/59161343
Modified: branches/safari-609.1.17.2-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (256218 => 256219)
--- branches/safari-609.1.17.2-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-02-10 22:42:14 UTC (rev 256218)
+++ branches/safari-609.1.17.2-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-02-10 22:43:51 UTC (rev 256219)
@@ -1422,7 +1422,7 @@
inline static UIKeyModifierFlags gestureRecognizerModifierFlags(UIGestureRecognizer *recognizer)
{
- return [recognizer respondsToSelector:@selector(_modifierFlags)] ? recognizer.modifierFlags : 0;
+ return [recognizer respondsToSelector:@selector(_modifierFlags)] ? [recognizer _modifierFlags] : 0;
}
- (void)_webTouchEventsRecognized:(UIWebTouchEventsGestureRecognizer *)gestureRecognizer
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
