Diff
Modified: trunk/Source/WTF/ChangeLog (288215 => 288216)
--- trunk/Source/WTF/ChangeLog 2022-01-19 18:16:22 UTC (rev 288215)
+++ trunk/Source/WTF/ChangeLog 2022-01-19 18:38:07 UTC (rev 288216)
@@ -1,3 +1,16 @@
+2022-01-19 Alex Christensen <[email protected]>
+
+ Allow experimental feature names to be hidden in WebKitAdditions
+ https://bugs.webkit.org/show_bug.cgi?id=235163
+
+ Reviewed by Chris Dumez.
+
+ * Scripts/GeneratePreferences.rb:
+ * Scripts/Preferences/WebPreferencesExperimental.yaml:
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/CMakeLists.txt:
+ * wtf/ExperimentalFeatureNames.h: Copied from Source/WebKitLegacy/mac/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.mm.erb.
+
2022-01-18 Chris Dumez <[email protected]>
Enable form.requestSubmit()
Modified: trunk/Source/WTF/Scripts/GeneratePreferences.rb (288215 => 288216)
--- trunk/Source/WTF/Scripts/GeneratePreferences.rb 2022-01-19 18:16:22 UTC (rev 288215)
+++ trunk/Source/WTF/Scripts/GeneratePreferences.rb 2022-01-19 18:38:07 UTC (rev 288216)
@@ -106,8 +106,14 @@
@name = name
@opts = opts
@type = opts["type"]
- @humanReadableName = '"' + (opts["humanReadableName"] || "") + '"'
- @humanReadableDescription = '"' + (opts["humanReadableDescription"] || "") + '"'
+ @humanReadableName = (opts["humanReadableName"] || "")
+ if not humanReadableName.start_with? "WebKitAdditions"
+ @humanReadableName = '"' + humanReadableName + '"'
+ end
+ @humanReadableDescription = (opts["humanReadableDescription"] || "")
+ if not humanReadableDescription.start_with? "WebKitAdditions"
+ @humanReadableDescription = '"' + humanReadableDescription + '"'
+ end
@getter = opts["getter"]
@webcoreBinding = opts["webcoreBinding"]
@webcoreName = opts["webcoreName"]
Modified: trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml (288215 => 288216)
--- trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml 2022-01-19 18:16:22 UTC (rev 288215)
+++ trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml 2022-01-19 18:38:07 UTC (rev 288216)
@@ -1604,6 +1604,18 @@
"HAVE(WEBGL_COMPATIBLE_METAL)": true
default: false
+WebKitAdditionsFeature1Enabled:
+ type: bool
+ humanReadableName: WebKitAdditionsFeature1HumanReadableName
+ humanReadableDescription: WebKitAdditionsFeature1HumanReadableDescription
+ defaultValue:
+ WebKitLegacy:
+ default: false
+ WebKit:
+ default: false
+ WebCore:
+ default: false
+
WebLocksAPIEnabled:
type: bool
humanReadableName: "Web Locks API"
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (288215 => 288216)
--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2022-01-19 18:16:22 UTC (rev 288215)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2022-01-19 18:38:07 UTC (rev 288216)
@@ -756,6 +756,7 @@
DCEE22041CEB9869000C2396 /* BackwardsGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackwardsGraph.h; sourceTree = "<group>"; };
DDE99317278D08C900F60D26 /* libWebKitAdditions.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWebKitAdditions.a; sourceTree = BUILT_PRODUCTS_DIR; };
DEF7FE5F22581AC800C15129 /* TaggedArrayStoragePtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TaggedArrayStoragePtr.h; sourceTree = "<group>"; };
+ DF292D55278F9BC600BB2918 /* ExperimentalFeatureNames.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExperimentalFeatureNames.h; sourceTree = "<group>"; };
DFC610A724FB71B9006254C8 /* CodePointIterator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CodePointIterator.h; sourceTree = "<group>"; };
E15556F318A0CC18006F48FB /* CryptographicUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptographicUtilities.cpp; sourceTree = "<group>"; };
E15556F418A0CC18006F48FB /* CryptographicUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptographicUtilities.h; sourceTree = "<group>"; };
@@ -1093,6 +1094,7 @@
5338EBA423AB04D100382662 /* EnumClassOperatorOverloads.h */,
1AEA88E11D6BBCF400E5AD64 /* EnumTraits.h */,
AD7C434A1DD2A4A70026888B /* Expected.h */,
+ DF292D55278F9BC600BB2918 /* ExperimentalFeatureNames.h */,
A8A4729F151A825A004123FF /* ExportMacros.h */,
FE996B5224A845AF001D2E63 /* FailureAction.h */,
0F7C5FB51D885CF20044F5E2 /* FastBitVector.cpp */,
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (288215 => 288216)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2022-01-19 18:16:22 UTC (rev 288215)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2022-01-19 18:38:07 UTC (rev 288216)
@@ -66,6 +66,7 @@
EnumClassOperatorOverloads.h
EnumTraits.h
Expected.h
+ ExperimentalFeatureNames.h
ExportMacros.h
FailureAction.h
FastBitVector.h
Copied: trunk/Source/WTF/wtf/ExperimentalFeatureNames.h (from rev 288215, trunk/Source/WebKitLegacy/mac/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.mm.erb) (0 => 288216)
--- trunk/Source/WTF/wtf/ExperimentalFeatureNames.h (rev 0)
+++ trunk/Source/WTF/wtf/ExperimentalFeatureNames.h 2022-01-19 18:38:07 UTC (rev 288216)
@@ -0,0 +1,41 @@
+/*
+ * 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
+
+namespace WTF {
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#include <WebKitAdditions/ExperimentalFeatureNameAdditions.h>
+
+#else
+
+#define WebKitAdditionsFeature1HumanReadableName "WebKitAdditions Feature"
+#define WebKitAdditionsFeature1HumanReadableDescription "WebKitAdditions Feature"
+
+#endif
+
+}
Modified: trunk/Source/WebKit/ChangeLog (288215 => 288216)
--- trunk/Source/WebKit/ChangeLog 2022-01-19 18:16:22 UTC (rev 288215)
+++ trunk/Source/WebKit/ChangeLog 2022-01-19 18:38:07 UTC (rev 288216)
@@ -1,5 +1,14 @@
2022-01-19 Alex Christensen <[email protected]>
+ Allow experimental feature names to be hidden in WebKitAdditions
+ https://bugs.webkit.org/show_bug.cgi?id=235163
+
+ Reviewed by Chris Dumez.
+
+ * Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.cpp.erb:
+
+2022-01-19 Alex Christensen <[email protected]>
+
Unreviewed, reverting r288147.
<rdar://87776311>
Modified: trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.cpp.erb (288215 => 288216)
--- trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.cpp.erb 2022-01-19 18:16:22 UTC (rev 288215)
+++ trunk/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.cpp.erb 2022-01-19 18:38:07 UTC (rev 288216)
@@ -30,6 +30,7 @@
#include "WebPreferencesDefinitions.h"
#include "WebPreferencesKeys.h"
+#include <wtf/ExperimentalFeatureNames.h>
namespace WebKit {
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (288215 => 288216)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2022-01-19 18:16:22 UTC (rev 288215)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2022-01-19 18:38:07 UTC (rev 288216)
@@ -1,3 +1,12 @@
+2022-01-19 Alex Christensen <[email protected]>
+
+ Allow experimental feature names to be hidden in WebKitAdditions
+ https://bugs.webkit.org/show_bug.cgi?id=235163
+
+ Reviewed by Chris Dumez.
+
+ * Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.mm.erb:
+
2022-01-18 Alex Christensen <[email protected]>
Use c++2a instead of gnu++2a for Cocoa builds
Modified: trunk/Source/WebKitLegacy/mac/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.mm.erb (288215 => 288216)
--- trunk/Source/WebKitLegacy/mac/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.mm.erb 2022-01-19 18:16:22 UTC (rev 288215)
+++ trunk/Source/WebKitLegacy/mac/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.mm.erb 2022-01-19 18:38:07 UTC (rev 288216)
@@ -29,6 +29,7 @@
#import "WebFeatureInternal.h"
#import "WebPreferencesDefinitions.h"
+#import <wtf/ExperimentalFeatureNames.h>
#import <wtf/NeverDestroyed.h>
#import <wtf/RetainPtr.h>
