Limit user-agent interactions based on the touch-action property on iOS
authorgraouts@webkit.org <graouts@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 28 Jan 2019 18:35:00 +0000 (18:35 +0000)
committergraouts@webkit.org <graouts@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 28 Jan 2019 18:35:00 +0000 (18:35 +0000)
https://bugs.webkit.org/show_bug.cgi?id=193447

Unreviewed build fix.

* UIProcess/API/Cocoa/WKWebView.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240589 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

index e90a49d..4ab33d8 100644 (file)
@@ -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>
index b987c99..bcb3a2c 100644 (file)
@@ -2628,6 +2628,7 @@ static WebCore::FloatPoint constrainContentOffset(WebCore::FloatPoint contentOff
     [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 @@ static WebCore::FloatPoint constrainContentOffset(WebCore::FloatPoint contentOff
 
     return adjustedContentOffset;
 }
+#endif
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView
 {