Title: [179272] branches/safari-600.5-branch/Source/WebKit2
- Revision
- 179272
- Author
- [email protected]
- Date
- 2015-01-28 10:48:22 -0800 (Wed, 28 Jan 2015)
Log Message
Merge r179195. rdar://problem/19572685
Modified Paths
Diff
Modified: branches/safari-600.5-branch/Source/WebKit2/ChangeLog (179271 => 179272)
--- branches/safari-600.5-branch/Source/WebKit2/ChangeLog 2015-01-28 18:44:14 UTC (rev 179271)
+++ branches/safari-600.5-branch/Source/WebKit2/ChangeLog 2015-01-28 18:48:22 UTC (rev 179272)
@@ -1,5 +1,26 @@
2015-01-28 Matthew <[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-28 Matthew <[email protected]>
+
Merge r179129. rdar://problem/19489518
2015-01-26 Beth Dakin <[email protected]>
Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (179271 => 179272)
--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-28 18:44:14 UTC (rev 179271)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-28 18:48:22 UTC (rev 179272)
@@ -148,6 +148,7 @@
- (void)dismissContentRelativeChildWindows
{
+ _page->setMaintainsInactiveSelection(false);
[_currentQLPreviewMenuItem close];
}
@@ -158,10 +159,10 @@
if (immediateActionRecognizer != _immediateActionRecognizer)
return;
+ [_wkView _dismissContentRelativeChildWindows];
+
_page->setMaintainsInactiveSelection(true);
- [_wkView _dismissContentRelativeChildWindows];
-
_page->performActionMenuHitTestAtLocation([immediateActionRecognizer locationInView:immediateActionRecognizer.view], true);
_state = ImmediateActionState::Pending;
@@ -216,7 +217,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
