Diff
Modified: trunk/Source/WebKit/ChangeLog (288474 => 288475)
--- trunk/Source/WebKit/ChangeLog 2022-01-24 22:54:47 UTC (rev 288474)
+++ trunk/Source/WebKit/ChangeLog 2022-01-24 23:02:44 UTC (rev 288475)
@@ -1,3 +1,16 @@
+2022-01-24 Ada Chan <[email protected]>
+
+ Soft link ARKit in a separate ARKitSoftLink file
+ https://bugs.webkit.org/show_bug.cgi?id=235532
+
+ Reviewed by Tim Horton.
+
+ * Shared/Cocoa/ARKitSoftLink.h: Added.
+ * Shared/Cocoa/ARKitSoftLink.mm: Added.
+ * SourcesCocoa.txt:
+ * UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:
+ * WebKit.xcodeproj/project.pbxproj:
+
2022-01-24 Eric Carlson <[email protected]>
REGRESSION (iOS 15): HTMLAudioElement fails to load new audio when device is locked or safari is in background
Added: trunk/Source/WebKit/Shared/Cocoa/ARKitSoftLink.h (0 => 288475)
--- trunk/Source/WebKit/Shared/Cocoa/ARKitSoftLink.h (rev 0)
+++ trunk/Source/WebKit/Shared/Cocoa/ARKitSoftLink.h 2022-01-24 23:02:44 UTC (rev 288475)
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2022 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.
+ */
+
+#pragma once
+
+#if PLATFORM(COCOA) && ((USE(SYSTEM_PREVIEW) && HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)) || (USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/ARKitSoftLinkAdditions.h>)))
+
+#import <wtf/SoftLinking.h>
+
+SOFT_LINK_FRAMEWORK_FOR_HEADER(WebKit, ARKit)
+
+SOFT_LINK_CLASS_FOR_HEADER(WebKit, ARQuickLookPreviewItem);
+
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/ARKitSoftLinkAdditions.h>)
+#import <WebKitAdditions/ARKitSoftLinkAdditions.h>
+#endif
+
+#endif
Added: trunk/Source/WebKit/Shared/Cocoa/ARKitSoftLink.mm (0 => 288475)
--- trunk/Source/WebKit/Shared/Cocoa/ARKitSoftLink.mm (rev 0)
+++ trunk/Source/WebKit/Shared/Cocoa/ARKitSoftLink.mm 2022-01-24 23:02:44 UTC (rev 288475)
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2022 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.
+ */
+
+#import "config.h"
+
+#if PLATFORM(COCOA) && ((USE(SYSTEM_PREVIEW) && HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)) || (USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/ARKitSoftLinkAdditions.mm>)))
+
+#import <wtf/SoftLinking.h>
+
+SOFT_LINK_PRIVATE_FRAMEWORK_FOR_SOURCE(WebKit, ARKit);
+
+SOFT_LINK_CLASS_FOR_SOURCE(WebKit, ARKit, ARQuickLookPreviewItem);
+
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/ARKitSoftLinkAdditions.mm>)
+#import <WebKitAdditions/ARKitSoftLinkAdditions.mm>
+#endif
+
+#endif
Modified: trunk/Source/WebKit/SourcesCocoa.txt (288474 => 288475)
--- trunk/Source/WebKit/SourcesCocoa.txt 2022-01-24 22:54:47 UTC (rev 288474)
+++ trunk/Source/WebKit/SourcesCocoa.txt 2022-01-24 23:02:44 UTC (rev 288475)
@@ -163,6 +163,7 @@
Shared/Cocoa/APIDataCocoa.mm
Shared/Cocoa/APIObject.mm
+Shared/Cocoa/ARKitSoftLink.mm
Shared/Cocoa/ArgumentCodersCocoa.mm
Shared/Cocoa/AuxiliaryProcessCocoa.mm
Shared/Cocoa/CodeSigning.mm
Modified: trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm (288474 => 288475)
--- trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm 2022-01-24 22:54:47 UTC (rev 288474)
+++ trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm 2022-01-24 23:02:44 UTC (rev 288475)
@@ -40,9 +40,8 @@
#import <wtf/WeakObjCPtr.h>
#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#import "ARKitSoftLink.h"
#import <pal/spi/ios/SystemPreviewSPI.h>
-SOFT_LINK_PRIVATE_FRAMEWORK(ARKit);
-SOFT_LINK_CLASS(ARKit, ARQuickLookPreviewItem);
SOFT_LINK_PRIVATE_FRAMEWORK(AssetViewer);
SOFT_LINK_CLASS(AssetViewer, ARQuickLookWebKitItem);
@@ -109,7 +108,7 @@
NSString *contentType = WebCore::UTIFromMIMEType("model/vnd.usdz+zip"_s);
#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
- auto previewItem = adoptNS([allocARQuickLookPreviewItemInstance() initWithFileAtURL:_downloadedURL]);
+ auto previewItem = adoptNS([WebKit::allocARQuickLookPreviewItemInstance() initWithFileAtURL:_downloadedURL]);
[previewItem setCanonicalWebPageURL:_originatingPageURL];
_item = adoptNS([allocARQuickLookWebKitItemInstance() initWithPreviewItemProvider:_itemProvider.get() contentType:contentType previewTitle:@"Preview" fileSize:@(0) previewItem:previewItem.get()]);
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (288474 => 288475)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-01-24 22:54:47 UTC (rev 288474)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-01-24 23:02:44 UTC (rev 288475)
@@ -4557,6 +4557,8 @@
52D5A1B21C5749F200DE34A3 /* VideoFullscreenManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoFullscreenManager.h; sourceTree = "<group>"; };
52D5A1B31C5749F200DE34A3 /* VideoFullscreenManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VideoFullscreenManager.messages.in; sourceTree = "<group>"; };
52D5A1B41C5749F200DE34A3 /* VideoFullscreenManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VideoFullscreenManager.mm; sourceTree = "<group>"; };
+ 52EB68CB279E2145005C98D9 /* ARKitSoftLink.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ARKitSoftLink.h; sourceTree = "<group>"; };
+ 52EB68CC279E2145005C98D9 /* ARKitSoftLink.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ARKitSoftLink.mm; sourceTree = "<group>"; };
52F060DD1654317500F3281B /* NetworkContentRuleListManagerMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkContentRuleListManagerMessageReceiver.cpp; path = DerivedSources/WebKit/NetworkContentRuleListManagerMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
5315876B2076B713004BF9F3 /* NetworkActivityTrackerCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkActivityTrackerCocoa.mm; sourceTree = "<group>"; };
5321594F1DBAE6D70054AA3C /* NetworkDataTaskCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkDataTaskCocoa.h; sourceTree = "<group>"; };
@@ -7107,8 +7109,6 @@
118502602673B0DA00A6425E /* XR */,
E3BCE877267252120011D8DB /* AccessibilityPreferences.cpp */,
E3BCE878267252120011D8DB /* AccessibilityPreferences.h */,
- 7B50E97F2771F6CE003DAAC4 /* IPCTester.cpp */,
- 7B50E9802771F6CF003DAAC4 /* IPCTester.h */,
A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */,
A7D792D41767CB0900881CBE /* ActivityAssertion.h */,
BC329D9A16ACCE9900316DE2 /* APIWebArchive.h */,
@@ -7158,6 +7158,8 @@
BCCF6B2312C93E7A008F9C35 /* ImageOptions.h */,
999B7ED82550E4A800F450A4 /* InspectorExtensionTypes.cpp */,
99BE3B1625433B9400C6551C /* InspectorExtensionTypes.h */,
+ 7B50E97F2771F6CE003DAAC4 /* IPCTester.cpp */,
+ 7B50E9802771F6CF003DAAC4 /* IPCTester.h */,
1A92DC1212F8BAB90017AF65 /* LayerTreeContext.cpp */,
1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */,
2D10875E1D2C573E00B85F82 /* LoadParameters.cpp */,
@@ -8967,6 +8969,8 @@
378E1A3B181ED6FF0031007A /* APIObject.mm */,
A175C44921AA3170000037D0 /* ArgumentCodersCocoa.h */,
A175C44B21AA331B000037D0 /* ArgumentCodersCocoa.mm */,
+ 52EB68CB279E2145005C98D9 /* ARKitSoftLink.h */,
+ 52EB68CC279E2145005C98D9 /* ARKitSoftLink.mm */,
1A698F171E4910220064E881 /* AuxiliaryProcessCocoa.mm */,
CE11AD511CBC482F00681EE5 /* CodeSigning.h */,
CE11AD4F1CBC47F800681EE5 /* CodeSigning.mm */,
@@ -12598,6 +12602,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
+ 7BDDA3192747C0400038659E /* (null) in Headers */,
37A5E01418BBF93F000A081E /* _WKActivatedElementInfo.h in Headers */,
379A873618BBFA4300588AF2 /* _WKActivatedElementInfoInternal.h in Headers */,
449316A325DC7DC400AA66DE /* _WKAppHighlight.h in Headers */,
@@ -12980,7 +12985,6 @@
C5BCE5DF1C50766A00CDE3FA /* InteractionInformationAtPosition.h in Headers */,
2D4D2C811DF60BF3002EB10C /* InteractionInformationRequest.h in Headers */,
A31F60A425CC7DB900AF14F4 /* IPCSemaphore.h in Headers */,
- 7BDDA3192747C0400038659E /* (null) in Headers */,
9B47908F253151CC00EC11AB /* JSIPCBinding.h in Headers */,
C1663E5B24AEAA2F00C6A3B2 /* LaunchServicesDatabaseXPCConstants.h in Headers */,
BCE0937814FB128C001138D9 /* LayerHostingContext.h in Headers */,
