Title: [240589] trunk/Source/WebKit
- Revision
- 240589
- Author
- [email protected]
- Date
- 2019-01-28 10:35:00 -0800 (Mon, 28 Jan 2019)
Log Message
Limit user-agent interactions based on the touch-action property on iOS
https://bugs.webkit.org/show_bug.cgi?id=193447
Unreviewed build fix.
* UIProcess/API/Cocoa/WKWebView.mm:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (240588 => 240589)
--- trunk/Source/WebKit/ChangeLog 2019-01-28 17:44:22 UTC (rev 240588)
+++ trunk/Source/WebKit/ChangeLog 2019-01-28 18:35:00 UTC (rev 240589)
@@ -5,6 +5,15 @@
Unreviewed build fix.
+ * UIProcess/API/Cocoa/WKWebView.mm:
+
+2019-01-28 Antoine Quint <[email protected]>
+
+ Limit user-agent interactions based on the touch-action property on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=193447
+
+ Unreviewed build fix.
+
* UIProcess/ios/WKContentViewInteraction.mm:
2019-01-28 Brent Fulgham <[email protected]>
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (240588 => 240589)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2019-01-28 17:44:22 UTC (rev 240588)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2019-01-28 18:35:00 UTC (rev 240589)
@@ -2628,6 +2628,7 @@
[self _didFinishScrolling];
}
+#if ENABLE(POINTER_EVENTS)
- (CGPoint)_scrollView:(UIScrollView *)scrollView adjustedOffsetForOffset:(CGPoint)offset translation:(CGPoint)translation startPoint:(CGPoint)start locationInView:(CGPoint)locationInView horizontalVelocity:(inout double *)hv verticalVelocity:(inout double *)vv
{
if (![_contentView preventsPanningInXAxis] && ![_contentView preventsPanningInYAxis])
@@ -2641,6 +2642,7 @@
return adjustedContentOffset;
}
+#endif
- (void)scrollViewDidScroll:(UIScrollView *)scrollView
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
