Diff
Modified: trunk/Source/WebCore/ChangeLog (202421 => 202422)
--- trunk/Source/WebCore/ChangeLog 2016-06-24 16:05:46 UTC (rev 202421)
+++ trunk/Source/WebCore/ChangeLog 2016-06-24 16:24:39 UTC (rev 202422)
@@ -1,3 +1,17 @@
+2016-06-24 Dan Bernstein <[email protected]>
+
+ [iOS] Inline DataDetectorsAdditions.h
+ https://bugs.webkit.org/show_bug.cgi?id=159093
+
+ Reviewed by Anders Carlsson.
+
+ * editing/cocoa/DataDetection.mm:
+ (WebCore::constructURLStringForResult): Use soft-linked constant directly.
+
+ * platform/cocoa/DataDetectorsCoreSoftLink.h: Declare soft-linked constant.
+ * platform/cocoa/DataDetectorsCoreSoftLink.mm: Define soft-linked constant.
+ * platform/spi/cocoa/DataDetectorsCoreSPI.h: Declare constant.
+
2016-06-24 Yusuke Suzuki <[email protected]>
[GTK][EFL] ImageBufferCairo should accept resolution factor
Modified: trunk/Source/WebCore/editing/cocoa/DataDetection.mm (202421 => 202422)
--- trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2016-06-24 16:05:46 UTC (rev 202421)
+++ trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2016-06-24 16:24:39 UTC (rev 202422)
@@ -51,10 +51,6 @@
#import "DataDetectorsCoreSoftLink.h"
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/DataDetectorsAdditions.h>
-#endif
-
namespace WebCore {
using namespace HTMLNames;
@@ -235,8 +231,8 @@
if (((detectionTypes & DataDetectorTypeAddress) && (DDResultCategoryAddress == category))
|| ((detectionTypes & DataDetectorTypeTrackingNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderTrackingNumberKey(), type, 0) == kCFCompareEqualTo))
|| ((detectionTypes & DataDetectorTypeFlightNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderFlightInformationKey(), type, 0) == kCFCompareEqualTo))
-#if USE(APPLE_INTERNAL_SDK)
- || ((detectionTypes & DataDetectorTypeLookupSuggestion) && (CFStringCompare(DDBinderSpotlightSourceKey, type, 0) == kCFCompareEqualTo))
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+ || ((detectionTypes & DataDetectorTypeLookupSuggestion) && (CFStringCompare(get_DataDetectorsCore_DDBinderParsecSourceKey(), type, 0) == kCFCompareEqualTo))
#endif
|| ((detectionTypes & DataDetectorTypePhoneNumber) && (DDResultCategoryPhoneNumber == category))
|| ((detectionTypes & DataDetectorTypeLink) && resultIsURL(currentResult))) {
Modified: trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h (202421 => 202422)
--- trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h 2016-06-24 16:05:46 UTC (rev 202421)
+++ trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h 2016-06-24 16:24:39 UTC (rev 202422)
@@ -53,6 +53,7 @@
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForURL, BOOL, (NSURL *url), (url))
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForResult, BOOL, (DDResultRef result), (result))
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldUseLightLinksForResult, BOOL, (DDResultRef result, BOOL extractedFromSignature), (result, extractedFromSignature))
+SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderParsecSourceKey, CFStringRef)
#endif
SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderHttpURLKey, CFStringRef)
SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderWebURLKey, CFStringRef)
Modified: trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm (202421 => 202422)
--- trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm 2016-06-24 16:05:46 UTC (rev 202421)
+++ trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm 2016-06-24 16:24:39 UTC (rev 202422)
@@ -52,6 +52,7 @@
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForURL, BOOL, (NSURL *url), (url))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForResult, BOOL, (DDResultRef result), (result))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldUseLightLinksForResult, BOOL, (DDResultRef result, BOOL extractedFromSignature), (result, extractedFromSignature))
+SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderParsecSourceKey, CFStringRef)
#endif
SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderHttpURLKey, CFStringRef)
SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderWebURLKey, CFStringRef)
Modified: trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h (202421 => 202422)
--- trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h 2016-06-24 16:05:46 UTC (rev 202421)
+++ trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h 2016-06-24 16:24:39 UTC (rev 202422)
@@ -97,6 +97,10 @@
extern CFStringRef const DDBinderSignatureBlockKey;
extern NSString * const DDURLScheme;
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000
+extern CFStringRef const DDBinderParsecSourceKey;
+#endif
+
@interface DDScannerResult : NSObject <NSCoding, NSSecureCoding>
+ (NSArray *)resultsFromCoreResults:(CFArrayRef)coreResults;
- (DDResultRef)coreResult;
