Unreviewed, reverting r256120@main.

https://bugs.webkit.org/show_bug.cgi?id=247224

broke Safari build

Reverted changeset:

"Add Web Extension code generator scripts, bindings glue, and some IDL files."
https://bugs.webkit.org/show_bug.cgi?id=246410
https://commits.webkit.org/256120@main

Canonical link: https://commits.webkit.org/256130@main

Source/WebKit/DerivedSources-input.xcfilelist

@@ -1,15 +1,4 @@
 # This file is generated by the generate-xcfilelists script.
-$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/AdditionalFeatureDefines.h
-$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Compiler.h
-$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Platform.h
-$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformCPU.h
-$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformCallingConventions.h
-$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformEnable.h
-$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformEnableCocoa.h
-$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformHave.h
-$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformLegacy.h
-$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformOS.h
-$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformUse.h
 $(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/GeneratePreferences.rb
 $(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/Preferences/WebPreferences.yaml
 $(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/Preferences/WebPreferencesDebug.yaml
@@ -172,22 +161,13 @@ $(PROJECT_DIR)/Shared/WebEvent.serialization.in
 $(PROJECT_DIR)/Shared/WebExtensionContextParameters.serialization.in
 $(PROJECT_DIR)/Shared/WebExtensionControllerParameters.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUBindGroupDescriptor.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPUBindGroupEntry.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUBindGroupLayoutDescriptor.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUBindGroupLayoutEntry.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPUBlendComponent.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPUBlendState.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPUBufferBinding.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPUBufferBindingLayout.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUBufferDescriptor.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPUCanvasConfiguration.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPUColor.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPUColorTargetState.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUCommandBufferDescriptor.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUCommandEncoderDescriptor.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUCompilationMessage.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUComputePassDescriptor.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPUComputePassTimestampWrites.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUComputePipelineDescriptor.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUDepthStencilState.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUDeviceDescriptor.serialization.in
@@ -201,39 +181,48 @@ $(PROJECT_DIR)/Shared/WebGPU/WebGPUImageCopyTexture.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUImageCopyTextureTagged.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUImageDataLayout.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUMultisampleState.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPUObjectDescriptorBase.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUOrigin2D.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPUOrigin3D.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUOutOfMemoryError.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUPipelineDescriptorBase.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUPipelineLayoutDescriptor.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPUPrimitiveState.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPUProgrammableStage.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUQuerySetDescriptor.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPURenderBundleDescriptor.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPURenderBundleEncoderDescriptor.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPURenderPassColorAttachment.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPURenderPassDescriptor.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPURenderPassLayout.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPURenderPassTimestampWrites.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPURenderPipelineDescriptor.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPURequestAdapterOptions.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUSamplerBindingLayout.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUSamplerDescriptor.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUShaderModuleCompilationHint.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUShaderModuleDescriptor.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPUTextureDescriptor.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPUTextureViewDescriptor.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPUVertexState.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPUBindGroupEntry.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPUBlendComponent.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPUBlendState.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPUBufferBinding.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPUBufferBindingLayout.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPUCanvasConfiguration.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPUColor.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPUColorTargetState.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPUComputePassTimestampWrites.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPUObjectDescriptorBase.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPUOrigin3D.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPUPrimitiveState.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPUProgrammableStage.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPURenderPassColorAttachment.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.serialization.in
+$(PROJECT_DIR)/Shared/WebGPU/WebGPURenderPassTimestampWrites.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUStencilFaceState.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUStorageTextureBindingLayout.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUSupportedFeatures.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUSupportedLimits.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUTextureBindingLayout.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPUTextureDescriptor.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPUTextureViewDescriptor.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUValidationError.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUVertexAttribute.serialization.in
 $(PROJECT_DIR)/Shared/WebGPU/WebGPUVertexBufferLayout.serialization.in
-$(PROJECT_DIR)/Shared/WebGPU/WebGPUVertexState.serialization.in
 $(PROJECT_DIR)/Shared/WebPushDaemonConnectionConfiguration.serialization.in
 $(PROJECT_DIR)/Shared/WebPushMessage.serialization.in
 $(PROJECT_DIR)/Shared/WebsiteData/WebsiteDataFetchOption.serialization.in
@@ -288,11 +277,6 @@ $(PROJECT_DIR)/WebProcess/Automation/WebAutomationSessionProxy.js
 $(PROJECT_DIR)/WebProcess/Automation/WebAutomationSessionProxy.messages.in
 $(PROJECT_DIR)/WebProcess/Cache/WebCacheStorageConnection.messages.in
 $(PROJECT_DIR)/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in
-$(PROJECT_DIR)/WebProcess/Extensions/Bindings/Scripts/CodeGeneratorExtensions.pm
-$(PROJECT_DIR)/WebProcess/Extensions/Bindings/Scripts/IDLAttributes.json
-$(PROJECT_DIR)/WebProcess/Extensions/Interfaces/WebExtensionAPIExtension.idl
-$(PROJECT_DIR)/WebProcess/Extensions/Interfaces/WebExtensionAPINamespace.idl
-$(PROJECT_DIR)/WebProcess/Extensions/Interfaces/WebExtensionAPIRuntime.idl
 $(PROJECT_DIR)/WebProcess/Extensions/WebExtensionContextProxy.messages.in
 $(PROJECT_DIR)/WebProcess/Extensions/WebExtensionControllerProxy.messages.in
 $(PROJECT_DIR)/WebProcess/FullScreen/WebFullScreenManager.messages.in
@@ -372,6 +356,3 @@ $(PROJECT_DIR)/WebProcess/cocoa/UserMediaCaptureManager.messages.in
 $(PROJECT_DIR)/WebProcess/cocoa/VideoFullscreenManager.messages.in
 $(PROJECT_DIR)/WebProcess/com.apple.WebProcess.sb.in
 $(PROJECT_DIR)/webpushd/mac/com.apple.WebKit.webpushd.sb.in
-$(WEBCORE_PRIVATE_HEADERS_DIR)/CodeGenerator.pm
-$(WEBCORE_PRIVATE_HEADERS_DIR)/IDLParser.pm
-$(WEBCORE_PRIVATE_HEADERS_DIR)/generate-bindings.pl

Source/WebKit/DerivedSources-output.xcfilelist

@@ -61,12 +61,6 @@ $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/IPCStreamTesterProxyMessagesReplies.
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/IPCTesterMessageReceiver.cpp
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/IPCTesterMessages.h
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/IPCTesterMessagesReplies.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/JSWebExtensionAPIExtension.mm
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/JSWebExtensionAPIExtension.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/JSWebExtensionAPINamespace.mm
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/JSWebExtensionAPINamespace.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/JSWebExtensionAPIRuntime.mm
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/JSWebExtensionAPIRuntime.h
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/LegacyCustomProtocolManagerMessageReceiver.cpp
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/LegacyCustomProtocolManagerMessages.h
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/LegacyCustomProtocolManagerMessagesReplies.h

Source/WebKit/DerivedSources.make

@@ -51,7 +51,6 @@ VPATH = \
     $(WebKit2)/WebProcess/Automation \
     $(WebKit2)/WebProcess/Cache \
     $(WebKit2)/WebProcess/Databases/IndexedDB \
-    $(WebKit2)/WebProcess/Extensions/Interfaces \
     $(WebKit2)/WebProcess/FullScreen \
     $(WebKit2)/WebProcess/Geolocation \
     $(WebKit2)/WebProcess/GPU \
@@ -327,14 +326,6 @@ GENERATE_MESSAGE_RECEIVER_SCRIPTS = \
 FRAMEWORK_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | perl -e 'print "-F " . join(" -F ", split(" ", <>));')
 HEADER_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | perl -e 'print "-I" . join(" -I", split(" ", <>));')
 
-platform_h_compiler_command = $(CC) -std=c++2a -x c++ $(1) $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null
-
-FEATURE_AND_PLATFORM_DEFINES := $(shell $(call platform_h_compiler_command,-E -P -dM) | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
-
-PLATFORM_HEADER_DIR := $(realpath $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH))
-PLATFORM_HEADER_DEPENDENCIES := $(filter $(PLATFORM_HEADER_DIR)/%,$(realpath $(shell $(call platform_h_compiler_command,-M) | $(PERL) -e "local \$$/; my (\$$target, \$$deps) = split(/:/, <>); print split(/\\\\/, \$$deps);")))
-FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES = $(WebKit2)/DerivedSources.make $(PLATFORM_HEADER_DEPENDENCIES)
-
 MESSAGE_RECEIVER_FILES := $(addsuffix MessageReceiver.cpp,$(notdir $(MESSAGE_RECEIVERS)))
 MESSAGES_FILES := $(addsuffix Messages.h,$(notdir $(MESSAGE_RECEIVERS)))
 MESSAGE_REPLIES_FILES := $(addsuffix MessagesReplies.h,$(notdir $(MESSAGE_RECEIVERS)))
@@ -561,27 +552,3 @@ all : GeneratedSerializers.h GeneratedSerializers.cpp GeneratedSerializers.mm Se
 
 GeneratedSerializers.h GeneratedSerializers.cpp GeneratedSerializers.mm SerializedTypeInfo.cpp : $(WebKit2)/Scripts/generate-serializers.py $(SERIALIZATION_DESCRIPTION_FILES) $(WebKit2)/DerivedSources.make
 	$(PYTHON) $(WebKit2)/Scripts/generate-serializers.py $(WebKit2)/ $(SERIALIZATION_DESCRIPTION_FILES)
-
-EXTENSIONS_DIR = $(WebKit2)/WebProcess/Extensions
-EXTENSIONS_SCRIPTS_DIR = $(EXTENSIONS_DIR)/Bindings/Scripts
-EXTENSIONS_INTERFACES_DIR = $(EXTENSIONS_DIR)/Interfaces
-IDL_ATTRIBUTES_FILE = $(EXTENSIONS_SCRIPTS_DIR)/IDLAttributes.json
-
-BINDINGS_SCRIPTS = \
-    $(WebCoreScripts)/generate-bindings.pl \
-    $(WebCoreScripts)/IDLParser.pm \
-    $(WebCoreScripts)/CodeGenerator.pm \
-    $(EXTENSIONS_SCRIPTS_DIR)/CodeGeneratorExtensions.pm \
-#
-
-EXTENSION_INTERFACES = \
-    WebExtensionAPIExtension \
-    WebExtensionAPINamespace \
-    WebExtensionAPIRuntime \
-#
-
-JS%.h JS%.mm : %.idl $(BINDINGS_SCRIPTS) $(IDL_ATTRIBUTES_FILE) $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES)
-	@echo Generating bindings for $*...
-	$(PERL) -I $(WebCoreScripts) -I $(EXTENSIONS_SCRIPTS_DIR) $(WebCoreScripts)/generate-bindings.pl --defines "$(FEATURE_AND_PLATFORM_DEFINES)" --include $(EXTENSIONS_INTERFACES_DIR) --outputDir . --generator Extensions --idlAttributesFile $(IDL_ATTRIBUTES_FILE) $<
-
-all : $(EXTENSION_INTERFACES:%=JS%.h) $(EXTENSION_INTERFACES:%=JS%.mm)

Source/WebKit/Scripts/generate-derived-sources.sh

@@ -8,7 +8,7 @@ mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit"
 cd "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit"
 
 export WebKit2="${SRCROOT}"
-export WebCoreScripts="${WEBCORE_PRIVATE_HEADERS_DIR}"
+
 
 if [ -z $1 ] || [ $1 != "sandbox-profiles-ios" ]; then
     /bin/ln -sfh "${JAVASCRIPTCORE_PRIVATE_HEADERS_DIR}" JavaScriptCorePrivateHeaders

Source/WebKit/SourcesCocoa.txt

@@ -613,8 +613,6 @@ WebProcess/cocoa/WebProcessCocoa.mm
 
 WebProcess/EntryPoint/Cocoa/XPCService/WebContentServiceEntryPoint.mm
 
-WebProcess/Extensions/Bindings/JSWebExtensionWrapper.cpp
-
 WebProcess/GPU/graphics/cocoa/ImageBufferRemoteIOSurfaceBackend.cpp
 WebProcess/GPU/graphics/cocoa/ImageBufferShareableMappedIOSurfaceBackend.cpp
 WebProcess/GPU/graphics/cocoa/RemoteGraphicsContextGLProxyCocoa.mm