Changeset 238474 in webkit

Timestamp:

Nov 25, 2018, 4:05:02 AM (8 years ago)

Author:

timothy_horton@apple.com

Message:

Scrolling and drawing compete for incoming gestures
​https://bugs.webkit.org/show_bug.cgi?id=191940

Reviewed by Wenson Hsieh.

• Platform/spi/ios/PencilKitSPI.h:
• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _initializeWithConfiguration:]):

• UIProcess/ios/WKDrawingView.mm:

(-[WKDrawingView initWithEmbeddedViewID:webPageProxy:]):
Make scrolling and drawing mutually exclusive if editable images
are enabled.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Platform/spi/ios/PencilKitSPI.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• UIProcess/ios/WKDrawingView.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-11-25  Tim Horton  <timothy_horton@apple.com>
+
+        Scrolling and drawing compete for incoming gestures
+        https://bugs.webkit.org/show_bug.cgi?id=191940
+
+        Reviewed by Wenson Hsieh.
+
+        * Platform/spi/ios/PencilKitSPI.h:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _initializeWithConfiguration:]):
+        * UIProcess/ios/WKDrawingView.mm:
+        (-[WKDrawingView initWithEmbeddedViewID:webPageProxy:]):
+        Make scrolling and drawing mutually exclusive if editable images
+        are enabled.
+
 2018-11-24  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/Platform/spi/ios/PencilKitSPI.h

@@ -33 +33 @@
 
 @interface PKCanvasView : UIView
+
+@property (nonatomic, getter=isFingerDrawingEnabled) BOOL fingerDrawingEnabled;
+
 @end
 

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

@@ -666 +666 @@
     [_scrollView setInternalDelegate:self];
     [_scrollView setBouncesZoom:YES];
+
+    if ([_configuration _editableImagesEnabled])
+        [_scrollView panGestureRecognizer].allowedTouchTypes = @[ @(UITouchTypeDirect) ];
 
     _avoidsUnsafeArea = YES;

trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm

@@ -47 +47 @@
     _pencilView = adoptNS([allocPKCanvasViewInstance() initWithFrame:CGRectZero]);
 
+    [_pencilView setFingerDrawingEnabled:NO];
     [_pencilView setUserInteractionEnabled:YES];
     [_pencilView setOpaque:NO];