Attachment 350028 Details for Bug 189701 – Patch

[patch] Patch

log-extensions-patch.txt (text/plain), 3.79 KB, created by Eric Carlson on 2018-09-18 10:03:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2018-09-18 10:03:52 PDT

Size: 3.79 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index f07210a559a..17db9300b3e 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-09-18  Eric Carlson  <eric.carlson@apple.com>
>+
>+        Always log when granting/revoking capture sandbox extensions
>+        https://bugs.webkit.org/show_bug.cgi?id=189701
>+        <rdar://problem/44564029>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/UserMediaProcessManager.cpp:
>+        (WebKit::UserMediaProcessManager::willCreateMediaStream): Always log.
>+        (WebKit::UserMediaProcessManager::endedCaptureSession): Ditto.
>+
>+        * WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
>+        (WebKit::UserMediaPermissionRequestManager::grantUserMediaDeviceSandboxExtensions): Ditto.
>+        (WebKit::UserMediaPermissionRequestManager::revokeUserMediaDeviceSandboxExtensions): Ditto.
>+
> 2018-09-11  Simon Fraser  <simon.fraser@apple.com>
> 
>         Make GraphicsLayers ref-counted, so their tree can persist when disconnected from RenderLayerBackings
>diff --git a/Source/WebKit/UIProcess/UserMediaProcessManager.cpp b/Source/WebKit/UIProcess/UserMediaProcessManager.cpp
>index 7025d4d9991..876f4bfd963 100644
>--- a/Source/WebKit/UIProcess/UserMediaProcessManager.cpp
>+++ b/Source/WebKit/UIProcess/UserMediaProcessManager.cpp
>@@ -21,6 +21,7 @@
> 
> #if ENABLE(MEDIA_STREAM)
> 
>+#include "Logging.h"
> #include "MediaDeviceSandboxExtensions.h"
> #include "WebPageMessages.h"
> #include "WebPageProxy.h"
>@@ -189,6 +190,9 @@ bool UserMediaProcessManager::willCreateMediaStream(UserMediaPermissionRequestMa
>             return false;
>         }
> 
>+        for (const auto& id : ids)
>+            RELEASE_LOG(WebRTC, "UserMediaProcessManager::willCreateMediaStream - granting extension %s", id.utf8().data());
>+
>         if (withAudio)
>             state.grantAudioExtension();
>         if (withVideo)
>@@ -242,6 +246,9 @@ void UserMediaProcessManager::endedCaptureSession(UserMediaPermissionRequestMana
>     if (params.isEmpty())
>         return;
> 
>+    for (const auto& id : params)
>+        RELEASE_LOG(WebRTC, "UserMediaProcessManager::endedCaptureSession - revoking extension %s", id.utf8().data());
>+
>     proxy.page().process().send(Messages::WebPage::RevokeUserMediaDeviceSandboxExtensions(params), proxy.page().pageID());
> #endif
> }
>diff --git a/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp b/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp
>index 7148fed2132..81824b0ffd0 100644
>--- a/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp
>+++ b/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp
>@@ -22,6 +22,7 @@
> 
> #if ENABLE(MEDIA_STREAM)
> 
>+#include "Logging.h"
> #include "WebCoreArgumentCoders.h"
> #include "WebFrame.h"
> #include "WebPage.h"
>@@ -210,6 +211,7 @@ void UserMediaPermissionRequestManager::grantUserMediaDeviceSandboxExtensions(Me
>     for (size_t i = 0; i < extensions.size(); i++) {
>         const auto& extension = extensions[i];
>         extension.second->consume();
>+        RELEASE_LOG(WebRTC, "UserMediaPermissionRequestManager::grantUserMediaDeviceSandboxExtensions - granted extension %s", extension.first.utf8().data());
>         m_userMediaDeviceSandboxExtensions.add(extension.first, extension.second.copyRef());
>     }
> }
>@@ -218,8 +220,10 @@ void UserMediaPermissionRequestManager::revokeUserMediaDeviceSandboxExtensions(c
> {
>     for (const auto& extensionID : extensionIDs) {
>         auto extension = m_userMediaDeviceSandboxExtensions.take(extensionID);
>-        if (extension)
>+        if (extension) {
>             extension->revoke();
>+            RELEASE_LOG(WebRTC, "UserMediaPermissionRequestManager::revokeUserMediaDeviceSandboxExtensions - revoked extension %s", extensionID.utf8().data());
>+        }
>     }
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 189701: 350028