Title: [179320] trunk/Source/WebKit2
- Revision
- 179320
- Author
- [email protected]
- Date
- 2015-01-28 17:09:50 -0800 (Wed, 28 Jan 2015)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (179319 => 179320)
--- trunk/Source/WebKit2/ChangeLog 2015-01-29 00:58:13 UTC (rev 179319)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-29 01:09:50 UTC (rev 179320)
@@ -1,3 +1,16 @@
+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-28 Sungmann Cho <[email protected]>
Remove remaining PLATFORM(WIN) code blocks from WebKit2.
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (179319 => 179320)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-01-29 00:58:13 UTC (rev 179319)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-01-29 01:09:50 UTC (rev 179320)
@@ -2855,6 +2855,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
