Title: [179352] branches/safari-600.4-branch/Source/WebKit2
- Revision
- 179352
- Author
- [email protected]
- Date
- 2015-01-29 11:34:44 -0800 (Thu, 29 Jan 2015)
Log Message
Merge r179339. rdar://problem/19619999
Modified Paths
Diff
Modified: branches/safari-600.4-branch/Source/WebKit2/ChangeLog (179351 => 179352)
--- branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-29 19:34:39 UTC (rev 179351)
+++ branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-29 19:34:44 UTC (rev 179352)
@@ -1,5 +1,19 @@
2015-01-29 Matthew Hanson <[email protected]>
+ Merge r179339. rdar://problem/19619999
+
+ 2015-01-29 Tim Horton <[email protected]>
+
+ Avoid manually handling quickLookWithEvent: if the immediate action gesture recognizer will do Lookup for us
+ https://bugs.webkit.orgshow_bug.cgi?id=141018
+ <rdar://problem/19619999>
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView quickLookWithEvent:]):
+ Yosemite is 101000, not 10100.
+
+2015-01-29 Matthew Hanson <[email protected]>
+
Merge r179320. rdar://problem/19619999
2015-01-28 Timothy Horton <[email protected]>
Modified: branches/safari-600.4-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (179351 => 179352)
--- branches/safari-600.4-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-01-29 19:34:39 UTC (rev 179351)
+++ branches/safari-600.4-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-01-29 19:34:44 UTC (rev 179352)
@@ -2857,7 +2857,7 @@
if (_data->_ignoresNonWheelEvents)
return;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
if (_data->_immediateActionGestureRecognizer) {
[super quickLookWithEvent:event];
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
