Changeset 176480 in webkit

Timestamp:

Nov 21, 2014, 3:53:13 PM (12 years ago)

Author:

timothy_horton@apple.com

Message:

REGRESSION (r176415): Can get stuck, unable to invoke any DataDetectors popovers
​https://bugs.webkit.org/show_bug.cgi?id=138955
<rdar://problem/19056442>

Reviewed by Anders Carlsson.

• UIProcess/API/mac/WKView.mm:

(-[WKView mouseDown:]):

• UIProcess/mac/WKActionMenuController.h:
• UIProcess/mac/WKActionMenuController.mm:

(-[WKActionMenuController wkView:willHandleMouseDown:]):
(-[WKActionMenuController didCloseMenu:withEvent:]):
(-[WKActionMenuController menuNeedsUpdate:]):
Keep track of whether we have called shouldUseActionsWithContext: on a
DDActionContext; if we get a mouseDown without having seen didCloseMenu:
(and thus don't properly pair the shouldUseActionsWithContext: with a didUseActions),
tear down the old DDActionContext before proceeding.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (1 diff)
• UIProcess/mac/WKActionMenuController.h (modified) (2 diffs)
• UIProcess/mac/WKActionMenuController.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-21  Tim Horton  <timothy_horton@apple.com>
+
+        REGRESSION (r176415): Can get stuck, unable to invoke any DataDetectors popovers
+        https://bugs.webkit.org/show_bug.cgi?id=138955
+        <rdar://problem/19056442>
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView mouseDown:]):
+        * UIProcess/mac/WKActionMenuController.h:
+        * UIProcess/mac/WKActionMenuController.mm:
+        (-[WKActionMenuController wkView:willHandleMouseDown:]):
+        (-[WKActionMenuController didCloseMenu:withEvent:]):
+        (-[WKActionMenuController menuNeedsUpdate:]):
+        Keep track of whether we have called shouldUseActionsWithContext: on a
+        DDActionContext; if we get a mouseDown without having seen didCloseMenu:
+        (and thus don't properly pair the shouldUseActionsWithContext: with a didUseActions),
+        tear down the old DDActionContext before proceeding.
+
 2014-11-21  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -1257 +1257 @@
     [self _setMouseDownEvent:event];
     _data->_ignoringMouseDraggedEvents = NO;
+    [_data->_actionMenuController wkView:self willHandleMouseDown:event];
     [self mouseDownInternal:event];
 }

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

@@ -69 +69 @@
     BOOL _isShowingTextIndicator;
     BOOL _shouldKeepPreviewPopoverOpen;
+    BOOL _hasActivatedActionContext;
 
 #if WK_API_ENABLED
@@ -83 +84 @@
 - (void)willOpenMenu:(NSMenu *)menu withEvent:(NSEvent *)event;
 - (void)didCloseMenu:(NSMenu *)menu withEvent:(NSEvent *)event;
+- (void)wkView:(WKView *)wkView willHandleMouseDown:(NSEvent *)event;
 
 - (void)didPerformActionMenuHitTest:(const WebKit::ActionMenuHitTestResult&)hitTestResult userData:(API::Object*)userData;

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

@@ -164 +164 @@
 }
 
+- (void)wkView:(WKView *)wkView willHandleMouseDown:(NSEvent *)event
+{
+    if (_type == kWKActionMenuDataDetectedItem && _currentActionContext && _hasActivatedActionContext) {
+        [getDDActionsManagerClass() didUseActions];
+        _hasActivatedActionContext = NO;
+    }
+}
+
 - (void)prepareForMenu:(NSMenu *)menu withEvent:(NSEvent *)event
 {
@@ -233 +241 @@
         return;
 
-    if (_type == kWKActionMenuDataDetectedItem) {
-        if (_currentActionContext)
-            [getDDActionsManagerClass() didUseActions];
+    if (_type == kWKActionMenuDataDetectedItem && _currentActionContext && _hasActivatedActionContext) {
+        [getDDActionsManagerClass() didUseActions];
+        _hasActivatedActionContext = NO;
     }
 
@@ -780 +788 @@
         [self _updateActionMenuItems];
 
-    if (_type == kWKActionMenuDataDetectedItem && _currentActionContext && ![getDDActionsManagerClass() shouldUseActionsWithContext:_currentActionContext.get()]) {
-        [menu cancelTracking];
-        [menu removeAllItems];
+    if (_type == kWKActionMenuDataDetectedItem && _currentActionContext) {
+        _hasActivatedActionContext = YES;
+        if (![getDDActionsManagerClass() shouldUseActionsWithContext:_currentActionContext.get()]) {
+            [menu cancelTracking];
+            [menu removeAllItems];
+        }
     }
 }