Web Inspector: WebRTC "Disable encryption" setting should be removed …

…from remote inspection, it already isn't present for local inspection https://bugs.webkit.org/show_bug.cgi?id=250336 rdar://104042073 Reviewed by Devin Rousso. This setting already isn't present on macOS, and we already tried to remove it once earlier this year, but failed due to what I believe to have been unrelated testing failures. We are attempting to reland it here with an update to make the patch work with the changes to the Device menu that have since occurred. * Source/JavaScriptCore/inspector/protocol/Page.json: * Source/WebCore/inspector/agents/InspectorPageAgent.cpp: (WebCore::InspectorPageAgent::disable): (WebCore::InspectorPageAgent::overrideSetting): * Source/WebCore/page/Settings.yaml: * Source/WebInspectorUI/UserInterface/Views/OverrideDeviceSettingsPopover.js: (WI.OverrideDeviceSettingsPopover.prototype._createSettingsSection): Canonical link: https://commits.webkit.org/263316@main
WebKit · Apr 24, 2023 · 5d57d9a · 5d57d9a
1 parent 326243b
commit 5d57d9a
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 8 deletions.
diff --git a/Source/JavaScriptCore/inspector/protocol/Page.json b/Source/JavaScriptCore/inspector/protocol/Page.json
@@ -20,7 +20,6 @@
                 "ScriptEnabled",
                 "ShowDebugBorders",
                 "ShowRepaintCounter",
-                "WebRTCEncryptionEnabled",
                 "WebSecurityEnabled"
             ]
         },

diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
@@ -388,7 +388,6 @@ Protocol::ErrorStringOr<void> InspectorPageAgent::disable()
     inspectedPageSettings.setScriptEnabledInspectorOverride(std::nullopt);
     inspectedPageSettings.setShowDebugBordersInspectorOverride(std::nullopt);
     inspectedPageSettings.setShowRepaintCounterInspectorOverride(std::nullopt);
-    inspectedPageSettings.setWebRTCEncryptionEnabledInspectorOverride(std::nullopt);
     inspectedPageSettings.setWebSecurityEnabledInspectorOverride(std::nullopt);
     inspectedPageSettings.setForcedPrefersReducedMotionAccessibilityValue(ForcedAccessibilityValue::System);
     inspectedPageSettings.setForcedPrefersContrastAccessibilityValue(ForcedAccessibilityValue::System);
@@ -494,10 +493,6 @@ Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Protocol::Page
         inspectedPageSettings.setShowRepaintCounterInspectorOverride(value);
         return { };
 
-    case Protocol::Page::Setting::WebRTCEncryptionEnabled:
-        inspectedPageSettings.setWebRTCEncryptionEnabledInspectorOverride(value);
-        return { };
-
     case Protocol::Page::Setting::WebSecurityEnabled:
         inspectedPageSettings.setWebSecurityEnabledInspectorOverride(value);
         return { };

diff --git a/Source/WebCore/page/Settings.yaml b/Source/WebCore/page/Settings.yaml
@@ -510,7 +510,6 @@ WebGLErrorsToConsoleEnabled:
 
 WebRTCEncryptionEnabled:
   type: bool
-  inspectorOverride: true
   defaultValue:
     WebCore:
       default: true

diff --git a/Source/WebInspectorUI/UserInterface/Views/OverrideDeviceSettingsPopover.js b/Source/WebInspectorUI/UserInterface/Views/OverrideDeviceSettingsPopover.js
@@ -97,7 +97,6 @@ WI.OverrideDeviceSettingsPopover = class OverrideDeviceSettingsPopover extends W
                 {name: WI.UIString("Allow media capture on insecure sites"), setting: InspectorBackend.Enum.Page.Setting.MediaCaptureRequiresSecureConnection, value: false},
                 {name: WI.UIString("Disable ICE candidate restrictions"), setting: InspectorBackend.Enum.Page.Setting.ICECandidateFilteringEnabled, value: false},
                 {name: WI.UIString("Use mock capture devices"), setting: InspectorBackend.Enum.Page.Setting.MockCaptureDevicesEnabled, value: true},
-                {name: WI.UIString("Disable encryption"), setting: InspectorBackend.Enum.Page.Setting.WebRTCEncryptionEnabled, value: false},
             ],
         });