<!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>[209082] trunk</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/209082">209082</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2016-11-29 11:20:08 -0800 (Tue, 29 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] Don't request user permission for a device if it has already been granted in the current browsing context
https://bugs.webkit.org/show_bug.cgi?id=164760
Source/WebKit2:
<rdar://problem/29261266>
Reviewed by Youenn Fablet.
* UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
(WebKit::FrameAuthorizationState::FrameAuthorizationState):
(WebKit::FrameAuthorizationState::hasPermissionToUseCaptureDevice):
(WebKit::FrameAuthorizationState::setHasPermissionToUseCaptureDevice):
(WebKit::FrameAuthorizationState::reset):
(WebKit::FrameAuthorizationState::securityOriginsAreEqual):
(WebKit::UserMediaPermissionRequestManagerProxy::stateForRequest):
(WebKit::UserMediaPermissionRequestManagerProxy::invalidateRequests):
(WebKit::UserMediaPermissionRequestManagerProxy::createRequest):
(WebKit::UserMediaPermissionRequestManagerProxy::userMediaAccessWasDenied):
(WebKit::UserMediaPermissionRequestManagerProxy::userMediaAccessWasGranted):
(WebKit::UserMediaPermissionRequestManagerProxy::requestUserMediaPermissionForFrame):
* UIProcess/UserMediaPermissionRequestManagerProxy.h:
(WebKit::FrameAuthorizationState::~FrameAuthorizationState):
(WebKit::FrameAuthorizationState::frameID):
* UIProcess/UserMediaPermissionRequestProxy.cpp:
(WebKit::UserMediaPermissionRequestProxy::UserMediaPermissionRequestProxy):
* UIProcess/UserMediaPermissionRequestProxy.h:
(WebKit::UserMediaPermissionRequestProxy::create):
(WebKit::UserMediaPermissionRequestProxy::frameID):
(WebKit::UserMediaPermissionRequestProxy::userMediaDocumentSecurityOrigin):
(WebKit::UserMediaPermissionRequestProxy::topLevelDocumentSecurityOrigin):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didCommitLoadForFrame):
* WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
(WebKit::UserMediaPermissionRequestManager::removeMediaRequestFromMaps):
Tools:
<rdar://problem/29261266>
Reviewed by Youenn Fablet.
Allow scripts to determine the number of times the user has been prompted for capture device access.
* WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
(WTR::InjectedBundle::setUserMediaPersistentPermissionForOrigin):
(WTR::InjectedBundle::userMediaPermissionRequestCountForOrigin):
(WTR::InjectedBundle::resetUserMediaPermissionRequestCountForOrigin):
(WTR::InjectedBundle::setUserMediaPermissionForOrigin): Deleted.
* WebKitTestRunner/InjectedBundle/InjectedBundle.h:
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::TestRunner::setUserMediaPersistentPermissionForOrigin):
(WTR::TestRunner::userMediaPermissionRequestCountForOrigin):
(WTR::TestRunner::resetUserMediaPermissionRequestCountForOrigin):
(WTR::TestRunner::setUserMediaPermissionForOrigin): Deleted.
* WebKitTestRunner/InjectedBundle/TestRunner.h:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetStateToConsistentValues):
(WTR::OriginSettings::incrementRequestCount):
(WTR::OriginSettings::resetRequestCount):
(WTR::OriginSettings::requestCount):
(WTR::TestController::saltForOrigin):
(WTR::TestController::setUserMediaPersistentPermissionForOrigin):
(WTR::TestController::handleCheckOfUserMediaPermissionForOrigin):
(WTR::TestController::settingsForOrigin):
(WTR::TestController::userMediaPermissionRequestCountForOrigin):
(WTR::TestController::resetUserMediaPermissionRequestCountForOrigin):
(WTR::TestController::decidePolicyForUserMediaPermissionRequestIfPossible):
(WTR::TestController::setUserMediaPermissionForOrigin): Deleted.
* WebKitTestRunner/TestController.h:
* WebKitTestRunner/TestInvocation.cpp:
(WTR::TestInvocation::didReceiveMessageFromInjectedBundle):
(WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
LayoutTests:
Reviewed by Youenn Fablet.
* fast/mediastream/MediaDevices-getUserMedia-expected.txt:
* fast/mediastream/MediaDevices-getUserMedia.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaDevicesenumerateDeviceshtml">trunk/LayoutTests/fast/mediastream/MediaDevices-enumerateDevices.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaDevicesgetUserMediaexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaDevices-getUserMedia-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaDevicesgetUserMediahtml">trunk/LayoutTests/fast/mediastream/MediaDevices-getUserMedia.html</a></li>
<li><a href="#trunkLayoutTestshttptestsmediamediastreamenumeratedevicessourceidpersistenthtml">trunk/LayoutTests/http/tests/media/media-stream/enumerate-devices-source-id-persistent.html</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagePrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserMediaPermissionRequestManagerProxycpp">trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserMediaPermissionRequestManagerProxyh">trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserMediaPermissionRequestProxycpp">trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserMediaPermissionRequestProxyh">trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleBindingsTestRunneridl">trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundleh">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllerh">trunk/Tools/WebKitTestRunner/TestController.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestInvocationcpp">trunk/Tools/WebKitTestRunner/TestInvocation.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsmediamediastreamgetusermediapromptexpectedtxt">trunk/LayoutTests/http/tests/media/media-stream/get-user-media-prompt-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsmediamediastreamgetusermediaprompthtml">trunk/LayoutTests/http/tests/media/media-stream/get-user-media-prompt.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/LayoutTests/ChangeLog 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-11-29 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] Don't request user permission for a device if it has already been granted in the current browsing context
+ https://bugs.webkit.org/show_bug.cgi?id=164760
+
+ Reviewed by Youenn Fablet.
+
+ * fast/mediastream/MediaDevices-getUserMedia-expected.txt:
+ * fast/mediastream/MediaDevices-getUserMedia.html:
+
</ins><span class="cx"> 2016-11-29 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline fast/forms/validation-message-appearance.html for mac-wk1.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaDevicesenumerateDeviceshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaDevices-enumerateDevices.html (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaDevices-enumerateDevices.html 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/LayoutTests/fast/mediastream/MediaDevices-enumerateDevices.html 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (window.testRunner) {
</span><span class="cx"> testRunner.setUserMediaPermission(true);
</span><del>- testRunner.setUserMediaPermissionForOrigin(false, document.location.href, "");
</del><ins>+ testRunner.setUserMediaPersistentPermissionForOrigin(false, document.location.href, "");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> navigator.mediaDevices
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> function grantPermission()
</span><span class="cx"> {
</span><span class="cx"> if (window.testRunner)
</span><del>- testRunner.setUserMediaPermissionForOrigin(true, document.location.href, "");
</del><ins>+ testRunner.setUserMediaPersistentPermissionForOrigin(true, document.location.href, "");
</ins><span class="cx">
</span><span class="cx"> debug(`<br>*** Calling mediaDevices.enumerateDevices with persistent access, and without a media stream track<br>`);
</span><span class="cx"> havePermission = true;
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaDevicesgetUserMediaexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaDevices-getUserMedia-expected.txt (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaDevices-getUserMedia-expected.txt 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/LayoutTests/fast/mediastream/MediaDevices-getUserMedia-expected.txt 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -31,11 +31,9 @@
</span><span class="cx"> PASS Error callback called.
</span><span class="cx"> PASS navigator.mediaDevices.getUserMedia({audio:false, video:videoConstraints}).then(invalidGotStream).catch(errorWithConstraints2) did not throw exception.
</span><span class="cx"> PASS Error callback called.
</span><del>-PASS navigator.mediaDevices.getUserMedia({audio:true}).then(invalidGotStream, error1); did not throw exception.
-PASS Error callback called.
-PASS errorArg.name is "NotAllowedError"
-PASS navigator.mediaDevices.getUserMedia({audio:true}).then(invalidGotStream).catch(error2); did not throw exception.
-PASS Error callback called.
</del><ins>+PASS errorArg.name is "Error"
+PASS navigator.mediaDevices.getUserMedia({audio:true}).then(validStream, error1); did not throw exception.
+PASS Stream generated because page has already authenticated.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaDevicesgetUserMediahtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaDevices-getUserMedia.html (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaDevices-getUserMedia.html 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/LayoutTests/fast/mediastream/MediaDevices-getUserMedia.html 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -27,23 +27,26 @@
</span><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function error2(e) {
- testPassed("Error callback called.");
</del><ins>+ function validStream(e) {
+ testPassed("Stream generated because page has already authenticated.");
</ins><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function error1(e) {
</span><del>- errorArg = e;
- testPassed("Error callback called.");
- shouldBeEqualToString("errorArg.name", "NotAllowedError");
-
- shouldNotThrow("navigator.mediaDevices.getUserMedia({audio:true}).then(invalidGotStream).catch(error2);");
</del><ins>+ testFailed("Error callback called.");
+ finishJSTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function errorWithConstraints2() {
</del><ins>+ function errorWithConstraints2(e) {
</ins><span class="cx"> testPassed("Error callback called.");
</span><ins>+ errorArg = e;
+ shouldBeEqualToString("errorArg.name", "Error");
+
+ // We tell LayoutTestRunner to deny user media requests but expect the gUM call to succeed
+ // as it should not see the request because the current browsing context has already
+ // successfully created a stream for the mock audio device.
</ins><span class="cx"> setUserMediaPermission(false);
</span><del>- shouldNotThrow("navigator.mediaDevices.getUserMedia({audio:true}).then(invalidGotStream, error1);");
</del><ins>+ shouldNotThrow("navigator.mediaDevices.getUserMedia({audio:true}).then(validStream, error1);");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function errorWithConstraints1() {
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediamediastreamenumeratedevicessourceidpersistenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/media/media-stream/enumerate-devices-source-id-persistent.html (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/media-stream/enumerate-devices-source-id-persistent.html 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/LayoutTests/http/tests/media/media-stream/enumerate-devices-source-id-persistent.html 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx">
</span><span class="cx"> if (window.testRunner) {
</span><span class="cx"> testRunner.setUserMediaPermission(true);
</span><del>- testRunner.setUserMediaPermissionForOrigin(true, "http://localhost:8000", location.href);
</del><ins>+ testRunner.setUserMediaPersistentPermissionForOrigin(true, "http://localhost:8000", location.href);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setup()
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediamediastreamgetusermediapromptexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/media-stream/get-user-media-prompt-expected.txt (0 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/media-stream/get-user-media-prompt-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/media/media-stream/get-user-media-prompt-expected.txt 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+Tests that user is only prompted once per device in the current browsing context.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS numberOfTimesGetUserMediaHasBeenCalled() is 0
+
+** Request an audio-only stream, the user should be prompted **
+PASS navigator.mediaDevices.getUserMedia({audio:true}).then(gotStream1); did not throw exception.
+PASS numberOfTimesGetUserMediaHasBeenCalled() is 1
+PASS stream.getAudioTracks().length is 1
+PASS stream.getVideoTracks().length is 0
+
+** Request a video-only stream, the user should be prompted **
+PASS navigator.mediaDevices.getUserMedia({video:true}).then(gotStream2); did not throw exception.
+PASS numberOfTimesGetUserMediaHasBeenCalled() is 2
+PASS stream.getAudioTracks().length is 0
+PASS stream.getVideoTracks().length is 1
+
+** Request a stream with video and audio, the user should be not prompted **
+PASS navigator.mediaDevices.getUserMedia({audio:true, video:true}).then(gotStream3); did not throw exception.
+PASS numberOfTimesGetUserMediaHasBeenCalled() is 2
+PASS stream.getAudioTracks().length is 1
+PASS stream.getVideoTracks().length is 1
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmediamediastreamgetusermediaprompthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/media-stream/get-user-media-prompt.html (0 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/media-stream/get-user-media-prompt.html (rev 0)
+++ trunk/LayoutTests/http/tests/media/media-stream/get-user-media-prompt.html 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -0,0 +1,68 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ iframe { border: 1px solid black; }
+ </style>
+ <script src="../../../../resources/js-test-pre.js"></script>
+ <script>
+
+ function numberOfTimesGetUserMediaHasBeenCalled()
+ {
+ return testRunner.userMediaPermissionRequestCountForOrigin(document.location.href, document.location.href);
+ }
+
+ function gotStream3(s)
+ {
+ stream = s;
+ shouldBe("numberOfTimesGetUserMediaHasBeenCalled()", "2");
+ shouldBe("stream.getAudioTracks().length", "1");
+ shouldBe("stream.getVideoTracks().length", "1");
+
+ debug("");
+ finishJSTest();
+ }
+
+ function gotStream2(s)
+ {
+ stream = s;
+ shouldBe("numberOfTimesGetUserMediaHasBeenCalled()", "2");
+ shouldBe("stream.getAudioTracks().length", "0");
+ shouldBe("stream.getVideoTracks().length", "1");
+
+ debug("<br>** Request a stream with video and audio, the user should be not prompted **");
+ shouldNotThrow("navigator.mediaDevices.getUserMedia({audio:true, video:true}).then(gotStream3);");
+ }
+
+ function gotStream1(s)
+ {
+ stream = s;
+ shouldBe("numberOfTimesGetUserMediaHasBeenCalled()", "1");
+ shouldBe("stream.getAudioTracks().length", "1");
+ shouldBe("stream.getVideoTracks().length", "0");
+
+ debug("<br>** Request a video-only stream, the user should be prompted **");
+ shouldNotThrow("navigator.mediaDevices.getUserMedia({video:true}).then(gotStream2);")
+ }
+
+ function setup()
+ {
+ description("Tests that user is only prompted once per device in the current browsing context.");
+
+ testRunner.resetUserMediaPermissionRequestCountForOrigin(document.location.href, document.location.href);
+ shouldBe("numberOfTimesGetUserMediaHasBeenCalled()", "0");
+
+ debug("<br>** Request an audio-only stream, the user should be prompted **");
+ shouldNotThrow("navigator.mediaDevices.getUserMedia({audio:true}).then(gotStream1);");
+ }
+
+ if (window.testRunner)
+ testRunner.setUserMediaPermission(true);
+ window.jsTestIsAsync = true;
+ window.successfullyParsed = true;
+ </script>
+ <script src="../../../../resources/js-test-post.js"></script>
+ </head>
+ <body onload="setup()">
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2016-11-29 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] Don't request user permission for a device if it has already been granted in the current browsing context
+ https://bugs.webkit.org/show_bug.cgi?id=164760
+ <rdar://problem/29261266>
+
+ Reviewed by Youenn Fablet.
+
+ * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+ (WebKit::FrameAuthorizationState::FrameAuthorizationState):
+ (WebKit::FrameAuthorizationState::hasPermissionToUseCaptureDevice):
+ (WebKit::FrameAuthorizationState::setHasPermissionToUseCaptureDevice):
+ (WebKit::FrameAuthorizationState::reset):
+ (WebKit::FrameAuthorizationState::securityOriginsAreEqual):
+ (WebKit::UserMediaPermissionRequestManagerProxy::stateForRequest):
+ (WebKit::UserMediaPermissionRequestManagerProxy::invalidateRequests):
+ (WebKit::UserMediaPermissionRequestManagerProxy::createRequest):
+ (WebKit::UserMediaPermissionRequestManagerProxy::userMediaAccessWasDenied):
+ (WebKit::UserMediaPermissionRequestManagerProxy::userMediaAccessWasGranted):
+ (WebKit::UserMediaPermissionRequestManagerProxy::requestUserMediaPermissionForFrame):
+ * UIProcess/UserMediaPermissionRequestManagerProxy.h:
+ (WebKit::FrameAuthorizationState::~FrameAuthorizationState):
+ (WebKit::FrameAuthorizationState::frameID):
+ * UIProcess/UserMediaPermissionRequestProxy.cpp:
+ (WebKit::UserMediaPermissionRequestProxy::UserMediaPermissionRequestProxy):
+ * UIProcess/UserMediaPermissionRequestProxy.h:
+ (WebKit::UserMediaPermissionRequestProxy::create):
+ (WebKit::UserMediaPermissionRequestProxy::frameID):
+ (WebKit::UserMediaPermissionRequestProxy::userMediaDocumentSecurityOrigin):
+ (WebKit::UserMediaPermissionRequestProxy::topLevelDocumentSecurityOrigin):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didCommitLoadForFrame):
+ * WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
+ (WebKit::UserMediaPermissionRequestManager::removeMediaRequestFromMaps):
+
</ins><span class="cx"> 2016-11-29 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Scroll snapping on Mac should use AppKit animations
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -2632,6 +2632,15 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKPageClearUserMediaState(WKPageRef page)
+{
+#if ENABLE(MEDIA_STREAM)
+ toImpl(page)->clearUserMediaState();
+#else
+ UNUSED_PARAM(page);
+#endif
+}
+
</ins><span class="cx"> void WKPageDidDenyPointerLock(WKPageRef page)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(POINTER_LOCK)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -128,7 +128,9 @@
</span><span class="cx"> };
</span><span class="cx"> typedef uint32_t WKMediaMutedState;
</span><span class="cx"> WK_EXPORT void WKPageSetMuted(WKPageRef page, WKMediaMutedState muted);
</span><del>-
</del><ins>+
+WK_EXPORT void WKPageClearUserMediaState(WKPageRef page);
+
</ins><span class="cx"> WK_EXPORT void WKPageDidAllowPointerLock(WKPageRef page);
</span><span class="cx"> WK_EXPORT void WKPageDidDenyPointerLock(WKPageRef page);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserMediaPermissionRequestManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -34,6 +34,61 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+FrameAuthorizationState::FrameAuthorizationState(UserMediaPermissionRequestProxy& request)
+ : m_userMediaDocumentSecurityOrigin(request.userMediaDocumentSecurityOrigin())
+ , m_topLevelDocumentSecurityOrigin(request.topLevelDocumentSecurityOrigin())
+{
+}
+
+bool FrameAuthorizationState::hasPermissionToUseCaptureDevice(const String& deviceUID)
+{
+ return m_authorizedDeviceUIDs.find(deviceUID) != notFound;
+}
+
+void FrameAuthorizationState::setHasPermissionToUseCaptureDevice(const String& deviceUID, bool hasPermission)
+{
+ if (deviceUID.isEmpty())
+ return;
+
+ size_t index = m_authorizedDeviceUIDs.find(deviceUID);
+ if (hasPermission == (index != notFound))
+ return;
+
+ if (hasPermission)
+ m_authorizedDeviceUIDs.append(deviceUID);
+ else
+ m_authorizedDeviceUIDs.remove(index);
+}
+
+void FrameAuthorizationState::ensureSecurityOriginsAreEqual(UserMediaPermissionRequestProxy& request)
+{
+ do {
+ if (!m_userMediaDocumentSecurityOrigin || !m_userMediaDocumentSecurityOrigin->equal(request.userMediaDocumentSecurityOrigin()))
+ break;
+
+ if (!m_topLevelDocumentSecurityOrigin || !m_topLevelDocumentSecurityOrigin->equal(request.topLevelDocumentSecurityOrigin()))
+ break;
+
+ return;
+ } while (0);
+
+ m_userMediaDocumentSecurityOrigin = request.userMediaDocumentSecurityOrigin();
+ m_topLevelDocumentSecurityOrigin = request.topLevelDocumentSecurityOrigin();
+ m_authorizedDeviceUIDs.clear();
+}
+
+FrameAuthorizationState& UserMediaPermissionRequestManagerProxy::stateForRequest(UserMediaPermissionRequestProxy& request)
+{
+ auto& state = m_frameStates.add(request.frameID(), nullptr).iterator->value;
+ if (state) {
+ state->ensureSecurityOriginsAreEqual(request);
+ return *state;
+ }
+
+ state = std::make_unique<FrameAuthorizationState>(request);
+ return *state;
+}
+
</ins><span class="cx"> UserMediaPermissionRequestManagerProxy::UserMediaPermissionRequestManagerProxy(WebPageProxy& page)
</span><span class="cx"> : m_page(page)
</span><span class="cx"> {
</span><span class="lines">@@ -49,19 +104,17 @@
</span><span class="cx"> request->invalidate();
</span><span class="cx"> m_pendingDeviceRequests.clear();
</span><span class="cx">
</span><del>- m_pageSandboxExtensionsGranted.clear();
</del><ins>+ m_frameStates.clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<UserMediaPermissionRequestProxy> UserMediaPermissionRequestManagerProxy::createRequest(uint64_t userMediaID, const Vector<String>& audioDeviceUIDs, const Vector<String>& videoDeviceUIDs)
</del><ins>+void UserMediaPermissionRequestManagerProxy::clearCachedState()
</ins><span class="cx"> {
</span><del>- Ref<UserMediaPermissionRequestProxy> request = UserMediaPermissionRequestProxy::create(*this, userMediaID, audioDeviceUIDs, videoDeviceUIDs);
- m_pendingUserMediaRequests.add(userMediaID, request.ptr());
- return request;
</del><ins>+ invalidateRequests();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<UserMediaPermissionRequestProxy> UserMediaPermissionRequestManagerProxy::createRequest(uint64_t userMediaID)
</del><ins>+Ref<UserMediaPermissionRequestProxy> UserMediaPermissionRequestManagerProxy::createRequest(uint64_t userMediaID, uint64_t frameID, const String& userMediaDocumentOriginIdentifier, const String& topLevelDocumentOriginIdentifier, const Vector<String>& audioDeviceUIDs, const Vector<String>& videoDeviceUIDs)
</ins><span class="cx"> {
</span><del>- Ref<UserMediaPermissionRequestProxy> request = UserMediaPermissionRequestProxy::create(*this, userMediaID, Vector<String>(), Vector<String>());
</del><ins>+ auto request = UserMediaPermissionRequestProxy::create(*this, userMediaID, frameID, userMediaDocumentOriginIdentifier, topLevelDocumentOriginIdentifier, audioDeviceUIDs, videoDeviceUIDs);
</ins><span class="cx"> m_pendingUserMediaRequests.add(userMediaID, request.ptr());
</span><span class="cx"> return request;
</span><span class="cx"> }
</span><span class="lines">@@ -103,10 +156,17 @@
</span><span class="cx"> if (!m_page.isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!m_pendingUserMediaRequests.take(userMediaID))
</del><ins>+ auto request = m_pendingUserMediaRequests.take(userMediaID);
+ if (!request)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- denyRequest(userMediaID, reason, "");
</del><ins>+ auto fameState = stateForRequest(*request);
+ for (const auto& deviceUID : request->videoDeviceUIDs())
+ fameState.setHasPermissionToUseCaptureDevice(deviceUID, false);
+ for (const auto& deviceUID : request->audioDeviceUIDs())
+ fameState.setHasPermissionToUseCaptureDevice(deviceUID, false);
+
+ denyRequest(userMediaID, reason, emptyString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UserMediaPermissionRequestManagerProxy::denyRequest(uint64_t userMediaID, UserMediaPermissionRequestProxy::UserMediaAccessDenialReason reason, const String& invalidConstraint)
</span><span class="lines">@@ -128,10 +188,15 @@
</span><span class="cx"> if (!m_page.isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!m_pendingUserMediaRequests.take(userMediaID))
</del><ins>+#if ENABLE(MEDIA_STREAM)
+ auto request = m_pendingUserMediaRequests.take(userMediaID);
+ if (!request)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>-#if ENABLE(MEDIA_STREAM)
</del><ins>+ auto& fameState = stateForRequest(*request);
+ fameState.setHasPermissionToUseCaptureDevice(audioDeviceUID, true);
+ fameState.setHasPermissionToUseCaptureDevice(videoDeviceUID, true);
+
</ins><span class="cx"> size_t extensionCount = 0;
</span><span class="cx"> unsigned requiredExtensions = SandboxExtensionsGranted::None;
</span><span class="cx"> if (!audioDeviceUID.isEmpty()) {
</span><span class="lines">@@ -143,10 +208,10 @@
</span><span class="cx"> extensionCount++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- unsigned currentExtensions = m_pageSandboxExtensionsGranted.get(m_page.pageID());
</del><ins>+ unsigned currentExtensions = m_pageSandboxExtensionsGranted;
</ins><span class="cx"> if (!(requiredExtensions & currentExtensions)) {
</span><span class="cx"> ASSERT(extensionCount);
</span><del>- m_pageSandboxExtensionsGranted.set(m_page.pageID(), requiredExtensions | currentExtensions);
</del><ins>+ m_pageSandboxExtensionsGranted = requiredExtensions | currentExtensions;
</ins><span class="cx"> SandboxExtension::HandleArray handles;
</span><span class="cx"> handles.allocate(extensionCount);
</span><span class="cx"> if (!videoDeviceUID.isEmpty())
</span><span class="lines">@@ -158,6 +223,7 @@
</span><span class="cx">
</span><span class="cx"> m_page.process().send(Messages::WebPage::UserMediaAccessWasGranted(userMediaID, audioDeviceUID, videoDeviceUID), m_page.pageID());
</span><span class="cx"> #else
</span><ins>+ UNUSED_PARAM(userMediaID);
</ins><span class="cx"> UNUSED_PARAM(audioDeviceUID);
</span><span class="cx"> UNUSED_PARAM(videoDeviceUID);
</span><span class="cx"> #endif
</span><span class="lines">@@ -178,18 +244,38 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (videoDeviceUIDs.isEmpty() && audioDeviceUIDs.isEmpty()) {
</span><del>- denyRequest(userMediaID, UserMediaPermissionRequestProxy::UserMediaAccessDenialReason::NoConstraints, "");
</del><ins>+ denyRequest(userMediaID, UserMediaPermissionRequestProxy::UserMediaAccessDenialReason::NoConstraints, emptyString());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto userMediaOrigin = API::SecurityOrigin::create(SecurityOriginData::fromDatabaseIdentifier(userMediaDocumentOriginIdentifier)->securityOrigin());
</span><span class="cx"> auto topLevelOrigin = API::SecurityOrigin::create(SecurityOriginData::fromDatabaseIdentifier(topLevelDocumentOriginIdentifier)->securityOrigin());
</span><del>- auto request = createRequest(userMediaID, audioDeviceUIDs, videoDeviceUIDs);
</del><ins>+ auto request = createRequest(userMediaID, frameID, userMediaDocumentOriginIdentifier, topLevelDocumentOriginIdentifier, audioDeviceUIDs, videoDeviceUIDs);
</ins><span class="cx">
</span><del>- if (!m_page.uiClient().decidePolicyForUserMediaPermissionRequest(m_page, *m_page.process().webFrame(frameID), *userMediaOrigin.get(), *topLevelOrigin.get(), request.get())) {
- m_pendingUserMediaRequests.take(userMediaID);
- request->deny(UserMediaPermissionRequestProxy::UserMediaAccessDenialReason::UserMediaDisabled);
</del><ins>+ String authorizedAudioDevice;
+ String authorizedVideoDevice;
+ auto& fameState = stateForRequest(request);
+ for (auto deviceUID : audioDeviceUIDs) {
+ if (fameState.hasPermissionToUseCaptureDevice(deviceUID)) {
+ authorizedAudioDevice = deviceUID;
+ break;
+ }
</ins><span class="cx"> }
</span><ins>+ for (auto deviceUID : videoDeviceUIDs) {
+ if (fameState.hasPermissionToUseCaptureDevice(deviceUID)) {
+ authorizedVideoDevice = deviceUID;
+ break;
+ }
+ }
+
+ if (audioDeviceUIDs.isEmpty() == authorizedAudioDevice.isEmpty() && videoDeviceUIDs.isEmpty() == authorizedVideoDevice.isEmpty()) {
+ userMediaAccessWasGranted(userMediaID, authorizedAudioDevice, authorizedVideoDevice);
+ return;
+ }
+
+ if (!m_page.uiClient().decidePolicyForUserMediaPermissionRequest(m_page, *m_page.process().webFrame(frameID), *userMediaOrigin.get(), *topLevelOrigin.get(), request.get()))
+ userMediaAccessWasDenied(userMediaID, UserMediaPermissionRequestProxy::UserMediaAccessDenialReason::UserMediaDisabled);
+
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> auto audioConstraints = MediaConstraintsImpl::create(audioConstraintsData);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserMediaPermissionRequestManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.h (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.h 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.h 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx">
</span><span class="cx"> #include "UserMediaPermissionCheckProxy.h"
</span><span class="cx"> #include "UserMediaPermissionRequestProxy.h"
</span><ins>+#include <WebCore/SecurityOrigin.h>
</ins><span class="cx"> #include <WebCore/UserMediaRequest.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx">
</span><span class="lines">@@ -34,6 +35,21 @@
</span><span class="cx">
</span><span class="cx"> class WebPageProxy;
</span><span class="cx">
</span><ins>+class FrameAuthorizationState {
+public:
+ explicit FrameAuthorizationState(UserMediaPermissionRequestProxy&);
+
+ bool hasPermissionToUseCaptureDevice(const String& deviceUID);
+ void setHasPermissionToUseCaptureDevice(const String&, bool);
+
+ void ensureSecurityOriginsAreEqual(UserMediaPermissionRequestProxy&);
+
+private:
+ RefPtr<WebCore::SecurityOrigin> m_userMediaDocumentSecurityOrigin;
+ RefPtr<WebCore::SecurityOrigin> m_topLevelDocumentSecurityOrigin;
+ Vector<String> m_authorizedDeviceUIDs;
+};
+
</ins><span class="cx"> class UserMediaPermissionRequestManagerProxy {
</span><span class="cx"> public:
</span><span class="cx"> explicit UserMediaPermissionRequestManagerProxy(WebPageProxy&);
</span><span class="lines">@@ -44,14 +60,16 @@
</span><span class="cx">
</span><span class="cx"> void userMediaAccessWasGranted(uint64_t, const String& audioDeviceUID, const String& videoDeviceUID);
</span><span class="cx"> void userMediaAccessWasDenied(uint64_t, UserMediaPermissionRequestProxy::UserMediaAccessDenialReason);
</span><ins>+ FrameAuthorizationState& stateForRequest(UserMediaPermissionRequestProxy&);
</ins><span class="cx">
</span><span class="cx"> void enumerateMediaDevicesForFrame(uint64_t userMediaID, uint64_t frameID, String userMediaDocumentOriginIdentifier, String topLevelDocumentOriginIdentifier);
</span><span class="cx">
</span><span class="cx"> void didCompleteUserMediaPermissionCheck(uint64_t, const String&, bool allow);
</span><span class="cx">
</span><ins>+ void clearCachedState();
+
</ins><span class="cx"> private:
</span><del>- Ref<UserMediaPermissionRequestProxy> createRequest(uint64_t, const Vector<String>& audioDeviceUIDs, const Vector<String>& videoDeviceUIDs);
- Ref<UserMediaPermissionRequestProxy> createRequest(uint64_t userMediaID);
</del><ins>+ Ref<UserMediaPermissionRequestProxy> createRequest(uint64_t userMediaID, uint64_t frameID, const String&userMediaDocumentOriginIdentifier, const String& topLevelDocumentOriginIdentifier, const Vector<String>& audioDeviceUIDs, const Vector<String>& videoDeviceUIDs);
</ins><span class="cx"> void denyRequest(uint64_t userMediaID, UserMediaPermissionRequestProxy::UserMediaAccessDenialReason, const String& invalidConstraint);
</span><span class="cx"> Ref<UserMediaPermissionCheckProxy> createUserMediaPermissionCheck(uint64_t userMediaID);
</span><span class="cx"> void syncWithWebCorePrefs() const;
</span><span class="lines">@@ -64,8 +82,10 @@
</span><span class="cx"> Video = 1 << 0,
</span><span class="cx"> Audio = 1 << 1
</span><span class="cx"> };
</span><del>- HashMap<uint64_t, unsigned> m_pageSandboxExtensionsGranted;
</del><ins>+ unsigned m_pageSandboxExtensionsGranted;
</ins><span class="cx">
</span><ins>+ HashMap<uint64_t, std::unique_ptr<FrameAuthorizationState>> m_frameStates;
+
</ins><span class="cx"> WebPageProxy& m_page;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserMediaPermissionRequestProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.cpp (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.cpp 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.cpp 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -22,13 +22,20 @@
</span><span class="cx">
</span><span class="cx"> #include "UserMediaPermissionRequestManagerProxy.h"
</span><span class="cx"> #include <WebCore/RealtimeMediaSourceCenter.h>
</span><ins>+#include <WebCore/SecurityOrigin.h>
+#include <WebCore/SecurityOriginData.h>
</ins><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><ins>+using namespace WebCore;
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-UserMediaPermissionRequestProxy::UserMediaPermissionRequestProxy(UserMediaPermissionRequestManagerProxy& manager, uint64_t userMediaID, const Vector<String>& audioDeviceUIDs, const Vector<String>& videoDeviceUIDs)
</del><ins>+UserMediaPermissionRequestProxy::UserMediaPermissionRequestProxy(UserMediaPermissionRequestManagerProxy& manager, uint64_t userMediaID, uint64_t frameID, const String& userMediaDocumentOriginIdentifier, const String& topLevelDocumentOriginIdentifier, const Vector<String>& audioDeviceUIDs, const Vector<String>& videoDeviceUIDs)
</ins><span class="cx"> : m_manager(&manager)
</span><span class="cx"> , m_userMediaID(userMediaID)
</span><ins>+ , m_frameID(frameID)
+ , m_userMediaDocumentSecurityOrigin((SecurityOriginData::fromDatabaseIdentifier(userMediaDocumentOriginIdentifier)->securityOrigin()))
+ , m_topLevelDocumentSecurityOrigin(SecurityOriginData::fromDatabaseIdentifier(topLevelDocumentOriginIdentifier)->securityOrigin())
</ins><span class="cx"> , m_videoDeviceUIDs(videoDeviceUIDs)
</span><span class="cx"> , m_audioDeviceUIDs(audioDeviceUIDs)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserMediaPermissionRequestProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.h (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.h 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.h 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -25,6 +25,10 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+namespace WebCore {
+class SecurityOrigin;
+}
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class UserMediaPermissionRequestManagerProxy;
</span><span class="lines">@@ -31,9 +35,9 @@
</span><span class="cx">
</span><span class="cx"> class UserMediaPermissionRequestProxy : public API::ObjectImpl<API::Object::Type::UserMediaPermissionRequest> {
</span><span class="cx"> public:
</span><del>- static Ref<UserMediaPermissionRequestProxy> create(UserMediaPermissionRequestManagerProxy& manager, uint64_t userMediaID, const Vector<String>& videoDeviceUIDs, const Vector<String>& audioDeviceUIDs)
</del><ins>+ static Ref<UserMediaPermissionRequestProxy> create(UserMediaPermissionRequestManagerProxy& manager, uint64_t userMediaID, uint64_t frameID, const String& userMediaDocumentOriginIdentifier, const String& topLevelDocumentOriginIdentifier, const Vector<String>& videoDeviceUIDs, const Vector<String>& audioDeviceUIDs)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new UserMediaPermissionRequestProxy(manager, userMediaID, videoDeviceUIDs, audioDeviceUIDs));
</del><ins>+ return adoptRef(*new UserMediaPermissionRequestProxy(manager, userMediaID, frameID, userMediaDocumentOriginIdentifier, topLevelDocumentOriginIdentifier, videoDeviceUIDs, audioDeviceUIDs));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void allow(const String& videoDeviceUID, const String& audioDeviceUID);
</span><span class="lines">@@ -49,11 +53,18 @@
</span><span class="cx"> const Vector<String>& videoDeviceUIDs() const { return m_videoDeviceUIDs; }
</span><span class="cx"> const Vector<String>& audioDeviceUIDs() const { return m_audioDeviceUIDs; }
</span><span class="cx">
</span><ins>+ uint64_t frameID() const { return m_frameID; }
+ WebCore::SecurityOrigin* userMediaDocumentSecurityOrigin() { return &m_userMediaDocumentSecurityOrigin.get(); }
+ WebCore::SecurityOrigin* topLevelDocumentSecurityOrigin() { return &m_topLevelDocumentSecurityOrigin.get(); }
+
</ins><span class="cx"> private:
</span><del>- UserMediaPermissionRequestProxy(UserMediaPermissionRequestManagerProxy&, uint64_t userMediaID, const Vector<String>& videoDeviceUIDs, const Vector<String>& audioDeviceUIDs);
</del><ins>+ UserMediaPermissionRequestProxy(UserMediaPermissionRequestManagerProxy&, uint64_t userMediaID, uint64_t frameID, const String& userMediaDocumentOriginIdentifier, const String& topLevelDocumentOriginIdentifier, const Vector<String>& videoDeviceUIDs, const Vector<String>& audioDeviceUIDs);
</ins><span class="cx">
</span><span class="cx"> UserMediaPermissionRequestManagerProxy* m_manager;
</span><span class="cx"> uint64_t m_userMediaID;
</span><ins>+ uint64_t m_frameID;
+ Ref<WebCore::SecurityOrigin> m_userMediaDocumentSecurityOrigin;
+ Ref<WebCore::SecurityOrigin> m_topLevelDocumentSecurityOrigin;
</ins><span class="cx"> Vector<String> m_videoDeviceUIDs;
</span><span class="cx"> Vector<String> m_audioDeviceUIDs;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -5732,6 +5732,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::clearUserMediaState()
+{
+#if ENABLE(MEDIA_STREAM)
+ m_userMediaPermissionRequestManager.clearCachedState();
+#endif
+}
</ins><span class="cx">
</span><span class="cx"> void WebPageProxy::requestNotificationPermission(uint64_t requestID, const String& originString)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -1170,6 +1170,8 @@
</span><span class="cx">
</span><span class="cx"> void isLoadingChanged() { activityStateDidChange(WebCore::ActivityState::IsLoading); }
</span><span class="cx">
</span><ins>+ void clearUserMediaState();
+
</ins><span class="cx"> private:
</span><span class="cx"> WebPageProxy(PageClient&, WebProcessProxy&, uint64_t pageID, Ref<API::PageConfiguration>&&);
</span><span class="cx"> void platformInitialize();
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/Tools/ChangeLog 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2016-11-29 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] Don't request user permission for a device if it has already been granted in the current browsing context
+ https://bugs.webkit.org/show_bug.cgi?id=164760
+ <rdar://problem/29261266>
+
+ Reviewed by Youenn Fablet.
+
+ Allow scripts to determine the number of times the user has been prompted for capture device access.
+
+ * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+ (WTR::InjectedBundle::setUserMediaPersistentPermissionForOrigin):
+ (WTR::InjectedBundle::userMediaPermissionRequestCountForOrigin):
+ (WTR::InjectedBundle::resetUserMediaPermissionRequestCountForOrigin):
+ (WTR::InjectedBundle::setUserMediaPermissionForOrigin): Deleted.
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.h:
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::TestRunner::setUserMediaPersistentPermissionForOrigin):
+ (WTR::TestRunner::userMediaPermissionRequestCountForOrigin):
+ (WTR::TestRunner::resetUserMediaPermissionRequestCountForOrigin):
+ (WTR::TestRunner::setUserMediaPermissionForOrigin): Deleted.
+ * WebKitTestRunner/InjectedBundle/TestRunner.h:
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetStateToConsistentValues):
+ (WTR::OriginSettings::incrementRequestCount):
+ (WTR::OriginSettings::resetRequestCount):
+ (WTR::OriginSettings::requestCount):
+ (WTR::TestController::saltForOrigin):
+ (WTR::TestController::setUserMediaPersistentPermissionForOrigin):
+ (WTR::TestController::handleCheckOfUserMediaPermissionForOrigin):
+ (WTR::TestController::settingsForOrigin):
+ (WTR::TestController::userMediaPermissionRequestCountForOrigin):
+ (WTR::TestController::resetUserMediaPermissionRequestCountForOrigin):
+ (WTR::TestController::decidePolicyForUserMediaPermissionRequestIfPossible):
+ (WTR::TestController::setUserMediaPermissionForOrigin): Deleted.
+ * WebKitTestRunner/TestController.h:
+ * WebKitTestRunner/TestInvocation.cpp:
+ (WTR::TestInvocation::didReceiveMessageFromInjectedBundle):
+ (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
+
</ins><span class="cx"> 2016-11-29 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> intersection-observer-entry-interface.html test fails on the bots
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleBindingsTestRunneridl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -185,7 +185,9 @@
</span><span class="cx">
</span><span class="cx"> // MediaStream
</span><span class="cx"> void setUserMediaPermission(boolean value);
</span><del>- void setUserMediaPermissionForOrigin(boolean permission, DOMString origin, DOMString parentOrigin);
</del><ins>+ void setUserMediaPersistentPermissionForOrigin(boolean permission, DOMString origin, DOMString parentOrigin);
+ unsigned long userMediaPermissionRequestCountForOrigin(DOMString origin, DOMString parentOrigin);
+ void resetUserMediaPermissionRequestCountForOrigin(DOMString origin, DOMString parentOrigin);
</ins><span class="cx">
</span><span class="cx"> // Audio testing.
</span><span class="cx"> [PassContext] void setAudioResult(object data);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -582,9 +582,9 @@
</span><span class="cx"> WKBundlePagePostMessage(page()->page(), messageName.get(), messageBody.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedBundle::setUserMediaPermissionForOrigin(bool permission, WKStringRef origin, WKStringRef parentOrigin)
</del><ins>+void InjectedBundle::setUserMediaPersistentPermissionForOrigin(bool permission, WKStringRef origin, WKStringRef parentOrigin)
</ins><span class="cx"> {
</span><del>- auto messageName = adoptWK(WKStringCreateWithUTF8CString("SetUserMediaPermissionForOrigin"));
</del><ins>+ auto messageName = adoptWK(WKStringCreateWithUTF8CString("SetUserMediaPersistentPermissionForOrigin"));
</ins><span class="cx"> WKRetainPtr<WKMutableDictionaryRef> messageBody(AdoptWK, WKMutableDictionaryCreate());
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> permissionKeyWK(AdoptWK, WKStringCreateWithUTF8CString("permission"));
</span><span class="lines">@@ -600,6 +600,38 @@
</span><span class="cx"> WKBundlePagePostMessage(page()->page(), messageName.get(), messageBody.get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+unsigned InjectedBundle::userMediaPermissionRequestCountForOrigin(WKStringRef origin, WKStringRef parentOrigin) const
+{
+ WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("UserMediaPermissionRequestCountForOrigin"));
+ WKRetainPtr<WKMutableDictionaryRef> messageBody(AdoptWK, WKMutableDictionaryCreate());
+
+ WKRetainPtr<WKStringRef> originKeyWK(AdoptWK, WKStringCreateWithUTF8CString("origin"));
+ WKDictionarySetItem(messageBody.get(), originKeyWK.get(), origin);
+
+ WKRetainPtr<WKStringRef> parentOriginKeyWK(AdoptWK, WKStringCreateWithUTF8CString("parentOrigin"));
+ WKDictionarySetItem(messageBody.get(), parentOriginKeyWK.get(), parentOrigin);
+
+ WKTypeRef resultToPass = 0;
+ WKBundlePagePostSynchronousMessageForTesting(page()->page(), messageName.get(), messageBody.get(), &resultToPass);
+ WKRetainPtr<WKUInt64Ref> count(AdoptWK, static_cast<WKUInt64Ref>(resultToPass));
+
+ return static_cast<unsigned>(WKUInt64GetValue(count.get()));
+}
+
+void InjectedBundle::resetUserMediaPermissionRequestCountForOrigin(WKStringRef origin, WKStringRef parentOrigin)
+{
+ WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("ResetUserMediaPermissionRequestCountForOrigin"));
+ WKRetainPtr<WKMutableDictionaryRef> messageBody(AdoptWK, WKMutableDictionaryCreate());
+
+ WKRetainPtr<WKStringRef> originKeyWK(AdoptWK, WKStringCreateWithUTF8CString("origin"));
+ WKDictionarySetItem(messageBody.get(), originKeyWK.get(), origin);
+
+ WKRetainPtr<WKStringRef> parentOriginKeyWK(AdoptWK, WKStringCreateWithUTF8CString("parentOrigin"));
+ WKDictionarySetItem(messageBody.get(), parentOriginKeyWK.get(), parentOrigin);
+
+ WKBundlePagePostMessage(page()->page(), messageName.get(), messageBody.get());
+}
+
</ins><span class="cx"> void InjectedBundle::setCustomPolicyDelegate(bool enabled, bool permissive)
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("SetCustomPolicyDelegate"));
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundleh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -101,7 +101,9 @@
</span><span class="cx">
</span><span class="cx"> // MediaStream.
</span><span class="cx"> void setUserMediaPermission(bool);
</span><del>- void setUserMediaPermissionForOrigin(bool permission, WKStringRef origin, WKStringRef parentOrigin);
</del><ins>+ void setUserMediaPersistentPermissionForOrigin(bool permission, WKStringRef origin, WKStringRef parentOrigin);
+ unsigned userMediaPermissionRequestCountForOrigin(WKStringRef origin, WKStringRef parentOrigin) const;
+ void resetUserMediaPermissionRequestCountForOrigin(WKStringRef origin, WKStringRef parentOrigin);
</ins><span class="cx">
</span><span class="cx"> // Policy delegate.
</span><span class="cx"> void setCustomPolicyDelegate(bool enabled, bool permissive);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -889,13 +889,27 @@
</span><span class="cx"> InjectedBundle::singleton().setUserMediaPermission(enabled);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestRunner::setUserMediaPermissionForOrigin(bool permission, JSStringRef origin, JSStringRef parentOrigin)
</del><ins>+void TestRunner::setUserMediaPersistentPermissionForOrigin(bool permission, JSStringRef origin, JSStringRef parentOrigin)
</ins><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKStringRef> originWK = toWK(origin);
</span><span class="cx"> WKRetainPtr<WKStringRef> parentOriginWK = toWK(parentOrigin);
</span><del>- InjectedBundle::singleton().setUserMediaPermissionForOrigin(permission, originWK.get(), parentOriginWK.get());
</del><ins>+ InjectedBundle::singleton().setUserMediaPersistentPermissionForOrigin(permission, originWK.get(), parentOriginWK.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+unsigned TestRunner::userMediaPermissionRequestCountForOrigin(JSStringRef origin, JSStringRef parentOrigin) const
+{
+ WKRetainPtr<WKStringRef> originWK = toWK(origin);
+ WKRetainPtr<WKStringRef> parentOriginWK = toWK(parentOrigin);
+ return InjectedBundle::singleton().userMediaPermissionRequestCountForOrigin(originWK.get(), parentOriginWK.get());
+}
+
+void TestRunner::resetUserMediaPermissionRequestCountForOrigin(JSStringRef origin, JSStringRef parentOrigin)
+{
+ WKRetainPtr<WKStringRef> originWK = toWK(origin);
+ WKRetainPtr<WKStringRef> parentOriginWK = toWK(parentOrigin);
+ InjectedBundle::singleton().resetUserMediaPermissionRequestCountForOrigin(originWK.get(), parentOriginWK.get());
+}
+
</ins><span class="cx"> bool TestRunner::callShouldCloseOnWebView()
</span><span class="cx"> {
</span><span class="cx"> WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::singleton().page()->page());
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -286,7 +286,9 @@
</span><span class="cx">
</span><span class="cx"> // MediaStream
</span><span class="cx"> void setUserMediaPermission(bool);
</span><del>- void setUserMediaPermissionForOrigin(bool permission, JSStringRef origin, JSStringRef parentOrigin);
</del><ins>+ void setUserMediaPersistentPermissionForOrigin(bool permission, JSStringRef origin, JSStringRef parentOrigin);
+ unsigned userMediaPermissionRequestCountForOrigin(JSStringRef origin, JSStringRef parentOrigin) const;
+ void resetUserMediaPermissionRequestCountForOrigin(JSStringRef origin, JSStringRef parentOrigin);
</ins><span class="cx">
</span><span class="cx"> void setPageVisibility(JSStringRef state);
</span><span class="cx"> void resetPageVisibility();
</span><span class="lines">@@ -400,6 +402,8 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKArrayRef> m_allowedHosts;
</span><span class="cx">
</span><ins>+ size_t m_userMediaPermissionRequestCount { 0 };
+
</ins><span class="cx"> PlatformTimerRef m_waitToDumpWatchdogTimer;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -756,6 +756,8 @@
</span><span class="cx">
</span><span class="cx"> WKPageSetMuted(m_mainWebView->page(), true);
</span><span class="cx">
</span><ins>+ WKPageClearUserMediaState(m_mainWebView->page());
+
</ins><span class="cx"> // Reset notification permissions
</span><span class="cx"> m_webNotificationProvider.reset();
</span><span class="cx">
</span><span class="lines">@@ -766,7 +768,7 @@
</span><span class="cx">
</span><span class="cx"> // Reset UserMedia permissions.
</span><span class="cx"> m_userMediaPermissionRequests.clear();
</span><del>- m_cahcedUserMediaPermissions.clear();
</del><ins>+ m_cachedUserMediaPermissions.clear();
</ins><span class="cx"> m_isUserMediaPermissionSet = false;
</span><span class="cx"> m_isUserMediaPermissionAllowed = false;
</span><span class="cx">
</span><span class="lines">@@ -1886,34 +1888,34 @@
</span><span class="cx">
</span><span class="cx"> HashMap<uint64_t, String>& ephemeralSalts() { return m_ephemeralSalts; }
</span><span class="cx">
</span><ins>+ void incrementRequestCount() { ++m_requestCount; }
+ void resetRequestCount() { m_requestCount = 0; }
+ unsigned requestCount() const { return m_requestCount; }
+
</ins><span class="cx"> private:
</span><span class="cx"> HashMap<uint64_t, String> m_ephemeralSalts;
</span><span class="cx"> String m_persistentSalt;
</span><ins>+ unsigned m_requestCount { 0 };
</ins><span class="cx"> bool m_persistentPermission { false };
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> String TestController::saltForOrigin(WKFrameRef frame, String originHash)
</span><span class="cx"> {
</span><del>- RefPtr<OriginSettings> settings = m_cahcedUserMediaPermissions.get(originHash);
- if (!settings) {
- settings = adoptRef(*new OriginSettings());
- m_cahcedUserMediaPermissions.add(originHash, settings);
- }
-
- auto& ephemeralSalts = settings->ephemeralSalts();
</del><ins>+ auto& settings = settingsForOrigin(originHash);
+ auto& ephemeralSalts = settings.ephemeralSalts();
</ins><span class="cx"> auto frameInfo = adoptWK(WKFrameCreateFrameInfo(frame));
</span><span class="cx"> auto frameHandle = WKFrameInfoGetFrameHandleRef(frameInfo.get());
</span><span class="cx"> uint64_t frameIdentifier = WKFrameHandleGetFrameID(frameHandle);
</span><span class="cx"> String frameSalt = ephemeralSalts.get(frameIdentifier);
</span><span class="cx">
</span><del>- if (settings->persistentPermission()) {
</del><ins>+ if (settings.persistentPermission()) {
</ins><span class="cx"> if (frameSalt.length())
</span><span class="cx"> return frameSalt;
</span><span class="cx">
</span><del>- if (!settings->persistentSalt().length())
- settings->setPersistentSalt(createCanonicalUUIDString());
</del><ins>+ if (!settings.persistentSalt().length())
+ settings.setPersistentSalt(createCanonicalUUIDString());
</ins><span class="cx">
</span><del>- return settings->persistentSalt();
</del><ins>+ return settings.persistentSalt();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!frameSalt.length()) {
</span><span class="lines">@@ -1924,16 +1926,11 @@
</span><span class="cx"> return frameSalt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestController::setUserMediaPermissionForOrigin(bool permission, WKStringRef userMediaDocumentOriginString, WKStringRef topLevelDocumentOriginString)
</del><ins>+void TestController::setUserMediaPersistentPermissionForOrigin(bool permission, WKStringRef userMediaDocumentOriginString, WKStringRef topLevelDocumentOriginString)
</ins><span class="cx"> {
</span><span class="cx"> auto originHash = userMediaOriginHash(userMediaDocumentOriginString, topLevelDocumentOriginString);
</span><del>- RefPtr<OriginSettings> settings = m_cahcedUserMediaPermissions.get(originHash);
- if (!settings) {
- settings = adoptRef(*new OriginSettings());
- m_cahcedUserMediaPermissions.add(originHash, settings);
- }
-
- settings->setPersistentPermission(permission);
</del><ins>+ auto& settings = settingsForOrigin(originHash);
+ settings.setPersistentPermission(permission);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestController::handleCheckOfUserMediaPermissionForOrigin(WKFrameRef frame, WKSecurityOriginRef userMediaDocumentOrigin, WKSecurityOriginRef topLevelDocumentOrigin, const WKUserMediaPermissionCheckRef& checkRequest)
</span><span class="lines">@@ -1941,7 +1938,7 @@
</span><span class="cx"> auto originHash = userMediaOriginHash(userMediaDocumentOrigin, topLevelDocumentOrigin);
</span><span class="cx"> auto salt = saltForOrigin(frame, originHash);
</span><span class="cx">
</span><del>- WKUserMediaPermissionCheckSetUserMediaAccessInfo(checkRequest, WKStringCreateWithUTF8CString(salt.utf8().data()), m_cahcedUserMediaPermissions.get(originHash)->persistentPermission());
</del><ins>+ WKUserMediaPermissionCheckSetUserMediaAccessInfo(checkRequest, WKStringCreateWithUTF8CString(salt.utf8().data()), settingsForOrigin(originHash).persistentPermission());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestController::handleUserMediaPermissionRequest(WKFrameRef frame, WKSecurityOriginRef userMediaDocumentOrigin, WKSecurityOriginRef topLevelDocumentOrigin, WKUserMediaPermissionRequestRef request)
</span><span class="lines">@@ -1951,6 +1948,29 @@
</span><span class="cx"> decidePolicyForUserMediaPermissionRequestIfPossible();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+OriginSettings& TestController::settingsForOrigin(const String& originHash)
+{
+ RefPtr<OriginSettings> settings = m_cachedUserMediaPermissions.get(originHash);
+ if (!settings) {
+ settings = adoptRef(*new OriginSettings());
+ m_cachedUserMediaPermissions.add(originHash, settings);
+ }
+
+ return *settings;
+}
+
+unsigned TestController::userMediaPermissionRequestCountForOrigin(WKStringRef userMediaDocumentOriginString, WKStringRef topLevelDocumentOriginString)
+{
+ auto originHash = userMediaOriginHash(userMediaDocumentOriginString, topLevelDocumentOriginString);
+ return settingsForOrigin(originHash).requestCount();
+}
+
+void TestController::resetUserMediaPermissionRequestCountForOrigin(WKStringRef userMediaDocumentOriginString, WKStringRef topLevelDocumentOriginString)
+{
+ auto originHash = userMediaOriginHash(userMediaDocumentOriginString, topLevelDocumentOriginString);
+ settingsForOrigin(originHash).resetRequestCount();
+}
+
</ins><span class="cx"> void TestController::decidePolicyForUserMediaPermissionRequestIfPossible()
</span><span class="cx"> {
</span><span class="cx"> if (!m_isUserMediaPermissionSet)
</span><span class="lines">@@ -1960,12 +1980,10 @@
</span><span class="cx"> auto originHash = pair.first;
</span><span class="cx"> auto request = pair.second.get();
</span><span class="cx">
</span><del>- bool persistentPermission = false;
- RefPtr<OriginSettings> settings = m_cahcedUserMediaPermissions.get(originHash);
- if (settings)
- persistentPermission = settings->persistentPermission();
</del><ins>+ auto& settings = settingsForOrigin(originHash);
+ settings.incrementRequestCount();
</ins><span class="cx">
</span><del>- if (!m_isUserMediaPermissionAllowed && !persistentPermission) {
</del><ins>+ if (!m_isUserMediaPermissionAllowed && !settings.persistentPermission()) {
</ins><span class="cx"> WKUserMediaPermissionRequestDeny(request, kWKPermissionDenied);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.h (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.h 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/Tools/WebKitTestRunner/TestController.h 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -101,9 +101,12 @@
</span><span class="cx"> void getUserMediaInfoForOrigin(WKFrameRef, WKStringRef originKey, bool&, WKRetainPtr<WKStringRef>&);
</span><span class="cx"> WKStringRef getUserMediaSaltForOrigin(WKFrameRef, WKStringRef originKey);
</span><span class="cx"> void setUserMediaPermission(bool);
</span><del>- void setUserMediaPermissionForOrigin(bool, WKStringRef userMediaDocumentOriginString, WKStringRef topLevelDocumentOriginString);
</del><ins>+ void setUserMediaPersistentPermissionForOrigin(bool, WKStringRef userMediaDocumentOriginString, WKStringRef topLevelDocumentOriginString);
</ins><span class="cx"> void handleUserMediaPermissionRequest(WKFrameRef, WKSecurityOriginRef, WKSecurityOriginRef, WKUserMediaPermissionRequestRef);
</span><span class="cx"> void handleCheckOfUserMediaPermissionForOrigin(WKFrameRef, WKSecurityOriginRef, WKSecurityOriginRef, const WKUserMediaPermissionCheckRef&);
</span><ins>+ OriginSettings& settingsForOrigin(const String&);
+ unsigned userMediaPermissionRequestCountForOrigin(WKStringRef userMediaDocumentOriginString, WKStringRef topLevelDocumentOriginString);
+ void resetUserMediaPermissionRequestCountForOrigin(WKStringRef userMediaDocumentOriginString, WKStringRef topLevelDocumentOriginString);
</ins><span class="cx">
</span><span class="cx"> // Policy delegate.
</span><span class="cx"> void setCustomPolicyDelegate(bool enabled, bool permissive);
</span><span class="lines">@@ -316,7 +319,7 @@
</span><span class="cx"> bool m_isGeolocationPermissionSet { false };
</span><span class="cx"> bool m_isGeolocationPermissionAllowed { false };
</span><span class="cx">
</span><del>- HashMap<String, RefPtr<OriginSettings>> m_cahcedUserMediaPermissions;
</del><ins>+ HashMap<String, RefPtr<OriginSettings>> m_cachedUserMediaPermissions;
</ins><span class="cx">
</span><span class="cx"> typedef Vector<std::pair<String, WKRetainPtr<WKUserMediaPermissionRequestRef>>> PermissionRequestList;
</span><span class="cx"> PermissionRequestList m_userMediaPermissionRequests;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestInvocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestInvocation.cpp (209081 => 209082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2016-11-29 19:15:29 UTC (rev 209081)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2016-11-29 19:20:08 UTC (rev 209082)
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (WKStringIsEqualToUTF8CString(messageName, "SetUserMediaPermissionForOrigin")) {
</del><ins>+ if (WKStringIsEqualToUTF8CString(messageName, "SetUserMediaPersistentPermissionForOrigin")) {
</ins><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKDictionaryGetTypeID());
</span><span class="cx"> WKDictionaryRef messageBodyDictionary = static_cast<WKDictionaryRef>(messageBody);
</span><span class="cx">
</span><span class="lines">@@ -510,10 +510,24 @@
</span><span class="cx"> WKRetainPtr<WKStringRef> parentOriginKey(AdoptWK, WKStringCreateWithUTF8CString("parentOrigin"));
</span><span class="cx"> WKStringRef parentOriginWK = static_cast<WKStringRef>(WKDictionaryGetItemForKey(messageBodyDictionary, parentOriginKey.get()));
</span><span class="cx">
</span><del>- TestController::singleton().setUserMediaPermissionForOrigin(permission, originWK, parentOriginWK);
</del><ins>+ TestController::singleton().setUserMediaPersistentPermissionForOrigin(permission, originWK, parentOriginWK);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (WKStringIsEqualToUTF8CString(messageName, "ResetUserMediaPermissionRequestCountForOrigin")) {
+ ASSERT(WKGetTypeID(messageBody) == WKDictionaryGetTypeID());
+ WKDictionaryRef messageBodyDictionary = static_cast<WKDictionaryRef>(messageBody);
+
+ WKRetainPtr<WKStringRef> originKey(AdoptWK, WKStringCreateWithUTF8CString("origin"));
+ WKStringRef originWK = static_cast<WKStringRef>(WKDictionaryGetItemForKey(messageBodyDictionary, originKey.get()));
+
+ WKRetainPtr<WKStringRef> parentOriginKey(AdoptWK, WKStringCreateWithUTF8CString("parentOrigin"));
+ WKStringRef parentOriginWK = static_cast<WKStringRef>(WKDictionaryGetItemForKey(messageBodyDictionary, parentOriginKey.get()));
+
+ TestController::singleton().resetUserMediaPermissionRequestCountForOrigin(originWK, parentOriginWK);
+ return;
+ }
+
</ins><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "SetCacheModel")) {
</span><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKUInt64GetTypeID());
</span><span class="cx"> uint64_t model = WKUInt64GetValue(static_cast<WKUInt64Ref>(messageBody));
</span><span class="lines">@@ -846,6 +860,22 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><ins>+ if (WKStringIsEqualToUTF8CString(messageName, "UserMediaPermissionRequestCountForOrigin")) {
+ ASSERT(WKGetTypeID(messageBody) == WKDictionaryGetTypeID());
+ WKDictionaryRef messageBodyDictionary = static_cast<WKDictionaryRef>(messageBody);
+
+ WKRetainPtr<WKStringRef> originKey(AdoptWK, WKStringCreateWithUTF8CString("origin"));
+ WKStringRef originWK = static_cast<WKStringRef>(WKDictionaryGetItemForKey(messageBodyDictionary, originKey.get()));
+
+ WKRetainPtr<WKStringRef> parentOriginKey(AdoptWK, WKStringCreateWithUTF8CString("parentOrigin"));
+ WKStringRef parentOriginWK = static_cast<WKStringRef>(WKDictionaryGetItemForKey(messageBodyDictionary, parentOriginKey.get()));
+
+ unsigned count = TestController::singleton().userMediaPermissionRequestCountForOrigin(originWK, parentOriginWK);
+ WKRetainPtr<WKUInt64Ref> result(AdoptWK, WKUInt64Create(count));
+ return result;
+ }
+
+
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>