Changeset 251952 in webkit


Ignore:
Timestamp:
Nov 1, 2019 4:34:27 PM (4 years ago)
Author:
beidson@apple.com
Message:

Rejigger WKWebArchive headers.
​https://bugs.webkit.org/show_bug.cgi?id=203648

Reviewed by Andy Estes.

  • Shared/API/c/mac/WKWebArchiveRef.cpp: Renamed from Source/WebKit/Shared/API/c/mac/WKWebArchive.cpp.

(WKWebArchiveGetTypeID):
(WKWebArchiveCreate):
(WKWebArchiveCreateWithData):
(WKWebArchiveCreateFromRange):
(WKWebArchiveCopyMainResource):
(WKWebArchiveCopySubresources):
(WKWebArchiveCopySubframeArchives):
(WKWebArchiveCopyData):

  • Shared/API/c/mac/WKWebArchiveRef.h: Copied from Source/WebKit/Shared/API/c/mac/WKWebArchive.h.
  • SourcesCocoa.txt:
  • UIProcess/API/Cocoa/WKWebArchive.h: Renamed from Source/WebKit/Shared/API/c/mac/WKWebArchive.h.
  • WebKit.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit
Files:
3 edited
1 copied
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r251950 r251952  
     12019-11-01  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
    1222019-11-01  Eric Carlson  <eric.carlson@apple.com>
    223

  • trunk/Source/WebKit/Shared/API/c/mac/WKWebArchiveRef.cpp

    r251951 r251952  
    2525
    2626#include "config.h"
    27 #include "WKWebArchive.h"
     27#include "WKWebArchiveRef.h"
    2828
    2929#include "APIArray.h"

  • trunk/Source/WebKit/Shared/API/c/mac/WKWebArchiveRef.h

    r251951 r251952  
    2424 */
    2525
    26 #ifndef WKWebArchive_h
    27 #define WKWebArchive_h
     26#ifndef WKWebArchiveRef_h
     27#define WKWebArchiveRef_h
    2828
    2929#include <WebKit/WKBase.h>
    … …  
    5050#endif
    5151
    52 #endif // WKWebArchive_h
     52#endif // WKWebArchiveRef_h

  • trunk/Source/WebKit/SourcesCocoa.txt

    r251868 r251952  
    102102Shared/API/c/mac/WKURLRequestNS.mm
    103103Shared/API/c/mac/WKURLResponseNS.mm
    104 Shared/API/c/mac/WKWebArchive.cpp
     104Shared/API/c/mac/WKWebArchiveRef.cpp
    105105Shared/API/c/mac/WKWebArchiveResource.cpp
    106106

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebArchive.h

    r251951 r251952  
    11/*
    2  * Copyright (C) 2013 Apple Inc. All rights reserved.
     2 * Copyright (C) 2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2222 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
    2323 * THE POSSIBILITY OF SUCH DAMAGE.
    24  */
     24*/
    2525
    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>
    3528#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 __cplusplus
    49 }
    50 #endif
    51 
    52 #endif // WKWebArchive_h

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

    r251868 r251952  
    956956                512F58FA12A88A5400629530 /* WKCredential.h in Headers */ = {isa = PBXBuildFile; fileRef = 512F58F212A88A5400629530 /* WKCredential.h */; settings = {ATTRIBUTES = (Private, ); }; };
    957957                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, ); }; };
    958960                513A163C163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 513A163A163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp */; };
    959961                513A163D163088F6005D7D22 /* NetworkProcessProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 513A163B163088F6005D7D22 /* NetworkProcessProxyMessages.h */; };
    … …  
    16081610                C59C4A5918B81174007BDCB6 /* FocusedElementInformation.h in Headers */ = {isa = PBXBuildFile; fileRef = C59C4A5718B81174007BDCB6 /* FocusedElementInformation.h */; };
    16091611                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, ); }; };
    16111612                C5E1AFEB16B20B7E006CC1F2 /* WKWebArchiveResource.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329DAA16ACE5C000316DE2 /* WKWebArchiveResource.h */; settings = {ATTRIBUTES = (Private, ); }; };
    16121613                C5E1AFED16B21017006CC1F2 /* APIWebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329D9A16ACCE9900316DE2 /* APIWebArchive.h */; };
    … …  
    33253326                512F58F312A88A5400629530 /* WKProtectionSpace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKProtectionSpace.cpp; sourceTree = "<group>"; };
    33263327                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>"; };
    33273331                513A163A163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkProcessProxyMessageReceiver.cpp; path = DerivedSources/WebKit2/NetworkProcessProxyMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
    33283332                513A163B163088F6005D7D22 /* NetworkProcessProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessProxyMessages.h; path = DerivedSources/WebKit2/NetworkProcessProxyMessages.h; sourceTree = BUILT_PRODUCTS_DIR; };
    … …  
    42874291                BC329D9E16ACD47800316DE2 /* APIWebArchiveResource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = APIWebArchiveResource.mm; sourceTree = "<group>"; };
    42884292                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>"; };
    42914293                BC329DA916ACE5BF00316DE2 /* WKWebArchiveResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKWebArchiveResource.cpp; sourceTree = "<group>"; };
    42924294                BC329DAA16ACE5C000316DE2 /* WKWebArchiveResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebArchiveResource.h; sourceTree = "<group>"; };
    … …  
    65126514                                1AAF089C19267FC800B6390C /* WKUserScriptInternal.h */,
    65136515                                7C882DF61C7E995E006BF731 /* WKUserScriptPrivate.h */,
     6516                                5136E515236A61190074FD5D /* WKWebArchive.h */,
    65146517                                F438CD1B224140A600DE6DDA /* WKWebpagePreferences.h */,
    65156518                                F438CD1D22414AD600DE6DDA /* WKWebpagePreferences.mm */,
    … …  
    84668469                                BC407625124FF0400068F20A /* WKURLResponseNS.h */,
    84678470                                BC407626124FF0400068F20A /* WKURLResponseNS.mm */,
    8468                                 BC329DA516ACE5A900316DE2 /* WKWebArchive.cpp */,
    8469                                 BC329DA616ACE5A900316DE2 /* WKWebArchive.h */,
     8471                                5136E513236A60D10074FD5D /* WKWebArchiveRef.cpp */,
     8472                                5136E512236A60C80074FD5D /* WKWebArchiveRef.h */,
    84708473                                BC329DA916ACE5BF00316DE2 /* WKWebArchiveResource.cpp */,
    84718474                                BC329DAA16ACE5C000316DE2 /* WKWebArchiveResource.h */,
    … …  
    1045610459                                2D28A4971AF965A100F190C9 /* WKViewLayoutStrategy.h in Headers */,
    1045710460                                BFA6179F12F0B99D0033E0CA /* WKViewPrivate.h in Headers */,
    10458                                 C5E1AFE916B20B75006CC1F2 /* WKWebArchive.h in Headers */,
     10461                                5136E516236A62110074FD5D /* WKWebArchive.h in Headers */,
     10462                                5136E514236A60DC0074FD5D /* WKWebArchiveRef.h in Headers */,
    1045910463                                C5E1AFEB16B20B7E006CC1F2 /* WKWebArchiveResource.h in Headers */,
    1046010464                                2D1E8223216FFF5100A15265 /* WKWebEvent.h in Headers */,
Note: See TracChangeset for help on using the changeset viewer.