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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@240589 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index e90a49d..4ab33d8 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -5,6 +5,15 @@
Unreviewed build fix.
+ * UIProcess/API/Cocoa/WKWebView.mm:
+
+2019-01-28 Antoine Quint <graouts@apple.com>
+
+ 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 <bfulgham@apple.com>
diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
index b987c99..bcb3a2c 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
@@ -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
{