Changeset 176463 in webkit

Timestamp:

Nov 21, 2014, 12:28:15 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 Beth Dakin.

• UIProcess/mac/WKActionMenuController.mm:

(-[WKActionMenuController _defaultMenuItemsForDataDetectedText]):

• WebView/WebActionMenuController.mm:

(-[WebActionMenuController _defaultMenuItemsForDataDetectedText]):
Blacklist contact results, because they don't have useful menus. If we
bail before setting up _currentActionContext, we'll still allow fallthrough
to ordinary text actions, avoiding mysterious failure when a contact is detected.

This doesn't break the case that r176351 was intended to fix,
because in that case we were detecting e.g. addresses.

• platform/spi/mac/DataDetectorsSPI.h:

Softlink some SPI.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/spi/mac/DataDetectorsSPI.h (modified) (1 diff)
• 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/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 Beth Dakin.
+
+        * platform/spi/mac/DataDetectorsSPI.h:
+        Softlink some SPI.
+
 2014-11-21  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -56 +56 @@
 SOFT_LINK(DataDetectorsCore, DDScannerCopyResultsWithOptions, CFArrayRef, (DDScannerRef scanner, DDScannerCopyResultsOptions options), (scanner, options))
 SOFT_LINK(DataDetectorsCore, DDResultGetRange, CFRange, (DDResultRef result), (result))
+SOFT_LINK(DataDetectorsCore, DDResultGetType, CFStringRef, (DDResultRef result), (result))
 
 }

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 Beth Dakin.
+
+        * WebView/WebActionMenuController.mm:
+        (-[WebActionMenuController _defaultMenuItemsForDataDetectedText]):
+        Blacklist contact results, because they don't have useful menus. If we
+        bail before setting up _currentActionContext, we'll still allow fallthrough
+        to ordinary text actions, avoiding mysterious failure when a contact is detected.
+
+        This doesn't break the case that r176351 was intended to fix,
+        because in that case we were detecting e.g. addresses.
+
 2014-11-21  Anders Carlsson  <andersca@apple.com>
 

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

@@ -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 @[ ];
+
+
     // FIXME: We should hide/show the yellow highlight here.
     _currentActionContext = [actionContext contextForView:_webView altMode:YES interactionStartedHandler:^() {

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 Beth Dakin.
+
+        * UIProcess/mac/WKActionMenuController.mm:
+        (-[WKActionMenuController _defaultMenuItemsForDataDetectedText]):
+        Blacklist contact results, because they don't have useful menus. If we
+        bail before setting up _currentActionContext, we'll still allow fallthrough
+        to ordinary text actions, avoiding mysterious failure when a contact is detected.
+
+        This doesn't break the case that r176351 was intended to fix,
+        because in that case we were detecting e.g. addresses.
+
 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 @[ ];
+
     // Ref our WebPageProxy for use in the blocks below.
     RefPtr<WebPageProxy> page = _page;