Title: [179351] branches/safari-600.4-branch/Source/WebKit2
- Revision
- 179351
- Author
- [email protected]
- Date
- 2015-01-29 11:34:39 -0800 (Thu, 29 Jan 2015)
Log Message
Merge r179320. rdar://problem/19619999
Modified Paths
Diff
Modified: branches/safari-600.4-branch/Source/WebKit2/ChangeLog (179350 => 179351)
--- branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-29 19:28:08 UTC (rev 179350)
+++ branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-29 19:34:39 UTC (rev 179351)
@@ -1,3 +1,20 @@
+2015-01-29 Matthew Hanson <[email protected]>
+
+ Merge r179320. rdar://problem/19619999
+
+ 2015-01-28 Timothy Horton <[email protected]>
+
+ Avoid manually handling quickLookWithEvent: if the immediate action gesture recognizer will do Lookup for us
+ https://bugs.webkit.org/show_bug.cgi?id=141018
+ <rdar://problem/19619999>
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView quickLookWithEvent:]):
+ If we have an immediate action gesture recognizer, just call super and
+ avoid WebKit's special quickLookWithEvent: implementation.
+
2015-01-27 Babak Shafiei <[email protected]>
Merge r179230.
Modified: branches/safari-600.4-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (179350 => 179351)
--- branches/safari-600.4-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-01-29 19:28:08 UTC (rev 179350)
+++ branches/safari-600.4-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-01-29 19:34:39 UTC (rev 179351)
@@ -2857,6 +2857,13 @@
if (_data->_ignoresNonWheelEvents)
return;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
+ if (_data->_immediateActionGestureRecognizer) {
+ [super quickLookWithEvent:event];
+ return;
+ }
+#endif
+
NSPoint locationInViewCoordinates = [self convertPoint:[event locationInWindow] fromView:nil];
_data->_page->performDictionaryLookupAtLocation(FloatPoint(locationInViewCoordinates.x, locationInViewCoordinates.y));
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
