Changeset 202422 in webkit
- Timestamp:
- Jun 24, 2016 9:24:39 AM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r202421 r202422 1 2016-06-24 Dan Bernstein <mitz@apple.com> 2 3 [iOS] Inline DataDetectorsAdditions.h 4 https://bugs.webkit.org/show_bug.cgi?id=159093 5 6 Reviewed by Anders Carlsson. 7 8 * editing/cocoa/DataDetection.mm: 9 (WebCore::constructURLStringForResult): Use soft-linked constant directly. 10 11 * platform/cocoa/DataDetectorsCoreSoftLink.h: Declare soft-linked constant. 12 * platform/cocoa/DataDetectorsCoreSoftLink.mm: Define soft-linked constant. 13 * platform/spi/cocoa/DataDetectorsCoreSPI.h: Declare constant. 14 1 15 2016-06-24 Yusuke Suzuki <utatane.tea@gmail.com> 2 16 -
trunk/Source/WebCore/editing/cocoa/DataDetection.mm
r202262 r202422 52 52 #import "DataDetectorsCoreSoftLink.h" 53 53 54 #if USE(APPLE_INTERNAL_SDK)55 #import <WebKitAdditions/DataDetectorsAdditions.h>56 #endif57 58 54 namespace WebCore { 59 55 … … 236 232 || ((detectionTypes & DataDetectorTypeTrackingNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderTrackingNumberKey(), type, 0) == kCFCompareEqualTo)) 237 233 || ((detectionTypes & DataDetectorTypeFlightNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderFlightInformationKey(), type, 0) == kCFCompareEqualTo)) 238 #if USE(APPLE_INTERNAL_SDK)239 || ((detectionTypes & DataDetectorTypeLookupSuggestion) && (CFStringCompare( DDBinderSpotlightSourceKey, type, 0) == kCFCompareEqualTo))234 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000 235 || ((detectionTypes & DataDetectorTypeLookupSuggestion) && (CFStringCompare(get_DataDetectorsCore_DDBinderParsecSourceKey(), type, 0) == kCFCompareEqualTo)) 240 236 #endif 241 237 || ((detectionTypes & DataDetectorTypePhoneNumber) && (DDResultCategoryPhoneNumber == category)) -
trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h
r198986 r202422 54 54 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForResult, BOOL, (DDResultRef result), (result)) 55 55 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldUseLightLinksForResult, BOOL, (DDResultRef result, BOOL extractedFromSignature), (result, extractedFromSignature)) 56 SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderParsecSourceKey, CFStringRef) 56 57 #endif 57 58 SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderHttpURLKey, CFStringRef) -
trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm
r198986 r202422 53 53 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForResult, BOOL, (DDResultRef result), (result)) 54 54 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldUseLightLinksForResult, BOOL, (DDResultRef result, BOOL extractedFromSignature), (result, extractedFromSignature)) 55 SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderParsecSourceKey, CFStringRef) 55 56 #endif 56 57 SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderHttpURLKey, CFStringRef) -
trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h
r198653 r202422 98 98 extern NSString * const DDURLScheme; 99 99 100 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000 101 extern CFStringRef const DDBinderParsecSourceKey; 102 #endif 103 100 104 @interface DDScannerResult : NSObject <NSCoding, NSSecureCoding> 101 105 + (NSArray *)resultsFromCoreResults:(CFArrayRef)coreResults;
Note: See TracChangeset
for help on using the changeset viewer.