Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 49649b12d8cec74e338d3bbe7399001750c051e3
https://github.com/WebKit/WebKit/commit/49649b12d8cec74e338d3bbe7399001750c051e3
Author: Simon Fraser <[email protected]>
Date: 2026-09-16 (Wed, 16 Sep 2026)
Changed paths:
M Source/JavaScriptCore/DerivedSources-input.xcfilelist
M Source/JavaScriptCore/DerivedSources.make
M Source/WTF/Scripts/GeneratePreferences.rb
M Source/WebCore/DerivedSources-input.xcfilelist
M Source/WebCore/DerivedSources.make
M Source/WebCore/Scripts/GenerateSettings.rb
M Source/WebKit/DerivedSources-input.xcfilelist
M Source/WebKit/DerivedSources.make
M Source/WebKitLegacy/mac/Scripts/generate-preferences.sh
M Tools/DumpRenderTree/DerivedSources-input.xcfilelist
M Tools/DumpRenderTree/DerivedSources.make
M Tools/WebKitTestRunner/DerivedSources-input.xcfilelist
M Tools/WebKitTestRunner/DerivedSources.make
Log Message:
-----------
Allow WebKitAdditions to provide settings via WebPreferencesAdditions.yaml
https://bugs.webkit.org/show_bug.cgi?id=324197
rdar://187413914
Reviewed by Lily Spiniolas.
WebKitAdditions has shipped an (empty) WebPreferencesAdditions.yaml, installed
as a
private header alongside WebKitDerivedSourcesAdditions.make, since r238713.
However,
nothing ever consumed it: Source/WebKit/DerivedSources.make references
ADDITIONAL_WEB_PREFERENCES_INPUT_FILES but never includes the additions
makefile that
sets it, so the variable has always been empty, and the other four preference
generators
had no hook at all.
GeneratePreferences.rb and GenerateSettings.rb already accept any number of
positional
YAML inputs and merge them. Each generator now resolves the additions file by
absolute
path out of WEBKITADDITIONS_HEADER_SEARCH_PATHS and appends it after
UnifiedWebPreferences.yaml. firstword is required because the file can be
present both
in the build output and in the SDK, and passing it twice would define every
preference
in it twice. In open source builds the wildcard does not match anything and the
generators are invoked exactly as before.
Preferences declared this way are additive only. Overriding the default of an
existing
preference is still done with WebPreferencesDefaultValuesAdditions.h.
* Source/JavaScriptCore/DerivedSources-input.xcfilelist:
* Source/JavaScriptCore/DerivedSources.make:
* Source/WTF/Scripts/GeneratePreferences.rb:
* Source/WebCore/DerivedSources-input.xcfilelist:
* Source/WebCore/DerivedSources.make:
* Source/WebCore/Scripts/GenerateSettings.rb:
* Source/WebKit/DerivedSources-input.xcfilelist:
* Source/WebKit/DerivedSources.make:
* Source/WebKitLegacy/mac/Scripts/generate-preferences.sh:
* Tools/DumpRenderTree/DerivedSources-input.xcfilelist:
* Tools/DumpRenderTree/DerivedSources.make:
* Tools/WebKitTestRunner/DerivedSources-input.xcfilelist:
* Tools/WebKitTestRunner/DerivedSources.make:
Canonical link: https://commits.webkit.org/321269@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
