Title: [236145] trunk/Source/WebKit
- Revision
- 236145
- Author
- [email protected]
- Date
- 2018-09-18 10:32:42 -0700 (Tue, 18 Sep 2018)
Log Message
Always log when granting/revoking capture sandbox extensions
https://bugs.webkit.org/show_bug.cgi?id=189701
<rdar://problem/44564029>
Reviewed by Youenn Fablet.
* UIProcess/UserMediaProcessManager.cpp:
(WebKit::UserMediaProcessManager::willCreateMediaStream): Always log.
(WebKit::UserMediaProcessManager::endedCaptureSession): Ditto.
* WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
(WebKit::UserMediaPermissionRequestManager::grantUserMediaDeviceSandboxExtensions): Ditto.
(WebKit::UserMediaPermissionRequestManager::revokeUserMediaDeviceSandboxExtensions): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (236144 => 236145)
--- trunk/Source/WebKit/ChangeLog 2018-09-18 17:11:17 UTC (rev 236144)
+++ trunk/Source/WebKit/ChangeLog 2018-09-18 17:32:42 UTC (rev 236145)
@@ -1,3 +1,19 @@
+2018-09-18 Eric Carlson <[email protected]>
+
+ Always log when granting/revoking capture sandbox extensions
+ https://bugs.webkit.org/show_bug.cgi?id=189701
+ <rdar://problem/44564029>
+
+ Reviewed by Youenn Fablet.
+
+ * 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-18 Youenn Fablet <[email protected]>
Enable Unified Plan by default
Modified: trunk/Source/WebKit/UIProcess/UserMediaProcessManager.cpp (236144 => 236145)
--- trunk/Source/WebKit/UIProcess/UserMediaProcessManager.cpp 2018-09-18 17:11:17 UTC (rev 236144)
+++ trunk/Source/WebKit/UIProcess/UserMediaProcessManager.cpp 2018-09-18 17:32:42 UTC (rev 236145)
@@ -21,6 +21,7 @@
#if ENABLE(MEDIA_STREAM)
+#include "Logging.h"
#include "MediaDeviceSandboxExtensions.h"
#include "WebPageMessages.h"
#include "WebPageProxy.h"
@@ -189,6 +190,9 @@
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 @@
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
}
Modified: trunk/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp (236144 => 236145)
--- trunk/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp 2018-09-18 17:11:17 UTC (rev 236144)
+++ trunk/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp 2018-09-18 17:32:42 UTC (rev 236145)
@@ -22,6 +22,7 @@
#if ENABLE(MEDIA_STREAM)
+#include "Logging.h"
#include "WebCoreArgumentCoders.h"
#include "WebFrame.h"
#include "WebPage.h"
@@ -210,6 +211,7 @@
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 @@
{
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());
+ }
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
