⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 278780 in webkit


Ignore:
Timestamp:
Jun 11, 2021, 1:44:21 PM (5 years ago)
Author:
Jonathan Bedard
Message:

[Monterey] Support building WebKit
​https://bugs.webkit.org/show_bug.cgi?id=226846
<rdar://problem/79095148>

Reviewed by Tim Horton.

Source/WebCore:

Covered by exisiting tests.

  • testing/Internals.cpp:

(WebCore::Internals::installImageOverlay): Explicitly define second arugment
to avoid 'missing field' compilation error.

Source/WebCore/PAL:

  • pal/spi/cocoa/CryptoKitCBridgingSPI.h: Add RSA BSSA declarations.
  • pal/spi/mac/QuickLookMacSPI.h: Add Image Analysis declarations.

Source/WebKit:

  • Platform/cocoa/TextRecognitionUtilities.mm: Import VisionKitSPI.h.
  • Platform/spi/Cocoa/VisionKitSPI.h: Added.
  • UIProcess/API/Cocoa/WKBrowsingContextController.mm:

(setUpPageLoaderClient): Allow deprecated declarations.
(setUpPagePolicyClient): Ditto.

  • UIProcess/API/Cocoa/WKConnection.mm:

(setUpClient): Allow deprecated declarations.

  • UIProcess/API/Cocoa/WKProcessGroup.mm:

(setUpConnectionClient): Allow deprecated declarations.
(setUpInjectedBundleClient): Ditto.
(setUpHistoryClient): Ditto.

  • UIProcess/API/Cocoa/WKWebViewTesting.mm:

(-[WKWebView _createMediaSessionCoordinatorForTesting:completionHandler:]): Explicitly define second arugment
to avoid 'missing field' compilation error.

  • UIProcess/Cocoa/WebViewImpl.mm: Import VisionKitSPI.h.
  • UIProcess/ios/WKContentViewInteraction.mm: Ditto.
  • WebKit.xcodeproj/project.pbxproj: Ditto.

Source/WTF:

  • wtf/PlatformHave.h: Add HAVE(VK_IMAGE_ANALYSIS).
  • wtf/spi/cocoa/SecuritySPI.h:

Tools:

  • TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: Add CoreCryptoSPI.h.
  • TestWebKitAPI/Tests/WebCore/cocoa/CoreCryptoSPI.h: Added.
  • TestWebKitAPI/Tests/WebCore/cocoa/PrivateClickMeasurementCocoa.mm: Import CoreCryptoSPI.h.
  • TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm: Ditto.
Location:
trunk
Files:
2 added
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r278669 r278780  
     12021-06-11  Jonathan Bedard  <jbedard@apple.com>
     2
     3        [Monterey] Support building WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=226846
     5        <rdar://problem/79095148>
     6
     7        Reviewed by Tim Horton.
     8
     9        * wtf/PlatformHave.h: Add HAVE(VK_IMAGE_ANALYSIS).
     10        * wtf/spi/cocoa/SecuritySPI.h:
     11
    1122021-06-09  Chris Dumez  <cdumez@apple.com>
    213

  • trunk/Source/WTF/wtf/PlatformHave.h

    r278736 r278780  
    10231023#define HAVE_CORE_TEXT_SBIX_IMAGE_SIZE_FUNCTIONS 1
    10241024#endif
     1025
     1026#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) \
     1027    || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
     1028#if !defined(HAVE_VK_IMAGE_ANALYSIS)
     1029#define HAVE_VK_IMAGE_ANALYSIS 1
     1030#endif
     1031#endif

  • trunk/Source/WTF/wtf/spi/cocoa/SecuritySPI.h

    r269696 r278780  
    8282CFDataRef SecAccessControlCopyData(SecAccessControlRef);
    8383
     84CFDataRef SecKeyCopySubjectPublicKeyInfo(SecKeyRef);
     85
    8486#if PLATFORM(MAC)
    8587#include <Security/SecAsn1Types.h>
    8688CFStringRef SecTaskCopySigningIdentifier(SecTaskRef, CFErrorRef *);
     89ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    8790extern const SecAsn1Template kSecAsn1AlgorithmIDTemplate[];
    8891extern const SecAsn1Template kSecAsn1SubjectPublicKeyInfoTemplate[];
     92ALLOW_DEPRECATED_DECLARATIONS_END
    8993uint32_t SecTaskGetCodeSignStatus(SecTaskRef);
    9094#endif

  • trunk/Source/WebCore/ChangeLog

    r278779 r278780  
     12021-06-11  Jonathan Bedard  <jbedard@apple.com>
     2
     3        [Monterey] Support building WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=226846
     5        <rdar://problem/79095148>
     6
     7        Reviewed by Tim Horton.
     8
     9        Covered by exisiting tests.
     10
     11        * testing/Internals.cpp:
     12        (WebCore::Internals::installImageOverlay): Explicitly define second arugment
     13        to avoid 'missing field' compilation error.
     14
    1152021-06-11  Chris Dumez  <cdumez@apple.com>
    216

  • trunk/Source/WebCore/PAL/ChangeLog

    r278649 r278780  
     12021-06-11  Jonathan Bedard  <jbedard@apple.com>
     2
     3        [Monterey] Support building WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=226846
     5        <rdar://problem/79095148>
     6
     7        Reviewed by Tim Horton.
     8
     9        * pal/spi/cocoa/CryptoKitCBridgingSPI.h: Add RSA BSSA declarations.
     10        * pal/spi/mac/QuickLookMacSPI.h: Add Image Analysis declarations.
     11
    1122021-06-08  Alex Christensen  <achristensen@webkit.org>
    213

  • trunk/Source/WebCore/PAL/pal/spi/cocoa/CryptoKitCBridgingSPI.h

    r276615 r278780  
    3535
    3636@interface RSABSSATokenWaitingActivation : NSObject
    37 @property (nonatomic, retain, readonly) NSData *blindedMessage;
     37#if HAVE(RSA_BSSA)
     38- (RSABSSATokenReady*)activateTokenWithServerResponse:(NSData*)serverResponse error:(NSError* __autoreleasing *)error;
     39#endif
     40@property (nonatomic, retain, readonly) NSData* blindedMessage;
    3841@end
    3942
    4043@interface RSABSSATokenReady : NSObject
    41 @property (nonatomic, retain, readonly) NSData *tokenContent;
    42 @property (nonatomic, retain, readonly) NSData *keyId;
    43 @property (nonatomic, retain, readonly) NSData *signature;
     44@property (nonatomic, retain, readonly) NSData* tokenContent;
     45@property (nonatomic, retain, readonly) NSData* keyId;
     46@property (nonatomic, retain, readonly) NSData* signature;
    4447@end
     48
     49#if HAVE(RSA_BSSA)
     50@interface RSABSSATokenBlinder : NSObject
     51- (instancetype)initWithPublicKey:(NSData*)spkiBytes error:(NSError* __autoreleasing *)error;
     52- (RSABSSATokenWaitingActivation*)tokenWaitingActivationWithContent:(NSData*)content error:(NSError* __autoreleasing *)error;
     53@property (nonatomic, retain, readonly) NSData* keyId;
     54@end
     55#endif
    4556
    4657#endif // USE(APPLE_INTERNAL_SDK)

  • trunk/Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h

    r277903 r278780  
    6060
    6161@interface QLItem : NSObject <QLPreviewItem>
     62@property (nonatomic, copy) NSDictionary* previewOptions;
    6263@end
    6364
    6465#endif // USE(APPLE_INTERNAL_SDK)
    6566
    66 #if HAVE(QUICKLOOK_PREVIEW_ITEM_DATA_PROVIDER)
     67#if HAVE(QUICKLOOK_PREVIEW_ITEM_DATA_PROVIDER) || HAVE(VK_IMAGE_ANALYSIS)
    6768
    6869@class UTType;
    … …  
    7071- (instancetype)initWithDataProvider:(id /* <QLPreviewItemDataProvider> */)data contentType:(UTType *)contentType previewTitle:(NSString *)previewTitle;
    7172@end
     73
     74#endif
     75
     76#if HAVE(VK_IMAGE_ANALYSIS)
     77
     78typedef NS_ENUM(NSInteger, QLPreviewActivity) {
     79    QLPreviewActivityNone,
     80    QLPreviewActivityMarkup,
     81    QLPreviewActivityTrim,
     82    QLPreviewActivityVisualSearch
     83};
    7284
    7385#endif

  • trunk/Source/WebCore/testing/Internals.cpp

    r278767 r278780  
    56515651            return makeDataForLine(line);
    56525652        })
     5653#if ENABLE(DATA_DETECTION)
     5654        , Vector<TextRecognitionDataDetector>()
     5655#endif
    56535656    });
    56545657#else

  • trunk/Source/WebKit/ChangeLog

    r278779 r278780  
     12021-06-11  Jonathan Bedard  <jbedard@apple.com>
     2
     3        [Monterey] Support building WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=226846
     5        <rdar://problem/79095148>
     6
     7        Reviewed by Tim Horton.
     8
     9        * Platform/cocoa/TextRecognitionUtilities.mm: Import VisionKitSPI.h.
     10        * Platform/spi/Cocoa/VisionKitSPI.h: Added.
     11        * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
     12        (setUpPageLoaderClient): Allow deprecated declarations.
     13        (setUpPagePolicyClient): Ditto.
     14        * UIProcess/API/Cocoa/WKConnection.mm:
     15        (setUpClient): Allow deprecated declarations.
     16        * UIProcess/API/Cocoa/WKProcessGroup.mm:
     17        (setUpConnectionClient): Allow deprecated declarations.
     18        (setUpInjectedBundleClient): Ditto.
     19        (setUpHistoryClient): Ditto.
     20        * UIProcess/API/Cocoa/WKWebViewTesting.mm:
     21        (-[WKWebView _createMediaSessionCoordinatorForTesting:completionHandler:]): Explicitly define second arugment
     22        to avoid 'missing field' compilation error.
     23        * UIProcess/Cocoa/WebViewImpl.mm: Import VisionKitSPI.h.
     24        * UIProcess/ios/WKContentViewInteraction.mm: Ditto.
     25        * WebKit.xcodeproj/project.pbxproj: Ditto.
     26
    1272021-06-11  Chris Dumez  <cdumez@apple.com>
    228

  • trunk/Source/WebKit/Platform/cocoa/TextRecognitionUtilities.mm

    r278575 r278780  
    2929#if ENABLE(IMAGE_ANALYSIS)
    3030
    31 #import <VisionKitCore/VKImageAnalysis_WebKit.h>
    32 #import <VisionKitCore/VKQuad.h>
     31#import "VisionKitSPI.h"
    3332#import <WebCore/TextRecognitionResult.h>
    3433#import <pal/spi/cocoa/FeatureFlagsSPI.h>

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm

    r275765 r278780  
    440440}
    441441
     442ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    442443static void setUpPageLoaderClient(WKBrowsingContextController *browsingContext, WebKit::WebPageProxy& page)
     444ALLOW_DEPRECATED_DECLARATIONS_END
    443445{
    444446    WKPageNavigationClientV0 loaderClient;
    … …  
    477479}
    478480
     481ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    479482static void setUpPagePolicyClient(WKBrowsingContextController *browsingContext, WebKit::WebPageProxy& page)
     483ALLOW_DEPRECATED_DECLARATIONS_END
    480484{
    481485    WKPagePolicyClientInternal policyClient;

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKConnection.mm

    r274227 r278780  
    7777}
    7878
     79ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    7980static void setUpClient(WKConnection *wrapper, WebKit::WebConnection& connection)
     81ALLOW_DEPRECATED_DECLARATIONS_END
    8082{
    8183    WKConnectionClientV0 client;

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessGroup.mm

    r267155 r278780  
    7474}
    7575
     76ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    7677static void setUpConnectionClient(WKProcessGroup *processGroup, WKContextRef contextRef)
     78ALLOW_DEPRECATED_DECLARATIONS_END
    7779{
    7880    WKContextConnectionClientV0 connectionClient;
    … …  
    102104}
    103105
     106ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    104107static void setUpInjectedBundleClient(WKProcessGroup *processGroup, WKContextRef contextRef)
     108ALLOW_DEPRECATED_DECLARATIONS_END
    105109{
    106110    WKContextInjectedBundleClientV1 injectedBundleClient;
    … …  
    170174}
    171175
     176ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    172177static void setUpHistoryClient(WKProcessGroup *processGroup, WKContextRef contextRef)
     178ALLOW_DEPRECATED_DECLARATIONS_END
    173179{
    174180    WKContextHistoryClientV0 historyClient;

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm

    r278423 r278780  
    455455        {
    456456            if (!success)
    457                 return { WebCore::ExceptionData { WebCore::InvalidStateError } };
     457                return { WebCore::ExceptionData { WebCore::InvalidStateError, String() } };
    458458
    459459            return { };
    … …  
    469469            [m_clientCoordinator joinWithCompletion:makeBlockPtr([weakThis = makeWeakPtr(this), callback = WTFMove(callback)] (BOOL success) mutable {
    470470                if (!weakThis) {
    471                     callback(WebCore::ExceptionData { WebCore::InvalidStateError });
     471                    callback(WebCore::ExceptionData { WebCore::InvalidStateError, String() });
    472472                    return;
    473473                }
    … …  
    486486            [m_clientCoordinator seekTo:time withCompletion:makeBlockPtr([weakThis = makeWeakPtr(this), callback = WTFMove(callback)] (BOOL success) mutable {
    487487                if (!weakThis) {
    488                     callback(WebCore::ExceptionData { WebCore::InvalidStateError });
     488                    callback(WebCore::ExceptionData { WebCore::InvalidStateError, String() });
    489489                    return;
    490490                }
    … …  
    498498            [m_clientCoordinator playWithCompletion:makeBlockPtr([weakThis = makeWeakPtr(this), callback = WTFMove(callback)] (BOOL success) mutable {
    499499                if (!weakThis) {
    500                     callback(WebCore::ExceptionData { WebCore::InvalidStateError });
     500                    callback(WebCore::ExceptionData { WebCore::InvalidStateError, String() });
    501501                    return;
    502502                }
    … …  
    510510            [m_clientCoordinator pauseWithCompletion:makeBlockPtr([weakThis = makeWeakPtr(this), callback = WTFMove(callback)] (BOOL success) mutable {
    511511                if (!weakThis) {
    512                     callback(WebCore::ExceptionData { WebCore::InvalidStateError });
     512                    callback(WebCore::ExceptionData { WebCore::InvalidStateError, String() });
    513513                    return;
    514514                }
    … …  
    522522            [m_clientCoordinator setTrack:track withCompletion:makeBlockPtr([weakThis = makeWeakPtr(this), callback = WTFMove(callback)] (BOOL success) mutable {
    523523                if (!weakThis) {
    524                     callback(WebCore::ExceptionData { WebCore::InvalidStateError });
     524                    callback(WebCore::ExceptionData { WebCore::InvalidStateError, String() });
    525525                    return;
    526526                }

  • trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm

    r278575 r278780  
    147147#endif
    148148
    149 #if ENABLE(IMAGE_ANALYSIS)
    150 #import <VisionKitCore/VKImageAnalysis_WebKit.h>
    151 #import <VisionKitCore/VKImageAnalyzer.h>
    152 #import <VisionKitCore/VKQuad.h>
    153 #endif // ENABLE(IMAGE_ANALYSIS)
     149#import "VisionKitSPI.h"
    154150
    155151#if HAVE(TRANSLATION_UI_SERVICES)

  • trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

    r278767 r278780  
    178178
    179179// FIXME: This should be pulled out into a separate softlinking header (either in PAL or WebKit2).
    180 #import <VisionKitCore/VKImageAnalysis_WebKit.h>
    181 #import <VisionKitCore/VKImageAnalyzer.h>
     180#import "VisionKitSPI.h"
    182181SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(VisionKitCore)
    183182SOFT_LINK_CLASS_OPTIONAL(VisionKitCore, VKImageAnalyzer)

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r278745 r278780  
    44        classes = {
    55        };
    6         objectVersion = 52;
     6        objectVersion = 54;
    77        objects = {
    88
    … …  
    814814                3131261F148FF82C00BA2A39 /* NotificationPermissionRequestManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3131261A148FF82B00BA2A39 /* NotificationPermissionRequestManager.h */; };
    815815                31312621148FF82C00BA2A39 /* WebNotificationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3131261C148FF82B00BA2A39 /* WebNotificationManager.h */; };
     816                3155EE0D2673F4F00085E59A /* VisionKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 3155EE0C2673F4EF0085E59A /* VisionKitSPI.h */; };
    816817                3157135F2040A9B20084F9CF /* SystemPreviewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3157135D2040A9B20084F9CF /* SystemPreviewController.h */; };
    817818                316B8B642054B55800BD4A62 /* WKSystemPreviewView.h in Headers */ = {isa = PBXBuildFile; fileRef = 316B8B622054B55800BD4A62 /* WKSystemPreviewView.h */; };
    … …  
    35513552                314888FE1D91B11D00377042 /* WKTextChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKTextChecker.cpp; sourceTree = "<group>"; };
    35523553                314888FF1D91B11D00377042 /* WKTextChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKTextChecker.h; sourceTree = "<group>"; };
     3554                3155EE0C2673F4EF0085E59A /* VisionKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisionKitSPI.h; sourceTree = "<group>"; };
    35533555                3157135C2040A9B20084F9CF /* SystemPreviewControllerCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SystemPreviewControllerCocoa.mm; sourceTree = "<group>"; };
    35543556                3157135D2040A9B20084F9CF /* SystemPreviewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SystemPreviewController.h; sourceTree = "<group>"; };
    … …  
    79097911                        isa = PBXGroup;
    79107912                        children = (
     7913                                3155EE0C2673F4EF0085E59A /* VisionKitSPI.h */,
    79117914                                E3CAAA432413278A00CED2E2 /* AccessibilitySupportSPI.h */,
    79127915                                572EBBDC25392181000552B3 /* AppAttestSPI.h */,
    … …  
    1203612039                                93B2614F227D14B100B97A76 /* LocalStorageDatabaseTracker.h in Headers */,
    1203712040                                46BEB6DB22FB9D4800269867 /* LocalStorageNamespace.h in Headers */,
     12041                                3155EE0D2673F4F00085E59A /* VisionKitSPI.h in Headers */,
    1203812042                                51A7F2F3125BF820008AEB1D /* Logging.h in Headers */,
    1203912043                                0FDCD7F71D47E92A009F08BC /* LogInitialization.h in Headers */,

  • trunk/Tools/ChangeLog

    r278776 r278780  
     12021-06-11  Jonathan Bedard  <jbedard@apple.com>
     2
     3        [Monterey] Support building WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=226846
     5        <rdar://problem/79095148>
     6
     7        Reviewed by Tim Horton.
     8
     9        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: Add CoreCryptoSPI.h.
     10        * TestWebKitAPI/Tests/WebCore/cocoa/CoreCryptoSPI.h: Added.
     11        * TestWebKitAPI/Tests/WebCore/cocoa/PrivateClickMeasurementCocoa.mm: Import CoreCryptoSPI.h.
     12        * TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm: Ditto.
     13
    1142021-06-11  Devin Rousso  <drousso@apple.com>
    215

  • trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

    r278736 r278780  
    20022002                31E9BDA0247F4C62002E51A2 /* WebGLPrepareDisplayOnWebThread.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WebGLPrepareDisplayOnWebThread.mm; sourceTree = "<group>"; };
    20032003                31E9BDA2247F4DD0002E51A2 /* webgl.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = webgl.html; sourceTree = "<group>"; };
     2004                31F865E526701E73003BFC6D /* CoreCryptoSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreCryptoSPI.h; sourceTree = "<group>"; };
    20042005                333B9CE11277F23100FEFCE3 /* PreventEmptyUserAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PreventEmptyUserAgent.cpp; sourceTree = "<group>"; };
    20052006                33976D8224DC479B00812304 /* IndexSparseSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexSparseSet.cpp; sourceTree = "<group>"; };
    … …  
    48664867                        children = (
    48674868                                0711DF51226A95FB003DD2F7 /* AVFoundationSoftLinkTest.mm */,
     4869                                31F865E526701E73003BFC6D /* CoreCryptoSPI.h */,
    48684870                                751B05D51F8EAC1A0028A09E /* DatabaseTrackerTest.mm */,
    48694871                                57F1C91025DDD51900E8F6EA /* PrivateClickMeasurementCocoa.mm */,

  • trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/PrivateClickMeasurementCocoa.mm

    r277740 r278780  
    2929#if HAVE(RSA_BSSA)
    3030
    31 #include <Security/SecKeyPriv.h>
     31#include "CoreCryptoSPI.h"
     32
    3233#include <WebCore/PrivateClickMeasurement.h>
    33 
    34 extern "C" {
    35 #include <corecrypto/cc_priv.h>
    36 #include <corecrypto/ccrng.h>
    37 #include <corecrypto/ccrsa.h>
    38 #include <corecrypto/ccrsabssa.h>
    39 }
     34#include <wtf/spi/cocoa/SecuritySPI.h>
    4035
    4136using namespace WebCore;

  • trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm

    r277769 r278780  
    3838#if HAVE(RSA_BSSA)
    3939
     40#include "CoreCryptoSPI.h"
     41
    4042#include <Security/SecKeyPriv.h>
    4143#include <WebCore/PrivateClickMeasurement.h>
    42 
    43 extern "C" {
    44 #include <corecrypto/cc_priv.h>
    45 #include <corecrypto/ccrng.h>
    46 #include <corecrypto/ccrsa.h>
    47 #include <corecrypto/ccrsabssa.h>
    48 }
     44#include <wtf/spi/cocoa/SecuritySPI.h>
    4945
    5046#endif // HAVE(RSA_BSSA)
Note: See TracChangeset for help on using the changeset viewer.