<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[210097] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/210097">210097</a></dd>
<dt>Author</dt> <dd>nael.ouedraogo@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-12-22 08:41:10 -0800 (Thu, 22 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>MediaStream: ASSERTION FAILED: m_ids.size() == m_handles.size() in MediaDeviceSandboxExtensions
https://bugs.webkit.org/show_bug.cgi?id=166328
Reviewed by Eric Carlson.
This assertion failure happens for ports with sandbox extensions disabled. SandboxExtension is empty and
HandleArray:size() always returns 0. Disable creation of MediaDevicesSandboxExtension in UserMediaProcessManager
when building without support of sandbox extension. Disable also WebPage::grantUserMediaDeviceSandboxExtensions
and WebPage::revokeUserMediaDeviceSandboxExtensions which can be avoided when sandbox extension is empty.
* UIProcess/UserMediaProcessManager.cpp:
(WebKit::UserMediaProcessManager::willCreateMediaStream):
(WebKit::UserMediaProcessManager::endedCaptureSession):
* WebProcess/WebPage/WebPage.cpp:
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserMediaProcessManagercpp">trunk/Source/WebKit2/UIProcess/UserMediaProcessManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (210096 => 210097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-12-22 09:22:42 UTC (rev 210096)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-22 16:41:10 UTC (rev 210097)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-12-22 Nael Ouedraogo <nael.ouedraogo@crf.canon.fr>
+
+ MediaStream: ASSERTION FAILED: m_ids.size() == m_handles.size() in MediaDeviceSandboxExtensions
+ https://bugs.webkit.org/show_bug.cgi?id=166328
+
+ Reviewed by Eric Carlson.
+
+ This assertion failure happens for ports with sandbox extensions disabled. SandboxExtension is empty and
+ HandleArray:size() always returns 0. Disable creation of MediaDevicesSandboxExtension in UserMediaProcessManager
+ when building without support of sandbox extension. Disable also WebPage::grantUserMediaDeviceSandboxExtensions
+ and WebPage::revokeUserMediaDeviceSandboxExtensions which can be avoided when sandbox extension is empty.
+
+ * UIProcess/UserMediaProcessManager.cpp:
+ (WebKit::UserMediaProcessManager::willCreateMediaStream):
+ (WebKit::UserMediaProcessManager::endedCaptureSession):
+ * WebProcess/WebPage/WebPage.cpp:
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
</ins><span class="cx"> 2016-12-22 Alejandro G. Castro <alex@igalia.com>
</span><span class="cx">
</span><span class="cx"> [WebRTC] Add support for runtime PeeConnection setting, required after r209757
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserMediaProcessManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserMediaProcessManager.cpp (210096 => 210097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserMediaProcessManager.cpp 2016-12-22 09:22:42 UTC (rev 210096)
+++ trunk/Source/WebKit2/UIProcess/UserMediaProcessManager.cpp 2016-12-22 16:41:10 UTC (rev 210097)
</span><span class="lines">@@ -111,6 +111,7 @@
</span><span class="cx">
</span><span class="cx"> void UserMediaProcessManager::willCreateMediaStream(UserMediaPermissionRequestManagerProxy& proxy, bool withAudio, bool withVideo)
</span><span class="cx"> {
</span><ins>+#if ENABLE(SANDBOX_EXTENSIONS)
</ins><span class="cx"> ASSERT(stateMap().contains(&proxy.page().process()));
</span><span class="cx">
</span><span class="cx"> auto& state = processState(proxy.page().process());
</span><span class="lines">@@ -151,6 +152,7 @@
</span><span class="cx"> state.setSandboxExtensionsGranted(currentExtensions);
</span><span class="cx"> proxy.page().process().send(Messages::WebPage::GrantUserMediaDeviceSandboxExtensions(MediaDeviceSandboxExtensions(ids, WTFMove(handles))), proxy.page().pageID());
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UserMediaProcessManager::startedCaptureSession(UserMediaPermissionRequestManagerProxy& proxy)
</span><span class="lines">@@ -160,6 +162,7 @@
</span><span class="cx">
</span><span class="cx"> void UserMediaProcessManager::endedCaptureSession(UserMediaPermissionRequestManagerProxy& proxy)
</span><span class="cx"> {
</span><ins>+#if ENABLE(SANDBOX_EXTENSIONS)
</ins><span class="cx"> ASSERT(stateMap().contains(&proxy.page().process()));
</span><span class="cx">
</span><span class="cx"> auto& state = processState(proxy.page().process());
</span><span class="lines">@@ -191,6 +194,7 @@
</span><span class="cx">
</span><span class="cx"> state.setSandboxExtensionsGranted(currentExtensions);
</span><span class="cx"> proxy.page().process().send(Messages::WebPage::RevokeUserMediaDeviceSandboxExtensions(params), proxy.page().pageID());
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (210096 => 210097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-12-22 09:22:42 UTC (rev 210096)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-12-22 16:41:10 UTC (rev 210097)
</span><span class="lines">@@ -3719,7 +3719,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_userMediaPermissionRequestManager.didCompleteMediaDeviceEnumeration(userMediaID, devices, deviceIdentifierHashSalt, originHasPersistentAccess);
</span><span class="cx"> }
</span><del>-
</del><ins>+#if ENABLE(SANDBOX_EXTENSIONS)
</ins><span class="cx"> void WebPage::grantUserMediaDeviceSandboxExtensions(const MediaDeviceSandboxExtensions& extensions)
</span><span class="cx"> {
</span><span class="cx"> m_userMediaPermissionRequestManager.grantUserMediaDeviceSandboxExtensions(extensions);
</span><span class="lines">@@ -3730,6 +3730,7 @@
</span><span class="cx"> m_userMediaPermissionRequestManager.revokeUserMediaDeviceSandboxExtensions(extensionIDs);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> void WebPage::advanceToNextMisspelling(bool startBeforeSelection)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (210096 => 210097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-12-22 09:22:42 UTC (rev 210096)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-12-22 16:41:10 UTC (rev 210097)
</span><span class="lines">@@ -1180,9 +1180,11 @@
</span><span class="cx"> void userMediaAccessWasDenied(uint64_t userMediaID, uint64_t reason, String invalidConstraint);
</span><span class="cx">
</span><span class="cx"> void didCompleteMediaDeviceEnumeration(uint64_t userMediaID, const Vector<WebCore::CaptureDevice>& devices, const String& deviceIdentifierHashSalt, bool originHasPersistentAccess);
</span><ins>+#if ENABLE(SANDBOX_EXTENSIONS)
</ins><span class="cx"> void grantUserMediaDeviceSandboxExtensions(const MediaDeviceSandboxExtensions&);
</span><span class="cx"> void revokeUserMediaDeviceSandboxExtensions(const Vector<String>&);
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void advanceToNextMisspelling(bool startBeforeSelection);
</span><span class="cx"> void changeSpellingToWord(const String& word);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (210096 => 210097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-12-22 09:22:42 UTC (rev 210096)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-12-22 16:41:10 UTC (rev 210097)
</span><span class="lines">@@ -292,9 +292,11 @@
</span><span class="cx"> UserMediaAccessWasGranted(uint64_t userMediaID, String audioDeviceUID, String videoDeviceUID)
</span><span class="cx"> UserMediaAccessWasDenied(uint64_t userMediaID, uint64_t reason, String invalidConstraint)
</span><span class="cx"> DidCompleteMediaDeviceEnumeration(uint64_t userMediaID, Vector<WebCore::CaptureDevice> devices, String mediaDeviceIdentifierHashSalt, bool hasPersistentAccess)
</span><ins>+#if ENABLE(SANDBOX_EXTENSIONS)
</ins><span class="cx"> GrantUserMediaDeviceSandboxExtensions(WebKit::MediaDeviceSandboxExtensions sandboxExtensions)
</span><span class="cx"> RevokeUserMediaDeviceSandboxExtensions(Vector<String> sandboxExtensionIDs)
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> # Notification
</span><span class="cx"> DidReceiveNotificationPermissionDecision(uint64_t notificationID, bool allowed)
</span></span></pre>
</div>
</div>
</body>
</html>