Diff
Modified: trunk/Source/WebKit/ChangeLog (251951 => 251952)
--- trunk/Source/WebKit/ChangeLog 2019-11-01 23:07:34 UTC (rev 251951)
+++ trunk/Source/WebKit/ChangeLog 2019-11-01 23:34:27 UTC (rev 251952)
@@ -1,3 +1,24 @@
+2019-11-01 Brady Eidson <beid...@apple.com>
+
+ 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:
+
2019-11-01 Eric Carlson <eric.carl...@apple.com>
Add experimental TextTrackCue API
Deleted: trunk/Source/WebKit/Shared/API/c/mac/WKWebArchive.cpp (251951 => 251952)
--- trunk/Source/WebKit/Shared/API/c/mac/WKWebArchive.cpp 2019-11-01 23:07:34 UTC (rev 251951)
+++ trunk/Source/WebKit/Shared/API/c/mac/WKWebArchive.cpp 2019-11-01 23:34:27 UTC (rev 251952)
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WKWebArchive.h"
-
-#include "APIArray.h"
-#include "APIData.h"
-#include "APIWebArchive.h"
-#include "APIWebArchiveResource.h"
-#include "InjectedBundleRangeHandle.h"
-#include "WKBundleAPICast.h"
-#include "WKSharedAPICast.h"
-
-WKTypeID WKWebArchiveGetTypeID()
-{
- return WebKit::toAPI(API::WebArchive::APIType);
-}
-
-WKWebArchiveRef WKWebArchiveCreate(WKWebArchiveResourceRef mainResourceRef, WKArrayRef subresourcesRef, WKArrayRef subframeArchivesRef)
-{
- auto webArchive = API::WebArchive::create(WebKit::toImpl(mainResourceRef), WebKit::toImpl(subresourcesRef), WebKit::toImpl(subframeArchivesRef));
- return WebKit::toAPI(&webArchive.leakRef());
-}
-
-WKWebArchiveRef WKWebArchiveCreateWithData(WKDataRef dataRef)
-{
- auto webArchive = API::WebArchive::create(WebKit::toImpl(dataRef));
- return WebKit::toAPI(&webArchive.leakRef());
-}
-
-WKWebArchiveRef WKWebArchiveCreateFromRange(WKBundleRangeHandleRef rangeHandleRef)
-{
- auto webArchive = API::WebArchive::create(WebKit::toImpl(rangeHandleRef)->coreRange());
- return WebKit::toAPI(&webArchive.leakRef());
-}
-
-WKWebArchiveResourceRef WKWebArchiveCopyMainResource(WKWebArchiveRef webArchiveRef)
-{
- RefPtr<API::WebArchiveResource> mainResource = WebKit::toImpl(webArchiveRef)->mainResource();
- return WebKit::toAPI(mainResource.leakRef());
-}
-
-WKArrayRef WKWebArchiveCopySubresources(WKWebArchiveRef webArchiveRef)
-{
- RefPtr<API::Array> subresources = WebKit::toImpl(webArchiveRef)->subresources();
- return WebKit::toAPI(subresources.leakRef());
-}
-
-WKArrayRef WKWebArchiveCopySubframeArchives(WKWebArchiveRef webArchiveRef)
-{
- RefPtr<API::Array> subframeArchives = WebKit::toImpl(webArchiveRef)->subframeArchives();
- return WebKit::toAPI(subframeArchives.leakRef());
-}
-
-WKDataRef WKWebArchiveCopyData(WKWebArchiveRef webArchiveRef)
-{
- return WebKit::toAPI(&WebKit::toImpl(webArchiveRef)->data().leakRef());
-}
Deleted: trunk/Source/WebKit/Shared/API/c/mac/WKWebArchive.h (251951 => 251952)
--- trunk/Source/WebKit/Shared/API/c/mac/WKWebArchive.h 2019-11-01 23:07:34 UTC (rev 251951)
+++ trunk/Source/WebKit/Shared/API/c/mac/WKWebArchive.h 2019-11-01 23:34:27 UTC (rev 251952)
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WKWebArchive_h
-#define WKWebArchive_h
-
-#include <WebKit/WKBase.h>
-
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WK_EXPORT WKTypeID WKWebArchiveGetTypeID();
-
-WK_EXPORT WKWebArchiveRef WKWebArchiveCreate(WKWebArchiveResourceRef mainResource, WKArrayRef subresources, WKArrayRef subframeArchives);
-WK_EXPORT WKWebArchiveRef WKWebArchiveCreateWithData(WKDataRef data);
-WK_EXPORT WKWebArchiveRef WKWebArchiveCreateFromRange(WKBundleRangeHandleRef range);
-
-WK_EXPORT WKWebArchiveResourceRef WKWebArchiveCopyMainResource(WKWebArchiveRef webArchive);
-WK_EXPORT WKArrayRef WKWebArchiveCopySubresources(WKWebArchiveRef webArchive);
-WK_EXPORT WKArrayRef WKWebArchiveCopySubframeArchives(WKWebArchiveRef webArchive);
-WK_EXPORT WKDataRef WKWebArchiveCopyData(WKWebArchiveRef webArchive);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // WKWebArchive_h
Copied: trunk/Source/WebKit/Shared/API/c/mac/WKWebArchiveRef.cpp (from rev 251951, trunk/Source/WebKit/Shared/API/c/mac/WKWebArchive.cpp) (0 => 251952)
--- trunk/Source/WebKit/Shared/API/c/mac/WKWebArchiveRef.cpp (rev 0)
+++ trunk/Source/WebKit/Shared/API/c/mac/WKWebArchiveRef.cpp 2019-11-01 23:34:27 UTC (rev 251952)
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WKWebArchiveRef.h"
+
+#include "APIArray.h"
+#include "APIData.h"
+#include "APIWebArchive.h"
+#include "APIWebArchiveResource.h"
+#include "InjectedBundleRangeHandle.h"
+#include "WKBundleAPICast.h"
+#include "WKSharedAPICast.h"
+
+WKTypeID WKWebArchiveGetTypeID()
+{
+ return WebKit::toAPI(API::WebArchive::APIType);
+}
+
+WKWebArchiveRef WKWebArchiveCreate(WKWebArchiveResourceRef mainResourceRef, WKArrayRef subresourcesRef, WKArrayRef subframeArchivesRef)
+{
+ auto webArchive = API::WebArchive::create(WebKit::toImpl(mainResourceRef), WebKit::toImpl(subresourcesRef), WebKit::toImpl(subframeArchivesRef));
+ return WebKit::toAPI(&webArchive.leakRef());
+}
+
+WKWebArchiveRef WKWebArchiveCreateWithData(WKDataRef dataRef)
+{
+ auto webArchive = API::WebArchive::create(WebKit::toImpl(dataRef));
+ return WebKit::toAPI(&webArchive.leakRef());
+}
+
+WKWebArchiveRef WKWebArchiveCreateFromRange(WKBundleRangeHandleRef rangeHandleRef)
+{
+ auto webArchive = API::WebArchive::create(WebKit::toImpl(rangeHandleRef)->coreRange());
+ return WebKit::toAPI(&webArchive.leakRef());
+}
+
+WKWebArchiveResourceRef WKWebArchiveCopyMainResource(WKWebArchiveRef webArchiveRef)
+{
+ RefPtr<API::WebArchiveResource> mainResource = WebKit::toImpl(webArchiveRef)->mainResource();
+ return WebKit::toAPI(mainResource.leakRef());
+}
+
+WKArrayRef WKWebArchiveCopySubresources(WKWebArchiveRef webArchiveRef)
+{
+ RefPtr<API::Array> subresources = WebKit::toImpl(webArchiveRef)->subresources();
+ return WebKit::toAPI(subresources.leakRef());
+}
+
+WKArrayRef WKWebArchiveCopySubframeArchives(WKWebArchiveRef webArchiveRef)
+{
+ RefPtr<API::Array> subframeArchives = WebKit::toImpl(webArchiveRef)->subframeArchives();
+ return WebKit::toAPI(subframeArchives.leakRef());
+}
+
+WKDataRef WKWebArchiveCopyData(WKWebArchiveRef webArchiveRef)
+{
+ return WebKit::toAPI(&WebKit::toImpl(webArchiveRef)->data().leakRef());
+}
Copied: trunk/Source/WebKit/Shared/API/c/mac/WKWebArchiveRef.h (from rev 251951, trunk/Source/WebKit/Shared/API/c/mac/WKWebArchive.h) (0 => 251952)
--- trunk/Source/WebKit/Shared/API/c/mac/WKWebArchiveRef.h (rev 0)
+++ trunk/Source/WebKit/Shared/API/c/mac/WKWebArchiveRef.h 2019-11-01 23:34:27 UTC (rev 251952)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WKWebArchiveRef_h
+#define WKWebArchiveRef_h
+
+#include <WebKit/WKBase.h>
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WK_EXPORT WKTypeID WKWebArchiveGetTypeID();
+
+WK_EXPORT WKWebArchiveRef WKWebArchiveCreate(WKWebArchiveResourceRef mainResource, WKArrayRef subresources, WKArrayRef subframeArchives);
+WK_EXPORT WKWebArchiveRef WKWebArchiveCreateWithData(WKDataRef data);
+WK_EXPORT WKWebArchiveRef WKWebArchiveCreateFromRange(WKBundleRangeHandleRef range);
+
+WK_EXPORT WKWebArchiveResourceRef WKWebArchiveCopyMainResource(WKWebArchiveRef webArchive);
+WK_EXPORT WKArrayRef WKWebArchiveCopySubresources(WKWebArchiveRef webArchive);
+WK_EXPORT WKArrayRef WKWebArchiveCopySubframeArchives(WKWebArchiveRef webArchive);
+WK_EXPORT WKDataRef WKWebArchiveCopyData(WKWebArchiveRef webArchive);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // WKWebArchiveRef_h
Modified: trunk/Source/WebKit/SourcesCocoa.txt (251951 => 251952)
--- trunk/Source/WebKit/SourcesCocoa.txt 2019-11-01 23:07:34 UTC (rev 251951)
+++ trunk/Source/WebKit/SourcesCocoa.txt 2019-11-01 23:34:27 UTC (rev 251952)
@@ -101,7 +101,7 @@
Shared/API/c/mac/WKObjCTypeWrapperRef.mm
Shared/API/c/mac/WKURLRequestNS.mm
Shared/API/c/mac/WKURLResponseNS.mm
-Shared/API/c/mac/WKWebArchive.cpp
+Shared/API/c/mac/WKWebArchiveRef.cpp
Shared/API/c/mac/WKWebArchiveResource.cpp
Shared/API/Cocoa/_WKFrameHandle.mm
Copied: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebArchive.h (from rev 251951, trunk/Source/WebKit/Shared/API/c/mac/WKWebArchive.h) (0 => 251952)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebArchive.h (rev 0)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebArchive.h 2019-11-01 23:34:27 UTC (rev 251952)
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2019 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#if !TARGET_OS_IPHONE
+#include <WebKit/WKWebArchiveRef.h>
+#endif
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (251951 => 251952)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-11-01 23:07:34 UTC (rev 251951)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-11-01 23:34:27 UTC (rev 251952)
@@ -955,6 +955,8 @@
512F58F812A88A5400629530 /* WKAuthenticationDecisionListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 512F58F012A88A5400629530 /* WKAuthenticationDecisionListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
512F58FA12A88A5400629530 /* WKCredential.h in Headers */ = {isa = PBXBuildFile; fileRef = 512F58F212A88A5400629530 /* WKCredential.h */; settings = {ATTRIBUTES = (Private, ); }; };
512F58FC12A88A5400629530 /* WKProtectionSpace.h in Headers */ = {isa = PBXBuildFile; fileRef = 512F58F412A88A5400629530 /* WKProtectionSpace.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 5136E514236A60DC0074FD5D /* WKWebArchiveRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 5136E512236A60C80074FD5D /* WKWebArchiveRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 5136E516236A62110074FD5D /* WKWebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 5136E515236A61190074FD5D /* WKWebArchive.h */; settings = {ATTRIBUTES = (Private, ); }; };
513A163C163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 513A163A163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp */; };
513A163D163088F6005D7D22 /* NetworkProcessProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 513A163B163088F6005D7D22 /* NetworkProcessProxyMessages.h */; };
513A164D1630A9BF005D7D22 /* NetworkConnectionToWebProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 513A164A1630A9BF005D7D22 /* NetworkConnectionToWebProcess.h */; };
@@ -1607,7 +1609,6 @@
C574A58112E66681002DFE98 /* PasteboardTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = C574A57F12E66681002DFE98 /* PasteboardTypes.h */; };
C59C4A5918B81174007BDCB6 /* FocusedElementInformation.h in Headers */ = {isa = PBXBuildFile; fileRef = C59C4A5718B81174007BDCB6 /* FocusedElementInformation.h */; };
C5BCE5DF1C50766A00CDE3FA /* InteractionInformationAtPosition.h in Headers */ = {isa = PBXBuildFile; fileRef = C5BCE5DA1C50761D00CDE3FA /* InteractionInformationAtPosition.h */; };
- C5E1AFE916B20B75006CC1F2 /* WKWebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329DA616ACE5A900316DE2 /* WKWebArchive.h */; settings = {ATTRIBUTES = (Private, ); }; };
C5E1AFEB16B20B7E006CC1F2 /* WKWebArchiveResource.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329DAA16ACE5C000316DE2 /* WKWebArchiveResource.h */; settings = {ATTRIBUTES = (Private, ); }; };
C5E1AFED16B21017006CC1F2 /* APIWebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329D9A16ACCE9900316DE2 /* APIWebArchive.h */; };
C5E1AFEF16B21029006CC1F2 /* APIWebArchiveResource.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329D9F16ACD47800316DE2 /* APIWebArchiveResource.h */; };
@@ -3324,6 +3325,9 @@
512F58F212A88A5400629530 /* WKCredential.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKCredential.h; sourceTree = "<group>"; };
512F58F312A88A5400629530 /* WKProtectionSpace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKProtectionSpace.cpp; sourceTree = "<group>"; };
512F58F412A88A5400629530 /* WKProtectionSpace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProtectionSpace.h; sourceTree = "<group>"; };
+ 5136E512236A60C80074FD5D /* WKWebArchiveRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebArchiveRef.h; sourceTree = "<group>"; };
+ 5136E513236A60D10074FD5D /* WKWebArchiveRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKWebArchiveRef.cpp; sourceTree = "<group>"; };
+ 5136E515236A61190074FD5D /* WKWebArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebArchive.h; sourceTree = "<group>"; };
513A163A163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkProcessProxyMessageReceiver.cpp; path = DerivedSources/WebKit2/NetworkProcessProxyMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
513A163B163088F6005D7D22 /* NetworkProcessProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessProxyMessages.h; path = DerivedSources/WebKit2/NetworkProcessProxyMessages.h; sourceTree = BUILT_PRODUCTS_DIR; };
513A16491630A9BF005D7D22 /* NetworkConnectionToWebProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkConnectionToWebProcess.cpp; sourceTree = "<group>"; };
@@ -4286,8 +4290,6 @@
BC329D9A16ACCE9900316DE2 /* APIWebArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIWebArchive.h; sourceTree = "<group>"; };
BC329D9E16ACD47800316DE2 /* APIWebArchiveResource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = APIWebArchiveResource.mm; sourceTree = "<group>"; };
BC329D9F16ACD47800316DE2 /* APIWebArchiveResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIWebArchiveResource.h; sourceTree = "<group>"; };
- BC329DA516ACE5A900316DE2 /* WKWebArchive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKWebArchive.cpp; sourceTree = "<group>"; };
- BC329DA616ACE5A900316DE2 /* WKWebArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebArchive.h; sourceTree = "<group>"; };
BC329DA916ACE5BF00316DE2 /* WKWebArchiveResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKWebArchiveResource.cpp; sourceTree = "<group>"; };
BC329DAA16ACE5C000316DE2 /* WKWebArchiveResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebArchiveResource.h; sourceTree = "<group>"; };
BC33DD671238464600360F3F /* APINumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APINumber.h; sourceTree = "<group>"; };
@@ -6511,6 +6513,7 @@
1AAF089819267EE500B6390C /* WKUserScript.mm */,
1AAF089C19267FC800B6390C /* WKUserScriptInternal.h */,
7C882DF61C7E995E006BF731 /* WKUserScriptPrivate.h */,
+ 5136E515236A61190074FD5D /* WKWebArchive.h */,
F438CD1B224140A600DE6DDA /* WKWebpagePreferences.h */,
F438CD1D22414AD600DE6DDA /* WKWebpagePreferences.mm */,
F438CD1E22414D4000DE6DDA /* WKWebpagePreferencesInternal.h */,
@@ -8465,8 +8468,8 @@
BC407624124FF0400068F20A /* WKURLRequestNS.mm */,
BC407625124FF0400068F20A /* WKURLResponseNS.h */,
BC407626124FF0400068F20A /* WKURLResponseNS.mm */,
- BC329DA516ACE5A900316DE2 /* WKWebArchive.cpp */,
- BC329DA616ACE5A900316DE2 /* WKWebArchive.h */,
+ 5136E513236A60D10074FD5D /* WKWebArchiveRef.cpp */,
+ 5136E512236A60C80074FD5D /* WKWebArchiveRef.h */,
BC329DA916ACE5BF00316DE2 /* WKWebArchiveResource.cpp */,
BC329DAA16ACE5C000316DE2 /* WKWebArchiveResource.h */,
);
@@ -10455,7 +10458,8 @@
BC8699B7116AADAA002A925B /* WKViewInternal.h in Headers */,
2D28A4971AF965A100F190C9 /* WKViewLayoutStrategy.h in Headers */,
BFA6179F12F0B99D0033E0CA /* WKViewPrivate.h in Headers */,
- C5E1AFE916B20B75006CC1F2 /* WKWebArchive.h in Headers */,
+ 5136E516236A62110074FD5D /* WKWebArchive.h in Headers */,
+ 5136E514236A60DC0074FD5D /* WKWebArchiveRef.h in Headers */,
C5E1AFEB16B20B7E006CC1F2 /* WKWebArchiveResource.h in Headers */,
2D1E8223216FFF5100A15265 /* WKWebEvent.h in Headers */,
F438CD1C2241421400DE6DDA /* WKWebpagePreferences.h in Headers */,
