Changeset 180782 in webkit

Timestamp:

Feb 27, 2015 2:45:33 PM (9 years ago)

Author:

Beth Dakin

Message:

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]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-02-27  Beth Dakin  <bdakin@apple.com>
+
+        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-27  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -4409 +4409 @@
 {
     // 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];
-
-    DDActionsManager *actionsManager = [getDDActionsManagerClass() sharedManager];
-    if ([actionsManager respondsToSelector:@selector(requestBubbleClosureUnanchorOnFailure:)])
-        [actionsManager requestBubbleClosureUnanchorOnFailure:YES];
+    if ([[self window] isKeyWindow]) {
+        if (Class lookupDefinitionModuleClass = getLULookupDefinitionModuleClass())
+            [lookupDefinitionModuleClass hideDefinition];
+
+        DDActionsManager *actionsManager = [getDDActionsManagerClass() sharedManager];
+        if ([actionsManager respondsToSelector:@selector(requestBubbleClosureUnanchorOnFailure:)])
+            [actionsManager requestBubbleClosureUnanchorOnFailure:YES];
+    }
 
     [self _setTextIndicator:nullptr fadeOut:NO];