Changeset 176477 in webkit

Timestamp:

Nov 21, 2014, 3:38:19 PM (12 years ago)

Author:

timothy_horton@apple.com

Message:

REGRESSION (r176351): Parts of apple.com/contact aren't Lookup-able
​​https://bugs.webkit.org/show_bug.cgi?id=138960
<rdar://problem/19056715>

Reviewed by Anders Carlsson.

• UIProcess/mac/WKActionMenuController.mm:

(-[WKActionMenuController _defaultMenuItemsForDataDetectedText]):
(-[WKActionMenuController _defaultMenuItemsForMailtoLink]): Deleted.

• WebView/WebActionMenuController.mm:

(-[WebActionMenuController _defaultMenuItemsForMailtoLink]):
(-[WebActionMenuController _defaultMenuItemsForDataDetectedText]):
Use DataDetectors SPI instead of an explicit blacklist.

• platform/spi/mac/DataDetectorsSPI.h:

Add some DataDetectors SPI.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/spi/mac/DataDetectorsSPI.h (modified) (2 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebActionMenuController.mm (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/mac/WKActionMenuController.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-21  Tim Horton  <timothy_horton@apple.com>
+
+        REGRESSION (r176351): Parts of apple.com/contact aren't Lookup-able
+        ​https://bugs.webkit.org/show_bug.cgi?id=138960
+        <rdar://problem/19056715>
+
+        Reviewed by Anders Carlsson.
+
+        * platform/spi/mac/DataDetectorsSPI.h:
+        Add some DataDetectors SPI.
+
 2014-11-21  Jer Noble  <jer.noble@apple.com>
 

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

@@ -68 +68 @@
 @property (retain) NSArray *allResults;
 @property (retain) __attribute__((NSObject)) DDResultRef mainResult;
-@property (assign) BOOL forActionMenuContent;
+@property (assign) BOOL altMode;
 
 - (DDActionContext *)contextForView:(NSView *)view altMode:(BOOL)altMode interactionStartedHandler:(void (^)(void))interactionStartedHandler interactionChangedHandler:(void (^)(void))interactionChangedHandler interactionStoppedHandler:(void (^)(void))interactionStoppedHandler;
@@ -87 +87 @@
 + (void)didUseActions;
 
+- (BOOL)hasActionsForResult:(DDResultRef)result actionContext:(DDActionContext *)actionContext;
 
 @end

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-11-21  Tim Horton  <timothy_horton@apple.com>
+
+        REGRESSION (r176351): Parts of apple.com/contact aren't Lookup-able
+        ​https://bugs.webkit.org/show_bug.cgi?id=138960
+        <rdar://problem/19056715>
+
+        Reviewed by Anders Carlsson.
+
+        * WebView/WebActionMenuController.mm:
+        (-[WebActionMenuController _defaultMenuItemsForMailtoLink]):
+        (-[WebActionMenuController _defaultMenuItemsForDataDetectedText]):
+        Use DataDetectors SPI instead of an explicit blacklist.
+
 2014-11-21  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -310 +310 @@
 
     RetainPtr<DDActionContext> actionContext = [[getDDActionContextClass() alloc] init];
-    [actionContext setForActionMenuContent:YES];
+    [actionContext setAltMode:YES];
 
     // FIXME: Should this show a yellow highlight?
@@ -573 +573 @@
         return @[ ];
 
-    // Blacklist contact results, because they don't have useful menus. If we
-    // bail here, before setting up _currentActionContext, we'll still allow fallthrough
-    // to ordinary text actions, avoiding mysterious failure when a contact is detected.
-    if (CFEqual(DDResultGetType([actionContext mainResult]), CFSTR("Contact")))
-        return @[ ];
-
+    [actionContext setAltMode:YES];
+    if ([[getDDActionsManagerClass() sharedManager] respondsToSelector:@selector(hasActionsForResult:actionContext:)]) {
+        if (![[getDDActionsManagerClass() sharedManager] hasActionsForResult:[actionContext mainResult] actionContext:actionContext.get()])
+            return @[ ];
+    }
 
     // FIXME: We should hide/show the yellow highlight here.

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-21  Tim Horton  <timothy_horton@apple.com>
+
+        REGRESSION (r176351): Parts of apple.com/contact aren't Lookup-able
+        ​https://bugs.webkit.org/show_bug.cgi?id=138960
+        <rdar://problem/19056715>
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/mac/WKActionMenuController.mm:
+        (-[WKActionMenuController _defaultMenuItemsForDataDetectedText]):
+        (-[WKActionMenuController _defaultMenuItemsForMailtoLink]): Deleted.
+        Use DataDetectors SPI instead of an explicit blacklist.
+
 2014-11-21  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -636 +636 @@
         return @[ ];
 
-    // Blacklist contact results, because they don't have useful menus. If we
-    // bail here, before setting up _currentActionContext, we'll still allow fallthrough
-    // to ordinary text actions, avoiding mysterious failure when a contact is detected.
-    if (CFEqual(DDResultGetType(actionContext.mainResult), CFSTR("Contact")))
-        return @[ ];
+    actionContext.altMode = YES;
+    if ([[getDDActionsManagerClass() sharedManager] respondsToSelector:@selector(hasActionsForResult:actionContext:)]) {
+        if (![[getDDActionsManagerClass() sharedManager] hasActionsForResult:actionContext.mainResult actionContext:actionContext])
+            return @[ ];
+    }
 
     // Ref our WebPageProxy for use in the blocks below.
@@ -756 +756 @@
     // FIXME: Should this show a yellow highlight?
     RetainPtr<DDActionContext> actionContext = [[getDDActionContextClass() alloc] init];
-    [actionContext setForActionMenuContent:YES];
+    [actionContext setAltMode:YES];
     [actionContext setHighlightFrame:[_wkView.window convertRectToScreen:[_wkView convertRect:hitTestResult->elementBoundingBox() toView:nil]]];
     return [[getDDActionsManagerClass() sharedManager] menuItemsForTargetURL:hitTestResult->absoluteLinkURL() actionContext:actionContext.get()];