Changeset 240644 in webkit

Timestamp:

Jan 28, 2019, 10:20:56 PM (8 years ago)

Author:

Devin Rousso

Message:

Web Inspector: provide a way to edit page WebRTC settings on a remote target
​https://bugs.webkit.org/show_bug.cgi?id=193863
<rdar://problem/47572764>

Reviewed by Joseph Pecoraro.

Source/JavaScriptCore:

• inspector/protocol/Page.json:

Add more values to the Setting enum type:

• ICECandidateFilteringEnabled
• MediaCaptureRequiresSecureConnection
• MockCaptureDevicesEnabled

Source/WebCore:

Test: inspector/page/overrideSetting-ICECandidateFilteringEnabled.html

inspector/page/overrideSetting-MockCaptureDevicesEnabled.html

• inspector/agents/InspectorPageAgent.cpp:

• page/Settings.yaml:
• page/SettingsBase.h:
• page/SettingsBase.cpp:

(SettingsBase::iceCandidateFilteringEnabledChanged): Added.
(SettingsBase::mockCaptureDevicesEnabledChanged): Added.

• Scripts/GenerateSettings.rb:
• Scripts/SettingsTemplates/Settings.cpp.erb:

Add page-level settings for WebRTC preferences.

• Modules/mediastream/UserMediaController.cpp:

(WebCore::UserMediaController::canCallGetUserMedia):

• testing/InternalSettings.cpp:

(WebCore::InternalSettings::setMediaCaptureRequiresSecureConnection):

• testing/Internals.h:
• testing/Internals.cpp:

(WebCore::Internals::Internals):
(WebCore::Internals::setMockMediaCaptureDevicesEnabled):
(WebCore::Internals::setMediaCaptureRequiresSecureConnection): Added.

• page/DeprecatedGlobalSettings.h:
• page/DeprecatedGlobalSettings.cpp:

(WebCore::DeprecatedGlobalSettings::mockCaptureDevicesEnabled): Deleted.
(WebCore::DeprecatedGlobalSettings::setMockCaptureDevicesEnabled): Deleted.
(WebCore::DeprecatedGlobalSettings::mediaCaptureRequiresSecureConnection): Deleted.
(WebCore::DeprecatedGlobalSettings::setMediaCaptureRequiresSecureConnection): Deleted.

Source/WebInspectorUI:

• UserInterface/Base/Main.js:

(WI.loaded):
(WI.initializeTarget):
(WI._handleDeviceSettingsToolbarButtonClicked):
(WI._handleDeviceSettingsToolbarButtonClicked.createCheckbox):
(WI._handleDeviceSettingsToolbarButtonClicked.createColumns): Deleted.

• UserInterface/Views/Main.css:

(.device-settings-content .container): Added.

• Localizations/en.lproj/localizedStrings.js:

Source/WebKit:

• Shared/WebPreferences.yaml:

Add page-level settings for WebRTC preferences.

Source/WebKitLegacy/mac:

• WebView/WebView.mm:

(-[WebView _preferencesChanged:]):
Add page-level settings for WebRTC preferences.

LayoutTests:

• inspector/page/overrideSetting-ICECandidateFilteringEnabled.html: Added.
• inspector/page/overrideSetting-ICECandidateFilteringEnabled-expected.txt: Added.
• inspector/page/overrideSetting-MockCaptureDevicesEnabled.html: Added.
• inspector/page/overrideSetting-MockCaptureDevicesEnabled-expected.txt: Added.
• platform/mac/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/page/overrideSetting-ICECandidateFilteringEnabled-expected.txt (added)
• LayoutTests/inspector/page/overrideSetting-ICECandidateFilteringEnabled.html (added)
• LayoutTests/inspector/page/overrideSetting-MockCaptureDevicesEnabled-expected.txt (added)
• LayoutTests/inspector/page/overrideSetting-MockCaptureDevicesEnabled.html (added)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/inspector/protocol/Page.json (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/UserMediaController.cpp (modified) (3 diffs)
• Source/WebCore/Scripts/GenerateSettings.rb (modified) (1 diff)
• Source/WebCore/Scripts/SettingsTemplates/Settings.cpp.erb (modified) (1 diff)
• Source/WebCore/inspector/agents/InspectorPageAgent.cpp (modified) (1 diff)
• Source/WebCore/page/DeprecatedGlobalSettings.cpp (modified) (3 diffs)
• Source/WebCore/page/DeprecatedGlobalSettings.h (modified) (2 diffs)
• Source/WebCore/page/Settings.yaml (modified) (1 diff)
• Source/WebCore/page/SettingsBase.cpp (modified) (3 diffs)
• Source/WebCore/page/SettingsBase.h (modified) (1 diff)
• Source/WebCore/page/SettingsDefaultValues.h (modified) (1 diff)
• Source/WebCore/testing/InternalSettings.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebInspectorUI/ChangeLog (modified) (1 diff)
• Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (modified) (4 diffs)
• Source/WebInspectorUI/UserInterface/Base/Main.js (modified) (8 diffs)
• Source/WebInspectorUI/UserInterface/Views/Main.css (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Shared/WebPreferences.yaml (modified) (3 diffs)
• Source/WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• Source/WebKitLegacy/mac/WebView/WebView.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-01-28  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: provide a way to edit page WebRTC settings on a remote target
+        https://bugs.webkit.org/show_bug.cgi?id=193863
+        <rdar://problem/47572764>
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/page/overrideSetting-ICECandidateFilteringEnabled.html: Added.
+        * inspector/page/overrideSetting-ICECandidateFilteringEnabled-expected.txt: Added.
+        * inspector/page/overrideSetting-MockCaptureDevicesEnabled.html: Added.
+        * inspector/page/overrideSetting-MockCaptureDevicesEnabled-expected.txt: Added.
+        * platform/mac/TestExpectations:
+
 2019-01-28  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -146 +146 @@
 fast/mediastream/RTCPeerConnection-media-setup-callbacks-single-dialog.html [ Skip ]
 fast/mediastream/RTCPeerConnection-stats.html [ Skip ]
+
+[ HighSierra ] inspector/page/overrideSetting-ICECandidateFilteringEnabled.html [ Skip ]
+[ HighSierra ] inspector/page/overrideSetting-MockCaptureDevicesEnabled.html [ Skip ]
 
 # Asserts in debug.

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-01-28  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: provide a way to edit page WebRTC settings on a remote target
+        https://bugs.webkit.org/show_bug.cgi?id=193863
+        <rdar://problem/47572764>
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/protocol/Page.json:
+        Add more values to the `Setting` enum type:
+         - `ICECandidateFilteringEnabled`
+         - `MediaCaptureRequiresSecureConnection`
+         - `MockCaptureDevicesEnabled`
+
 2019-01-28  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/JavaScriptCore/inspector/protocol/Page.json

@@ -10 +10 @@
             "enum": [
                 "AuthorAndUserStylesEnabled",
+                "ICECandidateFilteringEnabled",
                 "ImagesEnabled",
+                "MediaCaptureRequiresSecureConnection",
+                "MockCaptureDevicesEnabled",
                 "NeedsSiteSpecificQuirks",
                 "ScriptEnabled",

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-01-28  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: provide a way to edit page WebRTC settings on a remote target
+        https://bugs.webkit.org/show_bug.cgi?id=193863
+        <rdar://problem/47572764>
+
+        Reviewed by Joseph Pecoraro.
+
+        Test: inspector/page/overrideSetting-ICECandidateFilteringEnabled.html
+              inspector/page/overrideSetting-MockCaptureDevicesEnabled.html
+
+        * inspector/agents/InspectorPageAgent.cpp:
+
+        * page/Settings.yaml:
+        * page/SettingsBase.h:
+        * page/SettingsBase.cpp:
+        (SettingsBase::iceCandidateFilteringEnabledChanged): Added.
+        (SettingsBase::mockCaptureDevicesEnabledChanged): Added.
+        * Scripts/GenerateSettings.rb:
+        * Scripts/SettingsTemplates/Settings.cpp.erb:
+        Add page-level settings for WebRTC preferences.
+
+        * Modules/mediastream/UserMediaController.cpp:
+        (WebCore::UserMediaController::canCallGetUserMedia):
+
+        * testing/InternalSettings.cpp:
+        (WebCore::InternalSettings::setMediaCaptureRequiresSecureConnection):
+
+        * testing/Internals.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::Internals):
+        (WebCore::Internals::setMockMediaCaptureDevicesEnabled):
+        (WebCore::Internals::setMediaCaptureRequiresSecureConnection): Added.
+
+        * page/DeprecatedGlobalSettings.h:
+        * page/DeprecatedGlobalSettings.cpp:
+        (WebCore::DeprecatedGlobalSettings::mockCaptureDevicesEnabled): Deleted.
+        (WebCore::DeprecatedGlobalSettings::setMockCaptureDevicesEnabled): Deleted.
+        (WebCore::DeprecatedGlobalSettings::mediaCaptureRequiresSecureConnection): Deleted.
+        (WebCore::DeprecatedGlobalSettings::setMediaCaptureRequiresSecureConnection): Deleted.
+
 2019-01-28  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/UserMediaController.cpp

@@ -30 +30 @@
 
 #include "DOMWindow.h"
-#include "DeprecatedGlobalSettings.h"
 #include "Document.h"
 #include "DocumentLoader.h"
@@ -37 +36 @@
 #include "HTMLParserIdioms.h"
 #include "SchemeRegistry.h"
+#include "Settings.h"
 #include "UserMediaRequest.h"
 
@@ -114 +114 @@
     ASSERT(!types.isEmpty());
 
-    bool requiresSecureConnection = DeprecatedGlobalSettings::mediaCaptureRequiresSecureConnection();
+    bool requiresSecureConnection = true;
+    if (auto page = document.page())
+        requiresSecureConnection = page->settings().mediaCaptureRequiresSecureConnection();
     auto& documentLoader = *document.loader();
     if (requiresSecureConnection && !isSecure(documentLoader))

trunk/Source/WebCore/Scripts/GenerateSettings.rb

@@ -121 +121 @@
 
   def setterFunctionName
-    if @name.start_with?("css", "xss", "ftp", "dom", "dns")
+    if @name.start_with?("css", "xss", "ftp", "dom", "dns", "ice")
       "set" + @name[0..2].upcase + @name[3..@name.length]
     else

trunk/Source/WebCore/Scripts/SettingsTemplates/Settings.cpp.erb

@@ -126 +126 @@
         return;
     m_<%= @setting.name %>InspectorOverride = <%= @setting.name %>InspectorOverride;
+<%- if @setting.conditional -%>
+#if ENABLE(<%= @setting.conditional %>)
+<%- end -%>
     <%= @setting.onChange %>();
+<%- if @setting.conditional -%>
+#endif
+<%- end -%>
 }
 

trunk/Source/WebCore/inspector/agents/InspectorPageAgent.cpp

@@ -84 +84 @@
 using namespace Inspector;
 
+// Keep this in sync with Page.Setting
 #define FOR_EACH_INSPECTOR_OVERRIDE_SETTING(macro) \
     macro(AuthorAndUserStylesEnabled) \
+    macro(ICECandidateFilteringEnabled) \
     macro(ImagesEnabled) \
+    macro(MediaCaptureRequiresSecureConnection) \
+    macro(MockCaptureDevicesEnabled) \
     macro(NeedsSiteSpecificQuirks) \
     macro(ScriptEnabled) \

trunk/Source/WebCore/page/DeprecatedGlobalSettings.cpp

@@ -32 +32 @@
 #include <wtf/NeverDestroyed.h>
 
-#if ENABLE(MEDIA_STREAM)
-#include "MockRealtimeMediaSourceCenter.h"
-
-#endif
-
 namespace WebCore {
 
@@ -51 +46 @@
 bool DeprecatedGlobalSettings::gUsesOverlayScrollbars = false;
 bool DeprecatedGlobalSettings::gMockScrollAnimatorEnabled = false;
-
-#if ENABLE(MEDIA_STREAM)
-bool DeprecatedGlobalSettings::gMockCaptureDevicesEnabled = false;
-bool DeprecatedGlobalSettings::gMediaCaptureRequiresSecureConnection = true;
-#endif
 
 #if PLATFORM(WIN)
@@ -111 +101 @@
     HTMLMediaElement::resetMediaEngines();
 #endif
-}
-#endif
-
-#if ENABLE(MEDIA_STREAM)
-bool DeprecatedGlobalSettings::mockCaptureDevicesEnabled()
-{
-    return gMockCaptureDevicesEnabled;
-}
-
-void DeprecatedGlobalSettings::setMockCaptureDevicesEnabled(bool enabled)
-{
-    gMockCaptureDevicesEnabled = enabled;
-    MockRealtimeMediaSourceCenter::setMockRealtimeMediaSourceCenterEnabled(enabled);
-}
-
-bool DeprecatedGlobalSettings::mediaCaptureRequiresSecureConnection()
-{
-    return gMediaCaptureRequiresSecureConnection;
-}
-
-void DeprecatedGlobalSettings::setMediaCaptureRequiresSecureConnection(bool mediaCaptureRequiresSecureConnection)
-{
-    gMediaCaptureRequiresSecureConnection = mediaCaptureRequiresSecureConnection;
 }
 #endif

trunk/Source/WebCore/page/DeprecatedGlobalSettings.h

@@ -104 +104 @@
     static bool shouldManageAudioSessionCategory() { return gManageAudioSession; }
 #endif
-    
-#if ENABLE(MEDIA_STREAM)
-    static bool mockCaptureDevicesEnabled();
-    WEBCORE_EXPORT static void setMockCaptureDevicesEnabled(bool);
-
-    static bool mediaCaptureRequiresSecureConnection();
-    WEBCORE_EXPORT static void setMediaCaptureRequiresSecureConnection(bool);
-#endif
 
     WEBCORE_EXPORT static void setAllowsAnySSLCertificate(bool);
@@ -141 +133 @@
 #endif
     WEBCORE_EXPORT static bool gManageAudioSession;
-    
-#if ENABLE(MEDIA_STREAM)
-    static bool gMockCaptureDevicesEnabled;
-    static bool gMediaCaptureRequiresSecureConnection;
-#endif
 
     static bool gLowPowerVideoAudioBufferSizeEnabled;

trunk/Source/WebCore/page/Settings.yaml

@@ -797 +797 @@
 adClickAttributionEnabled:
   initial: false
+
+# Deprecated
+
+iceCandidateFilteringEnabled:
+  initial: true
+  onChange: iceCandidateFilteringEnabledChanged
+  inspectorOverride: true
+
+mockCaptureDevicesEnabled:
+  initial: false
+  conditional: MEDIA_STREAM
+  onChange: mockCaptureDevicesEnabledChanged
+  inspectorOverride: true
+
+mediaCaptureRequiresSecureConnection:
+  initial: true
+  conditional: MEDIA_STREAM
+  inspectorOverride: true

trunk/Source/WebCore/page/SettingsBase.cpp

@@ -49 +49 @@
 #include <wtf/StdLibExtras.h>
 
+#if ENABLE(MEDIA_STREAM)
+#include "MockRealtimeMediaSourceCenter.h"
+#endif
+
 namespace WebCore {
 
@@ -305 +309 @@
 }
 
+void SettingsBase::iceCandidateFilteringEnabledChanged()
+{
+    if (!m_page)
+        return;
+
+    if (m_page->settings().iceCandidateFilteringEnabled())
+        m_page->enableICECandidateFiltering();
+    else
+        m_page->disableICECandidateFiltering();
+}
+
 #if ENABLE(TEXT_AUTOSIZING)
 
@@ -322 +337 @@
 #endif
 
+#if ENABLE(MEDIA_STREAM)
+void SettingsBase::mockCaptureDevicesEnabledChanged()
+{
+    bool enabled = false;
+    if (m_page)
+        enabled = m_page->settings().mockCaptureDevicesEnabled();
+
+    MockRealtimeMediaSourceCenter::setMockRealtimeMediaSourceCenterEnabled(enabled);
+}
+#endif
+
 void SettingsBase::userStyleSheetLocationChanged()
 {

trunk/Source/WebCore/page/SettingsBase.h

@@ -193 +193 @@
     void hiddenPageCSSAnimationSuspensionEnabledChanged();
     void resourceUsageOverlayVisibleChanged();
+    void iceCandidateFilteringEnabledChanged();
 #if ENABLE(TEXT_AUTOSIZING)
     void shouldEnableTextAutosizingBoostChanged();
+#endif
+#if ENABLE(MEDIA_STREAM)
+    void mockCaptureDevicesEnabledChanged();
 #endif
 

trunk/Source/WebCore/page/SettingsDefaultValues.h

@@ -110 +110 @@
 static const bool defaultConicGradient = false;
 #endif
-    
 
 }

trunk/Source/WebCore/testing/InternalSettings.cpp

@@ -463 +463 @@
         return Exception { InvalidAccessError };
 #if ENABLE(MEDIA_STREAM)
-    DeprecatedGlobalSettings::setMediaCaptureRequiresSecureConnection(requires);
+    m_page->settings().setMediaCaptureRequiresSecureConnection(requires);
 #else
     UNUSED_PARAM(requires);

trunk/Source/WebCore/testing/Internals.cpp

@@ -535 +535 @@
 #if ENABLE(MEDIA_STREAM)
     setMockMediaCaptureDevicesEnabled(true);
-    WebCore::DeprecatedGlobalSettings::setMediaCaptureRequiresSecureConnection(false);
+    setMediaCaptureRequiresSecureConnection(false);
 #endif
 
@@ -1473 +1473 @@
 void Internals::setMockMediaCaptureDevicesEnabled(bool enabled)
 {
-    WebCore::DeprecatedGlobalSettings::setMockCaptureDevicesEnabled(enabled);
+    Document* document = contextDocument();
+    if (auto* page = document->page())
+        page->settings().setMockCaptureDevicesEnabled(enabled);
+}
+
+void Internals::setMediaCaptureRequiresSecureConnection(bool enabled)
+{
+    Document* document = contextDocument();
+    if (auto* page = document->page())
+        page->settings().setMediaCaptureRequiresSecureConnection(enabled);
 }
 

trunk/Source/WebCore/testing/Internals.h

@@ -508 +508 @@
 #if ENABLE(MEDIA_STREAM)
     void setMockMediaCaptureDevicesEnabled(bool);
+    void setMediaCaptureRequiresSecureConnection(bool);
     void setCustomPrivateRecorderCreator();
 #endif

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-01-28  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: provide a way to edit page WebRTC settings on a remote target
+        https://bugs.webkit.org/show_bug.cgi?id=193863
+        <rdar://problem/47572764>
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Base/Main.js:
+        (WI.loaded):
+        (WI.initializeTarget):
+        (WI._handleDeviceSettingsToolbarButtonClicked):
+        (WI._handleDeviceSettingsToolbarButtonClicked.createCheckbox):
+        (WI._handleDeviceSettingsToolbarButtonClicked.createColumns): Deleted.
+        * UserInterface/Views/Main.css:
+        (.device-settings-content .container): Added.
+
+        * Localizations/en.lproj/localizedStrings.js:
+
 2019-01-28  Matt Baker  <mattbaker@apple.com>
 

trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js

@@ -60 +60 @@
 localizedStrings["%s eval\n%s async"] = "%s eval\n%s async";
 localizedStrings["%s interval"] = "%s interval";
+localizedStrings["%s:"] = "%s:";
 localizedStrings["(Action %s)"] = "(Action %s)";
 localizedStrings["(Disk)"] = "(Disk)";
@@ -105 +106 @@
 localizedStrings["All items in \u0022%s\u0022 must be non-empty strings"] = "All items in \u0022%s\u0022 must be non-empty strings";
 localizedStrings["All items in \u0022%s\u0022 must be valid DOM nodes"] = "All items in \u0022%s\u0022 must be valid DOM nodes";
+localizedStrings["Allow Media Capture on Insecure Sites"] = "Allow Media Capture on Insecure Sites";
 localizedStrings["An error occurred trying to load the resource."] = "An error occurred trying to load the resource.";
 localizedStrings["An error occurred trying to read the \u201C%s\u201D table."] = "An error occurred trying to read the \u201C%s\u201D table.";
@@ -305 +307 @@
 localizedStrings["Disable Breakpoints"] = "Disable Breakpoints";
 localizedStrings["Disable Event Listener"] = "Disable Event Listener";
+localizedStrings["Disable ICE Candidate Restrictions"] = "Disable ICE Candidate Restrictions";
 localizedStrings["Disable Program"] = "Disable Program";
 localizedStrings["Disable all breakpoints (%s)"] = "Disable all breakpoints (%s)";
@@ -1024 +1027 @@
 localizedStrings["Use Default Appearance"] = "Use Default Appearance";
 localizedStrings["Use Default Media Styles"] = "Use Default Media Styles";
+localizedStrings["Use Mock Capture Devices"] = "Use Mock Capture Devices";
 localizedStrings["Use the resource cache when loading resources"] = "Use the resource cache when loading resources";
 localizedStrings["User Agent"] = "User Agent";

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -163 +163 @@
     this._targetsAvailablePromise = new WI.WrappedPromise;
     WI._overridenDeviceUserAgent = null;
-    WI._overridenDeviceSettings = new Set;
+    WI._overridenDeviceSettings = new Map;
 
     // Targets.
@@ -613 +613 @@
         // COMPATIBILITY (iOS 12.2): Page.overrideSetting did not exist.
         if (target.PageAgent.overrideSetting) {
-            for (let setting of WI._overridenDeviceSettings)
-                target.PageAgent.overrideSetting(setting, true);
+            for (let [setting, value] of WI._overridenDeviceSettings)
+                target.PageAgent.overrideSetting(setting, value);
         }
 
@@ -1991 +1991 @@
     }
 
-    function applyOverriddenSetting(setting, callback) {
+    function applyOverriddenSetting(setting, value, callback) {
         if (WI._overridenDeviceSettings.has(setting)) {
             // We've just "disabled" the checkbox, so clear the override instead of applying it.
@@ -2005 +2005 @@
             });
         } else {
-            // Override to false since the labels are the inverse of the setting.
-            const value = false;
             PageAgent.overrideSetting(setting, value, (error) => {
                 if (error) {
@@ -2013 +2011 @@
                 }
 
-                WI._overridenDeviceSettings.add(setting);
+                WI._overridenDeviceSettings.set(setting, value);
                 callback(true);
                 updateActivatedState();
@@ -2032 +2030 @@
     }
 
-    function createColumns(parent, count) {
-        let columnContainer = parent.appendChild(document.createElement("div"));
-        columnContainer.classList.add("columns");
-
-        let columns = [];
-        for (let i = 0; i < count; ++i) {
-            let column = columnContainer.appendChild(document.createElement("div"));
-            column.classList.add("column");
-            columns.push(column);
-        }
-        return columns;
-    }
-
-    function createCheckbox(container, label, setting) {
+    function createCheckbox(container, label, setting, value) {
+        if (!setting)
+            return;
+
         let labelElement = container.appendChild(document.createElement("label"));
 
@@ -2052 +2040 @@
         checkboxElement.checked = WI._overridenDeviceSettings.has(setting);
         checkboxElement.addEventListener("change", (event) => {
-            applyOverriddenSetting(setting, (enabled) => {
+            applyOverriddenSetting(setting, value, (enabled) => {
                 checkboxElement.checked = enabled;
             });
@@ -2169 +2157 @@
     });
 
-    let disableColumns = createColumns(createContainer(contentElement, WI.UIString("Disable:")), 2);
-    createCheckbox(disableColumns[0], WI.UIString("Images"), PageAgent.Setting.ImagesEnabled);
-    createCheckbox(disableColumns[0], WI.UIString("Styles"), PageAgent.Setting.AuthorAndUserStylesEnabled);
-    createCheckbox(disableColumns[0], WI.UIString("JavaScript"), PageAgent.Setting.ScriptEnabled);
-    createCheckbox(disableColumns[1], WI.UIString("Site-specific Hacks"), PageAgent.Setting.NeedsSiteSpecificQuirks);
-    createCheckbox(disableColumns[1], WI.UIString("Cross-Origin Restrictions"), PageAgent.Setting.WebSecurityEnabled);
+    const settings = [
+        {
+            name: WI.UIString("Disable:"),
+            columns: [
+                [
+                    {name: WI.UIString("Images"), setting: PageAgent.Setting.ImagesEnabled, value: false},
+                    {name: WI.UIString("Styles"), setting: PageAgent.Setting.AuthorAndUserStylesEnabled, value: false},
+                    {name: WI.UIString("JavaScript"), setting: PageAgent.Setting.ScriptEnabled, value: false},
+                ],
+                [
+                    {name: WI.UIString("Site-specific Hacks"), setting: PageAgent.Setting.NeedsSiteSpecificQuirks, value: false},
+                    {name: WI.UIString("Cross-Origin Restrictions"), setting: PageAgent.Setting.WebSecurityEnabled, value: false},
+                ]
+            ],
+        },
+        {
+            name: WI.UIString("%s:").format(WI.unlocalizedString("WebRTC")),
+            columns: [
+                [
+                    {name: WI.UIString("Allow Media Capture on Insecure Sites"), setting: PageAgent.Setting.MediaCaptureRequiresSecureConnection, value: false},
+                    {name: WI.UIString("Disable ICE Candidate Restrictions"), setting: PageAgent.Setting.ICECandidateFilteringEnabled, value: false},
+                    {name: WI.UIString("Use Mock Capture Devices"), setting: PageAgent.Setting.MockCaptureDevicesEnabled, value: true},
+                ],
+            ],
+        },
+    ];
+
+    for (let group of settings) {
+        if (!group.columns.some((column) => column.some((item) => item.setting)))
+            continue;
+
+        let container = createContainer(contentElement, group.name);
+
+        let columnContainer = container.appendChild(document.createElement("div"));
+        columnContainer.classList.add("columns");
+
+        for (let column of group.columns) {
+            let columnElement = columnContainer.appendChild(document.createElement("div"));
+            columnElement.classList.add("column");
+
+            for (let item of column)
+                createCheckbox(columnElement, item.name, item.setting, item.value);
+        }
+    }
 
     WI._deviceSettingsPopover.presentNewContentWithFrame(contentElement, calculateTargetFrame(), preferredEdges);

trunk/Source/WebInspectorUI/UserInterface/Views/Main.css

@@ -392 +392 @@
 }
 
+.device-settings-content .container {
+    margin-top: 8px;
+}
+
 .device-settings-content .columns {
     display: flex;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-01-28  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: provide a way to edit page WebRTC settings on a remote target
+        https://bugs.webkit.org/show_bug.cgi?id=193863
+        <rdar://problem/47572764>
+
+        Reviewed by Joseph Pecoraro.
+
+        * Shared/WebPreferences.yaml:
+        Add page-level settings for WebRTC preferences.
+
 2019-01-28  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/WebKit/Shared/WebPreferences.yaml

@@ -630 +630 @@
   webcoreName: httpEquivEnabled
 
-MockCaptureDevicesEnabled:
-  type: bool
-  defaultValue: DEFAULT_MOCK_CAPTURE_DEVICES_ENABLED
-  webcoreBinding: DeprecatedGlobalSettings
-  condition: ENABLE(MEDIA_STREAM)
-
 MockCaptureDevicesPromptEnabled:
   type: bool
   defaultValue: true
   webcoreBinding: none
-
-MediaCaptureRequiresSecureConnection:
-  type: bool
-  defaultValue: true
-  webcoreBinding: DeprecatedGlobalSettings
-  condition: ENABLE(MEDIA_STREAM)
 
 # FIXME: What is this for?
@@ -651 +639 @@
   type: bool
   defaultValue: false
-  webcoreBinding: none
-
-# FIXME: What is this for?
-ICECandidateFilteringEnabled:
-  type: bool
-  defaultValue: true
   webcoreBinding: none
 
@@ -1552 +1534 @@
   webcoreBinding: RuntimeEnabledFeatures
   category: internal
+
+# Deprecated
+
+ICECandidateFilteringEnabled:
+  type: bool
+  defaultValue: true
+
+MockCaptureDevicesEnabled:
+  type: bool
+  defaultValue: DEFAULT_MOCK_CAPTURE_DEVICES_ENABLED
+  condition: ENABLE(MEDIA_STREAM)
+
+MediaCaptureRequiresSecureConnection:
+  type: bool
+  defaultValue: true
+  condition: ENABLE(MEDIA_STREAM)

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2019-01-28  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: provide a way to edit page WebRTC settings on a remote target
+        https://bugs.webkit.org/show_bug.cgi?id=193863
+        <rdar://problem/47572764>
+
+        Reviewed by Joseph Pecoraro.
+
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]):
+        Add page-level settings for WebRTC preferences.
+
 2019-01-28  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebKitLegacy/mac/WebView/WebView.mm

@@ -3058 +3058 @@
 
 #if ENABLE(MEDIA_STREAM)
-    DeprecatedGlobalSettings::setMockCaptureDevicesEnabled(false);
-    DeprecatedGlobalSettings::setMediaCaptureRequiresSecureConnection(true);
+    settings.setMockCaptureDevicesEnabled(false);
+    settings.setMediaCaptureRequiresSecureConnection(true);
     RuntimeEnabledFeatures::sharedFeatures().setMediaStreamEnabled(false);
     RuntimeEnabledFeatures::sharedFeatures().setMediaDevicesEnabled(false);