Title: [178090] branches/safari-600.4-branch/Source/WebKit2
- Revision
- 178090
- Author
- matthew_han...@apple.com
- Date
- 2015-01-07 20:17:41 -0800 (Wed, 07 Jan 2015)
Log Message
Merged r177928. rdar://problems/19298391
Modified Paths
Diff
Modified: branches/safari-600.4-branch/Source/WebKit2/ChangeLog (178089 => 178090)
--- branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-08 04:17:40 UTC (rev 178089)
+++ branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-08 04:17:41 UTC (rev 178090)
@@ -1,5 +1,21 @@
2015-01-07 Matthew Hanson <matthew_han...@apple.com>
+ Merge r177928. rdar://problem/19298391
+
+ 2015-01-05 Timothy Horton <timothy_hor...@apple.com>
+
+ Implicitly dismissed DD popovers don't clear immediate action state, prematurely dismissing the next DD highlight
+ https://bugs.webkit.org/show_bug.cgi?id=140088
+ <rdar://problem/19298391>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController _menuItemForDataDetectedText]):
+ Instead of just tearing down the TextIndicator, clear all state.
+
+2015-01-07 Matthew Hanson <matthew_han...@apple.com>
+
Merge r177754. rdar://problem/19343307
2014-12-26 Conrad Shultz <conrad_shu...@apple.com>
Modified: branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (178089 => 178090)
--- branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-08 04:17:40 UTC (rev 178089)
+++ branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-08 04:17:41 UTC (rev 178090)
@@ -312,7 +312,7 @@
page->send(Messages::WebPage::DataDetectorsDidChangeUI(overlayID));
} interactionStoppedHandler:^() {
page->send(Messages::WebPage::DataDetectorsDidHideUI(overlayID));
- page->clearTextIndicator();
+ [self _clearImmediateActionState];
}];
[_currentActionContext setHighlightFrame:[_wkView.window convertRectToScreen:[_wkView convertRect:_hitTestResult.detectedDataBoundingBox toView:nil]]];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
