Changeset 251854 in webkit
- Timestamp:
- Oct 31, 2019 10:22:17 AM (4 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 3 edited
- 1 copied
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r251847 r251854 1 2019-10-31 Brady Eidson <beidson@apple.com> 2 3 Rejigger WKWebArchive headers. 4 https://bugs.webkit.org/show_bug.cgi?id=203648 5 6 Reviewed by Andy Estes. 7 8 * Shared/API/c/mac/WKWebArchiveRef.cpp: Renamed from Source/WebKit/Shared/API/c/mac/WKWebArchive.cpp. 9 (WKWebArchiveGetTypeID): 10 (WKWebArchiveCreate): 11 (WKWebArchiveCreateWithData): 12 (WKWebArchiveCreateFromRange): 13 (WKWebArchiveCopyMainResource): 14 (WKWebArchiveCopySubresources): 15 (WKWebArchiveCopySubframeArchives): 16 (WKWebArchiveCopyData): 17 * Shared/API/c/mac/WKWebArchiveRef.h: Copied from Source/WebKit/Shared/API/c/mac/WKWebArchive.h. 18 * SourcesCocoa.txt: 19 * UIProcess/API/Cocoa/WKWebArchive.h: Renamed from Source/WebKit/Shared/API/c/mac/WKWebArchive.h. 20 * WebKit.xcodeproj/project.pbxproj: 21 1 22 2019-10-31 Wenson Hsieh <wenson_hsieh@apple.com> 2 23 -
trunk/Source/WebKit/Shared/API/c/mac/WKWebArchiveRef.h
r251853 r251854 24 24 */ 25 25 26 #ifndef WKWebArchive _h27 #define WKWebArchive _h26 #ifndef WKWebArchiveRef_h 27 #define WKWebArchiveRef_h 28 28 29 29 #include <WebKit/WKBase.h> … … 50 50 #endif 51 51 52 #endif // WKWebArchive _h52 #endif // WKWebArchiveRef_h -
trunk/Source/WebKit/SourcesCocoa.txt
r251765 r251854 102 102 Shared/API/c/mac/WKURLRequestNS.mm 103 103 Shared/API/c/mac/WKURLResponseNS.mm 104 Shared/API/c/mac/WKWebArchive .cpp104 Shared/API/c/mac/WKWebArchiveRef.cpp 105 105 Shared/API/c/mac/WKWebArchiveResource.cpp 106 106 -
trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebArchive.h
r251853 r251854 1 1 /* 2 * Copyright (C) 201 3Apple Inc. All rights reserved.2 * Copyright (C) 2019 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 22 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 23 23 * THE POSSIBILITY OF SUCH DAMAGE. 24 24 */ 25 25 26 #ifndef WKWebArchive_h 27 #define WKWebArchive_h 28 29 #include <WebKit/WKBase.h> 30 31 #include <stddef.h> 32 33 #ifdef __cplusplus 34 extern "C" { 26 #if !TARGET_OS_IPHONE 27 #include <WebKit/WKWebArchiveRef.h> 35 28 #endif 36 37 WK_EXPORT WKTypeID WKWebArchiveGetTypeID();38 39 WK_EXPORT WKWebArchiveRef WKWebArchiveCreate(WKWebArchiveResourceRef mainResource, WKArrayRef subresources, WKArrayRef subframeArchives);40 WK_EXPORT WKWebArchiveRef WKWebArchiveCreateWithData(WKDataRef data);41 WK_EXPORT WKWebArchiveRef WKWebArchiveCreateFromRange(WKBundleRangeHandleRef range);42 43 WK_EXPORT WKWebArchiveResourceRef WKWebArchiveCopyMainResource(WKWebArchiveRef webArchive);44 WK_EXPORT WKArrayRef WKWebArchiveCopySubresources(WKWebArchiveRef webArchive);45 WK_EXPORT WKArrayRef WKWebArchiveCopySubframeArchives(WKWebArchiveRef webArchive);46 WK_EXPORT WKDataRef WKWebArchiveCopyData(WKWebArchiveRef webArchive);47 48 #ifdef __cplusplus49 }50 #endif51 52 #endif // WKWebArchive_h -
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
r251814 r251854 956 956 512F58FA12A88A5400629530 /* WKCredential.h in Headers */ = {isa = PBXBuildFile; fileRef = 512F58F212A88A5400629530 /* WKCredential.h */; settings = {ATTRIBUTES = (Private, ); }; }; 957 957 512F58FC12A88A5400629530 /* WKProtectionSpace.h in Headers */ = {isa = PBXBuildFile; fileRef = 512F58F412A88A5400629530 /* WKProtectionSpace.h */; settings = {ATTRIBUTES = (Private, ); }; }; 958 5136E514236A60DC0074FD5D /* WKWebArchiveRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 5136E512236A60C80074FD5D /* WKWebArchiveRef.h */; settings = {ATTRIBUTES = (Private, ); }; }; 959 5136E516236A62110074FD5D /* WKWebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 5136E515236A61190074FD5D /* WKWebArchive.h */; settings = {ATTRIBUTES = (Private, ); }; }; 958 960 513A163C163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 513A163A163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp */; }; 959 961 513A163D163088F6005D7D22 /* NetworkProcessProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 513A163B163088F6005D7D22 /* NetworkProcessProxyMessages.h */; }; … … 1608 1610 C59C4A5918B81174007BDCB6 /* FocusedElementInformation.h in Headers */ = {isa = PBXBuildFile; fileRef = C59C4A5718B81174007BDCB6 /* FocusedElementInformation.h */; }; 1609 1611 C5BCE5DF1C50766A00CDE3FA /* InteractionInformationAtPosition.h in Headers */ = {isa = PBXBuildFile; fileRef = C5BCE5DA1C50761D00CDE3FA /* InteractionInformationAtPosition.h */; }; 1610 C5E1AFE916B20B75006CC1F2 /* WKWebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329DA616ACE5A900316DE2 /* WKWebArchive.h */; settings = {ATTRIBUTES = (Private, ); }; };1611 1612 C5E1AFEB16B20B7E006CC1F2 /* WKWebArchiveResource.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329DAA16ACE5C000316DE2 /* WKWebArchiveResource.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1612 1613 C5E1AFED16B21017006CC1F2 /* APIWebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329D9A16ACCE9900316DE2 /* APIWebArchive.h */; }; … … 3325 3326 512F58F312A88A5400629530 /* WKProtectionSpace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKProtectionSpace.cpp; sourceTree = "<group>"; }; 3326 3327 512F58F412A88A5400629530 /* WKProtectionSpace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProtectionSpace.h; sourceTree = "<group>"; }; 3328 5136E512236A60C80074FD5D /* WKWebArchiveRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebArchiveRef.h; sourceTree = "<group>"; }; 3329 5136E513236A60D10074FD5D /* WKWebArchiveRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKWebArchiveRef.cpp; sourceTree = "<group>"; }; 3330 5136E515236A61190074FD5D /* WKWebArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebArchive.h; sourceTree = "<group>"; }; 3327 3331 513A163A163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkProcessProxyMessageReceiver.cpp; path = DerivedSources/WebKit2/NetworkProcessProxyMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; }; 3328 3332 513A163B163088F6005D7D22 /* NetworkProcessProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessProxyMessages.h; path = DerivedSources/WebKit2/NetworkProcessProxyMessages.h; sourceTree = BUILT_PRODUCTS_DIR; }; … … 4287 4291 BC329D9E16ACD47800316DE2 /* APIWebArchiveResource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = APIWebArchiveResource.mm; sourceTree = "<group>"; }; 4288 4292 BC329D9F16ACD47800316DE2 /* APIWebArchiveResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIWebArchiveResource.h; sourceTree = "<group>"; }; 4289 BC329DA516ACE5A900316DE2 /* WKWebArchive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKWebArchive.cpp; sourceTree = "<group>"; };4290 BC329DA616ACE5A900316DE2 /* WKWebArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebArchive.h; sourceTree = "<group>"; };4291 4293 BC329DA916ACE5BF00316DE2 /* WKWebArchiveResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKWebArchiveResource.cpp; sourceTree = "<group>"; }; 4292 4294 BC329DAA16ACE5C000316DE2 /* WKWebArchiveResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebArchiveResource.h; sourceTree = "<group>"; }; … … 6512 6514 1AAF089C19267FC800B6390C /* WKUserScriptInternal.h */, 6513 6515 7C882DF61C7E995E006BF731 /* WKUserScriptPrivate.h */, 6516 5136E515236A61190074FD5D /* WKWebArchive.h */, 6514 6517 F438CD1B224140A600DE6DDA /* WKWebpagePreferences.h */, 6515 6518 F438CD1D22414AD600DE6DDA /* WKWebpagePreferences.mm */, … … 8466 8469 BC407625124FF0400068F20A /* WKURLResponseNS.h */, 8467 8470 BC407626124FF0400068F20A /* WKURLResponseNS.mm */, 8468 BC329DA516ACE5A900316DE2 /* WKWebArchive.cpp */,8469 BC329DA616ACE5A900316DE2 /* WKWebArchive.h */,8471 5136E513236A60D10074FD5D /* WKWebArchiveRef.cpp */, 8472 5136E512236A60C80074FD5D /* WKWebArchiveRef.h */, 8470 8473 BC329DA916ACE5BF00316DE2 /* WKWebArchiveResource.cpp */, 8471 8474 BC329DAA16ACE5C000316DE2 /* WKWebArchiveResource.h */, … … 10456 10459 2D28A4971AF965A100F190C9 /* WKViewLayoutStrategy.h in Headers */, 10457 10460 BFA6179F12F0B99D0033E0CA /* WKViewPrivate.h in Headers */, 10458 C5E1AFE916B20B75006CC1F2 /* WKWebArchive.h in Headers */, 10461 5136E516236A62110074FD5D /* WKWebArchive.h in Headers */, 10462 5136E514236A60DC0074FD5D /* WKWebArchiveRef.h in Headers */, 10459 10463 C5E1AFEB16B20B7E006CC1F2 /* WKWebArchiveResource.h in Headers */, 10460 10464 2D1E8223216FFF5100A15265 /* WKWebEvent.h in Headers */,
Note: See TracChangeset
for help on using the changeset viewer.