Modified: trunk/Source/WebCore/PAL/ChangeLog (292443 => 292444)
--- trunk/Source/WebCore/PAL/ChangeLog 2022-04-06 00:08:40 UTC (rev 292443)
+++ trunk/Source/WebCore/PAL/ChangeLog 2022-04-06 00:24:58 UTC (rev 292444)
@@ -1,3 +1,18 @@
+2022-04-05 Elliott Williams <e...@apple.com>
+
+ [XCBuild] PAL: Add headers-only dependency on WebGPU
+ https://bugs.webkit.org/show_bug.cgi?id=238646
+
+ Reviewed by Alexey Proskuryakov.
+
+ Lots of includes of WebGPU in pal/graphics/WebGPU/Impl, so the build system needs to know to
+ copy its headers before building PAL.
+
+ Clean up a file reference to a header that was removed in
+ https://commits.webkit.org/247364@main
+
+ * PAL.xcodeproj/project.pbxproj:
+
2022-04-05 Chris Dumez <cdu...@apple.com>
Mark String(const char*) constructor as explicit
Modified: trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig (292443 => 292444)
--- trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig 2022-04-06 00:08:40 UTC (rev 292443)
+++ trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig 2022-04-06 00:24:58 UTC (rev 292444)
@@ -63,7 +63,7 @@
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_PRODUCT_DEPENDENCY_NAMES_$(WK_WHICH_BUILD_SYSTEM));
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(inherited) *.tiff *Cursor.png;
-EXCLUDED_PRODUCT_DEPENDENCY_NAMES_legacy = libWTF.a libWebKitAdditions.a;
+EXCLUDED_PRODUCT_DEPENDENCY_NAMES_legacy = libWTF.a libWebKitAdditions.a WebGPU.framework;
WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
Modified: trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj (292443 => 292444)
--- trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2022-04-06 00:08:40 UTC (rev 292443)
+++ trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2022-04-06 00:24:58 UTC (rev 292444)
@@ -89,6 +89,7 @@
CD6122D12559B8F200FC657A /* OutputDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD6122CF2559B8F200FC657A /* OutputDevice.mm */; };
CDACB3602387425B0018D7CE /* MediaToolboxSoftLink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDACB35E23873E480018D7CE /* MediaToolboxSoftLink.cpp */; };
DD05A36027BF0ACE0096EFAB /* libWTF.a in Product Dependencies */ = {isa = PBXBuildFile; fileRef = DD05A35F27BF0AC40096EFAB /* libWTF.a */; };
+ DD0B43C227F679A7009E31FC /* WebGPU.framework in Product Dependencies */ = {isa = PBXBuildFile; fileRef = DD0B43C127F67999009E31FC /* WebGPU.framework */; };
DD20DD1227BC90D60093D175 /* MediaTimeAVFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C00CFD21F68CE4600AAC26D /* MediaTimeAVFoundation.h */; settings = {ATTRIBUTES = (Private, ); }; };
DD20DD1327BC90D60093D175 /* OutputContext.h in Headers */ = {isa = PBXBuildFile; fileRef = CD6122CA2559B6AC00FC657A /* OutputContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
DD20DD1427BC90D60093D175 /* OutputDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = CD6122CE2559B8F200FC657A /* OutputDevice.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -206,7 +207,6 @@
DD20DD8427BC90D70093D175 /* WebGPUPipelineDescriptorBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC5E45E27374948006F6FF4 /* WebGPUPipelineDescriptorBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
DD20DD8527BC90D70093D175 /* WebGPUPipelineLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC5E44527374947006F6FF4 /* WebGPUPipelineLayout.h */; settings = {ATTRIBUTES = (Private, ); }; };
DD20DD8627BC90D70093D175 /* WebGPUPipelineLayoutDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC5E44D27374947006F6FF4 /* WebGPUPipelineLayoutDescriptor.h */; settings = {ATTRIBUTES = (Private, ); }; };
- DD20DD8727BC90D70093D175 /* WebGPUPipelineStatisticName.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC5E43927374946006F6FF4 /* WebGPUPipelineStatisticName.h */; settings = {ATTRIBUTES = (Private, ); }; };
DD20DD8827BC90D70093D175 /* WebGPUPowerPreference.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC5E47A27374949006F6FF4 /* WebGPUPowerPreference.h */; settings = {ATTRIBUTES = (Private, ); }; };
DD20DD8927BC90D70093D175 /* WebGPUPredefinedColorSpace.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC5E47D27374949006F6FF4 /* WebGPUPredefinedColorSpace.h */; settings = {ATTRIBUTES = (Private, ); }; };
DD20DD8A27BC90D70093D175 /* WebGPUPrimitiveState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC5E46D27374948006F6FF4 /* WebGPUPrimitiveState.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -509,6 +509,7 @@
files = (
DDB04F32278E4F1B008D3678 /* libWebKitAdditions.a in Product Dependencies */,
DD05A36027BF0ACE0096EFAB /* libWTF.a in Product Dependencies */,
+ DD0B43C227F679A7009E31FC /* WebGPU.framework in Product Dependencies */,
);
name = "Product Dependencies";
runOnlyForDeploymentPostprocessing = 0;
@@ -928,6 +929,7 @@
CDF91112220E4EEC001EA39E /* CelestialSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CelestialSPI.h; sourceTree = "<group>"; };
CE5673862151A7B9002F92D7 /* IOKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOKitSPI.h; sourceTree = "<group>"; };
DD05A35F27BF0AC40096EFAB /* libWTF.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWTF.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ DD0B43C127F67999009E31FC /* WebGPU.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WebGPU.framework; sourceTree = BUILT_PRODUCTS_DIR; };
DDE99300278D07B800F60D26 /* libWebKitAdditions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libWebKitAdditions.a; sourceTree = BUILT_PRODUCTS_DIR; };
DF83E208263734F1000825EF /* CryptoKitPrivateSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKitPrivateSPI.h; sourceTree = "<group>"; };
E327C0DE260BDC90002281C5 /* NotifySPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NotifySPI.h; sourceTree = "<group>"; };
@@ -1613,6 +1615,7 @@
children = (
DDE99300278D07B800F60D26 /* libWebKitAdditions.a */,
DD05A35F27BF0AC40096EFAB /* libWTF.a */,
+ DD0B43C127F67999009E31FC /* WebGPU.framework */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -1741,7 +1744,6 @@
DD20DD8427BC90D70093D175 /* WebGPUPipelineDescriptorBase.h in Headers */,
DD20DD8527BC90D70093D175 /* WebGPUPipelineLayout.h in Headers */,
DD20DD8627BC90D70093D175 /* WebGPUPipelineLayoutDescriptor.h in Headers */,
- DD20DD8727BC90D70093D175 /* WebGPUPipelineStatisticName.h in Headers */,
DD20DD8827BC90D70093D175 /* WebGPUPowerPreference.h in Headers */,
DD20DD8927BC90D70093D175 /* WebGPUPredefinedColorSpace.h in Headers */,
DD20DD8A27BC90D70093D175 /* WebGPUPrimitiveState.h in Headers */,
