Title: [179198] branches/safari-600.4-branch/Source/WebKit2
- Revision
- 179198
- Author
- [email protected]
- Date
- 2015-01-27 11:41:55 -0800 (Tue, 27 Jan 2015)
Log Message
Merge r179195. rdar://problem/19572685
Modified Paths
Diff
Modified: branches/safari-600.4-branch/Source/WebKit2/ChangeLog (179197 => 179198)
--- branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-27 19:39:22 UTC (rev 179197)
+++ branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-27 19:41:55 UTC (rev 179198)
@@ -1,3 +1,24 @@
+2015-01-27 Matthew Hanson <[email protected]>
+
+ Merge r179195. rdar://problem/19572685
+
+ 2015-01-27 Beth Dakin <[email protected]>
+
+ Invoking an immediate action on link often dismisses selection
+ https://bugs.webkit.org/show_bug.cgi?id=140911
+ -and corresponding-
+ rdar://problem/19572685
+
+ Reviewed by Tim Horton.
+
+ Calling _page->setMaintainsInactiveSelection(false) in complete is often
+ too soon. Instead, call it in dismissContentRelativeChildWindows. This is more
+ similar to the timing for the TextIndicator.
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController dismissContentRelativeChildWindows]):
+ (-[WKImmediateActionController immediateActionRecognizerWillPrepare:]):
+ (-[WKImmediateActionController immediateActionRecognizerDidCompleteAnimation:]):
+
2015-01-26 Matthew Hanson <[email protected]>
Merge r179087. rdar://problem/19571057
Modified: branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (179197 => 179198)
--- branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-27 19:39:22 UTC (rev 179197)
+++ branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-27 19:41:55 UTC (rev 179198)
@@ -147,6 +147,7 @@
- (void)dismissContentRelativeChildWindows
{
+ _page->setMaintainsInactiveSelection(false);
[_currentQLPreviewMenuItem close];
}
@@ -157,10 +158,10 @@
if (immediateActionRecognizer != _immediateActionRecognizer)
return;
+ [_wkView _dismissContentRelativeChildWindows];
+
_page->setMaintainsInactiveSelection(true);
- [_wkView _dismissContentRelativeChildWindows];
-
_page->performActionMenuHitTestAtLocation([immediateActionRecognizer locationInView:immediateActionRecognizer.view], true);
_state = ImmediateActionState::Pending;
@@ -215,7 +216,6 @@
return;
_page->setTextIndicatorAnimationProgress(1);
- _page->setMaintainsInactiveSelection(false);
}
- (PassRefPtr<WebHitTestResult>)_webHitTestResult
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
