Title: [181018] branches/safari-600.5-branch/Source/WebKit2
- Revision
- 181018
- Author
- [email protected]
- Date
- 2015-03-04 13:21:56 -0800 (Wed, 04 Mar 2015)
Log Message
Merged r180782. rdar://problem/19997159
Modified Paths
Diff
Modified: branches/safari-600.5-branch/Source/WebKit2/ChangeLog (181017 => 181018)
--- branches/safari-600.5-branch/Source/WebKit2/ChangeLog 2015-03-04 21:18:44 UTC (rev 181017)
+++ branches/safari-600.5-branch/Source/WebKit2/ChangeLog 2015-03-04 21:21:56 UTC (rev 181018)
@@ -1,3 +1,21 @@
+2015-03-04 Lucas Forschler <[email protected]>
+
+ Merge r180782
+
+ 2015-02-27 Beth Dakin <[email protected]>
+
+ Lookup panel dismisses when pages are loading in other tabs/windows
+ https://bugs.webkit.org/show_bug.cgi?id=142104
+ -and corresponding-
+ rdar://problem/19882137
+
+ Reviewed by Tim Horton.
+
+ Until rdar://problem/13875766 is resolved, we should only call into Lookup and
+ DataDetectors for key windows.
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _dismissContentRelativeChildWindows]):
+
2015-02-20 Dana Burkart <[email protected]>
Merged r180293. <rdar://problem/19890148>
Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (181017 => 181018)
--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-04 21:18:44 UTC (rev 181017)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-04 21:21:56 UTC (rev 181018)
@@ -4352,12 +4352,14 @@
- (void)_dismissContentRelativeChildWindows
{
// FIXME: We don't know which panel we are dismissing, it may not even be in the current page (see <rdar://problem/13875766>).
- if (Class lookupDefinitionModuleClass = getLULookupDefinitionModuleClass())
- [lookupDefinitionModuleClass hideDefinition];
+ if ([[self window] isKeyWindow]) {
+ if (Class lookupDefinitionModuleClass = getLULookupDefinitionModuleClass())
+ [lookupDefinitionModuleClass hideDefinition];
- DDActionsManager *actionsManager = [getDDActionsManagerClass() sharedManager];
- if ([actionsManager respondsToSelector:@selector(requestBubbleClosureUnanchorOnFailure:)])
- [actionsManager requestBubbleClosureUnanchorOnFailure:YES];
+ DDActionsManager *actionsManager = [getDDActionsManagerClass() sharedManager];
+ if ([actionsManager respondsToSelector:@selector(requestBubbleClosureUnanchorOnFailure:)])
+ [actionsManager requestBubbleClosureUnanchorOnFailure:YES];
+ }
[self _setTextIndicator:nullptr fadeOut:NO];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
