<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[176463] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/176463">176463</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-11-21 12:28:15 -0800 (Fri, 21 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/176351">r176351</a>): 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 <a href="http://trac.webkit.org/projects/webkit/changeset/176351">r176351</a> was intended to fix,
because in that case we were detecting e.g. addresses.
* platform/spi/mac/DataDetectorsSPI.h:
Softlink some SPI.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacDataDetectorsSPIh">trunk/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebActionMenuControllermm">trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKActionMenuControllermm">trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176462 => 176463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-21 20:18:29 UTC (rev 176462)
+++ trunk/Source/WebCore/ChangeLog 2014-11-21 20:28:15 UTC (rev 176463)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-11-21 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Move TextIndicator{Window} to WebCore
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138954
</span><span class="cx"> <rdar://problem/18992185>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacDataDetectorsSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h (176462 => 176463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2014-11-21 20:18:29 UTC (rev 176462)
+++ trunk/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2014-11-21 20:28:15 UTC (rev 176463)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> SOFT_LINK(DataDetectorsCore, DDScannerScanQuery, DDScanQueryRef, (DDScannerRef scanner, DDScanQueryRef query), (scanner, query))
</span><span class="cx"> SOFT_LINK(DataDetectorsCore, DDScannerCopyResultsWithOptions, CFArrayRef, (DDScannerRef scanner, DDScannerCopyResultsOptions options), (scanner, options))
</span><span class="cx"> SOFT_LINK(DataDetectorsCore, DDResultGetRange, CFRange, (DDResultRef result), (result))
</span><ins>+SOFT_LINK(DataDetectorsCore, DDResultGetType, CFStringRef, (DDResultRef result), (result))
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (176462 => 176463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-11-21 20:18:29 UTC (rev 176462)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-21 20:28:15 UTC (rev 176463)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+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.
+
</ins><span class="cx"> 2014-11-21 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the Timer parameters from timer callbacks
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm (176462 => 176463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-21 20:18:29 UTC (rev 176462)
+++ trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-21 20:28:15 UTC (rev 176463)
</span><span class="lines">@@ -572,6 +572,13 @@
</span><span class="cx"> if (!actionContext || !detectedDataRange)
</span><span class="cx"> return @[ ];
</span><span class="cx">
</span><ins>+ // 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 @[ ];
+
+
</ins><span class="cx"> // FIXME: We should hide/show the yellow highlight here.
</span><span class="cx"> _currentActionContext = [actionContext contextForView:_webView altMode:YES interactionStartedHandler:^() {
</span><span class="cx"> } interactionChangedHandler:^() {
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176462 => 176463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-21 20:18:29 UTC (rev 176462)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-21 20:28:15 UTC (rev 176463)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-11-21 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Move TextIndicator{Window} to WebCore
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138954
</span><span class="cx"> <rdar://problem/18992185>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176462 => 176463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-21 20:18:29 UTC (rev 176462)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-21 20:28:15 UTC (rev 176463)
</span><span class="lines">@@ -635,6 +635,12 @@
</span><span class="cx"> if (!actionContext)
</span><span class="cx"> return @[ ];
</span><span class="cx">
</span><ins>+ // 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 @[ ];
+
</ins><span class="cx"> // Ref our WebPageProxy for use in the blocks below.
</span><span class="cx"> RefPtr<WebPageProxy> page = _page;
</span><span class="cx"> PageOverlay::PageOverlayID overlayID = _hitTestResult.detectedDataOriginatingPageOverlay;
</span></span></pre>
</div>
</div>
</body>
</html>