Title: [292365] trunk/Source
Revision
292365
Author
timothy_hor...@apple.com
Date
2022-04-04 19:09:45 -0700 (Mon, 04 Apr 2022)

Log Message

Remove GPU process system feature flags
https://bugs.webkit.org/show_bug.cgi?id=238766

Reviewed by Simon Fraser.

Source/WebKit:

* FeatureFlags/WebKit-appletvos.plist:
* FeatureFlags/WebKit-ios.plist:
* FeatureFlags/WebKit-macos.plist:
* FeatureFlags/WebKit-watchos.plist:
* Shared/WebPreferencesDefaultValues.cpp:
(WebKit::defaultCaptureAudioInGPUProcessEnabled):
(WebKit::defaultUseGPUProcessForCanvasRenderingEnabled): Deleted.
(WebKit::defaultUseGPUProcessForDOMRenderingEnabled): Deleted.
(WebKit::defaultUseGPUProcessForMediaEnabled): Deleted.
(WebKit::defaultUseGPUProcessForWebGLEnabled): Deleted.
(WebKit::defaultCaptureVideoInGPUProcessEnabled): Deleted.
(WebKit::defaultWebRTCCodecsInGPUProcess): Deleted.
* Shared/WebPreferencesDefaultValues.h:

Source/WTF:

* Scripts/Preferences/WebPreferencesExperimental.yaml:
* Scripts/Preferences/WebPreferencesInternal.yaml:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (292364 => 292365)


--- trunk/Source/WTF/ChangeLog	2022-04-05 02:06:26 UTC (rev 292364)
+++ trunk/Source/WTF/ChangeLog	2022-04-05 02:09:45 UTC (rev 292365)
@@ -1,5 +1,15 @@
 2022-04-04  Tim Horton  <timothy_hor...@apple.com>
 
+        Remove GPU process system feature flags
+        https://bugs.webkit.org/show_bug.cgi?id=238766
+
+        Reviewed by Simon Fraser.
+
+        * Scripts/Preferences/WebPreferencesExperimental.yaml:
+        * Scripts/Preferences/WebPreferencesInternal.yaml:
+
+2022-04-04  Tim Horton  <timothy_hor...@apple.com>
+
         Remove VP8/9 and WebM-related system feature flags
         https://bugs.webkit.org/show_bug.cgi?id=238757
 

Modified: trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml (292364 => 292365)


--- trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml	2022-04-05 02:06:26 UTC (rev 292364)
+++ trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml	2022-04-05 02:09:45 UTC (rev 292365)
@@ -1442,7 +1442,8 @@
   exposed: [ WebKit ]
   defaultValue:
     WebKit:
-      default: defaultUseGPUProcessForDOMRenderingEnabled()
+      "ENABLE(GPU_PROCESS_BY_DEFAULT) && PLATFORM(IOS_FAMILY) && !HAVE(UIKIT_WEBKIT_INTERNALS)": true
+      default: false
 
 UseGPUProcessForDisplayCapture:
   type: bool
@@ -1464,7 +1465,9 @@
   exposed: [ WebKit ]
   defaultValue:
     WebKit:
-      default: defaultUseGPUProcessForWebGLEnabled()
+      "ENABLE(GPU_PROCESS_BY_DEFAULT) && PLATFORM(IOS_FAMILY) && !HAVE(UIKIT_WEBKIT_INTERNALS)": true
+      "PLATFORM(WIN)": true
+      default: false
 
 UseScreenCaptureKit:
   type: bool

Modified: trunk/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml (292364 => 292365)


--- trunk/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml	2022-04-05 02:06:26 UTC (rev 292364)
+++ trunk/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml	2022-04-05 02:09:45 UTC (rev 292365)
@@ -198,7 +198,8 @@
   exposed: [ WebKit ]
   defaultValue:
     WebKit:
-      default: WebKit::defaultCaptureVideoInGPUProcessEnabled()
+      "ENABLE(GPU_PROCESS_BY_DEFAULT)": true
+      default: false
 
 CaptureVideoInUIProcessEnabled:
   type: bool
@@ -976,7 +977,9 @@
   exposed: [ WebKit ]
   defaultValue:
     WebKit:
-      default: defaultUseGPUProcessForCanvasRenderingEnabled()
+      "ENABLE(GPU_PROCESS_BY_DEFAULT)": true
+      "PLATFORM(WIN)": true
+      default: false
 
 UseGPUProcessForMediaEnabled:
   type: bool
@@ -987,7 +990,8 @@
   exposed: [ WebKit ]
   defaultValue:
     WebKit:
-      default: WebKit::defaultUseGPUProcessForMediaEnabled()
+      "ENABLE(GPU_PROCESS_BY_DEFAULT)": true
+      default: false
 
 UseGeneralDirectoryForStorage:
   type: bool
@@ -1094,7 +1098,8 @@
     WebKitLegacy:
       default: false
     WebKit:
-      default: WebKit::defaultWebRTCCodecsInGPUProcess()
+      "ENABLE(GPU_PROCESS_BY_DEFAULT)": true
+      default: false
     WebCore:
       default: false
 

Modified: trunk/Source/WebKit/ChangeLog (292364 => 292365)


--- trunk/Source/WebKit/ChangeLog	2022-04-05 02:06:26 UTC (rev 292364)
+++ trunk/Source/WebKit/ChangeLog	2022-04-05 02:09:45 UTC (rev 292365)
@@ -1,3 +1,24 @@
+2022-04-04  Tim Horton  <timothy_hor...@apple.com>
+
+        Remove GPU process system feature flags
+        https://bugs.webkit.org/show_bug.cgi?id=238766
+
+        Reviewed by Simon Fraser.
+
+        * FeatureFlags/WebKit-appletvos.plist:
+        * FeatureFlags/WebKit-ios.plist:
+        * FeatureFlags/WebKit-macos.plist:
+        * FeatureFlags/WebKit-watchos.plist:
+        * Shared/WebPreferencesDefaultValues.cpp:
+        (WebKit::defaultCaptureAudioInGPUProcessEnabled):
+        (WebKit::defaultUseGPUProcessForCanvasRenderingEnabled): Deleted.
+        (WebKit::defaultUseGPUProcessForDOMRenderingEnabled): Deleted.
+        (WebKit::defaultUseGPUProcessForMediaEnabled): Deleted.
+        (WebKit::defaultUseGPUProcessForWebGLEnabled): Deleted.
+        (WebKit::defaultCaptureVideoInGPUProcessEnabled): Deleted.
+        (WebKit::defaultWebRTCCodecsInGPUProcess): Deleted.
+        * Shared/WebPreferencesDefaultValues.h:
+
 2022-04-04  Simon Fraser  <simon.fra...@apple.com>
 
         Remove lots of WebCore:: in RemoteLayerBackingStore

Modified: trunk/Source/WebKit/FeatureFlags/WebKit-appletvos.plist (292364 => 292365)


--- trunk/Source/WebKit/FeatureFlags/WebKit-appletvos.plist	2022-04-05 02:06:26 UTC (rev 292364)
+++ trunk/Source/WebKit/FeatureFlags/WebKit-appletvos.plist	2022-04-05 02:09:45 UTC (rev 292365)
@@ -2,45 +2,5 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>gpu_process_canvas_rendering</key>
-	<dict>
-		<key>Enabled</key>
-		<true/>
-		<key>Attributes</key>
-		<dict>
-			<key>CodeComplete</key>
-			<true/>
-		</dict>
-	</dict>
-	<key>gpu_process_dom_rendering</key>
-	<dict>
-		<key>Enabled</key>
-		<true/>
-	</dict>
-	<key>gpu_process_media</key>
-	<dict>
-		<key>Enabled</key>
-		<true/>
-		<key>Attributes</key>
-		<dict>
-			<key>CodeComplete</key>
-			<true/>
-		</dict>
-	</dict>
-	<key>gpu_process_webgl</key>
-	<dict>
-		<key>Enabled</key>
-		<true/>
-	</dict>
-	<key>gpu_process_webrtc</key>
-	<dict>
-		<key>Enabled</key>
-		<false/>
-		<key>Attributes</key>
-		<dict>
-			<key>CodeComplete</key>
-			<true/>
-		</dict>
-	</dict>
 </dict>
 </plist>

Modified: trunk/Source/WebKit/FeatureFlags/WebKit-ios.plist (292364 => 292365)


--- trunk/Source/WebKit/FeatureFlags/WebKit-ios.plist	2022-04-05 02:06:26 UTC (rev 292364)
+++ trunk/Source/WebKit/FeatureFlags/WebKit-ios.plist	2022-04-05 02:09:45 UTC (rev 292365)
@@ -2,45 +2,5 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>gpu_process_canvas_rendering</key>
-	<dict>
-		<key>Enabled</key>
-		<true/>
-		<key>Attributes</key>
-		<dict>
-			<key>CodeComplete</key>
-			<true/>
-		</dict>
-	</dict>
-	<key>gpu_process_dom_rendering</key>
-	<dict>
-		<key>Enabled</key>
-		<true/>
-	</dict>
-	<key>gpu_process_media</key>
-	<dict>
-		<key>Enabled</key>
-		<true/>
-		<key>Attributes</key>
-		<dict>
-			<key>CodeComplete</key>
-			<true/>
-		</dict>
-	</dict>
-	<key>gpu_process_webgl</key>
-	<dict>
-		<key>Enabled</key>
-		<true/>
-	</dict>
-	<key>gpu_process_webrtc</key>
-	<dict>
-		<key>Enabled</key>
-		<true/>
-		<key>Attributes</key>
-		<dict>
-			<key>CodeComplete</key>
-			<true/>
-		</dict>
-	</dict>
 </dict>
 </plist>

Modified: trunk/Source/WebKit/FeatureFlags/WebKit-macos.plist (292364 => 292365)


--- trunk/Source/WebKit/FeatureFlags/WebKit-macos.plist	2022-04-05 02:06:26 UTC (rev 292364)
+++ trunk/Source/WebKit/FeatureFlags/WebKit-macos.plist	2022-04-05 02:09:45 UTC (rev 292365)
@@ -2,45 +2,5 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>gpu_process_canvas_rendering</key>
-	<dict>
-		<key>Enabled</key>
-		<true/>
-		<key>Attributes</key>
-		<dict>
-			<key>CodeComplete</key>
-			<true/>
-		</dict>
-	</dict>
-	<key>gpu_process_dom_rendering</key>
-	<dict>
-		<key>Enabled</key>
-		<false/>
-	</dict>
-	<key>gpu_process_media</key>
-	<dict>
-		<key>Enabled</key>
-		<true/>
-		<key>Attributes</key>
-		<dict>
-			<key>CodeComplete</key>
-			<true/>
-		</dict>
-	</dict>
-	<key>gpu_process_webgl</key>
-	<dict>
-		<key>Enabled</key>
-		<false/>
-	</dict>
-	<key>gpu_process_webrtc</key>
-	<dict>
-		<key>Enabled</key>
-		<true/>
-		<key>Attributes</key>
-		<dict>
-			<key>CodeComplete</key>
-			<true/>
-		</dict>
-	</dict>
 </dict>
 </plist>

Modified: trunk/Source/WebKit/FeatureFlags/WebKit-watchos.plist (292364 => 292365)


--- trunk/Source/WebKit/FeatureFlags/WebKit-watchos.plist	2022-04-05 02:06:26 UTC (rev 292364)
+++ trunk/Source/WebKit/FeatureFlags/WebKit-watchos.plist	2022-04-05 02:09:45 UTC (rev 292365)
@@ -2,45 +2,5 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>gpu_process_canvas_rendering</key>
-	<dict>
-		<key>Enabled</key>
-		<true/>
-		<key>Attributes</key>
-		<dict>
-			<key>CodeComplete</key>
-			<true/>
-		</dict>
-	</dict>
-	<key>gpu_process_dom_rendering</key>
-	<dict>
-		<key>Enabled</key>
-		<true/>
-	</dict>
-	<key>gpu_process_media</key>
-	<dict>
-		<key>Enabled</key>
-		<true/>
-		<key>Attributes</key>
-		<dict>
-			<key>CodeComplete</key>
-			<true/>
-		</dict>
-	</dict>
-	<key>gpu_process_webgl</key>
-	<dict>
-		<key>Enabled</key>
-		<true/>
-	</dict>
-	<key>gpu_process_webrtc</key>
-	<dict>
-		<key>Enabled</key>
-		<false/>
-		<key>Attributes</key>
-		<dict>
-			<key>CodeComplete</key>
-			<true/>
-		</dict>
-	</dict>
 </dict>
 </plist>

Modified: trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp (292364 => 292365)


--- trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp	2022-04-05 02:06:26 UTC (rev 292364)
+++ trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp	2022-04-05 02:09:45 UTC (rev 292365)
@@ -128,61 +128,6 @@
 #endif
 }
 
-#if ENABLE(GPU_PROCESS)
-
-bool defaultUseGPUProcessForCanvasRenderingEnabled()
-{
-#if ENABLE(GPU_PROCESS_BY_DEFAULT) || PLATFORM(WIN)
-    bool defaultValue = true;
-#else
-    bool defaultValue = false;
-#endif
-
-    return isFeatureFlagEnabled("gpu_process_canvas_rendering", defaultValue);
-}
-
-bool defaultUseGPUProcessForDOMRenderingEnabled()
-{
-#if HAVE(UIKIT_WEBKIT_INTERNALS)
-    return false;
-#else
-#if ENABLE(GPU_PROCESS_BY_DEFAULT) && PLATFORM(IOS_FAMILY)
-    bool defaultValue = true;
-#else
-    bool defaultValue = false;
-#endif
-    
-    return isFeatureFlagEnabled("gpu_process_dom_rendering", defaultValue);
-#endif
-}
-
-bool defaultUseGPUProcessForMediaEnabled()
-{
-#if ENABLE(GPU_PROCESS_BY_DEFAULT)
-    bool defaultValue = true;
-#else
-    bool defaultValue = false;
-#endif
-
-    return isFeatureFlagEnabled("gpu_process_media", defaultValue);
-}
-
-bool defaultUseGPUProcessForWebGLEnabled()
-{
-#if HAVE(UIKIT_WEBKIT_INTERNALS)
-    return false;
-#else
-#if (ENABLE(GPU_PROCESS_BY_DEFAULT) && PLATFORM(IOS_FAMILY)) || PLATFORM(WIN)
-    bool defaultValue = true;
-#else
-    bool defaultValue = false;
-#endif
-    return isFeatureFlagEnabled("gpu_process_webgl", defaultValue);
-#endif
-}
-
-#endif // ENABLE(GPU_PROCESS)
-
 #if ENABLE(MEDIA_STREAM)
 
 bool defaultCaptureAudioInGPUProcessEnabled()
@@ -194,18 +139,10 @@
 #endif
 
 #if ENABLE(GPU_PROCESS_BY_DEFAULT)
-    bool defaultValue = true;
+    return true;
 #else
-    bool defaultValue = false;
+    return false;
 #endif
-
-#if PLATFORM(MAC)
-    return isFeatureFlagEnabled("gpu_process_webrtc", defaultValue);
-#elif PLATFORM(IOS_FAMILY)
-    return isFeatureFlagEnabled("gpu_process_media", defaultValue);
-#else
-    return defaultValue;
-#endif
 }
 
 bool defaultCaptureAudioInUIProcessEnabled()
@@ -217,34 +154,8 @@
     return false;
 }
 
-bool defaultCaptureVideoInGPUProcessEnabled()
-{
-#if ENABLE(GPU_PROCESS_BY_DEFAULT)
-    bool defaultValue = true;
-#else
-    bool defaultValue = false;
-#endif
-
-    return isFeatureFlagEnabled("gpu_process_webrtc", defaultValue);
-}
-
 #endif // ENABLE(MEDIA_STREAM)
 
-#if ENABLE(WEB_RTC)
-
-bool defaultWebRTCCodecsInGPUProcess()
-{
-#if ENABLE(GPU_PROCESS_BY_DEFAULT)
-    bool defaultValue = true;
-#else
-    bool defaultValue = false;
-#endif
-
-    return isFeatureFlagEnabled("gpu_process_webrtc", defaultValue);
-}
-
-#endif // ENABLE(WEB_RTC)
-
 #if ENABLE(MEDIA_SESSION_COORDINATOR)
 bool defaultMediaSessionCoordinatorEnabled()
 {

Modified: trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h (292364 => 292365)


--- trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h	2022-04-05 02:06:26 UTC (rev 292364)
+++ trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h	2022-04-05 02:09:45 UTC (rev 292365)
@@ -66,23 +66,11 @@
 
 bool defaultOfflineWebApplicationCacheEnabled();
 
-#if ENABLE(GPU_PROCESS)
-bool defaultUseGPUProcessForCanvasRenderingEnabled();
-bool defaultUseGPUProcessForDOMRenderingEnabled();
-bool defaultUseGPUProcessForMediaEnabled();
-bool defaultUseGPUProcessForWebGLEnabled();
-#endif
-
 #if ENABLE(MEDIA_STREAM)
 bool defaultCaptureAudioInGPUProcessEnabled();
 bool defaultCaptureAudioInUIProcessEnabled();
-bool defaultCaptureVideoInGPUProcessEnabled();
 #endif
 
-#if ENABLE(WEB_RTC)
-bool defaultWebRTCCodecsInGPUProcess();
-#endif
-
 #if ENABLE(MEDIA_SOURCE) && PLATFORM(IOS_FAMILY)
 bool defaultMediaSourceEnabled();
 #endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to