Changeset 185689 in webkit

Timestamp:

Jun 17, 2015, 6:55:35 PM (11 years ago)

Author:

bshafiei@apple.com

Message:

Merged r185684. rdar://problem/21388784

Location:

tags/Safari-601.1.36.1/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (2 diffs)

tags/Safari-601.1.36.1/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-17  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r185684.
+
+    2015-06-17  Yongjun Zhang  <yongjun_zhang@apple.com>
+
+            Also turn off long press on link preview.
+            https://bugs.webkit.org/show_bug.cgi?id=146084
+
+            Also turn off long presss gesture when previewing. Turn that back on when preview is completed.
+
+            Reviewed by Tim Horton.
+
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView willPresentPreviewViewController:forPosition:inSourceView:]):
+            (-[WKContentView didDismissPreviewViewController:committing:]):
+
 2015-06-16  Ryuan Choi  <ryuan.choi@navercorp.com>
 

tags/Safari-601.1.36.1/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

@@ -3154 +3154 @@
 {
     [self removeGestureRecognizer:_touchEventGestureRecognizer.get()];
+    [self removeGestureRecognizer:_longPressGestureRecognizer.get()];
 
     [self _cancelInteraction];
@@ -3162 +3163 @@
 {
     [self addGestureRecognizer:_touchEventGestureRecognizer.get()];
+    [self addGestureRecognizer:_longPressGestureRecognizer.get()];
 
     id<WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);