Title: [179264] branches/safari-600.5-branch/Source/WebKit2
- Revision
- 179264
- Author
- [email protected]
- Date
- 2015-01-28 10:14:21 -0800 (Wed, 28 Jan 2015)
Log Message
Merge r179023. rdar://problem/19573674
Modified Paths
Diff
Modified: branches/safari-600.5-branch/Source/WebKit2/ChangeLog (179263 => 179264)
--- branches/safari-600.5-branch/Source/WebKit2/ChangeLog 2015-01-28 18:09:00 UTC (rev 179263)
+++ branches/safari-600.5-branch/Source/WebKit2/ChangeLog 2015-01-28 18:14:21 UTC (rev 179264)
@@ -1,5 +1,16 @@
2015-01-28 Matthew <[email protected]>
+ Merge r179023. rdar://problem/19573674
+
+ 2015-01-23 Timothy Horton <[email protected]>
+
+ Fix the pre-Yosemite build.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _dismissContentRelativeChildWindows]):
+
+2015-01-28 Matthew <[email protected]>
+
Merge r179014. rdar://problem/19573674
2015-01-23 Timothy Horton <[email protected]>
Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (179263 => 179264)
--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-01-28 18:09:00 UTC (rev 179263)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-01-28 18:14:21 UTC (rev 179264)
@@ -4342,7 +4342,9 @@
[self _setTextIndicator:nullptr fadeOut:NO];
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
[_data->_immediateActionController dismissContentRelativeChildWindows];
+#endif
static_cast<PageClient&>(*_data->_pageClient).dismissCorrectionPanel(ReasonForDismissingAlternativeTextIgnored);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
