<!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>[197976] 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/197976">197976</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2016-03-10 17:06:48 -0800 (Thu, 10 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Expose additional WKDataDetectorTypes.
https://bugs.webkit.org/show_bug.cgi?id=155331
rdar://problem/24175813
Reviewed by Tim Horton.
Source/WebCore:
Adding support for additional data detector types (tracking
numbers, flight information and spotlight suggestions).
* editing/cocoa/DataDetection.h:
* editing/cocoa/DataDetection.mm:
(WebCore::constructURLStringForResult):
(WebCore::DataDetection::detectContentInRange):
* platform/cocoa/DataDetectorsCoreSoftLink.h:
* platform/cocoa/DataDetectorsCoreSoftLink.mm:
* platform/spi/cocoa/DataDetectorsCoreSPI.h:
Source/WebKit2:
Adding API to enable data detection of tracking numbers,
flight number and spotlight suggestions.
* UIProcess/API/Cocoa/WKWebView.mm:
(fromWKDataDetectorTypes):
* UIProcess/API/Cocoa/WKWebViewConfiguration.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaDataDetectionh">trunk/Source/WebCore/editing/cocoa/DataDetection.h</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaDataDetectionmm">trunk/Source/WebCore/editing/cocoa/DataDetection.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaDataDetectorsCoreSoftLinkh">trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaDataDetectorsCoreSoftLinkmm">trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaDataDetectorsCoreSPIh">trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197975 => 197976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-11 01:03:38 UTC (rev 197975)
+++ trunk/Source/WebCore/ChangeLog 2016-03-11 01:06:48 UTC (rev 197976)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-03-10 Enrica Casucci <enrica@apple.com>
+
+ Expose additional WKDataDetectorTypes.
+ https://bugs.webkit.org/show_bug.cgi?id=155331
+ rdar://problem/24175813
+
+ Reviewed by Tim Horton.
+
+ Adding support for additional data detector types (tracking
+ numbers, flight information and spotlight suggestions).
+
+ * editing/cocoa/DataDetection.h:
+ * editing/cocoa/DataDetection.mm:
+ (WebCore::constructURLStringForResult):
+ (WebCore::DataDetection::detectContentInRange):
+ * platform/cocoa/DataDetectorsCoreSoftLink.h:
+ * platform/cocoa/DataDetectorsCoreSoftLink.mm:
+ * platform/spi/cocoa/DataDetectorsCoreSPI.h:
+
</ins><span class="cx"> 2016-03-10 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> CSP: Implement frame-ancestors directive
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaDataDetectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/DataDetection.h (197975 => 197976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/DataDetection.h 2016-03-11 01:03:38 UTC (rev 197975)
+++ trunk/Source/WebCore/editing/cocoa/DataDetection.h 2016-03-11 01:06:48 UTC (rev 197976)
</span><span class="lines">@@ -46,8 +46,9 @@
</span><span class="cx"> DataDetectorTypeLink = 1 << 1,
</span><span class="cx"> DataDetectorTypeAddress = 1 << 2,
</span><span class="cx"> DataDetectorTypeCalendarEvent = 1 << 3,
</span><del>- DataDetectorTypeTrackingNumber = 1 << 4, // Not individually selectable with the API
- DataDetectorTypeFlight = 1 << 5, // Not individually selectable with the API
</del><ins>+ DataDetectorTypeTrackingNumber = 1 << 4,
+ DataDetectorTypeFlightNumber = 1 << 5,
+ DataDetectorTypeSpotlightSuggestion = 1 << 6,
</ins><span class="cx"> DataDetectorTypeAll = ULONG_MAX
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaDataDetectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/DataDetection.mm (197975 => 197976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2016-03-11 01:03:38 UTC (rev 197975)
+++ trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2016-03-11 01:06:48 UTC (rev 197976)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #import "VisiblePosition.h"
</span><span class="cx"> #import "VisibleUnits.h"
</span><span class="cx"> #import "htmlediting.h"
</span><ins>+#import <WebKitAdditions/DataDetectorsAdditions.h>
</ins><span class="cx">
</span><span class="cx"> const char *dataDetectorsURLScheme = "x-apple-data-detectors";
</span><span class="cx"> const char *dataDetectorsAttributeTypeKey = "x-apple-data-detectors-type";
</span><span class="lines">@@ -199,7 +200,8 @@
</span><span class="cx">
</span><span class="cx"> if (((detectionTypes & DataDetectorTypeAddress) && (DDResultCategoryAddress == category))
</span><span class="cx"> || ((detectionTypes & DataDetectorTypeTrackingNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderTrackingNumberKey(), type, 0) == kCFCompareEqualTo))
</span><del>- || ((detectionTypes & DataDetectorTypeFlight) && (CFStringCompare(get_DataDetectorsCore_DDBinderFlightInformationKey(), type, 0) == kCFCompareEqualTo))
</del><ins>+ || ((detectionTypes & DataDetectorTypeFlightNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderFlightInformationKey(), type, 0) == kCFCompareEqualTo))
+ || ((detectionTypes & DataDetectorTypeSpotlightSuggestion) && (CFStringCompare(DDBinderSpotlightSourceKey, type, 0) == kCFCompareEqualTo))
</ins><span class="cx"> || ((detectionTypes & DataDetectorTypePhoneNumber) && (DDResultCategoryPhoneNumber == category))
</span><span class="cx"> || ((detectionTypes & DataDetectorTypeLink) && resultIsURL(currentResult))) {
</span><span class="cx">
</span><span class="lines">@@ -427,6 +429,9 @@
</span><span class="cx"> RetainPtr<DDScanQueryRef> scanQuery = adoptCF(softLink_DataDetectorsCore_DDScanQueryCreate(NULL));
</span><span class="cx"> buildQuery(scanQuery.get(), contextRange.get());
</span><span class="cx">
</span><ins>+ if (types & DataDetectorTypeSpotlightSuggestion)
+ softLink_DataDetectorsCore_DDScannerEnableOptionalSource(scanner.get(), DDScannerSourceSpotlight, true);
+
</ins><span class="cx"> // FIXME: we should add a timeout to this call to make sure it doesn't take too much time.
</span><span class="cx"> if (!softLink_DataDetectorsCore_DDScannerScanQuery(scanner.get(), scanQuery.get()))
</span><span class="cx"> return nil;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaDataDetectorsCoreSoftLinkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h (197975 => 197976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h 2016-03-11 01:03:38 UTC (rev 197975)
+++ trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h 2016-03-11 01:06:48 UTC (rev 197976)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDScannerScanQuery, Boolean, (DDScannerRef scanner, DDScanQueryRef query), (scanner, query))
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDScanQueryCreate, DDScanQueryRef, (CFAllocatorRef allocator), (allocator))
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDScannerCopyResultsWithOptions, CFArrayRef, (DDScannerRef scanner, DDScannerCopyResultsOptions options), (scanner, options))
</span><ins>+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDScannerEnableOptionalSource, void, (DDScannerRef scanner, DDScannerSource source, Boolean enable), (scanner, source, enable))
</ins><span class="cx"> SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDResultGetRange, CFRange, (DDResultRef result), (result))
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDResultGetType, CFStringRef, (DDResultRef result), (result))
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDResultGetCategory, DDResultCategory, (DDResultRef result), (result))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaDataDetectorsCoreSoftLinkmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm (197975 => 197976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm 2016-03-11 01:03:38 UTC (rev 197975)
+++ trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm 2016-03-11 01:06:48 UTC (rev 197976)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDScannerScanQuery, Boolean, (DDScannerRef scanner, DDScanQueryRef query), (scanner, query))
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDScanQueryCreate, DDScanQueryRef, (CFAllocatorRef allocator), (allocator))
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDScannerCopyResultsWithOptions, CFArrayRef, (DDScannerRef scanner, DDScannerCopyResultsOptions options), (scanner, options))
</span><ins>+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDScannerEnableOptionalSource, void, (DDScannerRef scanner, DDScannerSource source, Boolean enable), (scanner, source, enable))
</ins><span class="cx"> SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDResultGetRange, CFRange, (DDResultRef result), (result))
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDResultGetType, CFStringRef, (DDResultRef result), (result))
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDResultGetCategory, DDResultCategory, (DDResultRef result), (result))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaDataDetectorsCoreSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h (197975 => 197976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h 2016-03-11 01:03:38 UTC (rev 197975)
+++ trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h 2016-03-11 01:06:48 UTC (rev 197976)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #import <DataDetectorsCore/DDScannerResult.h>
</span><span class="cx"> #import <DataDetectorsCore/DataDetectorsCore.h>
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+#import <DataDetectorsCore/DDOptionalSource.h>
</ins><span class="cx"> #import <DataDetectorsCore/DDURLifier.h>
</span><span class="cx"> #endif
</span><span class="cx"> #else // !USE(APPLE_INTERNAL_SDK)
</span><span class="lines">@@ -48,6 +49,8 @@
</span><span class="cx"> DDScannerCopyResultsOptionsCoalesceSignatures = 1 << 1,
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+typedef CFIndex DDScannerSource;
+
</ins><span class="cx"> enum {
</span><span class="cx"> DDURLifierPhoneNumberDetectionNone = 0,
</span><span class="cx"> DDURLifierPhoneNumberDetectionRegular = 1 << 1,
</span><span class="lines">@@ -113,6 +116,10 @@
</span><span class="cx"> typedef CFIndex DDScannerCopyResultsOptions;
</span><span class="cx"> typedef CFIndex DDScannerOptions;
</span><span class="cx">
</span><ins>+enum {
+ DDScannerSourceSpotlight = 1<<1,
+};
+
</ins><span class="cx"> extern "C" {
</span><span class="cx">
</span><span class="cx"> extern const DDScannerCopyResultsOptions DDScannerCopyResultsOptionsForPassiveUse;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (197975 => 197976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-11 01:03:38 UTC (rev 197975)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-11 01:06:48 UTC (rev 197976)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-10 Enrica Casucci <enrica@apple.com>
+
+ Expose additional WKDataDetectorTypes.
+ https://bugs.webkit.org/show_bug.cgi?id=155331
+ rdar://problem/24175813
+
+ Reviewed by Tim Horton.
+
+ Adding API to enable data detection of tracking numbers,
+ flight number and spotlight suggestions.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (fromWKDataDetectorTypes):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.h:
+
</ins><span class="cx"> 2016-03-10 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> defaultActions in UIDelegate method
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (197975 => 197976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-03-11 01:03:38 UTC (rev 197975)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-03-11 01:06:48 UTC (rev 197976)
</span><span class="lines">@@ -333,7 +333,13 @@
</span><span class="cx"> value |= WebCore::DataDetectorTypeAddress;
</span><span class="cx"> if (types & WKDataDetectorTypeCalendarEvent)
</span><span class="cx"> value |= WebCore::DataDetectorTypeCalendarEvent;
</span><del>-
</del><ins>+ if (types & WKDataDetectorTypeTrackingNumber)
+ value |= WebCore::DataDetectorTypeTrackingNumber;
+ if (types & WKDataDetectorTypeFlightNumber)
+ value |= WebCore::DataDetectorTypeFlightNumber;
+ if (types & WKDataDetectorTypeSpotlightSuggestion)
+ value |= WebCore::DataDetectorTypeSpotlightSuggestion;
+
</ins><span class="cx"> return static_cast<WebCore::DataDetectorTypes>(value);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h (197975 => 197976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2016-03-11 01:03:38 UTC (rev 197975)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2016-03-11 01:06:48 UTC (rev 197976)
</span><span class="lines">@@ -67,6 +67,9 @@
</span><span class="cx"> WKDataDetectorTypeLink = 1 << 1,
</span><span class="cx"> WKDataDetectorTypeAddress = 1 << 2,
</span><span class="cx"> WKDataDetectorTypeCalendarEvent = 1 << 3,
</span><ins>+ WKDataDetectorTypeTrackingNumber = 1 << 4,
+ WKDataDetectorTypeFlightNumber = 1 << 5,
+ WKDataDetectorTypeSpotlightSuggestion = 1 << 6,
</ins><span class="cx"> WKDataDetectorTypeAll = NSUIntegerMax
</span><span class="cx"> } WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>