Changeset 279491 in webkit
- Timestamp:
- Jul 1, 2021, 6:07:54 PM (5 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 edited
- 3 moved
-
ChangeLog (modified) (1 diff)
-
PAL/ChangeLog (modified) (1 diff)
-
PAL/PAL.xcodeproj/project.pbxproj (modified) (8 diffs)
-
PAL/pal/PlatformMac.cmake (modified) (1 diff)
-
PAL/pal/cocoa/CryptoKitPrivateSoftLink.h (moved) (moved from trunk/Source/WebCore/PAL/pal/cocoa/CryptoKitCBridgingSoftLink.h ) (1 diff)
-
PAL/pal/cocoa/CryptoKitPrivateSoftLink.mm (moved) (moved from trunk/Source/WebCore/PAL/pal/cocoa/CryptoKitCBridgingSoftLink.mm ) (1 diff)
-
PAL/pal/spi/cocoa/CryptoKitPrivateSPI.h (moved) (moved from trunk/Source/WebCore/PAL/pal/spi/cocoa/CryptoKitCBridgingSPI.h ) (1 diff)
-
loader/cocoa/PrivateClickMeasurementCocoa.mm (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r279490 r279491 1 2021-07-01 John Wilander <wilander@apple.com> 2 3 PCM: Change import from CryptoKitCBridging to CryptoKitPrivate 4 https://bugs.webkit.org/show_bug.cgi?id=227556 5 <rdar://79992592> 6 7 Reviewed by Alex Christensen. 8 9 Patch by Frederic Jacobs. 10 11 No new tests since no functionality is changed. 12 13 * loader/cocoa/PrivateClickMeasurementCocoa.mm: 14 Changed import from CryptoKitCBridgingSoftLink.h to CryptoKitPrivateSoftLink.h. 15 1 16 2021-07-01 Alex Christensen <achristensen@webkit.org> 2 17 -
trunk/Source/WebCore/PAL/ChangeLog
r279467 r279491 1 2021-07-01 John Wilander <wilander@apple.com> 2 3 PCM: Change import from CryptoKitCBridging to CryptoKitPrivate 4 https://bugs.webkit.org/show_bug.cgi?id=227556 5 <rdar://79992592> 6 7 Reviewed by Alex Christensen. 8 9 Patch by Frederic Jacobs. 10 11 * PAL.xcodeproj/project.pbxproj: 12 * pal/PlatformMac.cmake: 13 * pal/cocoa/CryptoKitPrivateSoftLink.h: Renamed from Source/WebCore/PAL/pal/cocoa/CryptoKitCBridgingSoftLink.h. 14 * pal/cocoa/CryptoKitPrivateSoftLink.mm: Renamed from Source/WebCore/PAL/pal/cocoa/CryptoKitCBridgingSoftLink.mm. 15 * pal/spi/cocoa/CryptoKitPrivateSPI.h: Renamed from Source/WebCore/PAL/pal/spi/cocoa/CryptoKitCBridgingSPI.h. 16 1 17 2021-07-01 Amir Mark Jr <amir_mark@apple.com> 2 18 -
trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
r279467 r279491 141 141 572A107822B456F500F410C8 /* AuthKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 572A107722B456F500F410C8 /* AuthKitSPI.h */; }; 142 142 576CA9D622B854AB0030143C /* AppSSOSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 576CA9D522B854AB0030143C /* AppSSOSPI.h */; }; 143 57F1C90925DCF0CF00E8F6EA /* CryptoKit CBridgingSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 57F1C90725DCF0CF00E8F6EA /* CryptoKitCBridgingSoftLink.h */; };144 57F1C90A25DCF0CF00E8F6EA /* CryptoKit CBridgingSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 57F1C90825DCF0CF00E8F6EA /* CryptoKitCBridgingSoftLink.mm */; };143 57F1C90925DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 57F1C90725DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.h */; }; 144 57F1C90A25DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 57F1C90825DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.mm */; }; 145 145 57FD318A22B3593E008D0E8B /* AppSSOSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 57FD318922B3593E008D0E8B /* AppSSOSoftLink.mm */; }; 146 146 57FD318B22B35989008D0E8B /* AppSSOSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 57FD318822B3592F008D0E8B /* AppSSOSoftLink.h */; }; … … 201 201 CDF91113220E4EEC001EA39E /* CelestialSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF91112220E4EEC001EA39E /* CelestialSPI.h */; }; 202 202 CE5673872151A7B9002F92D7 /* IOKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE5673862151A7B9002F92D7 /* IOKitSPI.h */; }; 203 DF83E209263734F1000825EF /* CryptoKit CBridgingSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = DF83E208263734F1000825EF /* CryptoKitCBridgingSPI.h */; };203 DF83E209263734F1000825EF /* CryptoKitPrivateSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = DF83E208263734F1000825EF /* CryptoKitPrivateSPI.h */; }; 204 204 E327C0DF260BE436002281C5 /* NotifySPI.h in Headers */ = {isa = PBXBuildFile; fileRef = E327C0DE260BDC90002281C5 /* NotifySPI.h */; }; 205 205 E5D45D122106A07400D2B738 /* NSColorWellSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = E5D45D112106A07400D2B738 /* NSColorWellSPI.h */; }; … … 361 361 572A107722B456F500F410C8 /* AuthKitSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AuthKitSPI.h; sourceTree = "<group>"; }; 362 362 576CA9D522B854AB0030143C /* AppSSOSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppSSOSPI.h; sourceTree = "<group>"; }; 363 57F1C90725DCF0CF00E8F6EA /* CryptoKit CBridgingSoftLink.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CryptoKitCBridgingSoftLink.h; sourceTree = "<group>"; };364 57F1C90825DCF0CF00E8F6EA /* CryptoKit CBridgingSoftLink.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CryptoKitCBridgingSoftLink.mm; sourceTree = "<group>"; };363 57F1C90725DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CryptoKitPrivateSoftLink.h; sourceTree = "<group>"; }; 364 57F1C90825DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CryptoKitPrivateSoftLink.mm; sourceTree = "<group>"; }; 365 365 57FD318822B3592F008D0E8B /* AppSSOSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppSSOSoftLink.h; sourceTree = "<group>"; }; 366 366 57FD318922B3593E008D0E8B /* AppSSOSoftLink.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppSSOSoftLink.mm; sourceTree = "<group>"; }; … … 426 426 CDF91112220E4EEC001EA39E /* CelestialSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CelestialSPI.h; sourceTree = "<group>"; }; 427 427 CE5673862151A7B9002F92D7 /* IOKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOKitSPI.h; sourceTree = "<group>"; }; 428 DF83E208263734F1000825EF /* CryptoKit CBridgingSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKitCBridgingSPI.h; sourceTree = "<group>"; };428 DF83E208263734F1000825EF /* CryptoKitPrivateSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKitPrivateSPI.h; sourceTree = "<group>"; }; 429 429 E327C0DE260BDC90002281C5 /* NotifySPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NotifySPI.h; sourceTree = "<group>"; }; 430 430 E5D45D112106A07400D2B738 /* NSColorWellSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSColorWellSPI.h; sourceTree = "<group>"; }; … … 527 527 ABCA536724895DB900361BFF /* CoreMotionSPI.h */, 528 528 C138EA1A2436447200656DF1 /* CoreServicesSPI.h */, 529 DF83E208263734F1000825EF /* CryptoKit CBridgingSPI.h */,529 DF83E208263734F1000825EF /* CryptoKitPrivateSPI.h */, 530 530 0C2DA1251F3BEB4900DBC317 /* DataDetectorsCoreSPI.h */, 531 531 1D12CC4A2411BCAE00FDA0A3 /* FeatureFlagsSPI.h */, … … 734 734 077E87B0226A460200A2AFF0 /* AVFoundationSoftLink.h */, 735 735 077E87AF226A460200A2AFF0 /* AVFoundationSoftLink.mm */, 736 57F1C90725DCF0CF00E8F6EA /* CryptoKit CBridgingSoftLink.h */,737 57F1C90825DCF0CF00E8F6EA /* CryptoKit CBridgingSoftLink.mm */,736 57F1C90725DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.h */, 737 57F1C90825DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.mm */, 738 738 F4DDD01A264DC69E00EF1B91 /* DataDetectorsCoreSoftLink.h */, 739 739 F4DDD019264DC69E00EF1B91 /* DataDetectorsCoreSoftLink.mm */, … … 884 884 0C5AF9191F43A4C7002EAC02 /* CoreUISPI.h in Headers */, 885 885 1C09D0531E31C44100725F18 /* CryptoDigest.h in Headers */, 886 57F1C90925DCF0CF00E8F6EA /* CryptoKit CBridgingSoftLink.h in Headers */,887 DF83E209263734F1000825EF /* CryptoKit CBridgingSPI.h in Headers */,886 57F1C90925DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.h in Headers */, 887 DF83E209263734F1000825EF /* CryptoKitPrivateSPI.h in Headers */, 888 888 F4DDD01C264DC69E00EF1B91 /* DataDetectorsCoreSoftLink.h in Headers */, 889 889 0C2DA1411F3BEB4900DBC317 /* DataDetectorsCoreSPI.h in Headers */, … … 1104 1104 1C77C8C925D7972000635E0C /* CoreTextSoftLink.cpp in Sources */, 1105 1105 1C09D0561E31C46500725F18 /* CryptoDigestCommonCrypto.cpp in Sources */, 1106 57F1C90A25DCF0CF00E8F6EA /* CryptoKit CBridgingSoftLink.mm in Sources */,1106 57F1C90A25DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.mm in Sources */, 1107 1107 F4DDD01B264DC69E00EF1B91 /* DataDetectorsCoreSoftLink.mm in Sources */, 1108 1108 F4E0875C266ACA53000F814A /* DataDetectorsSoftLink.mm in Sources */, -
trunk/Source/WebCore/PAL/pal/PlatformMac.cmake
r279467 r279491 12 12 cocoa/AppSSOSoftLink.h 13 13 cocoa/AVFoundationSoftLink.h 14 cocoa/CryptoKit CBridgingSoftLink.h14 cocoa/CryptoKitPrivateSoftLink.h 15 15 cocoa/DataDetectorsCoreSoftLink.h 16 16 cocoa/MediaToolboxSoftLink.h -
trunk/Source/WebCore/PAL/pal/cocoa/CryptoKitPrivateSoftLink.h
r279490 r279491 28 28 #if HAVE(RSA_BSSA) 29 29 30 #import <pal/spi/cocoa/CryptoKit CBridgingSPI.h>30 #import <pal/spi/cocoa/CryptoKitPrivateSPI.h> 31 31 #import <wtf/SoftLinking.h> 32 32 33 SOFT_LINK_FRAMEWORK_FOR_HEADER(PAL, CryptoKit CBridging);33 SOFT_LINK_FRAMEWORK_FOR_HEADER(PAL, CryptoKitPrivate); 34 34 35 35 SOFT_LINK_CLASS_FOR_HEADER(PAL, RSABSSATokenBlinder); -
trunk/Source/WebCore/PAL/pal/cocoa/CryptoKitPrivateSoftLink.mm
r279490 r279491 30 30 #import <wtf/SoftLinking.h> 31 31 32 SOFT_LINK_PRIVATE_FRAMEWORK_FOR_SOURCE_WITH_EXPORT(PAL, CryptoKit CBridging, PAL_EXPORT);32 SOFT_LINK_PRIVATE_FRAMEWORK_FOR_SOURCE_WITH_EXPORT(PAL, CryptoKitPrivate, PAL_EXPORT); 33 33 34 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, CryptoKit CBridging, RSABSSATokenBlinder, PAL_EXPORT);34 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, CryptoKitPrivate, RSABSSATokenBlinder, PAL_EXPORT); 35 35 36 36 #endif -
trunk/Source/WebCore/PAL/pal/spi/cocoa/CryptoKitPrivateSPI.h
r279490 r279491 30 30 #if USE(APPLE_INTERNAL_SDK) 31 31 32 // FIXME(227598): Remove conditional once CryptoKitPrivate/RSABSSA.h is available. 33 #if __has_include(<CryptoKitPrivate/RSABSSA.h>) 34 #import <CryptoKitPrivate/RSABSSA.h> 35 #else 32 36 #import <CryptoKitCBridging/RSABSSA.h> 37 #endif 33 38 34 39 #else -
trunk/Source/WebCore/loader/cocoa/PrivateClickMeasurementCocoa.mm
r279467 r279491 27 27 #import "PrivateClickMeasurement.h" 28 28 29 #import <pal/cocoa/CryptoKit CBridgingSoftLink.h>29 #import <pal/cocoa/CryptoKitPrivateSoftLink.h> 30 30 31 31 namespace WebCore {
Note:
See TracChangeset
for help on using the changeset viewer.