Implement action menus for tel: URLs

https://bugs.webkit.org/show_bug.cgi?id=139240
<rdar://problem/19115662>

Reviewed by Anders Carlsson.

* WebView/WebActionMenuController.mm:
(-[WebActionMenuController _defaultMenuItemsForDataDetectableLink]):
Make sure to use the newly created currentActionContext... everywhere.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@176777 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 2ffa0e397020cda772ab0247ee8b60da44aa7152..5e91d27b1d4c56477b7f9322b9b0956ce0c0a49a 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2014-12-03  Timothy Horton  <timothy_horton@apple.com>
+
+        Implement action menus for tel: URLs
+        https://bugs.webkit.org/show_bug.cgi?id=139240
+        <rdar://problem/19115662>
+
+        Reviewed by Anders Carlsson.
+
+        * WebView/WebActionMenuController.mm:
+        (-[WebActionMenuController _defaultMenuItemsForDataDetectableLink]):
+        Make sure to use the newly created currentActionContext... everywhere.
+
 2014-12-03  Timothy Horton  <timothy_horton@apple.com>
 
         Implement action menus for tel: URLs

diff --git a/Source/WebKit/mac/WebView/WebActionMenuController.mm b/Source/WebKit/mac/WebView/WebActionMenuController.mm
index 6be702c0dc5072219d953fb0f54a26c1adea3f12..7d684802dcd7507239994fe4b9c914626c4c8fc0 100644 (file)
--- a/Source/WebKit/mac/WebView/WebActionMenuController.mm
+++ b/Source/WebKit/mac/WebView/WebActionMenuController.mm
@@ -300,7 +300,7 @@ static IntRect elementBoundingBoxInWindowCoordinatesFromNode(Node* node)
     } interactionStoppedHandler:^() {
     }];
 
-    [actionContext setHighlightFrame:elementBoundingBoxInWindowCoordinatesFromNode(node)];
+    [_currentActionContext setHighlightFrame:elementBoundingBoxInWindowCoordinatesFromNode(node)];
 
     return [[getDDActionsManagerClass() sharedManager] menuItemsForTargetURL:_hitTestResult.absoluteLinkURL() actionContext:_currentActionContext.get()];
 }