Title: [188153] branches/safari-601.1.46-branch/Source/WebKit2
- Revision
- 188153
- Author
- [email protected]
- Date
- 2015-08-07 13:15:38 -0700 (Fri, 07 Aug 2015)
Log Message
Merged r188109. <rdar://problem/22128839>
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (188152 => 188153)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-07 20:14:32 UTC (rev 188152)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-07 20:15:38 UTC (rev 188153)
@@ -1,5 +1,20 @@
2015-08-07 Lucas Forschler <[email protected]>
+ Merge r188109
+
+ 2015-08-06 Enrica Casucci <[email protected]>
+
+ Cleanup action sheet only when long press is canceled (non ended).
+ https://bugs.webkit.org/show_bug.cgi?id=147766
+ rdar://problem/22181842
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _longPressRecognized:]):
+
+2015-08-07 Lucas Forschler <[email protected]>
+
Merge r188058
2015-08-06 Enrica Casucci <[email protected]>
Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (188152 => 188153)
--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-07 20:14:32 UTC (rev 188152)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-07 20:15:38 UTC (rev 188153)
@@ -1094,7 +1094,6 @@
}
break;
case UIGestureRecognizerStateCancelled:
- case UIGestureRecognizerStateEnded:
[_actionSheetAssistant cleanupSheet];
break;
default:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
