Title: [183139] branches/safari-600.7-branch/Source/WebKit2
- Revision
- 183139
- Author
- [email protected]
- Date
- 2015-04-22 15:17:45 -0700 (Wed, 22 Apr 2015)
Log Message
Merge r181812. rdar://problem/20557289
Modified Paths
Diff
Modified: branches/safari-600.7-branch/Source/WebKit2/ChangeLog (183138 => 183139)
--- branches/safari-600.7-branch/Source/WebKit2/ChangeLog 2015-04-22 22:10:29 UTC (rev 183138)
+++ branches/safari-600.7-branch/Source/WebKit2/ChangeLog 2015-04-22 22:17:45 UTC (rev 183139)
@@ -1,5 +1,21 @@
2015-04-22 Matthew Hanson <[email protected]>
+ Merge r181812. rdar://problem/20557289
+
+ 2015-03-20 Beth Dakin <[email protected]>
+
+ [Immediate Actions] Should re-enable immediate actions for iBooks
+ https://bugs.webkit.org/show_bug.cgi?id=142915
+ -and corresponding-
+ rdar://problem/19585689
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView initWithFrame:processPool:configuration:webView:]):
+
+2015-04-22 Matthew Hanson <[email protected]>
+
Merge r181656. rdar://problem/20545362
2015-03-17 Timothy Horton <[email protected]>
Modified: branches/safari-600.7-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (183138 => 183139)
--- branches/safari-600.7-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-04-22 22:10:29 UTC (rev 183138)
+++ branches/safari-600.7-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-04-22 22:17:45 UTC (rev 183139)
@@ -3640,9 +3640,7 @@
self.actionMenu.autoenablesItems = NO;
}
- // FIXME: We should not permanently disable this for iBooks. rdar://problem/19585689
- Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer");
- if (gestureClass && !applicationIsIBooks()) {
+ if (Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer")) {
_data->_immediateActionGestureRecognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] initWithTarget:nil action:NULL]);
_data->_immediateActionController = adoptNS([[WKImmediateActionController alloc] initWithPage:*_data->_page view:self recognizer:_data->_immediateActionGestureRecognizer.get()]);
[_data->_immediateActionGestureRecognizer setDelegate:_data->_immediateActionController.get()];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
