Diff
Modified: branches/safari-602.1.32-branch/Source/WebCore/ChangeLog (201026 => 201027)
--- 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)
@@ -1,5 +1,21 @@
2016-05-17 Babak Shafiei <[email protected]>
+ Merge r200874. rdar://problem/26269611
+
+ 2016-05-13 Sam Weinig <[email protected]>
+
+ 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 <[email protected]>
+
Merge r200819. rdar://problem/26235373
2016-05-13 Tina Liu <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebCore/editing/cocoa/DataDetection.h (201026 => 201027)
--- 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)
@@ -48,7 +48,7 @@
DataDetectorTypeCalendarEvent = 1 << 3,
DataDetectorTypeTrackingNumber = 1 << 4,
DataDetectorTypeFlightNumber = 1 << 5,
- DataDetectorTypeSpotlightSuggestion = 1 << 6,
+ DataDetectorTypeLookupSuggestion = 1 << 6,
DataDetectorTypeAll = ULONG_MAX
};
Modified: branches/safari-602.1.32-branch/Source/WebCore/editing/cocoa/DataDetection.mm (201026 => 201027)
--- 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)
@@ -234,7 +234,7 @@
|| ((detectionTypes & DataDetectorTypeTrackingNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderTrackingNumberKey(), type, 0) == kCFCompareEqualTo))
|| ((detectionTypes & DataDetectorTypeFlightNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderFlightInformationKey(), type, 0) == kCFCompareEqualTo))
#if USE(APPLE_INTERNAL_SDK)
- || ((detectionTypes & DataDetectorTypeSpotlightSuggestion) && (CFStringCompare(DDBinderSpotlightSourceKey, type, 0) == kCFCompareEqualTo))
+ || ((detectionTypes & DataDetectorTypeLookupSuggestion) && (CFStringCompare(DDBinderSpotlightSourceKey, type, 0) == kCFCompareEqualTo))
#endif
|| ((detectionTypes & DataDetectorTypePhoneNumber) && (DDResultCategoryPhoneNumber == category))
|| ((detectionTypes & DataDetectorTypeLink) && resultIsURL(currentResult))) {
@@ -466,7 +466,7 @@
buildQuery(scanQuery.get(), contextRange.get());
#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
- if (types & DataDetectorTypeSpotlightSuggestion)
+ if (types & DataDetectorTypeLookupSuggestion)
softLink_DataDetectorsCore_DDScannerEnableOptionalSource(scanner.get(), DDScannerSourceSpotlight, true);
#endif
Modified: branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog (201026 => 201027)
--- 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)
@@ -1,5 +1,23 @@
2016-05-17 Babak Shafiei <[email protected]>
+ Merge r200874. rdar://problem/26269611
+
+ 2016-05-13 Sam Weinig <[email protected]>
+
+ 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 <[email protected]>
+
Merge r200668.
2016-05-10 Sam Weinig <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (201026 => 201027)
--- 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)
@@ -48,6 +48,7 @@
#define WK_CLASS_DEPRECATED(_macIntro, _macDep, _iosIntro, _iosDep, ...) __attribute__((visibility("default"))) __attribute__((deprecated(__VA_ARGS__)))
#define WK_ENUM_AVAILABLE(_mac, _ios)
#define WK_ENUM_AVAILABLE_IOS(_ios)
+#define WK_ENUM_DEPRECATED(_macIntro, _macDep, _iosIntro, _iosDep, ...) __attribute__((deprecated(__VA_ARGS__)))
#if __has_feature(objc_generics) && (!defined(__MAC_OS_X_VERSION_MAX_ALLOWED) || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100)
Modified: branches/safari-602.1.32-branch/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h (201026 => 201027)
--- 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)
@@ -56,10 +56,4 @@
#define WK_C_DEPRECATED(message)
#endif
-#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
-
#endif /* WKDeclarationSpecifiers_h */
Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (201026 => 201027)
--- 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)
@@ -358,8 +358,8 @@
value |= WebCore::DataDetectorTypeTrackingNumber;
if (types & WKDataDetectorTypeFlightNumber)
value |= WebCore::DataDetectorTypeFlightNumber;
- if (types & WKDataDetectorTypeSpotlightSuggestion)
- value |= WebCore::DataDetectorTypeSpotlightSuggestion;
+ if (types & WKDataDetectorTypeLookupSuggestion)
+ value |= WebCore::DataDetectorTypeLookupSuggestion;
return static_cast<WebCore::DataDetectorTypes>(value);
}
Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h (201026 => 201027)
--- 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)
@@ -69,8 +69,10 @@
WKDataDetectorTypeCalendarEvent = 1 << 3,
WKDataDetectorTypeTrackingNumber = 1 << 4,
WKDataDetectorTypeFlightNumber = 1 << 5,
- WKDataDetectorTypeSpotlightSuggestion = 1 << 6,
+ WKDataDetectorTypeLookupSuggestion = 1 << 6,
WKDataDetectorTypeAll = NSUIntegerMax
+
+ WKDataDetectorTypeSpotlightSuggestion WK_ENUM_DEPRECATED(NA, NA, WK_IOS_TBA, WK_IOS_TBA, "Please use WKDataDetectorTypeLookupSuggestion") = WKDataDetectorTypeLookupSuggestion,
} WK_ENUM_AVAILABLE(NA, WK_IOS_TBA);
#else
Modified: branches/safari-602.1.32-branch/Source/WebKit2/mac/postprocess-framework-headers.sh (201026 => 201027)
--- 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)
@@ -71,6 +71,7 @@
-e s/WK_AVAILABLE/NS_AVAILABLE/
-e s/WK_DEPRECATED/NS_DEPRECATED/
-e s/WK_ENUM_AVAILABLE/NS_ENUM_AVAILABLE/
+ -e s/WK_ENUM_DEPRECATED/NS_ENUM_DEPRECATED/
-e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/
-e s/^WK_CLASS_DEPRECATED/NS_CLASS_DEPRECATED/
)
