Changeset 190102 in webkit

Timestamp:

Sep 21, 2015, 9:27:09 PM (10 years ago)

Author:

timothy_horton@apple.com

Message:

Allow DataDetectors to pre-filter telephone number menu items
​https://bugs.webkit.org/show_bug.cgi?id=149444
<rdar://problem/19286320>

Reviewed by Sam Weinig.

Source/WebCore:

• platform/spi/mac/DataDetectorsSPI.h:

Add some SPI.

Source/WebKit2:

• Platform/mac/MenuUtilities.mm:

(WebKit::menuItemForTelephoneNumber):
(WebKit::menuForTelephoneNumber):
Let DataDetectors know what kind of items we want, so that they can avoid
some unnecessary work in cases where we were just going to throw away the items anyway.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/spi/mac/DataDetectorsSPI.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Platform/mac/MenuUtilities.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-09-21  Timothy Horton  <timothy_horton@apple.com>
+
+        Allow DataDetectors to pre-filter telephone number menu items
+        https://bugs.webkit.org/show_bug.cgi?id=149444
+        <rdar://problem/19286320>
+
+        Reviewed by Sam Weinig.
+
+        * platform/spi/mac/DataDetectorsSPI.h:
+        Add some SPI.
+
 2015-09-21  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h

@@ -47 +47 @@
 @property (assign) BOOL altMode;
 @property (assign) BOOL immediate;
+
+@property (copy) NSArray *allowedActionUTIs;
 
 - (DDActionContext *)contextForView:(NSView *)view altMode:(BOOL)altMode interactionStartedHandler:(void (^)(void))interactionStartedHandler interactionChangedHandler:(void (^)(void))interactionChangedHandler interactionStoppedHandler:(void (^)(void))interactionStoppedHandler;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-09-21  Timothy Horton  <timothy_horton@apple.com>
+
+        Allow DataDetectors to pre-filter telephone number menu items
+        https://bugs.webkit.org/show_bug.cgi?id=149444
+        <rdar://problem/19286320>
+
+        Reviewed by Sam Weinig.
+
+        * Platform/mac/MenuUtilities.mm:
+        (WebKit::menuItemForTelephoneNumber):
+        (WebKit::menuForTelephoneNumber):
+        Let DataDetectors know what kind of items we want, so that they can avoid
+        some unnecessary work in cases where we were just going to throw away the items anyway.
+
 2015-09-21  Gwang Yoon Hwang  <yoon@igalia.com>
 

trunk/Source/WebKit2/Platform/mac/MenuUtilities.mm

@@ -51 +51 @@
 NSMenuItem *menuItemForTelephoneNumber(const String& telephoneNumber)
 {
-    NSArray *proposedMenu = [[getDDActionsManagerClass() sharedManager] menuItemsForValue:(NSString *)telephoneNumber type:getDDBinderPhoneNumberKey() service:nil context:nil];
-    for (NSMenuItem *item in proposedMenu) {
+    RetainPtr<DDActionContext> actionContext = [[getDDActionContextClass() alloc] init];
+    [actionContext setAllowedActionUTIs:@[ @"com.apple.dial" ]];
+
+    NSArray *proposedMenuItems = [[getDDActionsManagerClass() sharedManager] menuItemsForValue:(NSString *)telephoneNumber type:getDDBinderPhoneNumberKey() service:nil context:actionContext.get()];
+    for (NSMenuItem *item in proposedMenuItems) {
         NSDictionary *representedObject = item.representedObject;
         if (![representedObject isKindOfClass:[NSDictionary class]])
@@ -76 +79 @@
     NSMenuItem *dialItem = nil;
 
-    NSArray *proposedMenu = [[getDDActionsManagerClass() sharedManager] menuItemsForValue:(NSString *)telephoneNumber type:getDDBinderPhoneNumberKey() service:nil context:nil];
-    for (NSMenuItem *item in proposedMenu) {
+    RetainPtr<DDActionContext> actionContext = [[getDDActionContextClass() alloc] init];
+    [actionContext setAllowedActionUTIs:@[ @"com.apple.dial", @"com.apple.facetime", @"com.apple.facetimeaudio" ]];
+
+    NSArray *proposedMenuItems = [[getDDActionsManagerClass() sharedManager] menuItemsForValue:(NSString *)telephoneNumber type:getDDBinderPhoneNumberKey() service:nil context:actionContext.get()];
+    for (NSMenuItem *item in proposedMenuItems) {
         NSDictionary *representedObject = item.representedObject;
         if (![representedObject isKindOfClass:[NSDictionary class]])
@@ -86 +92 @@
             continue;
 
-        if ([actionObject.actionUTI hasPrefix:@"com.apple.dial"]) {
+        if ([actionObject.actionUTI hasPrefix:@"com.apple.dial"])
             dialItem = item;
-            continue;
-        }
-
-        if ([actionObject.actionUTI hasPrefix:@"com.apple.facetime"])
+        else if ([actionObject.actionUTI hasPrefix:@"com.apple.facetime"])
             [faceTimeItems addObject:item];
     }