Changeset 176570 in webkit

Timestamp:

Nov 28, 2014, 2:10:24 PM (12 years ago)

Author:

timothy_horton@apple.com

Message:

Stale userData is handed to WKView _actionMenuItemsForHitTestResult under prepareForMenu
​https://bugs.webkit.org/show_bug.cgi?id=139069
<rdar://problem/19075587>

Reviewed by Sam Weinig.

• UIProcess/mac/WKActionMenuController.mm:

(-[WKActionMenuController wkView:willHandleMouseDown:]):
(-[WKActionMenuController didCloseMenu:withEvent:]):
(-[WKActionMenuController _clearActionMenuState]):
Previously, _userData was not being cleared in didCloseMenu, so a subsequent
action menu invocation would end up sending stale userData to _actionMenuItemsForHitTestResult.

Additionally, factor all of the cleanup code out into _clearActionMenuState,
and call it from both wkView:willHandleMouseDown: and didCloseMenu:withEvent:.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WKActionMenuController.mm (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-28  Tim Horton  <timothy_horton@apple.com>
+
+        Stale userData is handed to WKView _actionMenuItemsForHitTestResult under prepareForMenu
+        https://bugs.webkit.org/show_bug.cgi?id=139069
+        <rdar://problem/19075587>
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/mac/WKActionMenuController.mm:
+        (-[WKActionMenuController wkView:willHandleMouseDown:]):
+        (-[WKActionMenuController didCloseMenu:withEvent:]):
+        (-[WKActionMenuController _clearActionMenuState]):
+        Previously, _userData was not being cleared in didCloseMenu, so a subsequent
+        action menu invocation would end up sending stale userData to _actionMenuItemsForHitTestResult.
+
+        Additionally, factor all of the cleanup code out into _clearActionMenuState,
+        and call it from both wkView:willHandleMouseDown: and didCloseMenu:withEvent:.
+
 2014-11-26  Timothy Horton  <timothy_horton@apple.com>
 

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

@@ -64 +64 @@
 - (void)_showTextIndicator;
 - (void)_hideTextIndicator;
+- (void)_clearActionMenuState;
 @end
 
@@ -219 +220 @@
 - (void)wkView:(WKView *)wkView willHandleMouseDown:(NSEvent *)event
 {
-    if (_type == kWKActionMenuDataDetectedItem && _currentActionContext && _hasActivatedActionContext) {
-        [getDDActionsManagerClass() didUseActions];
-        _hasActivatedActionContext = NO;
-    }
+    [self _clearActionMenuState];
 }
 
@@ -294 +292 @@
         return;
 
+    [_previewPopover setBehavior:NSPopoverBehaviorTransient];
+    if (!_shouldKeepPreviewPopoverOpen)
+        [self _clearPreviewPopover];
+
+    [self _clearActionMenuState];
+}
+
+- (void)_clearActionMenuState
+{
     if (_type == kWKActionMenuDataDetectedItem && _currentActionContext && _hasActivatedActionContext) {
         [getDDActionsManagerClass() didUseActions];
         _hasActivatedActionContext = NO;
     }
-
-    [_previewPopover setBehavior:NSPopoverBehaviorTransient];
-    if (!_shouldKeepPreviewPopoverOpen)
-        [self _clearPreviewPopover];
 
     _state = ActionMenuState::None;
@@ -308 +311 @@
     _sharingServicePicker = nil;
     _currentActionContext = nil;
+    _userData = nil;
 }