Changeset 176351 in webkit

Timestamp:

Nov 19, 2014, 3:00:48 PM (12 years ago)

Author:

Beth Dakin

Message:

Data detected results with no menu items should not fall through to regular text
action menus
​https://bugs.webkit.org/show_bug.cgi?id=138887
-and corresponding-
rdar://problem/18971616

Reviewed by Tim Horton.

Source/WebKit/mac:

• WebView/WebActionMenuController.mm:

(-[WebActionMenuController _defaultMenuItems]):

Source/WebKit2:

• UIProcess/mac/WKActionMenuController.mm:

(-[WKActionMenuController _defaultMenuItems]):

Location:

trunk/Source

Files:

• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebActionMenuController.mm (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/mac/WKActionMenuController.mm (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-11-19  Beth Dakin  <bdakin@apple.com>
+
+        Data detected results with no menu items should not fall through to regular text 
+        action menus
+        https://bugs.webkit.org/show_bug.cgi?id=138887
+        -and corresponding-
+        rdar://problem/18971616
+
+        Reviewed by Tim Horton.
+
+        * WebView/WebActionMenuController.mm:
+        (-[WebActionMenuController _defaultMenuItems]):
+
 2014-11-19  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm

@@ -853 +853 @@
     if (node && node->isTextNode()) {
         NSArray *dataDetectorMenuItems = [self _defaultMenuItemsForDataDetectedText];
-        if (dataDetectorMenuItems.count) {
+        if (_currentActionContext) {
+            // If this is a data detected item with no menu items, we should not fall back to regular text options.
+            if (!dataDetectorMenuItems.count) {
+                _type = WebActionMenuNone;
+                return @[ ];
+            }
             _type = WebActionMenuDataDetectedItem;
             return dataDetectorMenuItems;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-19  Beth Dakin  <bdakin@apple.com>
+
+        Data detected results with no menu items should not fall through to regular text 
+        action menus
+        https://bugs.webkit.org/show_bug.cgi?id=138887
+        -and corresponding-
+        rdar://problem/18971616
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/mac/WKActionMenuController.mm:
+        (-[WKActionMenuController _defaultMenuItems]):
+
 2014-11-19  Daniel Bates  <dabates@apple.com>
 

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

@@ -921 +921 @@
     if (hitTestResult->isTextNode()) {
         NSArray *dataDetectorMenuItems = [self _defaultMenuItemsForDataDetectedText];
-        if (dataDetectorMenuItems.count) {
+        if (_currentActionContext) {
+            // If this is a data detected item with no menu items, we should not fall back to regular text options.
+            if (!dataDetectorMenuItems.count) {
+                _type = kWKActionMenuNone;
+                return @[ ];
+            }
             _type = kWKActionMenuDataDetectedItem;
             return dataDetectorMenuItems;