Attachment 360232 Details for Bug 193863 – Patch

[patch] Patch

bug-193863-20190126013311.patch (text/plain), 22.57 KB, created by Devin Rousso on 2019-01-26 01:33:12 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-01-26 01:33:12 PST

Size: 22.57 KB

patch

obsolete

>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 253b1ea60b41a9166c8fddbc86ef10964ca94165..22235521d76bad7e619391adb920b43e376ee66a 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-01-26  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 NOBODY (OOPS!).
>+
>+        * inspector/protocol/Page.json:
>+        Add more values to the `Setting` enum type:
>+         - `ICECandidateFilteringEnabled`
>+         - `MediaCaptureRequiresSecureConnection`
>+         - `MockCaptureDevicesEnabled`
>+
> 2019-01-25  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: provide a way to edit page settings on a remote target
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 0473ff1cdd1e42a7d88013250bee07c219081ed6..bca9a5c526f910c7651468343f16078983355e31 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,40 @@
>+2019-01-26  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 NOBODY (OOPS!).
>+
>+        No change in functionality when there is no connected Web Inspector.
>+
>+        * inspector/agents/InspectorPageAgent.cpp:
>+        (WebCore::InspectorPageAgent::disable):
>+        (WebCore::InspectorPageAgent::overrideSetting):
>+
>+        * page/Settings.yaml:
>+        * page/SettingsDefaultValues.h:
>+        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-25  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: provide a way to edit page settings on a remote target
>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 38101219f69cb22de64c0b33286e30279b443345..1c2a99913c091301b726570d85912fce3111207c 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-01-26  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 NOBODY (OOPS!).
>+
>+        * UserInterface/Base/Main.js:
>+        (WI._handleDeviceSettingsToolbarButtonClicked):
>+        * UserInterface/Views/Main.css:
>+        (.device-settings-content):
>+        (.device-settings-content .container): Added.
>+
>+        * Localizations/en.lproj/localizedStrings.js:
>+
> 2019-01-25  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: provide a way to edit page settings on a remote target
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index d2d0fe25760b7044d5fb8aa27b1e02538a2f1f71..e6460fbff4f719593c4442c0b4b52eef9d111d0a 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-01-26  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 NOBODY (OOPS!).
>+
>+        * Shared/WebPreferences.yaml:
>+        Add page-level settings for WebRTC preferences.
>+
> 2019-01-25  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: provide a way to edit page settings on a remote target
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index 3c6d71db37f7ba5bc917c242e8aa5f098e327462..85e39b914d34558ebb973602275622e756267365 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-01-26  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 NOBODY (OOPS!).
>+
>+        * WebView/WebView.mm:
>+        (-[WebView _preferencesChanged:]):
>+        Add page-level settings for WebRTC preferences.
>+
> 2019-01-25  Keith Rollin  <krollin@apple.com>
> 
>         Update WebKitAdditions.xcconfig with correct order of variable definitions
>diff --git a/Source/JavaScriptCore/inspector/protocol/Page.json b/Source/JavaScriptCore/inspector/protocol/Page.json
>index 7dba156ad5505135a34a4812ed6d6d29673be771..1ddd93c325d18914ad4e3f095197409497d9e57f 100644
>--- a/Source/JavaScriptCore/inspector/protocol/Page.json
>+++ b/Source/JavaScriptCore/inspector/protocol/Page.json
>@@ -9,7 +9,10 @@
>             "description": "List of settings able to be overridden by WebInspector. Keep this in sync with FOR_EACH_INSPECTOR_OVERRIDE_SETTING.",
>             "enum": [
>                 "AuthorAndUserStylesEnabled",
>+                "ICECandidateFilteringEnabled",
>                 "ImagesEnabled",
>+                "MediaCaptureRequiresSecureConnection",
>+                "MockCaptureDevicesEnabled",
>                 "NeedsSiteSpecificQuirks",
>                 "ScriptEnabled",
>                 "WebSecurityEnabled"
>diff --git a/Source/WebCore/Modules/mediastream/UserMediaController.cpp b/Source/WebCore/Modules/mediastream/UserMediaController.cpp
>index 6251a7ec05da629b8b450dbe37396ce8be866ce5..ab96397951782212db7471ebd590947eea27c50f 100644
>--- a/Source/WebCore/Modules/mediastream/UserMediaController.cpp
>+++ b/Source/WebCore/Modules/mediastream/UserMediaController.cpp
>@@ -29,13 +29,13 @@
> #if ENABLE(MEDIA_STREAM)
> 
> #include "DOMWindow.h"
>-#include "DeprecatedGlobalSettings.h"
> #include "Document.h"
> #include "DocumentLoader.h"
> #include "Frame.h"
> #include "HTMLIFrameElement.h"
> #include "HTMLParserIdioms.h"
> #include "SchemeRegistry.h"
>+#include "Settings.h"
> #include "UserMediaRequest.h"
> 
> namespace WebCore {
>@@ -113,7 +113,9 @@ UserMediaController::GetUserMediaAccess UserMediaController::canCallGetUserMedia
> {
>     ASSERT(!types.isEmpty());
> 
>-    bool requiresSecureConnection = DeprecatedGlobalSettings::mediaCaptureRequiresSecureConnection();
>+    bool requiresSecureConnection = true;
>+    if (document.page())
>+        requiresSecureConnection = document.page()->settings().mediaCaptureRequiresSecureConnection();
>     auto& documentLoader = *document.loader();
>     if (requiresSecureConnection && !isSecure(documentLoader))
>         return GetUserMediaAccess::InsecureDocument;
>diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
>index 8dd8491f8c9265fd86170bdc4a24d453927b9e9a..4c72d1bb43899c95102b243e60868a2917cfe02d 100644
>--- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
>+++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
>@@ -83,9 +83,12 @@ namespace WebCore {
> 
> using namespace Inspector;
> 
>+// Keep this in sync with Page.Setting
> #define FOR_EACH_INSPECTOR_OVERRIDE_SETTING(macro) \
>     macro(AuthorAndUserStylesEnabled) \
>     macro(ImagesEnabled) \
>+    macro(MediaCaptureRequiresSecureConnection) \
>+    macro(MockCaptureDevicesEnabled) \
>     macro(NeedsSiteSpecificQuirks) \
>     macro(ScriptEnabled) \
>     macro(WebSecurityEnabled)
>@@ -329,6 +332,8 @@ void InspectorPageAgent::disable(ErrorString&)
>     FOR_EACH_INSPECTOR_OVERRIDE_SETTING(DISABLE_INSPECTOR_OVERRIDE_SETTING)
> 
> #undef DISABLE_INSPECTOR_OVERRIDE_SETTING
>+
>+    m_page.enableICECandidateFiltering();
> }
> 
> void InspectorPageAgent::reload(ErrorString&, const bool* optionalReloadFromOrigin, const bool* optionalRevalidateAllResources)
>@@ -381,6 +386,13 @@ void InspectorPageAgent::overrideSetting(ErrorString& errorString, const String&
>     FOR_EACH_INSPECTOR_OVERRIDE_SETTING(CASE_INSPECTOR_OVERRIDE_SETTING)
> 
> #undef CASE_INSPECTOR_OVERRIDE_SETTING
>+
>+    case Inspector::Protocol::Page::Setting::ICECandidateFilteringEnabled: {
>+        if (value && !*value)
>+            m_page.disableICECandidateFiltering();
>+        else
>+            m_page.enableICECandidateFiltering();
>+    }
>     }
> 
>     ASSERT_NOT_REACHED();
>diff --git a/Source/WebCore/page/DeprecatedGlobalSettings.cpp b/Source/WebCore/page/DeprecatedGlobalSettings.cpp
>index f4995d3870c2bda06e13f019f9de5ec203059eff..6faa2301d22ebe5246779636f9c1227bdc53a243 100644
>--- a/Source/WebCore/page/DeprecatedGlobalSettings.cpp
>+++ b/Source/WebCore/page/DeprecatedGlobalSettings.cpp
>@@ -51,11 +51,6 @@ bool DeprecatedGlobalSettings::gMockScrollbarsEnabled = false;
> bool DeprecatedGlobalSettings::gUsesOverlayScrollbars = false;
> bool DeprecatedGlobalSettings::gMockScrollAnimatorEnabled = false;
> 
>-#if ENABLE(MEDIA_STREAM)
>-bool DeprecatedGlobalSettings::gMockCaptureDevicesEnabled = false;
>-bool DeprecatedGlobalSettings::gMediaCaptureRequiresSecureConnection = true;
>-#endif
>-
> #if PLATFORM(WIN)
> bool DeprecatedGlobalSettings::gShouldUseHighResolutionTimers = true;
> #endif
>@@ -113,29 +108,6 @@ void DeprecatedGlobalSettings::setGStreamerEnabled(bool enabled)
> }
> #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
>-
> // It's very important that this setting doesn't change in the middle of a document's lifetime.
> // The Mac port uses this flag when registering and deregistering platform-dependent scrollbar
> // objects. Therefore, if this changes at an unexpected time, deregistration may not happen
>diff --git a/Source/WebCore/page/DeprecatedGlobalSettings.h b/Source/WebCore/page/DeprecatedGlobalSettings.h
>index 216da09f87de45a7d7216b2965fe1291a191e7bf..620d12a18aef92a62d5fc74a7c3aab7a976e7944 100644
>--- a/Source/WebCore/page/DeprecatedGlobalSettings.h
>+++ b/Source/WebCore/page/DeprecatedGlobalSettings.h
>@@ -103,14 +103,6 @@ public:
>     static void setShouldManageAudioSessionCategory(bool flag) { gManageAudioSession = flag; }
>     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);
>     static bool allowsAnySSLCertificate();
>@@ -140,11 +132,6 @@ private:
>     WEBCORE_EXPORT static bool gDisableScreenSizeOverride;
> #endif
>     WEBCORE_EXPORT static bool gManageAudioSession;
>-    
>-#if ENABLE(MEDIA_STREAM)
>-    static bool gMockCaptureDevicesEnabled;
>-    static bool gMediaCaptureRequiresSecureConnection;
>-#endif
> 
>     static bool gLowPowerVideoAudioBufferSizeEnabled;
>     static bool gResourceLoadStatisticsEnabledEnabled;
>diff --git a/Source/WebCore/page/Settings.yaml b/Source/WebCore/page/Settings.yaml
>index ca4c57c869f4950881ba840d8bb649102eb3257e..08e93ac5f9c85b09481be479c79c57c018f0e02b 100644
>--- a/Source/WebCore/page/Settings.yaml
>+++ b/Source/WebCore/page/Settings.yaml
>@@ -796,3 +796,15 @@ editableImagesEnabled:
> 
> adClickAttributionEnabled:
>   initial: false
>+
>+# Deprecated
>+
>+mockCaptureDevicesEnabled:
>+  initial: defaultMockCaptureDevicesEnabled
>+  conditional: MEDIA_STREAM
>+  inspectorOverride: true
>+
>+mediaCaptureRequiresSecureConnection:
>+  initial: true
>+  conditional: MEDIA_STREAM
>+  inspectorOverride: true
>diff --git a/Source/WebCore/page/SettingsDefaultValues.h b/Source/WebCore/page/SettingsDefaultValues.h
>index 5ad744ac8f52843914901722849ca95997fe7577..878ac6ec42a86e7f692a9c61f63b4895ea355c15 100644
>--- a/Source/WebCore/page/SettingsDefaultValues.h
>+++ b/Source/WebCore/page/SettingsDefaultValues.h
>@@ -87,6 +87,12 @@ static const bool defaultQuickTimePluginReplacementEnabled = false;
> static const bool defaultRequiresUserGestureToLoadVideo = false;
> #endif
> 
>+#if PLATFORM(IOS_FAMILY_SIMULATOR)
>+static const bool defaultMockCaptureDevicesEnabled = true;
>+#else
>+static const bool defaultMockCaptureDevicesEnabled = false;
>+#endif
>+
> static const bool defaultAllowsPictureInPictureMediaPlayback = true;
> 
> static const double defaultIncrementalRenderingSuppressionTimeoutInSeconds = 5;
>diff --git a/Source/WebCore/testing/InternalSettings.cpp b/Source/WebCore/testing/InternalSettings.cpp
>index 6f7e519630954856bfcf95d75b993db88946c3f2..5dfb065056d47ab178234c06e359fff4499b32a3 100644
>--- a/Source/WebCore/testing/InternalSettings.cpp
>+++ b/Source/WebCore/testing/InternalSettings.cpp
>@@ -462,7 +462,7 @@ ExceptionOr<void> InternalSettings::setMediaCaptureRequiresSecureConnection(bool
>     if (!m_page)
>         return Exception { InvalidAccessError };
> #if ENABLE(MEDIA_STREAM)
>-    DeprecatedGlobalSettings::setMediaCaptureRequiresSecureConnection(requires);
>+    m_page->settings().setMediaCaptureRequiresSecureConnection(requires);
> #else
>     UNUSED_PARAM(requires);
> #endif
>diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
>index 1c84704b7b3965298a872894bcfad2e12b4da602..81594438d187f6b058d282b88084f1518aeeca81 100644
>--- a/Source/WebCore/testing/Internals.cpp
>+++ b/Source/WebCore/testing/Internals.cpp
>@@ -534,7 +534,7 @@ Internals::Internals(Document& document)
> 
> #if ENABLE(MEDIA_STREAM)
>     setMockMediaCaptureDevicesEnabled(true);
>-    WebCore::DeprecatedGlobalSettings::setMediaCaptureRequiresSecureConnection(false);
>+    setMediaCaptureRequiresSecureConnection(false);
> #endif
> 
> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
>@@ -1472,7 +1472,18 @@ void Internals::applyRotationForOutgoingVideoSources(RTCPeerConnection& connecti
> 
> void Internals::setMockMediaCaptureDevicesEnabled(bool enabled)
> {
>-    WebCore::DeprecatedGlobalSettings::setMockCaptureDevicesEnabled(enabled);
>+    Document* document = contextDocument();
>+    auto* page = document->page();
>+    if (page)
>+        page->settings().setMockCaptureDevicesEnabled(enabled);
>+}
>+
>+void Internals::setMediaCaptureRequiresSecureConnection(bool enabled)
>+{
>+    Document* document = contextDocument();
>+    auto* page = document->page();
>+    if (page)
>+        page->settings().setMediaCaptureRequiresSecureConnection(enabled);
> }
> 
> static std::unique_ptr<MediaRecorderPrivate> createRecorderMockSource()
>diff --git a/Source/WebCore/testing/Internals.h b/Source/WebCore/testing/Internals.h
>index f70b7b6b93e7bf017364036002da4686a6eece94..37c5490d477ff54852a1400bb24975ffed86b429 100644
>--- a/Source/WebCore/testing/Internals.h
>+++ b/Source/WebCore/testing/Internals.h
>@@ -507,6 +507,7 @@ public:
> 
> #if ENABLE(MEDIA_STREAM)
>     void setMockMediaCaptureDevicesEnabled(bool);
>+    void setMediaCaptureRequiresSecureConnection(bool);
>     void setCustomPrivateRecorderCreator();
> #endif
> 
>diff --git a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>index 7a42d89de2a8ce2056beca2fcdcd4a4745f60980..d178938f15deda9e568f57e8374ae280cde70c46 100644
>--- a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>+++ b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>@@ -59,6 +59,7 @@ localizedStrings["%s cannot be modified"] = "%s cannot be modified";
> localizedStrings["%s delay"] = "%s delay";
> 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)";
> localizedStrings["(Index)"] = "(Index)";
>@@ -104,6 +105,7 @@ localizedStrings["All Storage"] = "All Storage";
> localizedStrings["All items in \u0022%s\u0022 must be error objects"] = "All items in \u0022%s\u0022 must be error objects";
> 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.";
> localizedStrings["An unexpected error %s occurred."] = "An unexpected error %s occurred.";
>@@ -301,6 +303,7 @@ localizedStrings["Dimensions"] = "Dimensions";
> localizedStrings["Disable Breakpoint"] = "Disable Breakpoint";
> 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)";
> localizedStrings["Disable paint flashing"] = "Disable paint flashing";
>@@ -1016,6 +1019,7 @@ localizedStrings["Unsupported property value"] = "Unsupported property value";
> localizedStrings["Untitled"] = "Untitled";
> 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";
> localizedStrings["User Agent Stylesheet"] = "User Agent Stylesheet";
>diff --git a/Source/WebInspectorUI/UserInterface/Base/Main.js b/Source/WebInspectorUI/UserInterface/Base/Main.js
>index c61f9378e22dbaa78552c7a5aed234fb606cf324..8f0f84d15521528fca26b13ebb1d42de799ef1b6 100644
>--- a/Source/WebInspectorUI/UserInterface/Base/Main.js
>+++ b/Source/WebInspectorUI/UserInterface/Base/Main.js
>@@ -1982,6 +1982,9 @@ WI._handleDeviceSettingsToolbarButtonClicked = function(event)
>     };
> 
>     let createCheckbox = (container, label, setting) => {
>+        if (!setting)
>+            return;
>+
>         let enabled = this._overridenDeviceSettings.has(setting);
> 
>         let labelElement = container.appendChild(document.createElement("label"));
>@@ -2043,6 +2046,11 @@ WI._handleDeviceSettingsToolbarButtonClicked = function(event)
>     createCheckbox(disableColumns[1], WI.UIString("Site-specific Hacks"), PageAgent.Setting.NeedsSiteSpecificQuirks);
>     createCheckbox(disableColumns[1], WI.UIString("Cross-Origin Restrictions"), PageAgent.Setting.WebSecurityEnabled);
> 
>+    let webRTCColumns = createColumns(createContainer(contentElement, WI.UIString("%s:").format(WI.unlocalizedString("WebRTC"))), 1);
>+    createCheckbox(webRTCColumns[0], WI.UIString("Allow Media Capture on Insecure Sites"), PageAgent.Setting.MediaCaptureRequiresSecureConnection);
>+    createCheckbox(webRTCColumns[0], WI.UIString("Disable ICE Candidate Restrictions"), PageAgent.Setting.ICECandidateFilteringEnabled);
>+    createCheckbox(webRTCColumns[0], WI.UIString("Use Mock Capture Devices"), PageAgent.Setting.MockCaptureDevicesEnabled);
>+
>     WI._deviceSettingsPopover.presentNewContentWithFrame(contentElement, calculateTargetFrame(), preferredEdges);
> };
> 
>diff --git a/Source/WebInspectorUI/UserInterface/Views/Main.css b/Source/WebInspectorUI/UserInterface/Views/Main.css
>index f8b0e1a4791304a744d185548dd2cf65364e06d6..6b56613ded601a1b527a44d44bf97286d47920dd 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/Main.css
>+++ b/Source/WebInspectorUI/UserInterface/Views/Main.css
>@@ -388,11 +388,13 @@ body[dir=rtl] .go-to-arrow {
> }
> 
> .device-settings-content {
>-    padding: 8px;
>-
>     --label-input-margin-after: 4px;
> }
> 
>+.device-settings-content .container {
>+    margin: 8px;
>+}
>+
> .device-settings-content .columns {
>     display: flex;
> }
>diff --git a/Source/WebKit/Shared/WebPreferences.yaml b/Source/WebKit/Shared/WebPreferences.yaml
>index 9b0eacaa9b7a79c21fda40dcbd6b7dcc77dae73c..061dc0ad1b52365fb55bcd04f3c405a86aa2740d 100644
>--- a/Source/WebKit/Shared/WebPreferences.yaml
>+++ b/Source/WebKit/Shared/WebPreferences.yaml
>@@ -632,7 +632,6 @@ HTTPEquivEnabled:
> MockCaptureDevicesEnabled:
>   type: bool
>   defaultValue: DEFAULT_MOCK_CAPTURE_DEVICES_ENABLED
>-  webcoreBinding: DeprecatedGlobalSettings
>   condition: ENABLE(MEDIA_STREAM)
> 
> MockCaptureDevicesPromptEnabled:
>@@ -643,7 +642,6 @@ MockCaptureDevicesPromptEnabled:
> MediaCaptureRequiresSecureConnection:
>   type: bool
>   defaultValue: true
>-  webcoreBinding: DeprecatedGlobalSettings
>   condition: ENABLE(MEDIA_STREAM)
> 
> # FIXME: What is this for?
>diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm
>index eaef8ff160fb4eb30a890e6bcf53afda6ad55017..2835ef51585de16757827c98919aa357eb95d6d9 100644
>--- a/Source/WebKitLegacy/mac/WebView/WebView.mm
>+++ b/Source/WebKitLegacy/mac/WebView/WebView.mm
>@@ -3054,8 +3054,8 @@ - (void)_preferencesChanged:(WebPreferences *)preferences
> #endif
> 
> #if ENABLE(MEDIA_STREAM)
>-    DeprecatedGlobalSettings::setMockCaptureDevicesEnabled(false);
>-    DeprecatedGlobalSettings::setMediaCaptureRequiresSecureConnection(true);
>+    settings.setMockCaptureDevicesEnabled(false);
>+    settings.setMediaCaptureRequiresSecureConnection(true);
>     RuntimeEnabledFeatures::sharedFeatures().setMediaStreamEnabled(false);
>     RuntimeEnabledFeatures::sharedFeatures().setMediaDevicesEnabled(false);
>     RuntimeEnabledFeatures::sharedFeatures().setMediaRecorderEnabled(preferences.mediaRecorderEnabled);

Actions: View | Formatted Diff | Diff

Attachments on bug 193863: 360232 | 360233 | 360234 | 360257 | 360259 | 360260 | 360267 | 360269 | 360356 | 360372 | 360428