Title: [176797] branches/safari-600.3-branch/Source/WebKit/mac
- Revision
- 176797
- Author
- [email protected]
- Date
- 2014-12-04 08:36:02 -0800 (Thu, 04 Dec 2014)
Log Message
Merged r176777. rdar://problems/19115662
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (176796 => 176797)
--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-04 16:35:54 UTC (rev 176796)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-04 16:36:02 UTC (rev 176797)
@@ -1,5 +1,22 @@
2014-12-04 Dana Burkart <[email protected]>
+ Merge r176777. <rdar://problem/19115662>
+
+ 2014-12-03 Timothy Horton <[email protected]>
+
+ 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-04 Dana Burkart <[email protected]>
+
Merge r176775. <rdar://problem/19115662>
2014-12-03 Timothy Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm (176796 => 176797)
--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-12-04 16:35:54 UTC (rev 176796)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-12-04 16:36:02 UTC (rev 176797)
@@ -301,7 +301,7 @@
} interactionStoppedHandler:^() {
}];
- [actionContext setHighlightFrame:elementBoundingBoxInWindowCoordinatesFromNode(node)];
+ [_currentActionContext setHighlightFrame:elementBoundingBoxInWindowCoordinatesFromNode(node)];
return [[getDDActionsManagerClass() sharedManager] menuItemsForTargetURL:_hitTestResult.absoluteLinkURL() actionContext:_currentActionContext.get()];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
