Changeset 202422 in webkit


Ignore:
Timestamp:
Jun 24, 2016 9:24:39 AM (8 years ago)
Author:
mitz@apple.com
Message:

[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.
Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r202421 r202422  
     12016-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
    1152016-06-24  Yusuke Suzuki  <utatane.tea@gmail.com>
    216
  • trunk/Source/WebCore/editing/cocoa/DataDetection.mm

    r202262 r202422  
    5252#import "DataDetectorsCoreSoftLink.h"
    5353
    54 #if USE(APPLE_INTERNAL_SDK)
    55 #import <WebKitAdditions/DataDetectorsAdditions.h>
    56 #endif
    57 
    5854namespace WebCore {
    5955
     
    236232        || ((detectionTypes & DataDetectorTypeTrackingNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderTrackingNumberKey(), type, 0) == kCFCompareEqualTo))
    237233        || ((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))
    240236#endif
    241237        || ((detectionTypes & DataDetectorTypePhoneNumber) && (DDResultCategoryPhoneNumber == category))
  • trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h

    r198986 r202422  
    5454SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForResult, BOOL, (DDResultRef result), (result))
    5555SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldUseLightLinksForResult, BOOL, (DDResultRef result, BOOL extractedFromSignature), (result, extractedFromSignature))
     56SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderParsecSourceKey, CFStringRef)
    5657#endif
    5758SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderHttpURLKey, CFStringRef)
  • trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm

    r198986 r202422  
    5353SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForResult, BOOL, (DDResultRef result), (result))
    5454SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldUseLightLinksForResult, BOOL, (DDResultRef result, BOOL extractedFromSignature), (result, extractedFromSignature))
     55SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderParsecSourceKey, CFStringRef)
    5556#endif
    5657SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderHttpURLKey, CFStringRef)
  • trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h

    r198653 r202422  
    9898extern NSString * const DDURLScheme;
    9999
     100#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000
     101extern CFStringRef const DDBinderParsecSourceKey;
     102#endif
     103
    100104@interface DDScannerResult : NSObject <NSCoding, NSSecureCoding>
    101105+ (NSArray *)resultsFromCoreResults:(CFArrayRef)coreResults;
Note: See TracChangeset for help on using the changeset viewer.