Changeset 175963 in webkit

Timestamp:

Nov 11, 2014, 11:17:11 AM (12 years ago)

Author:

timothy_horton@apple.com

Message:

Data Detectors popovers should be dismissed upon scrolling
​https://bugs.webkit.org/show_bug.cgi?id=138600
<rdar://problem/18932770>

Reviewed by Beth Dakin.

• platform/spi/mac/DataDetectorsSPI.h:

Adjust the SPI header.

• UIProcess/mac/WKActionMenuController.mm:

(-[WKActionMenuController prepareForMenu:withEvent:]):
Dismiss popovers when we start preparing another menu.

(-[WKActionMenuController dismissActionMenuPopovers]):
Use the new DataDetectors SPI.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/spi/mac/DataDetectorsSPI.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/mac/WKActionMenuController.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-11  Tim Horton  <timothy_horton@apple.com>
+
+        Data Detectors popovers should be dismissed upon scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=138600
+        <rdar://problem/18932770>
+
+        Reviewed by Beth Dakin.
+
+        * platform/spi/mac/DataDetectorsSPI.h:
+        Adjust the SPI header.
+
 2014-11-11  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h

@@ -75 +75 @@
 + (DDActionsManager *)sharedManager;
 - (NSArray *)menuItemsForResult:(DDResultRef)result actionContext:(DDActionContext *)context;
-- (void)unanchorBubbles;
+- (void)requestBubbleClosureUnanchorOnFailure:(BOOL)unanchorOnFailure;
 
 @end

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-11  Tim Horton  <timothy_horton@apple.com>
+
+        Data Detectors popovers should be dismissed upon scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=138600
+        <rdar://problem/18932770>
+
+        Reviewed by Beth Dakin.
+
+        * UIProcess/mac/WKActionMenuController.mm:
+        (-[WKActionMenuController prepareForMenu:withEvent:]):
+        Dismiss popovers when we start preparing another menu.
+
+        (-[WKActionMenuController dismissActionMenuPopovers]):
+        Use the new DataDetectors SPI.
+
 2014-11-11  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm

@@ -177 +177 @@
     }
 
+    [self dismissActionMenuPopovers];
+
     _page->performActionMenuHitTestAtLocation([_wkView convertPoint:event.locationInWindow fromView:nil]);
 
@@ -182 +184 @@
     [self _updateActionMenuItemsForStage:MenuUpdateStage::PrepareForMenu];
 
-    [self _hideTextIndicator];
     _shouldKeepPreviewPopoverOpen = NO;
 }
@@ -244 +245 @@
 - (void)dismissActionMenuPopovers
 {
-    // Ideally, this would actually dismiss the data detector popovers. We don't currently have the ability to request
-    // that and know whether or not it succeeded, so we'll settle for unanchoring.
-    [[getDDActionsManagerClass() sharedManager] unanchorBubbles];
+    [[getDDActionsManagerClass() sharedManager] requestBubbleClosureUnanchorOnFailure:YES];
 
     [self _hideTextIndicator];