<!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>[201027] branches/safari-602.1.32-branch/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/201027">201027</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-05-17 11:49:01 -0700 (Tue, 17 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/200874">r200874</a>. rdar://problem/26269611</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602132branchSourceWebCoreChangeLog">branches/safari-602.1.32-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebCoreeditingcocoaDataDetectionh">branches/safari-602.1.32-branch/Source/WebCore/editing/cocoa/DataDetection.h</a></li>
<li><a href="#branchessafari602132branchSourceWebCoreeditingcocoaDataDetectionmm">branches/safari-602.1.32-branch/Source/WebCore/editing/cocoa/DataDetection.mm</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2ChangeLog">branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2SharedAPICocoaWKFoundationh">branches/safari-602.1.32-branch/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2SharedAPIcWKDeclarationSpecifiersh">branches/safari-602.1.32-branch/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh">branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2macpostprocessframeworkheaderssh">branches/safari-602.1.32-branch/Source/WebKit2/mac/postprocess-framework-headers.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602132branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/ChangeLog (201026 => 201027)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-17 18:48:57 UTC (rev 201026)
+++ branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-17 18:49:01 UTC (rev 201027)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-05-17 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r200874. rdar://problem/26269611
+
+ 2016-05-13 Sam Weinig <sam@webkit.org>
+
+ Rename WKDataDetectorTypeSpotlightSuggestion to WKDataDetectorTypeLookupSuggestion
+ <rdar://problem/26269611>
+
+ Reviewed by Dan Bernstein and Enrica Casucci.
+
+ * editing/cocoa/DataDetection.h:
+ * editing/cocoa/DataDetection.mm:
+ (WebCore::constructURLStringForResult):
+ (WebCore::DataDetection::detectContentInRange):
+
+2016-05-17 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r200819. rdar://problem/26235373
</span><span class="cx">
</span><span class="cx"> 2016-05-13 Tina Liu <iting_liu@apple.com>
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebCoreeditingcocoaDataDetectionh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/editing/cocoa/DataDetection.h (201026 => 201027)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/editing/cocoa/DataDetection.h 2016-05-17 18:48:57 UTC (rev 201026)
+++ branches/safari-602.1.32-branch/Source/WebCore/editing/cocoa/DataDetection.h 2016-05-17 18:49:01 UTC (rev 201027)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> DataDetectorTypeCalendarEvent = 1 << 3,
</span><span class="cx"> DataDetectorTypeTrackingNumber = 1 << 4,
</span><span class="cx"> DataDetectorTypeFlightNumber = 1 << 5,
</span><del>- DataDetectorTypeSpotlightSuggestion = 1 << 6,
</del><ins>+ DataDetectorTypeLookupSuggestion = 1 << 6,
</ins><span class="cx"> DataDetectorTypeAll = ULONG_MAX
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebCoreeditingcocoaDataDetectionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/editing/cocoa/DataDetection.mm (201026 => 201027)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/editing/cocoa/DataDetection.mm 2016-05-17 18:48:57 UTC (rev 201026)
+++ branches/safari-602.1.32-branch/Source/WebCore/editing/cocoa/DataDetection.mm 2016-05-17 18:49:01 UTC (rev 201027)
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> || ((detectionTypes & DataDetectorTypeTrackingNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderTrackingNumberKey(), type, 0) == kCFCompareEqualTo))
</span><span class="cx"> || ((detectionTypes & DataDetectorTypeFlightNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderFlightInformationKey(), type, 0) == kCFCompareEqualTo))
</span><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><del>- || ((detectionTypes & DataDetectorTypeSpotlightSuggestion) && (CFStringCompare(DDBinderSpotlightSourceKey, type, 0) == kCFCompareEqualTo))
</del><ins>+ || ((detectionTypes & DataDetectorTypeLookupSuggestion) && (CFStringCompare(DDBinderSpotlightSourceKey, type, 0) == kCFCompareEqualTo))
</ins><span class="cx"> #endif
</span><span class="cx"> || ((detectionTypes & DataDetectorTypePhoneNumber) && (DDResultCategoryPhoneNumber == category))
</span><span class="cx"> || ((detectionTypes & DataDetectorTypeLink) && resultIsURL(currentResult))) {
</span><span class="lines">@@ -466,7 +466,7 @@
</span><span class="cx"> buildQuery(scanQuery.get(), contextRange.get());
</span><span class="cx">
</span><span class="cx"> #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
</span><del>- if (types & DataDetectorTypeSpotlightSuggestion)
</del><ins>+ if (types & DataDetectorTypeLookupSuggestion)
</ins><span class="cx"> softLink_DataDetectorsCore_DDScannerEnableOptionalSource(scanner.get(), DDScannerSourceSpotlight, true);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog (201026 => 201027)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-17 18:48:57 UTC (rev 201026)
+++ branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-17 18:49:01 UTC (rev 201027)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-05-17 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r200874. rdar://problem/26269611
+
+ 2016-05-13 Sam Weinig <sam@webkit.org>
+
+ Rename WKDataDetectorTypeSpotlightSuggestion to WKDataDetectorTypeLookupSuggestion
+ <rdar://problem/26269611>
+
+ Reviewed by Dan Bernstein and Enrica Casucci.
+
+ * Shared/API/Cocoa/WKFoundation.h:
+ * Shared/API/c/WKDeclarationSpecifiers.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (fromWKDataDetectorTypes):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.h:
+ * mac/postprocess-framework-headers.sh:
+
+2016-05-17 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r200668.
</span><span class="cx">
</span><span class="cx"> 2016-05-10 Sam Weinig <sam@webkit.org>
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2SharedAPICocoaWKFoundationh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (201026 => 201027)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2016-05-17 18:48:57 UTC (rev 201026)
+++ branches/safari-602.1.32-branch/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2016-05-17 18:49:01 UTC (rev 201027)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> #define WK_CLASS_DEPRECATED(_macIntro, _macDep, _iosIntro, _iosDep, ...) __attribute__((visibility("default"))) __attribute__((deprecated(__VA_ARGS__)))
</span><span class="cx"> #define WK_ENUM_AVAILABLE(_mac, _ios)
</span><span class="cx"> #define WK_ENUM_AVAILABLE_IOS(_ios)
</span><ins>+#define WK_ENUM_DEPRECATED(_macIntro, _macDep, _iosIntro, _iosDep, ...) __attribute__((deprecated(__VA_ARGS__)))
</ins><span class="cx">
</span><span class="cx"> #if __has_feature(objc_generics) && (!defined(__MAC_OS_X_VERSION_MAX_ALLOWED) || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100)
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2SharedAPIcWKDeclarationSpecifiersh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h (201026 => 201027)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h 2016-05-17 18:48:57 UTC (rev 201026)
+++ branches/safari-602.1.32-branch/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h 2016-05-17 18:49:01 UTC (rev 201027)
</span><span class="lines">@@ -56,10 +56,4 @@
</span><span class="cx"> #define WK_C_DEPRECATED(message)
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(__has_extension) && __has_extension(enumerator_attributes) && __has_extension(attribute_unavailable_with_message)
-#define WK_ENUM_DEPRECATED(message) __attribute__((deprecated(message)))
-#else
-#define WK_ENUM_DEPRECATED(message)
-#endif
-
</del><span class="cx"> #endif /* WKDeclarationSpecifiers_h */
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (201026 => 201027)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-05-17 18:48:57 UTC (rev 201026)
+++ branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-05-17 18:49:01 UTC (rev 201027)
</span><span class="lines">@@ -358,8 +358,8 @@
</span><span class="cx"> value |= WebCore::DataDetectorTypeTrackingNumber;
</span><span class="cx"> if (types & WKDataDetectorTypeFlightNumber)
</span><span class="cx"> value |= WebCore::DataDetectorTypeFlightNumber;
</span><del>- if (types & WKDataDetectorTypeSpotlightSuggestion)
- value |= WebCore::DataDetectorTypeSpotlightSuggestion;
</del><ins>+ if (types & WKDataDetectorTypeLookupSuggestion)
+ value |= WebCore::DataDetectorTypeLookupSuggestion;
</ins><span class="cx">
</span><span class="cx"> return static_cast<WebCore::DataDetectorTypes>(value);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h (201026 => 201027)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2016-05-17 18:48:57 UTC (rev 201026)
+++ branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2016-05-17 18:49:01 UTC (rev 201027)
</span><span class="lines">@@ -69,8 +69,10 @@
</span><span class="cx"> WKDataDetectorTypeCalendarEvent = 1 << 3,
</span><span class="cx"> WKDataDetectorTypeTrackingNumber = 1 << 4,
</span><span class="cx"> WKDataDetectorTypeFlightNumber = 1 << 5,
</span><del>- WKDataDetectorTypeSpotlightSuggestion = 1 << 6,
</del><ins>+ WKDataDetectorTypeLookupSuggestion = 1 << 6,
</ins><span class="cx"> WKDataDetectorTypeAll = NSUIntegerMax
</span><ins>+
+ WKDataDetectorTypeSpotlightSuggestion WK_ENUM_DEPRECATED(NA, NA, WK_IOS_TBA, WK_IOS_TBA, "Please use WKDataDetectorTypeLookupSuggestion") = WKDataDetectorTypeLookupSuggestion,
</ins><span class="cx"> } WK_ENUM_AVAILABLE(NA, WK_IOS_TBA);
</span><span class="cx">
</span><span class="cx"> #else
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2macpostprocessframeworkheaderssh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/mac/postprocess-framework-headers.sh (201026 => 201027)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/mac/postprocess-framework-headers.sh 2016-05-17 18:48:57 UTC (rev 201026)
+++ branches/safari-602.1.32-branch/Source/WebKit2/mac/postprocess-framework-headers.sh 2016-05-17 18:49:01 UTC (rev 201027)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> -e s/WK_AVAILABLE/NS_AVAILABLE/
</span><span class="cx"> -e s/WK_DEPRECATED/NS_DEPRECATED/
</span><span class="cx"> -e s/WK_ENUM_AVAILABLE/NS_ENUM_AVAILABLE/
</span><ins>+ -e s/WK_ENUM_DEPRECATED/NS_ENUM_DEPRECATED/
</ins><span class="cx"> -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/
</span><span class="cx"> -e s/^WK_CLASS_DEPRECATED/NS_CLASS_DEPRECATED/
</span><span class="cx"> )
</span></span></pre>
</div>
</div>
</body>
</html>