Diff
Modified: trunk/Source/WebCore/ChangeLog (197992 => 197993)
--- trunk/Source/WebCore/ChangeLog 2016-03-11 05:01:06 UTC (rev 197992)
+++ trunk/Source/WebCore/ChangeLog 2016-03-11 05:09:03 UTC (rev 197993)
@@ -1,3 +1,13 @@
+2016-03-10 Tim Horton <[email protected]>
+
+ Try to fix the iOS 9 build.
+
+ * editing/cocoa/DataDetection.mm:
+ (WebCore::DataDetection::detectContentInRange):
+ * platform/cocoa/DataDetectorsCoreSoftLink.h:
+ * platform/cocoa/DataDetectorsCoreSoftLink.mm:
+ * platform/spi/cocoa/DataDetectorsCoreSPI.h:
+
2016-03-10 David Kilzer <[email protected]>
REGRESSION (r197976): Build failure due to missing DDOptionalSource.h header
Modified: trunk/Source/WebCore/editing/cocoa/DataDetection.mm (197992 => 197993)
--- trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2016-03-11 05:01:06 UTC (rev 197992)
+++ trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2016-03-11 05:09:03 UTC (rev 197993)
@@ -434,8 +434,10 @@
RetainPtr<DDScanQueryRef> scanQuery = adoptCF(softLink_DataDetectorsCore_DDScanQueryCreate(NULL));
buildQuery(scanQuery.get(), contextRange.get());
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
if (types & DataDetectorTypeSpotlightSuggestion)
softLink_DataDetectorsCore_DDScannerEnableOptionalSource(scanner.get(), DDScannerSourceSpotlight, true);
+#endif
// FIXME: we should add a timeout to this call to make sure it doesn't take too much time.
if (!softLink_DataDetectorsCore_DDScannerScanQuery(scanner.get(), scanQuery.get()))
Modified: trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h (197992 => 197993)
--- trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h 2016-03-11 05:01:06 UTC (rev 197992)
+++ trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h 2016-03-11 05:09:03 UTC (rev 197993)
@@ -36,7 +36,6 @@
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDScannerScanQuery, Boolean, (DDScannerRef scanner, DDScanQueryRef query), (scanner, query))
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDScanQueryCreate, DDScanQueryRef, (CFAllocatorRef allocator), (allocator))
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDScannerCopyResultsWithOptions, CFArrayRef, (DDScannerRef scanner, DDScannerCopyResultsOptions options), (scanner, options))
-SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDScannerEnableOptionalSource, void, (DDScannerRef scanner, DDScannerSource source, Boolean enable), (scanner, source, enable))
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDResultGetRange, CFRange, (DDResultRef result), (result))
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDResultGetType, CFStringRef, (DDResultRef result), (result))
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDResultGetCategory, DDResultCategory, (DDResultRef result), (result))
@@ -60,6 +59,10 @@
SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDURLScheme, NSString *)
SOFT_LINK_CONSTANT_FOR_HEADER(WebCore, DataDetectorsCore, DDScannerCopyResultsOptionsForPassiveUse, DDScannerCopyResultsOptions)
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDScannerEnableOptionalSource, void, (DDScannerRef scanner, DDScannerSource source, Boolean enable), (scanner, source, enable))
#endif
+#endif // PLATFORM(IOS)
+
#endif // DataDetectorsCoreSoftLink_h
Modified: trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm (197992 => 197993)
--- trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm 2016-03-11 05:01:06 UTC (rev 197992)
+++ trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm 2016-03-11 05:09:03 UTC (rev 197993)
@@ -35,7 +35,6 @@
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDScannerScanQuery, Boolean, (DDScannerRef scanner, DDScanQueryRef query), (scanner, query))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDScanQueryCreate, DDScanQueryRef, (CFAllocatorRef allocator), (allocator))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDScannerCopyResultsWithOptions, CFArrayRef, (DDScannerRef scanner, DDScannerCopyResultsOptions options), (scanner, options))
-SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDScannerEnableOptionalSource, void, (DDScannerRef scanner, DDScannerSource source, Boolean enable), (scanner, source, enable))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDResultGetRange, CFRange, (DDResultRef result), (result))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDResultGetType, CFStringRef, (DDResultRef result), (result))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDResultGetCategory, DDResultCategory, (DDResultRef result), (result))
@@ -59,4 +58,8 @@
SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDURLScheme, NSString *)
SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, DataDetectorsCore, DDScannerCopyResultsOptionsForPassiveUse, DDScannerCopyResultsOptions)
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDScannerEnableOptionalSource, void, (DDScannerRef scanner, DDScannerSource source, Boolean enable), (scanner, source, enable))
#endif
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h (197992 => 197993)
--- trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h 2016-03-11 05:01:06 UTC (rev 197992)
+++ trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h 2016-03-11 05:09:03 UTC (rev 197993)
@@ -31,12 +31,14 @@
#import <DataDetectorsCore/DDBinderKeys_Private.h>
#import <DataDetectorsCore/DDScannerResult.h>
#import <DataDetectorsCore/DataDetectorsCore.h>
+
#if PLATFORM(IOS)
#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
#import <DataDetectorsCore/DDOptionalSource.h>
#endif
#import <DataDetectorsCore/DDURLifier.h>
-#endif
+#endif // PLATFORM(IOS)
+
#else // !USE(APPLE_INTERNAL_SDK)
typedef enum {
