Title: [267641] trunk/Source/WebKitLegacy
Revision
267641
Author
[email protected]
Date
2020-09-26 17:21:02 -0700 (Sat, 26 Sep 2020)

Log Message

[Preferences] Generate Debug and Internal preferences for WebKitLegacy
https://bugs.webkit.org/show_bug.cgi?id=217015

Reviewed by Darin Adler.

Source/WebKitLegacy:

* WebKitLegacy.xcodeproj/project.pbxproj:
Adds generation of WebPreferencesInternalFeatures.mm from WebPreferencesInternalFeatures.mm.erb.

Source/WebKitLegacy/mac:

Imports WebPreferencesDebug.yaml and WebPreferencesInternal.yaml from WebKit and starts
generating them.

In addition, preference yaml files must now be sorted alphabetically by preference name, and
this is now enforced by GeneratePreferences.rb, generating an error if they are out of order.

* Scripts/GeneratePreferences.rb:
* Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb:
* Scripts/PreferencesTemplates/WebPreferencesInternalFeatures.mm.erb: Added.
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
(+[WebPreferences _internalDebugFeatures]): Deleted.
* WebView/WebPreferencesDebug.yaml:
* WebView/WebPreferencesDefaultValues.h:
* WebView/WebPreferencesExperimental.yaml:
* WebView/WebPreferencesInternal.yaml:
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):

Modified Paths

Added Paths

Diff

Modified: trunk/Source/WebKitLegacy/ChangeLog (267640 => 267641)


--- trunk/Source/WebKitLegacy/ChangeLog	2020-09-26 23:23:24 UTC (rev 267640)
+++ trunk/Source/WebKitLegacy/ChangeLog	2020-09-27 00:21:02 UTC (rev 267641)
@@ -1,5 +1,15 @@
 2020-09-26  Sam Weinig  <[email protected]>
 
+        [Preferences] Generate Debug and Internal preferences for WebKitLegacy
+        https://bugs.webkit.org/show_bug.cgi?id=217015
+
+        Reviewed by Darin Adler.
+
+        * WebKitLegacy.xcodeproj/project.pbxproj:
+        Adds generation of WebPreferencesInternalFeatures.mm from WebPreferencesInternalFeatures.mm.erb.
+
+2020-09-26  Sam Weinig  <[email protected]>
+
         [Preferences] It should be possible to have different default values for WebKitLegacy and WebKit in preference yaml files
         https://bugs.webkit.org/show_bug.cgi?id=216987
 

Modified: trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (267640 => 267641)


--- trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj	2020-09-26 23:23:24 UTC (rev 267640)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj	2020-09-27 00:21:02 UTC (rev 267641)
@@ -229,6 +229,7 @@
 		7C023A29251BB5E500BA7BB6 /* WebPreferencesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C023A28251BB5E500BA7BB6 /* WebPreferencesInternal.h */; };
 		7C023A2F251C05FC00BA7BB6 /* WebPreferencesDefinitions.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C023A2E251C05D500BA7BB6 /* WebPreferencesDefinitions.h */; };
 		7C1FB3C21846E8E1001A03D8 /* WebAllowDenyPolicyListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C1FB3C11846E8E1001A03D8 /* WebAllowDenyPolicyListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		7C671126251FE40F004F4536 /* WebPreferencesInternalFeatures.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C671125251FE406004F4536 /* WebPreferencesInternalFeatures.mm */; };
 		7E6FEF0808985A7200C44C3F /* WebScriptDebugDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E6FEF0508985A7200C44C3F /* WebScriptDebugDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		931633EB0AEDFF930062B92D /* WebFrameLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 931633EA0AEDFF930062B92D /* WebFrameLoaderClient.h */; };
 		9321D5921A391DC3008052BE /* WebImmediateActionController.h in Headers */ = {isa = PBXBuildFile; fileRef = 9321D5911A391DB8008052BE /* WebImmediateActionController.h */; };
@@ -1005,6 +1006,8 @@
 		7C671117251C2459004F4536 /* generate-webkitversion.pl */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; name = "generate-webkitversion.pl"; path = "scripts/generate-webkitversion.pl"; sourceTree = "<group>"; };
 		7C671118251C2459004F4536 /* postprocess-header-rule */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = "postprocess-header-rule"; path = "scripts/postprocess-header-rule"; sourceTree = "<group>"; };
 		7C671119251C2483004F4536 /* check-xcfilelists.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = "check-xcfilelists.sh"; path = "scripts/check-xcfilelists.sh"; sourceTree = "<group>"; };
+		7C671123251FB237004F4536 /* WebPreferencesInternalFeatures.mm.erb */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebPreferencesInternalFeatures.mm.erb; sourceTree = "<group>"; };
+		7C671125251FE406004F4536 /* WebPreferencesInternalFeatures.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = WebPreferencesInternalFeatures.mm; path = WebPreferencesInternalFeatures.mm; sourceTree = "<group>"; };
 		7E6FEF0508985A7200C44C3F /* WebScriptDebugDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebScriptDebugDelegate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
 		7E6FEF0608985A7200C44C3F /* WebScriptDebugDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebScriptDebugDelegate.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
 		833987810543012D00EE146E /* WebDocumentPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDocumentPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -1945,6 +1948,7 @@
 			children = (
 				7C023A2C251C05AC00BA7BB6 /* WebPreferencesDefinitions.h.erb */,
 				7C023216251B96E400BA7BB6 /* WebPreferencesExperimentalFeatures.mm.erb */,
+				7C671123251FB237004F4536 /* WebPreferencesInternalFeatures.mm.erb */,
 				7C023A25251BADD100BA7BB6 /* WebViewPreferencesChangedGenerated.mm.erb */,
 			);
 			path = PreferencesTemplates;
@@ -1956,6 +1960,7 @@
 				7C0239EA251BA01A00BA7BB6 /* unified-sources */,
 				7C023A2E251C05D500BA7BB6 /* WebPreferencesDefinitions.h */,
 				7C023A05251BA18C00BA7BB6 /* WebPreferencesExperimentalFeatures.mm */,
+				7C671125251FE406004F4536 /* WebPreferencesInternalFeatures.mm */,
 				7C023A26251BAF2200BA7BB6 /* WebViewPreferencesChangedGenerated.mm */,
 			);
 			name = "Derived Sources";
@@ -3456,6 +3461,7 @@
 				"$(SRCROOT)/mac/Scripts/GeneratePreferences.rb",
 				"$(SRCROOT)/mac/Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb",
 				"$(SRCROOT)/mac/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.mm.erb",
+				"$(SRCROOT)/mac/Scripts/PreferencesTemplates/WebPreferencesInternalFeatures.mm.erb",
 				"$(SRCROOT)/mac/Scripts/PreferencesTemplates/WebViewPreferencesChangedGenerated.mm.erb",
 			);
 			name = "Generate Preferences";
@@ -3464,11 +3470,12 @@
 			outputPaths = (
 				"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy/WebPreferencesDefinitions.h",
 				"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy/WebPreferencesExperimentalFeatures.mm",
+				"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy/WebPreferencesInternalFeatures.mm",
 				"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy/WebViewPreferencesChangedGenerated.mm",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "set -e\n\n${SRCROOT}/mac/Scripts/GeneratePreferences.rb --frontend WebKitLegacy --template WebPreferencesDefinitions.h --template WebPreferencesExperimentalFeatures.mm --template WebViewPreferencesChangedGenerated.mm --outputDir ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy/ --base ${SRCROOT}/mac/WebView/WebPreferences.yaml --debug ${SRCROOT}/mac/WebView/WebPreferencesDebug.yaml --experimental ${SRCROOT}/mac/WebView/WebPreferencesExperimental.yaml --internal ${SRCROOT}/mac/WebView/WebPreferencesInternal.yaml\n";
+			shellScript = "set -e\n\n${SRCROOT}/mac/Scripts/GeneratePreferences.rb --frontend WebKitLegacy --template WebPreferencesDefinitions.h --template WebPreferencesExperimentalFeatures.mm --template WebPreferencesInternalFeatures.mm --template WebViewPreferencesChangedGenerated.mm --outputDir ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy/ --base ${SRCROOT}/mac/WebView/WebPreferences.yaml --debug ${SRCROOT}/mac/WebView/WebPreferencesDebug.yaml --experimental ${SRCROOT}/mac/WebView/WebPreferencesExperimental.yaml --internal ${SRCROOT}/mac/WebView/WebPreferencesInternal.yaml\n";
 		};
 		A13EE61D185AE82700556064 /* Postprocess Headers */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -3651,6 +3658,7 @@
 				939810F80824BF01008DF038 /* WebPreferences.mm in Sources */,
 				7C023A24251BA43E00BA7BB6 /* WebPreferencesDefaultValues.mm in Sources */,
 				7C023A06251BA18C00BA7BB6 /* WebPreferencesExperimentalFeatures.mm in Sources */,
+				7C671126251FE40F004F4536 /* WebPreferencesInternalFeatures.mm in Sources */,
 				1A6A208D1886154600E50F5F /* WebProgressTrackerClient.mm in Sources */,
 				9398111A0824BF01008DF038 /* WebResource.mm in Sources */,
 				A5DEFC0A11D5331C00885273 /* WebSecurityOrigin.mm in Sources */,

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (267640 => 267641)


--- trunk/Source/WebKitLegacy/mac/ChangeLog	2020-09-26 23:23:24 UTC (rev 267640)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2020-09-27 00:21:02 UTC (rev 267641)
@@ -1,5 +1,33 @@
 2020-09-26  Sam Weinig  <[email protected]>
 
+        [Preferences] Generate Debug and Internal preferences for WebKitLegacy
+        https://bugs.webkit.org/show_bug.cgi?id=217015
+
+        Reviewed by Darin Adler.
+
+        Imports WebPreferencesDebug.yaml and WebPreferencesInternal.yaml from WebKit and starts
+        generating them. 
+        
+        In addition, preference yaml files must now be sorted alphabetically by preference name, and
+        this is now enforced by GeneratePreferences.rb, generating an error if they are out of order.
+
+        * Scripts/GeneratePreferences.rb:
+        * Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb:
+        * Scripts/PreferencesTemplates/WebPreferencesInternalFeatures.mm.erb: Added.
+        * WebView/WebPreferenceKeysPrivate.h:
+        * WebView/WebPreferences.mm:
+        (+[WebPreferences initialize]):
+        (+[WebPreferences _internalDebugFeatures]): Deleted.
+        * WebView/WebPreferencesDebug.yaml:
+        * WebView/WebPreferencesDefaultValues.h:
+        * WebView/WebPreferencesExperimental.yaml:
+        * WebView/WebPreferencesInternal.yaml:
+        * WebView/WebPreferencesPrivate.h:
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]):
+
+2020-09-26  Sam Weinig  <[email protected]>
+
         [Preferences] It should be possible to have different default values for WebKitLegacy and WebKit in preference yaml files
         https://bugs.webkit.org/show_bug.cgi?id=216987
 

Modified: trunk/Source/WebKitLegacy/mac/Scripts/GeneratePreferences.rb (267640 => 267641)


--- trunk/Source/WebKitLegacy/mac/Scripts/GeneratePreferences.rb	2020-09-26 23:23:24 UTC (rev 267640)
+++ trunk/Source/WebKitLegacy/mac/Scripts/GeneratePreferences.rb	2020-09-27 00:21:02 UTC (rev 267641)
@@ -64,35 +64,32 @@
 
 FileUtils.mkdir_p(options[:outputDirectory])
 
-parsedBasePreferences = begin
-  YAML.load_file(options[:basePreferences])
-rescue ArgumentError => e
-  puts "Could not parse input file: #{e.message}"
-  exit(-1)
+def load(path)
+  parsed = begin
+    YAML.load_file(path)
+  rescue ArgumentError => e
+    puts "ERROR: Could not parse input file: #{e.message}"
+    exit(-1)
+  end
+  if parsed
+    previousName = nil
+    parsed.keys.each do |name|
+      if previousName != nil and previousName > name
+        puts "ERROR: Input file #{path} is not sorted. First out of order name found is '#{name}'."
+        exit(-1)
+      end
+      previousName = name
+    end
+  end
+  parsed
 end
 
-parsedDebugPreferences = begin
-  YAML.load_file(options[:debugPreferences])
-rescue ArgumentError => e
-  puts "Could not parse input file: #{e.message}"
-  exit(-1)
-end
+parsedBasePreferences = load(options[:basePreferences])
+parsedDebugPreferences = load(options[:debugPreferences])
+parsedExperimentalPreferences = load(options[:experimentalPreferences])
+parsedInternalPreferences = load(options[:internalPreferences])
 
-parsedExperimentalPreferences = begin
-  YAML.load_file(options[:experimentalPreferences])
-rescue ArgumentError => e
-  puts "Could not parse input file: #{e.message}"
-  exit(-1)
-end
 
-parsedInternalPreferences = begin
-  YAML.load_file(options[:internalPreferences])
-rescue ArgumentError => e
-  puts "Could not parse input file: #{e.message}"
-  exit(-1)
-end
-
-
 class Preference
   attr_accessor :name
   attr_accessor :type
@@ -168,7 +165,7 @@
     @preferencesNotDebug = []
     @preferencesDebug = []
     @experimentalFeatures = []
-    @internalDebugFeatures = []
+    @internalFeatures = []
 
     if parsedBasePreferences
       parsedBasePreferences.each do |name, options|
@@ -195,7 +192,7 @@
       parsedInternalPreferences.each do |name, options|
         preference = Preference.new(name, options, @frontend)
         @preferences << preference
-        @internalDebugFeatures << preference
+        @internalFeatures << preference
       end
     end
 
@@ -203,7 +200,7 @@
     @preferencesNotDebug.sort! { |x, y| x.name <=> y.name }
     @preferencesDebug.sort! { |x, y| x.name <=> y.name }
     @experimentalFeatures.sort! { |x, y| x.name <=> y.name }.sort! { |x, y| x.humanReadableName <=> y.humanReadableName }
-    @internalDebugFeatures.sort! { |x, y| x.name <=> y.name }.sort! { |x, y| x.humanReadableName <=> y.humanReadableName }
+    @internalFeatures.sort! { |x, y| x.name <=> y.name }.sort! { |x, y| x.humanReadableName <=> y.humanReadableName }
 
     @preferencesBoundToSetting = @preferences.select { |p| !p.webcoreBinding }
     @preferencesBoundToDeprecatedGlobalSettings = @preferences.select { |p| p.webcoreBinding == "DeprecatedGlobalSettings" }

Modified: trunk/Source/WebKitLegacy/mac/Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb (267640 => 267641)


--- trunk/Source/WebKitLegacy/mac/Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb	2020-09-26 23:23:24 UTC (rev 267640)
+++ trunk/Source/WebKitLegacy/mac/Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb	2020-09-27 00:21:02 UTC (rev 267641)
@@ -31,7 +31,7 @@
 
 // Default initialization of WebPreferences' internal dictionary.
 
-<%- for @pref in @experimentalFeatures do -%>
+<%- for @pref in @preferences do -%>
 <%-   if @pref.condition -%>
 #if <%= @pref.condition %>
 <%-   end -%>
@@ -58,7 +58,7 @@
 <%- end -%>
 
 #define INITIALIZE_DEFAULT_PREFERENCES_DICTIONARY_FROM_GENERATED_PREFERENCES \
-<%- for @pref in @experimentalFeatures do -%>
+<%- for @pref in @preferences do -%>
     @(DEFAULT_VALUE_FOR_<%= @pref.name %>), @"WebKit<%= @pref.name %>", \
 <%- end -%>
     \

Copied: trunk/Source/WebKitLegacy/mac/Scripts/PreferencesTemplates/WebPreferencesInternalFeatures.mm.erb (from rev 267640, trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.h) (0 => 267641)


--- trunk/Source/WebKitLegacy/mac/Scripts/PreferencesTemplates/WebPreferencesInternalFeatures.mm.erb	                        (rev 0)
+++ trunk/Source/WebKitLegacy/mac/Scripts/PreferencesTemplates/WebPreferencesInternalFeatures.mm.erb	2020-09-27 00:21:02 UTC (rev 267641)
@@ -0,0 +1,54 @@
+/*
+ * <%= @warning %>
+ *
+ * Copyright (C) 2020 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 "WebPreferencesPrivate.h"
+
+#import "WebFeatureInternal.h"
+#import "WebPreferencesDefinitions.h"
+
+using namespace WebKit;
+
+@implementation WebPreferences (WebPrivateInternalFeatures)
+
++ (NSArray<WebFeature *> *)_internalFeatures
+{
+    static NSArray<WebFeature *> *features = @[
+<%- for @pref in @internalFeatures do -%>
+<%- if @pref.condition -%>
+#if <%= @pref.condition %>
+<%- end -%>
+        [[WebFeature alloc] initWithKey:@"<%= @pref.name %>" name:@<%= @pref.humanReadableName %> details:@<%= @pref.humanReadableDescription %> defaultValue:DEFAULT_VALUE_FOR_<%= @pref.name %> hidden:<%= @pref.hidden %>],
+<%- if @pref.condition -%>
+#endif
+<%- end -%>
+<%- end -%>
+    ];
+
+    return features;
+}
+
+@end

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h (267640 => 267641)


--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h	2020-09-26 23:23:24 UTC (rev 267640)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h	2020-09-27 00:21:02 UTC (rev 267641)
@@ -88,7 +88,7 @@
 #define WebKitPageCacheSupportsPluginsPreferenceKey @"WebKitPageCacheSupportsPluginsPreferenceKey"
 #define WebKitFTPDirectoryTemplatePath @"WebKitFTPDirectoryTemplatePath"
 #define WebKitForceFTPDirectoryListings @"WebKitForceFTPDirectoryListings"
-#define WebKitDeveloperExtrasEnabledPreferenceKey @"WebKitDeveloperExtrasEnabledPreferenceKey"
+#define WebKitDeveloperExtrasEnabledPreferenceKey @"WebKitDeveloperExtrasEnabled"
 #define WebKitJavaScriptRuntimeFlagsPreferenceKey @"WebKitJavaScriptRuntimeFlagsPreferenceKey"
 #define WebKitAuthorAndUserStylesEnabledPreferenceKey @"WebKitAuthorAndUserStylesEnabledPreferenceKey"
 #define WebKitDOMTimersThrottlingEnabledPreferenceKey @"WebKitDOMTimersThrottlingEnabledPreferenceKey"
@@ -169,7 +169,7 @@
 #define WebKitMediaKeysStorageDirectoryKey @"WebKitMediaKeysStorageDirectory"
 #define WebKitDataTransferItemsEnabledPreferenceKey @"WebKitDataTransferItemsEnabled"
 #define WebKitCustomPasteboardDataEnabledPreferenceKey @"WebKitCustomPasteboardDataEnabled"
-#define WebKitKeygenElementEnabledPreferenceKey @"WebKitKeygenElementEnabledPreferenceKey"
+#define WebKitKeygenElementEnabledPreferenceKey @"WebKitKeygenElementEnabled"
 #define WebKitCacheAPIEnabledPreferenceKey @"WebKitCacheAPIEnabled"
 #define WebKitDownloadAttributeEnabledPreferenceKey @"WebKitDownloadAttributeEnabled"
 #define WebKitDirectoryUploadEnabledPreferenceKey @"WebKitDirectoryUploadEnabled"

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm (267640 => 267641)


--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm	2020-09-26 23:23:24 UTC (rev 267640)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm	2020-09-27 00:21:02 UTC (rev 267641)
@@ -467,7 +467,6 @@
         @YES, WebKitUsesPageCachePreferenceKey,
         @(cacheModelForMainBundle()), WebKitCacheModelPreferenceKey,
         @YES, WebKitPageCacheSupportsPluginsPreferenceKey,
-        @NO, WebKitDeveloperExtrasEnabledPreferenceKey,
         @(0), WebKitJavaScriptRuntimeFlagsPreferenceKey,
         @YES, WebKitAuthorAndUserStylesEnabledPreferenceKey,
         @YES, WebKitDOMTimersThrottlingEnabledPreferenceKey,
@@ -478,19 +477,11 @@
         @NO, WebKitJavaScriptCanAccessClipboardPreferenceKey,
         @YES, WebKitXSSAuditorEnabledPreferenceKey,
         @YES, WebKitAcceleratedCompositingEnabledPreferenceKey,
-        [NSNumber numberWithBool:DEFAULT_SUBPIXEL_ANTIALIASED_LAYER_TEXT_ENABLED], WebKitSubpixelAntialiasedLayerTextEnabledPreferenceKey,
-        @NO, WebKitDisplayListDrawingEnabledPreferenceKey,
 #if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
-        @YES, WebKitAcceleratedDrawingEnabledPreferenceKey,
         @YES, WebKitCanvasUsesAcceleratedDrawingPreferenceKey,
 #else
-        @NO, WebKitAcceleratedDrawingEnabledPreferenceKey,
         @NO, WebKitCanvasUsesAcceleratedDrawingPreferenceKey,
 #endif
-        @NO, WebKitShowDebugBordersPreferenceKey,
-        @YES, WebKitSimpleLineLayoutEnabledPreferenceKey,
-        @NO, WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey,
-        @NO, WebKitShowRepaintCounterPreferenceKey,
         @YES, WebKitWebGLEnabledPreferenceKey,
         @YES, WebKitForceWebGLUsesLowPowerPreferenceKey,
         @NO, WebKitAccelerated2dCanvasEnabledPreferenceKey,
@@ -503,10 +494,8 @@
 #else
         @(static_cast<uint32_t>(FrameFlattening::Disabled)), WebKitFrameFlatteningPreferenceKey,
 #endif
-        @NO, WebKitAsyncFrameScrollingEnabledPreferenceKey,
         @NO, WebKitSpatialNavigationEnabledPreferenceKey,
         @NO, WebKitDNSPrefetchingEnabledPreferenceKey,
-        @NO, WebKitFullScreenEnabledPreferenceKey,
         @NO, WebKitAsynchronousSpellCheckingEnabledPreferenceKey,
         @YES, WebKitHyperlinkAuditingEnabledPreferenceKey,
         @NO, WebKitUsePreHTML5ParserQuirksKey,
@@ -602,14 +591,11 @@
 #endif
 
 #if ENABLE(MEDIA_STREAM)
-        @NO, WebKitMockCaptureDevicesEnabledPreferenceKey,
         @YES, WebKitMockCaptureDevicesPromptEnabledPreferenceKey,
-        @YES, WebKitMediaCaptureRequiresSecureConnectionPreferenceKey,
 #endif
         @YES, WebKitDataTransferItemsEnabledPreferenceKey,
         @NO, WebKitCustomPasteboardDataEnabledPreferenceKey,
         @YES, WebKitModernMediaControlsEnabledPreferenceKey,
-        @YES, WebKitLayoutFormattingContextIntegrationEnabledPreferenceKey,
 
         @NO, WebKitCacheAPIEnabledPreferenceKey,
 
@@ -618,7 +604,6 @@
 #endif
         @NO, WebKitDirectoryUploadEnabledPreferenceKey,
 
-        @YES, WebKitCSSOMViewScrollingAPIEnabledPreferenceKey,
         @YES, WebKitNeedsStorageAccessFromFileURLsQuirkKey,
         @NO, WebKitAllowCrossOriginSubresourcesToAskForCredentialsKey,
 #if ENABLE(MEDIA_STREAM)
@@ -628,9 +613,6 @@
 #if ENABLE(WEB_RTC)
         @YES, WebKitPeerConnectionEnabledPreferenceKey,
 #endif
-        @YES, WebKitSelectionAcrossShadowBoundariesEnabledPreferenceKey,
-        @NO, WebKitCSSLogicalEnabledPreferenceKey,
-        @NO, WebKitLineHeightUnitsEnabledPreferenceKey,
         @NO, WebKitMediaUserGestureInheritsFromDocument,
         @YES, WebKitLegacyEncryptedMediaAPIEnabledKey,
         @NO, WebKitEncryptedMediaAPIEnabledKey,
@@ -641,7 +623,6 @@
         @YES, WebKitAllowMediaContentTypesRequiringHardwareSupportAsFallbackKey,
         @NO, WebKitInspectorAdditionsEnabledPreferenceKey,
         (NSString *)Settings::defaultMediaContentTypesRequiringHardwareSupport(), WebKitMediaContentTypesRequiringHardwareSupportPreferenceKey,
-        @YES, WebKitAriaReflectionEnabledPreferenceKey,
         @NO, WebKitMediaCapabilitiesEnabledPreferenceKey,
         @NO, WebKitDebugInAppBrowserPrivacyEnabledPreferenceKey,
         @(webSQLEnabled), WebKitWebSQLEnabledPreferenceKey,
@@ -3235,15 +3216,6 @@
 
 @end
 
-@implementation WebPreferences (WebPrivateInternalDebugFeatures)
-
-+ (NSArray<WebFeature *> *)_internalDebugFeatures
-{
-    return @[];
-}
-
-@end
-
 @implementation WebPreferences (WebPrivateFeatures)
 
 - (BOOL)_isEnabledForFeature:(WebFeature *)feature

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDebug.yaml (267640 => 267641)


--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDebug.yaml	2020-09-26 23:23:24 UTC (rev 267640)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDebug.yaml	2020-09-27 00:21:02 UTC (rev 267641)
@@ -21,4 +21,144 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 
-# Debug Preferences go here.
+AcceleratedDrawingEnabled:
+  type: bool
+  defaultValue:
+    WebKitLegacy:
+      "PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)": true
+      default: false
+    WebKit:
+      default: true
+
+DeveloperExtrasEnabled:
+  type: bool
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+# FIXME: Starting the preference name with "Disable" is inconsistent with most other preferences and should be changed.
+DisableScreenSizeOverride:
+  type: bool
+  webcoreBinding: DeprecatedGlobalSettings
+  condition: PLATFORM(IOS_FAMILY)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+DisplayListDrawingEnabled:
+  type: bool
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+ForceAlwaysUserScalable:
+  type: bool
+  webcoreBinding: none
+  condition: PLATFORM(IOS_FAMILY)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+# FIXME: The 'Is' prefix is inconsistent with most other preferences and should be removed.
+IsInAppBrowserPrivacyEnabled:
+  type: bool
+  humanReadableName: "In-App Browser Privacy"
+  humanReadableDescription: "Enable In-App Browser Privacy"
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: WebKit::defaultInAppBrowserPrivacy()
+
+LogsPageMessagesToSystemConsoleEnabled:
+  type: bool
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+NeedsInAppBrowserPrivacyQuirks:
+  type: bool
+  humanReadableName: "Needs In-App Browser Privacy Quirks"
+  humanReadableDescription: "Enable quirks needed to support In-App Browser privacy"
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+ResourceUsageOverlayVisible:
+  type: bool
+  condition: ENABLE(RESOURCE_USAGE)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+# FIXME: WebKit has an alternate name for this called 'CompositingBordersVisible'. We should standardize on one name.
+ShowDebugBorders:
+  type: bool
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+# FIXME: WebKit has an alternate name for this called 'CompositingRepaintCountersVisible'. We should standardize on one name.
+ShowRepaintCounter:
+  type: bool
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+SimpleLineLayoutDebugBordersEnabled:
+  type: bool
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+SubpixelAntialiasedLayerTextEnabled:
+  type: bool
+  defaultValue:
+    WebKitLegacy:
+      "PLATFORM(MAC)": true
+      default: false
+    WebKit:
+      "PLATFORM(MAC)": true
+      default: false
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+TiledScrollingIndicatorVisible:
+  type: bool
+  webcoreName: showTiledScrollingIndicator
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+VisibleDebugOverlayRegions:
+  type: uint32_t
+  defaultValue:
+    WebKitLegacy:
+      default: 0
+    WebKit:
+      default: 0
+

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.h (267640 => 267641)


--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.h	2020-09-26 23:23:24 UTC (rev 267640)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.h	2020-09-27 00:21:02 UTC (rev 267641)
@@ -33,6 +33,12 @@
 #define DEFAULT_SUBPIXEL_ANTIALIASED_LAYER_TEXT_ENABLED false
 #endif
 
+#if PLATFORM(IOS_FAMILY)
+#define EXPERIMENTAL_FULLSCREEN_API_HIDDEN false
+#else
+#define EXPERIMENTAL_FULLSCREEN_API_HIDDEN true
+#endif
+
 namespace WebKit {
 
 #if PLATFORM(COCOA) && HAVE(SYSTEM_FEATURE_FLAGS)

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesExperimental.yaml (267640 => 267641)


--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesExperimental.yaml	2020-09-26 23:23:24 UTC (rev 267640)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesExperimental.yaml	2020-09-27 00:21:02 UTC (rev 267641)
@@ -37,10 +37,11 @@
     WebKit:
       default: false
 
-AdClickAttributionEnabled:
+AdClickAttributionDebugModeEnabled:
   type: bool
-  humanReadableName: "Ad Click Attribution"
-  humanReadableDescription: "Enable Ad Click Attribution for Cross-Site Link Navigations"
+  humanReadableName: "Ad Click Attribution Debug Mode"
+  humanReadableDescription: "Enable Ad Click Attribution Debug Mode"
+  webcoreBinding: RuntimeEnabledFeatures
   defaultValue:
     WebKitLegacy:
       default: false
@@ -47,11 +48,10 @@
     WebKit:
       default: false
 
-AdClickAttributionDebugModeEnabled:
+AdClickAttributionEnabled:
   type: bool
-  humanReadableName: "Ad Click Attribution Debug Mode"
-  humanReadableDescription: "Enable Ad Click Attribution Debug Mode"
-  webcoreBinding: RuntimeEnabledFeatures
+  humanReadableName: "Ad Click Attribution"
+  humanReadableDescription: "Enable Ad Click Attribution for Cross-Site Link Navigations"
   defaultValue:
     WebKitLegacy:
       default: false
@@ -91,28 +91,6 @@
     WebKit:
       default: true
 
-CoreImageAcceleratedFilterRenderEnabled:
-  type: bool
-  humanReadableName: "CoreImage-Accelerated Filter Rendering"
-  humanReadableDescription: "Accelerated CSS and SVG filter rendering using CoreImage"
-  condition: ENABLE(CORE_IMAGE_ACCELERATED_FILTER_RENDER)
-  defaultValue:
-    WebKitLegacy:
-      default: false
-    WebKit:
-      default: false
-
-CoreMathMLEnabled:
-  type: bool
-  humanReadableName: "MathML Core"
-  humanReadableDescription: "Disable features removed from the MathML Core spec."
-  defaultValue:
-    WebKitLegacy:
-      default: false
-    WebKit:
-      "PLATFORM(GTK) || PLATFORM(WPE)": true
-      default: false
-
 CSSCustomPropertiesAndValuesEnabled:
   type: bool
   humanReadableName: "CSS Custom Properties and Values API"
@@ -171,6 +149,28 @@
       "ENABLE(EXPERIMENTAL_FEATURES) && (PLATFORM(GTK) || PLATFORM(WPE))": true
       default: false
 
+CoreImageAcceleratedFilterRenderEnabled:
+  type: bool
+  humanReadableName: "CoreImage-Accelerated Filter Rendering"
+  humanReadableDescription: "Accelerated CSS and SVG filter rendering using CoreImage"
+  condition: ENABLE(CORE_IMAGE_ACCELERATED_FILTER_RENDER)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+CoreMathMLEnabled:
+  type: bool
+  humanReadableName: "MathML Core"
+  humanReadableDescription: "Disable features removed from the MathML Core spec."
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      "PLATFORM(GTK) || PLATFORM(WPE)": true
+      default: false
+
 DialogElementEnabled:
   type: bool
   humanReadableName: "Dialog Element"
@@ -253,17 +253,6 @@
     WebKit:
       default: true
 
-HighlightAPIEnabled:
-  type: bool
-  humanReadableName: "Highlight API"
-  humanReadableDescription: "Highlight API support"
-  webcoreBinding: RuntimeEnabledFeatures
-  defaultValue:
-    WebKitLegacy:
-      default: false
-    WebKit:
-      default: false
-
 # FIXME: This is on by default in WebKit2. Perhaps we should consider turning it on for WebKitLegacy as well.
 HDRMediaCapabilitiesEnabled:
   type: bool
@@ -299,6 +288,17 @@
     WebKit:
       default: false
 
+HighlightAPIEnabled:
+  type: bool
+  humanReadableName: "Highlight API"
+  humanReadableDescription: "Highlight API support"
+  webcoreBinding: RuntimeEnabledFeatures
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
 # FIXME: This is enabled when ENABLE(EXPERIMENTAL_FEATURES) is true in WebKit2. Perhaps we should consider using that for WebKitLegacy as well.
 ImageBitmapEnabled:
   type: bool
@@ -312,6 +312,17 @@
       "ENABLE(EXPERIMENTAL_FEATURES)" : true
       default: false
 
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+InProcessCookieCacheEnabled:
+  type: bool
+  humanReadableName: "In-Process Cookie Cache"
+  humanReadableDescription: "In-Process DOM Cookie Cache"
+  defaultValue:
+    WebKitLegacy:
+      default: true
+    WebKit:
+      default: true
+
 IncrementalPDFLoadingEnabled:
   type: bool
   humanReadableName: "Incremental PDF Loading"
@@ -336,17 +347,6 @@
     WebKit:
       default: true
 
-# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
-InProcessCookieCacheEnabled:
-  type: bool
-  humanReadableName: "In-Process Cookie Cache"
-  humanReadableDescription: "In-Process DOM Cookie Cache"
-  defaultValue:
-    WebKitLegacy:
-      default: true
-    WebKit:
-      default: true
-
 # FIXME: The 'Is' prefix is inconsistent with most other preferences and should be removed.
 IsFirstPartyWebsiteDataRemovalDisabled:
   type: bool
@@ -684,17 +684,6 @@
     WebKit:
       default: true
 
-VisualViewportAPIEnabled:
-  type: bool
-  humanReadableName: "Visual Viewport API"
-  humanReadableDescription: "Enable Visual Viewport API"
-  defaultValue:
-    WebKitLegacy:
-      "PLATFORM(IOS_FAMILY)" : false
-      default: true
-    WebKit:
-      default: true
-
 # FIXME: Is this implemented for WebKitLegacy? If not, this should be excluded from WebKitLegacy entirely.
 VP9DecoderEnabled:
   type: bool
@@ -721,6 +710,16 @@
     WebKit:
       default: WebKit::defaultVP9SWDecoderEnabledOnBattery()
 
+VisualViewportAPIEnabled:
+  type: bool
+  humanReadableName: "Visual Viewport API"
+  humanReadableDescription: "Enable Visual Viewport API"
+  defaultValue:
+    WebKitLegacy:
+      "PLATFORM(IOS_FAMILY)" : false
+      default: true
+    WebKit:
+      default: true
 
 # FIXME: This is enabled when ENABLE(EXPERIMENTAL_FEATURES) is true in WebKit2. Perhaps we should consider using that for WebKitLegacy as well.
 WebAnimationsCompositeOperationsEnabled:
@@ -835,11 +834,11 @@
     WebKit:
       default: false
 
-# FIXME: Is this implemented for WebKitLegacy? If not, this should be excluded from WebKitLegacy entirely.
-WebRTCVP9CodecEnabled:
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+WebRTCPlatformCodecsInGPUProcessEnabled:
   type: bool
-  humanReadableName: "WebRTC VP9 codec"
-  humanReadableDescription: "Enable WebRTC VP9 codec"
+  humanReadableName: "WebRTC Platform Codecs in GPU Process"
+  humanReadableDescription: "Enable WebRTC Platform Codecs in GPU Process"
   webcoreBinding: RuntimeEnabledFeatures
   condition: ENABLE(WEB_RTC)
   defaultValue:
@@ -846,13 +845,13 @@
     WebKitLegacy:
       default: false
     WebKit:
-      default: false
+      default: WebKit::defaultWebRTCCodecsInGPUProcess()
 
-# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
-WebRTCPlatformCodecsInGPUProcessEnabled:
+# FIXME: Is this implemented for WebKitLegacy? If not, this should be excluded from WebKitLegacy entirely.
+WebRTCVP9CodecEnabled:
   type: bool
-  humanReadableName: "WebRTC Platform Codecs in GPU Process"
-  humanReadableDescription: "Enable WebRTC Platform Codecs in GPU Process"
+  humanReadableName: "WebRTC VP9 codec"
+  humanReadableDescription: "Enable WebRTC VP9 codec"
   webcoreBinding: RuntimeEnabledFeatures
   condition: ENABLE(WEB_RTC)
   defaultValue:
@@ -859,7 +858,7 @@
     WebKitLegacy:
       default: false
     WebKit:
-      default: WebKit::defaultWebRTCCodecsInGPUProcess()
+      default: false
 
 WebShareFileAPIEnabled:
   type: bool

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesInternal.yaml (267640 => 267641)


--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesInternal.yaml	2020-09-26 23:23:24 UTC (rev 267640)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesInternal.yaml	2020-09-27 00:21:02 UTC (rev 267641)
@@ -26,4 +26,736 @@
 # They must include a humanReadableName and humanReadableDescription. This is
 #   the text exposed to the user from the WebKit client.
 
-# Internal preferences go here.
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+AllowViewportShrinkToFitContent:
+  type: bool
+  humanReadableName: "Allow Viewport Shrink to Fit Content"
+  humanReadableDescription: "Allow the viewport shrink to fit content heuristic when appropriate"
+  condition: PLATFORM(IOS_FAMILY)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: true
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+AlwaysZoomOnDoubleTap:
+  type: bool
+  humanReadableName: "DTTZ always"
+  humanReadableDescription: "Double taps zoom, even if we dispatched a click anywhere"
+  webcoreBinding: none
+  condition: PLATFORM(IOS_FAMILY)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+ApplePayRemoteUIEnabled:
+  type: bool
+  humanReadableDescription: "Enable Apple Pay Remote UI"
+  humanReadableName: "Apple Pay Remote UI"
+  condition: ENABLE(APPLE_PAY_REMOTE_UI)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: true
+
+AriaReflectionEnabled:
+  type: bool
+  humanReadableName: "ARIA Reflection"
+  humanReadableDescription: "ARIA Reflection support"
+  webcoreBinding: RuntimeEnabledFeatures
+  defaultValue:
+    WebKitLegacy:
+      default: true
+    WebKit:
+      default: true
+
+AsyncFrameScrollingEnabled:
+  type: bool
+  humanReadableName: "Async Frame Scrolling"
+  humanReadableDescription: "Perform frame scrolling off the main thread"
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: WebKit::defaultAsyncFrameScrollingEnabled()
+
+AsyncOverflowScrollingEnabled:
+  type: bool
+  humanReadableName: "Async Overflow Scrolling"
+  humanReadableDescription: "Perform overflow scrolling off the main thread"
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: WebKit::defaultAsyncFrameScrollingEnabled()
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+BlockingOfSmallPluginsEnabled:
+  type: bool
+  humanReadableName: "Block small plugins"
+  humanReadableDescription: "Stop plugins smaller than a certain threshold from loading."
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: true
+
+CSSLogicalEnabled:
+  type: bool
+  humanReadableName: "CSS Logical Properties and Values"
+  humanReadableDescription: "Enable CSS Logical Properties and Values"
+  webcoreBinding: RuntimeEnabledFeatures
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+CSSOMViewScrollingAPIEnabled:
+  type: bool
+  humanReadableName: "CSSOM View Scrolling API"
+  humanReadableDescription: "Implement standard behavior for scrollLeft, scrollTop, scrollWidth, scrollHeight, scrollTo, scrollBy and scrollingElement."
+  defaultValue:
+    WebKitLegacy:
+      default: true
+    WebKit:
+      "PLATFORM(IOS_FAMILY)": WebKit::defaultCSSOMViewScrollingAPIEnabled()
+      default: true
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+CaptureAudioInGPUProcessEnabled:
+  type: bool
+  humanReadableName: "GPU Process: Audio Capture"
+  humanReadableDescription: "Enable audio capture in GPU Process"
+  webcoreBinding: none
+  condition: ENABLE(MEDIA_STREAM)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: WebKit::defaultCaptureAudioInGPUProcessEnabled()
+
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+CaptureAudioInUIProcessEnabled:
+  type: bool
+  humanReadableName: "Capture audio in UI Process"
+  humanReadableDescription: "Enable audio capture in UI Process"
+  webcoreBinding: none
+  condition: ENABLE(MEDIA_STREAM)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: WebKit::defaultCaptureAudioInUIProcessEnabled()
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+CaptureVideoInGPUProcessEnabled:
+  type: bool
+  humanReadableName: "GPU Process: Video Capture"
+  humanReadableDescription: "Enable video capture in GPU Process"
+  webcoreBinding: none
+  condition: ENABLE(MEDIA_STREAM)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: WebKit::defaultCaptureVideoInGPUProcessEnabled()
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+CaptureVideoInUIProcessEnabled:
+  type: bool
+  humanReadableName: "Capture video in UI Process"
+  humanReadableDescription: "Enable video capture in UI Process"
+  webcoreBinding: none
+  condition: ENABLE(MEDIA_STREAM)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: WebKit::defaultCaptureVideoInUIProcessEnabled()
+
+DOMPasteAccessRequestsEnabled:
+  type: bool
+  humanReadableName: "DOM Paste Access Requests"
+  humanReadableDescription: "Enable DOM Paste Access Requests"
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      "PLATFORM(IOS) || PLATFORM(MAC)": true
+      default: false
+
+# FIXME: This is on by default in WebKit2 (for everything but WatchOS). Perhaps we should consider turning it on for WebKitLegacy as well.
+DataListElementEnabled:
+  type: bool
+  humanReadableName: "DataList Element"
+  humanReadableDescription: "Enable datalist elements"
+  webcoreBinding: RuntimeEnabledFeatures
+  condition: ENABLE(DATALIST_ELEMENT)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      "PLATFORM(WATCHOS)": false
+      default: true
+
+# FIXME: This is on by default in WebKit2 (for macOS at least). Perhaps we should consider turning it on for WebKitLegacy as well.
+DateTimeInputsEditableComponentsEnabled:
+  type: bool
+  humanReadableName: "Date/Time inputs have editable components"
+  humanReadableDescription: "Enable multiple editable components in date/time inputs"
+  condition: ENABLE(DATE_AND_TIME_INPUT_TYPES)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      "PLATFORM(MAC)": true
+      default: false
+
+EnterKeyHintEnabled:
+  type: bool
+  defaultValue: DEFAULT_ENTER_KEY_HINT_ENABLED
+  humanReadableName: "Enter Key Hint"
+  humanReadableDescription: "Enable the enterKeyHint HTML attribute"
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      "PLATFORM(COCOA)": true
+      default: false
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+ExperimentalPlugInSandboxProfilesEnabled:
+  type: bool
+  humanReadableName: "Sandbox Plug-Ins"
+  humanReadableDescription: "Enable Plug-In sandboxing"
+  webcoreBinding: RuntimeEnabledFeatures
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+FasterClicksEnabled:
+  type: bool
+  humanReadableName: "Fast clicks"
+  humanReadableDescription: "Support faster clicks on zoomable pages"
+  webcoreBinding: none
+  condition: PLATFORM(IOS_FAMILY)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: true
+
+# FIXME: This is works differently in WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+FrameFlatteningEnabled:
+  type: bool
+  humanReadableName: "Frame flattening"
+  humanReadableDescription: "Enable frame flattening, which adjusts the height of an iframe to fit its contents"
+  webcoreBinding: custom
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      "PLATFORM(IOS_FAMILY)": true
+      default: false
+
+FullScreenEnabled:
+  type: bool
+  humanReadableName: "Fullscreen API"
+  humanReadableDescription: "Fullscreen API"
+  condition: ENABLE(FULLSCREEN_API)
+  hidden: EXPERIMENTAL_FULLSCREEN_API_HIDDEN
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+ICECandidateFilteringEnabled:
+  type: bool
+  humanReadableName: "Enable ICE Candidate Filtering"
+  humanReadableDescription: "Enable ICE Candidate Filtering"
+  defaultValue:
+    WebKitLegacy:
+      default: true
+    WebKit:
+      default: true
+
+InputTypeColorEnabled:
+  type: bool
+  humanReadableName: "Color Inputs"
+  humanReadableDescription: "Enable input elements of type color"
+  condition: ENABLE(INPUT_TYPE_COLOR)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      "PLATFORM(WATCHOS)": false
+      default: true
+
+InputTypeDateEnabled:
+  type: bool
+  humanReadableName: "Date Input"
+  humanReadableDescription: "Enable input elements of type date"
+  condition: ENABLE(INPUT_TYPE_DATE)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      "!PLATFORM(MAC) && !PLATFORM(MACCATALYST) && !PLATFORM(APPLETV)": true
+      default: false
+  
+InputTypeDateTimeLocalEnabled:
+  type: bool
+  humanReadableName: "datetime-local Inputs"
+  humanReadableDescription: "Enable input elements of type datetime-local"
+  condition: ENABLE(INPUT_TYPE_DATETIMELOCAL)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      "!PLATFORM(MAC) && !PLATFORM(MACCATALYST) && !PLATFORM(APPLETV)": true
+      default: false
+
+InputTypeMonthEnabled:
+  type: bool
+  humanReadableName: "Month Input"
+  humanReadableDescription: "Enable input elements of type month"
+  condition: ENABLE(INPUT_TYPE_MONTH)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      "!PLATFORM(MAC) && !PLATFORM(MACCATALYST) && !PLATFORM(APPLETV)": true
+      default: false
+
+InputTypeTimeEnabled:
+  type: bool
+  humanReadableName: "Time Input"
+  humanReadableDescription: "Enable input elements of type time"
+  condition: ENABLE(INPUT_TYPE_TIME)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      "!PLATFORM(MAC) && !PLATFORM(MACCATALYST) && !PLATFORM(APPLETV)": true
+      default: false
+
+InputTypeWeekEnabled:
+  type: bool
+  humanReadableName: "Week Input"
+  humanReadableDescription: "Enable input elements of type week"
+  condition: ENABLE(INPUT_TYPE_WEEK)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      "!PLATFORM(MAC) && !PLATFORM(MACCATALYST) && !PLATFORM(APPLETV)": true
+      default: false
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+IsFirstPartyWebsiteDataRemovalLiveOnTestingEnabled:
+  type: bool
+  humanReadableName: "[ITP Live-On] 1 Hour Timeout For Non-Cookie Data Removal"
+  humanReadableDescription: "Remove all non-cookie website data after just one hour of no user interaction when Intelligent Tracking Prevention is enabled"
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+IsFirstPartyWebsiteDataRemovalReproTestingEnabled:
+  type: bool
+  humanReadableName: "[ITP Repro] 30 Second Timeout For Non-Cookie Data Removal"
+  humanReadableDescription: "Remove all non-cookie website data after just 30 seconds of no user interaction when Intelligent Tracking Prevention is enabled"
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+IsITPDatabaseEnabled:
+  type: bool
+  humanReadableName: "ITP Database Backend"
+  humanReadableDescription: "Enable Intelligent Tracking Prevention Database Backend"
+  webcoreBinding: RuntimeEnabledFeatures
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: true
+
+KeygenElementEnabled:
+  type: bool
+  webcoreBinding: RuntimeEnabledFeatures
+  humanReadableName: "HTMLKeygenElement"
+  humanReadableDescription: "Enables the deprecated and disabled-by-default HTML keygen element."
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+LayoutFormattingContextEnabled:
+  type: bool
+  humanReadableName: "Full next-generation layout (LFC)"
+  humanReadableDescription: "Enable full next-generation layout (LFC)"
+  webcoreBinding: RuntimeEnabledFeatures
+  condition: ENABLE(LAYOUT_FORMATTING_CONTEXT)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+LayoutFormattingContextIntegrationEnabled:
+  type: bool
+  humanReadableName: "Next-generation line layout integration (LFC)"
+  humanReadableDescription: "Enable next-generation line layout integration (LFC)"
+  webcoreBinding: RuntimeEnabledFeatures
+  condition: ENABLE(LAYOUT_FORMATTING_CONTEXT)
+  defaultValue:
+    WebKitLegacy:
+      default: true
+    WebKit:
+      default: true
+
+LegacyOverflowScrollingTouchEnabled:
+  type: bool
+  humanReadableName: "Legacy -webkit-overflow-scrolling property"
+  humanReadableDescription: "Support the legacy -webkit-overflow-scrolling CSS property"
+  condition: ENABLE(OVERFLOW_SCROLLING_TOUCH)
+  defaultValue:
+    WebKitLegacy:
+      default: true
+    WebKit:
+      default: true
+
+LineHeightUnitsEnabled:
+  type: bool
+  humanReadableName: "lh / rlh units"
+  humanReadableDescription: "Enable the lh and lhr units"
+  webcoreBinding: RuntimeEnabledFeatures
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+LiveRangeSelectionEnabled:
+  type: bool
+  defaultValue: false
+  humanReadableName: "Live Ranges in Selection"
+  humanReadableDescription: "Live range behavior for ranges in the Selection object"
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+MediaCaptureRequiresSecureConnection:
+  type: bool
+  humanReadableName: "Limit Media Capture to Secure Sites"
+  humanReadableDescription: "Limit Media Capture to Secure Sites"
+  condition: ENABLE(MEDIA_STREAM)
+  defaultValue:
+    WebKitLegacy:
+      default: true
+    WebKit:
+      default: true
+
+MockCaptureDevicesEnabled:
+  type: bool
+  defaultValue: DEFAULT_MOCK_CAPTURE_DEVICES_ENABLED
+  condition: ENABLE(MEDIA_STREAM)
+  humanReadableName: "Enable Mock Capture Devices"
+  humanReadableDescription: "Enable Mock Capture Devices"
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      "PLATFORM(IOS_FAMILY_SIMULATOR)": true
+      default: false
+
+MouseEventsSimulationEnabled:
+  type: bool
+  humanReadableName: "Mouse events simulation"
+  humanReadableDescription: "Enable mouse events dispatch along with touch events on iOS"
+  webcoreBinding: RuntimeEnabledFeatures
+  condition: ENABLE(TOUCH_EVENTS)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+OffscreenCanvasEnabled:
+  type: bool
+  humanReadableName: "OffscreenCanvas"
+  humanReadableDescription: "Support for the OffscreenCanvas APIs"
+  webcoreBinding: RuntimeEnabledFeatures
+  condition: ENABLE(OFFSCREEN_CANVAS)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      "ENABLE(EXPERIMENTAL_FEATURES) && (PLATFORM(GTK) || PLATFORM(WPE))": true
+      default: false
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+PreferFasterClickOverDoubleTap:
+  type: bool
+  humanReadableName: "Fast clicks beat DTTZ"
+  humanReadableDescription: "Prefer a faster click over a double tap"
+  webcoreBinding: none
+  condition: PLATFORM(IOS_FAMILY)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      "PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS)": true
+      default: false
+
+PrefixedWebAudioEnabled:
+  type: bool
+  humanReadableName: "Prefixed WebAudio API"
+  humanReadableDescription: "Prefixed WebAudio API"
+  condition: ENABLE(WEB_AUDIO)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+RestrictedHTTPResponseAccess:
+  type: bool
+  humanReadableName: "Filter HTTP Response for Web Processes"
+  humanReadableDescription: "Enable HTTP Response filtering for Web Processes"
+  webcoreBinding: RuntimeEnabledFeatures
+  defaultValue:
+    WebKitLegacy:
+      default: true
+    WebKit:
+      default: false
+
+SecureContextChecksEnabled:
+  type: bool
+  humanReadableName: "Secure Context Checks"
+  humanReadableDescription: "Allow access to HTTPS-only Web APIs over HTTP"
+  webcoreBinding: RuntimeEnabledFeatures
+  defaultValue:
+    WebKitLegacy:
+      default: true
+    WebKit:
+      default: true
+
+SelectionAcrossShadowBoundariesEnabled:
+  type: bool
+  humanReadableName: "Selection across shadow DOM"
+  humanReadableDescription: "Allow user-initiated selection across shadow DOM boundaries"
+  defaultValue:
+    WebKitLegacy:
+      default: true
+    WebKit:
+      default: true
+
+# FIXME: This is not implemented for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+ServiceWorkersEnabled:
+  type: bool
+  humanReadableName: "Service Workers"
+  humanReadableDescription: "Enable Service Workers"
+  webcoreBinding: RuntimeEnabledFeatures
+  webcoreName: serviceWorkerEnabled
+  condition: ENABLE(SERVICE_WORKER)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      "ENABLE(EXPERIMENTAL_FEATURES) || PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)": true
+      default: false
+
+SimpleLineLayoutEnabled:
+  type: bool
+  humanReadableName: "Simple line layout"
+  humanReadableDescription: "Enable simple line layout path (SLL)"
+  defaultValue:
+    WebKitLegacy:
+      default: true
+    WebKit:
+      default: true
+
+# FIXME: Is this implemented for WebKitLegacy? If not, this should be excluded from WebKitLegacy entirely.
+SpeakerSelectionRequiresUserGesture:
+  type: bool
+  humanReadableName: "Require a user gesture for speaker selection"
+  humanReadableDescription: "Require a user gesture for speaker selection"
+  condition: ENABLE(MEDIA_STREAM)
+  defaultValue:
+    WebKitLegacy:
+      default: true
+    WebKit:
+      default: true
+
+# FIXME: Is this implemented for WebKitLegacy? If not, this should be excluded from WebKitLegacy entirely.
+TextAutosizingUsesIdempotentMode:
+  type: bool
+  humanReadableName: "Idempotent Text Autosizing"
+  humanReadableDescription: "Use idempotent text autosizing mode"
+  condition: ENABLE(TEXT_AUTOSIZING)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      "PLATFORM(IOS_FAMILY)": defaultTextAutosizingUsesIdempotentMode()
+      default: false
+
+# FIXME: Is this implemented for WebKitLegacy? If not, this should be excluded from WebKitLegacy entirely.
+UndoManagerAPIEnabled:
+  type: bool
+  defaultValue: false
+  humanReadableName: "UndoManager DOM API"
+  humanReadableDescription: "Enable the UndoManager DOM API"
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+UseGPUProcessForCanvasRenderingEnabled:
+  type: bool
+  humanReadableName: "GPU Process: Canvas Rendering"
+  humanReadableDescription: "Enable canvas rendering in GPU Process"
+  webcoreBinding: none
+  condition: ENABLE(GPU_PROCESS)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: defaultUseGPUProcessForCanvasRenderingEnabled()
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+UseGPUProcessForDOMRenderingEnabled:
+  type: bool
+  humanReadableName: "GPU Process: DOM Rendering"
+  humanReadableDescription: "Enable DOM rendering in GPU Process"
+  webcoreBinding: none
+  condition: ENABLE(GPU_PROCESS)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: defaultUseGPUProcessForDOMRenderingEnabled()
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+UseGPUProcessForMediaEnabled:
+  type: bool
+  humanReadableName: "GPU Process: Media"
+  humanReadableDescription: "Do all media loading and playback in the GPU Process"
+  condition: ENABLE(GPU_PROCESS)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: defaultUseGPUProcessForMediaEnabled()
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+UseGPUProcessForWebGLEnabled:
+  type: bool
+  humanReadableName: "GPU Process: WebGL"
+  humanReadableDescription: "Enable WebGL in GPU Process"
+  webcoreBinding: none
+  condition: ENABLE(GPU_PROCESS)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: defaultUseGPUProcessForWebGLEnabled()
+
+WebAPIStatisticsEnabled:
+  type: bool
+  humanReadableName: "Web API Statistics"
+  humanReadableDescription: "Enable Web API Statistics"
+  webcoreBinding: RuntimeEnabledFeatures
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+
+# FIXME: Is this implemented for WebKitLegacy? If not, this should be excluded from WebKitLegacy entirely.
+WebRTCDTMFEnabled:
+  type: bool
+  humanReadableName: "WebRTC DTMF"
+  humanReadableDescription: "Enable WebRTC DTMF"
+  webcoreBinding: RuntimeEnabledFeatures
+  condition: ENABLE(WEB_RTC)
+  defaultValue:
+    WebKitLegacy:
+      default: true
+    WebKit:
+      default: true
+
+# FIXME: Is this implemented for WebKitLegacy? If not, this should be excluded from WebKitLegacy entirely.
+WebRTCH264HardwareEncoderEnabled:
+  type: bool
+  humanReadableName: "WebRTC H264 Hardware encoder"
+  humanReadableDescription: "Enable H264 Hardware encoder"
+  webcoreBinding: none
+  condition: ENABLE(WEB_RTC)
+  defaultValue:
+    WebKitLegacy:
+      default: true
+    WebKit:
+      default: true
+
+# FIXME: Is this implemented for WebKitLegacy? If not, this should be excluded from WebKitLegacy entirely.
+WebRTCH264SimulcastEnabled:
+  type: bool
+  humanReadableName: "WebRTC H264 Simulcast"
+  humanReadableDescription: "Enable WebRTC H264 Simulcast"
+  webcoreBinding: RuntimeEnabledFeatures
+  condition: ENABLE(WEB_RTC)
+  defaultValue:
+    WebKitLegacy:
+      default: true
+    WebKit:
+      default: true
+
+# FIXME: Is this implemented for WebKitLegacy? If not, this should be excluded from WebKitLegacy entirely.
+WebRTCMDNSICECandidatesEnabled:
+  type: bool
+  humanReadableName: "WebRTC mDNS ICE candidates"
+  humanReadableDescription: "Enable WebRTC mDNS ICE candidates"
+  webcoreBinding: RuntimeEnabledFeatures
+  condition: ENABLE(WEB_RTC)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: true
+
+# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
+ZoomOnDoubleTapWhenRoot:
+  type: bool
+  condition: PLATFORM(IOS_FAMILY)
+  humanReadableName: "DTTZ also when root"
+  humanReadableDescription: "Double taps zoom, even if we dispatched a click on the root nodes"
+  webcoreBinding: none
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h (267640 => 267641)


--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h	2020-09-26 23:23:24 UTC (rev 267640)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h	2020-09-27 00:21:02 UTC (rev 267641)
@@ -598,8 +598,8 @@
 + (NSArray<WebFeature *> *)_experimentalFeatures;
 @end
 
-@interface WebPreferences (WebPrivateInternalDebugFeatures)
-+ (NSArray<WebFeature *> *)_internalDebugFeatures;
+@interface WebPreferences (WebPrivateInternalFeatures)
++ (NSArray<WebFeature *> *)_internalFeatures;
 @end
 
 @interface WebPreferences (WebPrivateFeatures)

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (267640 => 267641)


--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm	2020-09-26 23:23:24 UTC (rev 267640)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm	2020-09-27 00:21:02 UTC (rev 267641)
@@ -3106,7 +3106,6 @@
     settings.setBackForwardCacheSupportsPlugins([preferences pageCacheSupportsPlugins]);
     settings.setBackForwardCacheExpirationInterval(Seconds { [preferences _backForwardCacheExpirationInterval] });
 
-    settings.setDeveloperExtrasEnabled([preferences developerExtrasEnabled]);
     settings.setJavaScriptRuntimeFlags(JSC::RuntimeFlags([preferences _javascript_RuntimeFlags]));
     settings.setAuthorAndUserStylesEnabled([preferences authorAndUserStylesEnabled]);
 
@@ -3120,16 +3119,9 @@
     settings.setDNSPrefetchingEnabled([preferences isDNSPrefetchingEnabled]);
 
     settings.setAcceleratedCompositingEnabled([preferences acceleratedCompositingEnabled]);
-    settings.setAcceleratedDrawingEnabled([preferences acceleratedDrawingEnabled]);
-    settings.setDisplayListDrawingEnabled([preferences displayListDrawingEnabled]);
     settings.setCanvasUsesAcceleratedDrawing([preferences canvasUsesAcceleratedDrawing]);
-    settings.setShowDebugBorders([preferences showDebugBorders]);
-    settings.setSimpleLineLayoutEnabled([preferences simpleLineLayoutEnabled]);
-    settings.setSimpleLineLayoutDebugBordersEnabled([preferences simpleLineLayoutDebugBordersEnabled]);
-    settings.setShowRepaintCounter([preferences showRepaintCounter]);
     settings.setWebGLEnabled([preferences webGLEnabled]);
     settings.setSubpixelCSSOMElementMetricsEnabled([preferences subpixelCSSOMElementMetricsEnabled]);
-    settings.setSubpixelAntialiasedLayerTextEnabled([preferences subpixelAntialiasedLayerTextEnabled]);
 
     settings.setForceWebGLUsesLowPower([preferences forceLowPowerGPUForWebGL]);
     settings.setAccelerated2dCanvasEnabled([preferences accelerated2dCanvasEnabled]);
@@ -3136,7 +3128,6 @@
     settings.setLoadDeferringEnabled(shouldEnableLoadDeferring());
     settings.setWindowFocusRestricted(shouldRestrictWindowFocus());
     settings.setFrameFlattening((const WebCore::FrameFlattening)[preferences frameFlattening]);
-    settings.setAsyncFrameScrollingEnabled([preferences asyncFrameScrollingEnabled]);
     settings.setSpatialNavigationEnabled([preferences isSpatialNavigationEnabled]);
     settings.setPaginateDuringLayoutEnabled([preferences paginateDuringLayoutEnabled]);
 
@@ -3178,7 +3169,6 @@
 
     settings.setJavaScriptCanOpenWindowsAutomatically([preferences _javascript_CanOpenWindowsAutomatically] || shouldAllowWindowOpenWithoutUserGesture());
 
-    settings.setCSSOMViewScrollingAPIEnabled([preferences CSSOMViewScrollingAPIEnabled]);
     settings.setMediaContentTypesRequiringHardwareSupport([preferences mediaContentTypesRequiringHardwareSupport]);
 
     switch ([preferences storageBlockingPolicy]) {
@@ -3281,8 +3271,6 @@
 #endif
 
 #if ENABLE(MEDIA_STREAM)
-    settings.setMockCaptureDevicesEnabled(false);
-    settings.setMediaCaptureRequiresSecureConnection(true);
     settings.setMediaStreamEnabled(false);
     settings.setMediaDevicesEnabled(false);
 #endif
@@ -3293,7 +3281,6 @@
 
 #if ENABLE(WEB_AUDIO)
     settings.setWebAudioEnabled([preferences webAudioEnabled]);
-    settings.setPrefixedWebAudioEnabled(false);
 #endif
 
 #if ENABLE(FULLSCREEN_API)
@@ -3300,9 +3287,6 @@
     settings.setFullScreenEnabled([preferences fullScreenEnabled]);
 #endif
 
-    RuntimeEnabledFeatures::sharedFeatures().setCSSLogicalEnabled([preferences cssLogicalEnabled]);
-    RuntimeEnabledFeatures::sharedFeatures().setLineHeightUnitsEnabled([preferences lineHeightUnitsEnabled]);
-
     settings.setHiddenPageDOMTimerThrottlingEnabled([preferences hiddenPageDOMTimerThrottlingEnabled]);
     settings.setHiddenPageCSSAnimationSuspensionEnabled([preferences hiddenPageCSSAnimationSuspensionEnabled]);
 
@@ -3335,10 +3319,6 @@
     settings.setMediaPreloadingEnabled(preferences.mediaPreloadingEnabled);
     RuntimeEnabledFeatures::sharedFeatures().setDirectoryUploadEnabled([preferences directoryUploadEnabled]);
     RuntimeEnabledFeatures::sharedFeatures().setMenuItemElementEnabled([preferences menuItemElementEnabled]);
-    RuntimeEnabledFeatures::sharedFeatures().setAriaReflectionEnabled([preferences ariaReflectionEnabled]);
-    RuntimeEnabledFeatures::sharedFeatures().setKeygenElementEnabled([preferences keygenElementEnabled]);
-    RuntimeEnabledFeatures::sharedFeatures().setLayoutFormattingContextIntegrationEnabled([preferences layoutFormattingContextIntegrationEnabled]);
-    settings.setIsInAppBrowserPrivacyEnabled([preferences isInAppBrowserPrivacyEnabled]);
     RuntimeEnabledFeatures::sharedFeatures().setWebSQLDisabled(![preferences webSQLEnabled]);
     
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
@@ -3385,7 +3365,6 @@
     settings.setLargeImageAsyncDecodingEnabled([preferences largeImageAsyncDecodingEnabled]);
     settings.setAnimatedImageAsyncDecodingEnabled([preferences animatedImageAsyncDecodingEnabled]);
     settings.setMediaCapabilitiesEnabled([preferences mediaCapabilitiesEnabled]);
-    settings.setSelectionAcrossShadowBoundariesEnabled(preferences.selectionAcrossShadowBoundariesEnabled);
 }
 
 static inline IMP getMethod(id o, SEL s)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to