Attachment 341673 Details for Bug 186150 – Patch for landing

[patch] Patch for landing

bug-186150-20180531104944.patch (text/plain), 2.22 KB, created by Brent Fulgham on 2018-05-31 10:49:45 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brent Fulgham

Created: 2018-05-31 10:49:45 PDT

Size: 2.22 KB

patch

obsolete

>Subversion Revision: 232349
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 23de5dd709914ede45bc153ee53db6edef33f03c..9fd78e476f1655fc4e12103f2c2ee8c2de9d92b5 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-05-31  Brent Fulgham  <bfulgham@apple.com>
>+
>+        Don't attempt to extend sandbox when running tests with mock media devices
>+        https://bugs.webkit.org/show_bug.cgi?id=186150
>+        <rdar://problem/40690875>
>+
>+        Reviewed by Alexey Proskuryakov.
>+
>+        Avoid attempting to issue a sandbox extension to actual media devices when
>+        running with Mock capture devices.
>+
>+        Also handle the 'denyNextRequest' test state outside of the USE(APPLE_INTERNAL_SDK)
>+        guards, since it is needed for Open Source builds as well.
>+
>+        * UIProcess/UserMediaProcessManager.cpp:
>+        (WebKit::UserMediaProcessManager::willCreateMediaStream):
>+
> 2018-05-30  Yusuke Suzuki  <utatane.tea@gmail.com>
> 
>         [JSC] Pass VM& parameter as much as possible
>diff --git a/Source/WebKit/UIProcess/UserMediaProcessManager.cpp b/Source/WebKit/UIProcess/UserMediaProcessManager.cpp
>index ae946f1a90c69ad08d9549b7ccbae30f96a0cc30..cd0a55b88d93f4a633e77c13c65e96f58de887b6 100644
>--- a/Source/WebKit/UIProcess/UserMediaProcessManager.cpp
>+++ b/Source/WebKit/UIProcess/UserMediaProcessManager.cpp
>@@ -128,15 +128,18 @@ void UserMediaProcessManager::muteCaptureMediaStreamsExceptIn(WebPageProxy& page
> 
> bool UserMediaProcessManager::willCreateMediaStream(UserMediaPermissionRequestManagerProxy& proxy, bool withAudio, bool withVideo)
> {
>-#if ENABLE(SANDBOX_EXTENSIONS) && USE(APPLE_INTERNAL_SDK)
>-    auto& processStartingCapture = proxy.page().process();
>-
>-    ASSERT(stateMap().contains(&processStartingCapture));
>-
>     if (m_denyNextRequest) {
>         m_denyNextRequest = false;
>         return false;
>     }
>+    
>+    if (proxy.page().preferences().mockCaptureDevicesEnabled())
>+        return true;
>+    
>+#if ENABLE(SANDBOX_EXTENSIONS) && USE(APPLE_INTERNAL_SDK)
>+    auto& processStartingCapture = proxy.page().process();
>+
>+    ASSERT(stateMap().contains(&processStartingCapture));
> 
>     auto& state = processState(processStartingCapture);
>     size_t extensionCount = 0;

Actions: View | Formatted Diff | Diff

Attachments on bug 186150: 341672 | 341673