<!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>[188385] 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/188385">188385</a></dd>
<dt>Author</dt> <dd>mdaiter@apple.com</dd>
<dt>Date</dt> <dd>2015-08-13 10:33:43 -0700 (Thu, 13 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore:
UserMediaRequest should supply IDs of devices selected by user
https://bugs.webkit.org/show_bug.cgi?id=147263
<rdar://problem/21983345>
Reviewed by Jer Noble.
* Modules/mediastream/UserMediaRequest.cpp:
(WebCore::UserMediaRequest::userMediaAccessGranted):
* Modules/mediastream/UserMediaRequest.h:
* platform/mock/UserMediaClientMock.h:
Source/WebKit/mac:
Linking device query ability from WebKit2 to clients
https://bugs.webkit.org/show_bug.cgi?id=147263
<rdar://problem/21983345>
Reviewed by Jer Noble.
* WebCoreSupport/WebUserMediaClient.mm:
(-[WebUserMediaPolicyListener allow]):
(-[WebUserMediaPolicyListener allowDeviceWithVideoUID:andAudioUID:]):
Source/WebKit2:
Linking device query ability from WebKit2 to clients
https://bugs.webkit.org/show_bug.cgi?id=147263
<rdar://problem/21983345>
Reviewed by Jer Noble.
* Platform/mac/LayerHostingContext.mm:
(WebKit::LayerHostingContext::setColorMatchUntaggedContent):
(WebKit::LayerHostingContext::colorMatchUntaggedContent):
* UIProcess/API/C/WKUserMediaPermissionRequest.cpp:
(WKUserMediaPermissionRequestAllow):
(WKUserMediaPermissionRequestDeviceNamesVideo):
(WKUserMediaPermissionRequestDeviceNamesAudio):
* UIProcess/API/C/WKUserMediaPermissionRequest.h:
* UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
(WebKit::UserMediaPermissionRequestManagerProxy::didReceiveUserMediaPermissionDecision): Deleted.
* UIProcess/UserMediaPermissionRequestManagerProxy.h:
* UIProcess/UserMediaPermissionRequestProxy.cpp:
(WebKit::UserMediaPermissionRequestProxy::allow):
(WebKit::UserMediaPermissionRequestProxy::deny):
* UIProcess/UserMediaPermissionRequestProxy.h:
* WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
(WebKit::UserMediaPermissionRequestManager::didReceiveUserMediaPermissionDecision):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp">trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamUserMediaRequesth">trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceCenterh">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockUserMediaClientMockh">trunk/Source/WebCore/platform/mock/UserMediaClientMock.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebUserMediaClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKUserMediaPermissionRequestcpp">trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKUserMediaPermissionRequesth">trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitUserMediaPermissionRequestcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp</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="#trunkSourceWebKit2WebProcessMediaStreamUserMediaPermissionRequestManagercpp">trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2UserMediacpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188384 => 188385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-13 17:25:01 UTC (rev 188384)
+++ trunk/Source/WebCore/ChangeLog 2015-08-13 17:33:43 UTC (rev 188385)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-08-13 Matthew Daiter <mdaiter@apple.com>
+
+ UserMediaRequest should supply IDs of devices selected by user
+ https://bugs.webkit.org/show_bug.cgi?id=147263
+ <rdar://problem/21983345>
+
+ Reviewed by Jer Noble.
+
+ * Modules/mediastream/UserMediaRequest.cpp:
+ (WebCore::UserMediaRequest::userMediaAccessGranted):
+ * Modules/mediastream/UserMediaRequest.h:
+ * platform/mock/UserMediaClientMock.h:
+
</ins><span class="cx"> 2015-08-12 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Cairo] Improve image quality when using newer versions of cairo/pixman
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (188384 => 188385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-08-13 17:25:01 UTC (rev 188384)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-08-13 17:33:43 UTC (rev 188385)
</span><span class="lines">@@ -143,8 +143,10 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UserMediaRequest::userMediaAccessGranted()
</del><ins>+void UserMediaRequest::userMediaAccessGranted(const String& videoDeviceUID, const String& audioDeviceUID)
</ins><span class="cx"> {
</span><ins>+ m_chosenVideoDeviceUID = videoDeviceUID;
+ m_chosenAudioDeviceUID = audioDeviceUID;
</ins><span class="cx"> RefPtr<UserMediaRequest> protectedThis(this);
</span><span class="cx"> callOnMainThread([protectedThis] {
</span><span class="cx"> // 3 - the user granted access, ask platform to create the media stream descriptors.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h (188384 => 188385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2015-08-13 17:25:01 UTC (rev 188384)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2015-08-13 17:33:43 UTC (rev 188385)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> WEBCORE_EXPORT SecurityOrigin* securityOrigin() const;
</span><span class="cx">
</span><span class="cx"> void start();
</span><del>- WEBCORE_EXPORT void userMediaAccessGranted();
</del><ins>+ WEBCORE_EXPORT void userMediaAccessGranted(const String& videoDeviceUID, const String& audioDeviceUID);
</ins><span class="cx"> WEBCORE_EXPORT void userMediaAccessDenied();
</span><span class="cx">
</span><span class="cx"> bool requiresAudio() const { return m_audioConstraints; }
</span><span class="lines">@@ -74,6 +74,9 @@
</span><span class="cx">
</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><ins>+
+ const String& firstVideoDeviceUID() const { return !videoDeviceUIDs().isEmpty() ? videoDeviceUIDs().at(0) : emptyString(); }
+ const String& firstAudioDeviceUID() const { return !audioDeviceUIDs().isEmpty() ? audioDeviceUIDs().at(0) : emptyString(); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> UserMediaRequest(ScriptExecutionContext*, UserMediaController*, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints, MediaDevices::Promise&&);
</span><span class="lines">@@ -94,6 +97,9 @@
</span><span class="cx"> Vector<String> m_videoDeviceUIDs;
</span><span class="cx"> Vector<String> m_audioDeviceUIDs;
</span><span class="cx">
</span><ins>+ String m_chosenVideoDeviceUID;
+ String m_chosenAudioDeviceUID;
+
</ins><span class="cx"> UserMediaController* m_controller;
</span><span class="cx">
</span><span class="cx"> MediaDevices::Promise m_promise;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceCenterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.h (188384 => 188385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.h 2015-08-13 17:25:01 UTC (rev 188384)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.h 2015-08-13 17:33:43 UTC (rev 188385)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~RealtimeMediaSourceCenter();
</span><span class="cx">
</span><del>- static RealtimeMediaSourceCenter& singleton();
</del><ins>+ WEBCORE_EXPORT static RealtimeMediaSourceCenter& singleton();
</ins><span class="cx"> static void setSharedStreamCenter(RealtimeMediaSourceCenter*);
</span><span class="cx">
</span><span class="cx"> virtual void validateRequestConstraints(PassRefPtr<MediaStreamCreationClient>, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockUserMediaClientMockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/UserMediaClientMock.h (188384 => 188385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/UserMediaClientMock.h 2015-08-13 17:25:01 UTC (rev 188384)
+++ trunk/Source/WebCore/platform/mock/UserMediaClientMock.h 2015-08-13 17:33:43 UTC (rev 188385)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> void fire() override
</span><span class="cx"> {
</span><span class="cx"> if (m_requestSuccess)
</span><del>- m_request->userMediaAccessGranted();
</del><ins>+ m_request->userMediaAccessGranted(m_request->videoDeviceUIDs().at(0), m_request->audioDeviceUIDs().at(0));
</ins><span class="cx"> else
</span><span class="cx"> m_request->userMediaAccessDenied();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (188384 => 188385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-08-13 17:25:01 UTC (rev 188384)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-08-13 17:33:43 UTC (rev 188385)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-08-13 Matthew Daiter <mdaiter@apple.com>
+
+ Linking device query ability from WebKit2 to clients
+ https://bugs.webkit.org/show_bug.cgi?id=147263
+ <rdar://problem/21983345>
+
+ Reviewed by Jer Noble.
+
+ * WebCoreSupport/WebUserMediaClient.mm:
+ (-[WebUserMediaPolicyListener allow]):
+ (-[WebUserMediaPolicyListener allowDeviceWithVideoUID:andAudioUID:]):
+
+
</ins><span class="cx"> 2015-08-10 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Align WebKit1's PageCache size with WebKit2's
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebUserMediaClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm (188384 => 188385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm 2015-08-13 17:25:01 UTC (rev 188384)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm 2015-08-13 17:33:43 UTC (rev 188385)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> }
</span><span class="cx"> - (id)initWithUserMediaRequest:(PassRefPtr<UserMediaRequest>)request;
</span><span class="cx"> - (void)cancelRequest;
</span><del>-- (void)allow;
</del><ins>+- (void)allowDeviceWithVideoUID:(const String&)videoUID andAudioUID:(const String&)audioUID;
</ins><span class="cx"> - (void)deny;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -152,8 +152,23 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> if (!_request)
</span><span class="cx"> return;
</span><ins>+
+ const String& videoUID = _request->firstVideoDeviceUID();
+ const String& audioUID = _request->firstAudioDeviceUID();
+
+ _request->userMediaAccessGranted(videoUID, audioUID);
+ RemoveRequestFromMap(_request.get());
+#endif
+}
</ins><span class="cx">
</span><del>- _request->userMediaAccessGranted();
</del><ins>+- (void)allowDeviceWithVideoUID:(const String&)videoUID andAudioUID:(const String&)audioUID
+{
+#if ENABLE(MEDIA_STREAM)
+ if (!_request)
+ return;
+
+ _request->userMediaAccessGranted(videoUID, audioUID);
+
</ins><span class="cx"> RemoveRequestFromMap(_request.get());
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (188384 => 188385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-08-13 17:25:01 UTC (rev 188384)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-13 17:33:43 UTC (rev 188385)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-08-13 Matthew Daiter <mdaiter@apple.com>
+
+ Linking device query ability from WebKit2 to clients
+ https://bugs.webkit.org/show_bug.cgi?id=147263
+ <rdar://problem/21983345>
+
+ Reviewed by Jer Noble.
+
+ * Platform/mac/LayerHostingContext.mm:
+ (WebKit::LayerHostingContext::setColorMatchUntaggedContent):
+ (WebKit::LayerHostingContext::colorMatchUntaggedContent):
+ * UIProcess/API/C/WKUserMediaPermissionRequest.cpp:
+ (WKUserMediaPermissionRequestAllow):
+ (WKUserMediaPermissionRequestDeviceNamesVideo):
+ (WKUserMediaPermissionRequestDeviceNamesAudio):
+ * UIProcess/API/C/WKUserMediaPermissionRequest.h:
+ * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+ (WebKit::UserMediaPermissionRequestManagerProxy::didReceiveUserMediaPermissionDecision): Deleted.
+ * UIProcess/UserMediaPermissionRequestManagerProxy.h:
+ * UIProcess/UserMediaPermissionRequestProxy.cpp:
+ (WebKit::UserMediaPermissionRequestProxy::allow):
+ (WebKit::UserMediaPermissionRequestProxy::deny):
+ * UIProcess/UserMediaPermissionRequestProxy.h:
+ * WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
+ (WebKit::UserMediaPermissionRequestManager::didReceiveUserMediaPermissionDecision):
+
+
</ins><span class="cx"> 2015-08-12 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] WebKit processes should have access to com.apple.nesessionmanager.flow-divert-token
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKUserMediaPermissionRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.cpp (188384 => 188385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.cpp 2015-08-13 17:25:01 UTC (rev 188384)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.cpp 2015-08-13 17:33:43 UTC (rev 188385)
</span><span class="lines">@@ -21,6 +21,9 @@
</span><span class="cx">
</span><span class="cx"> #include "UserMediaPermissionRequestProxy.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><ins>+#include "WKArray.h"
+#include "WKMutableArray.h"
+#include "WKString.h"
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="lines">@@ -29,12 +32,50 @@
</span><span class="cx"> return toAPI(UserMediaPermissionRequestProxy::APIType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKUserMediaPermissionRequestAllow(WKUserMediaPermissionRequestRef userMediaPermissionRequestRef)
</del><ins>+
+void WKUserMediaPermissionRequestAllowBest(WKUserMediaPermissionRequestRef userMediaPermissionRequestRef)
</ins><span class="cx"> {
</span><del>- toImpl(userMediaPermissionRequestRef)->allow();
</del><ins>+ const String& videoDevice = toImpl(userMediaPermissionRequestRef)->firstVideoDeviceUID();
+ const String& audioDevice = toImpl(userMediaPermissionRequestRef)->firstAudioDeviceUID();
+ toImpl(userMediaPermissionRequestRef)->allow(videoDevice, audioDevice);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKUserMediaPermissionRequestAllow(WKUserMediaPermissionRequestRef userMediaPermissionRequestRef, WKStringRef videoDeviceUID, WKStringRef audioDeviceUID)
+{
+ toImpl(userMediaPermissionRequestRef)->allow(toWTFString(videoDeviceUID), toWTFString(audioDeviceUID));
+}
+
</ins><span class="cx"> void WKUserMediaPermissionRequestDeny(WKUserMediaPermissionRequestRef userMediaPermissionRequestRef)
</span><span class="cx"> {
</span><span class="cx"> toImpl(userMediaPermissionRequestRef)->deny();
</span><span class="cx"> }
</span><ins>+
+WKArrayRef WKUserMediaPermissionRequestDeviceNamesVideo(WKUserMediaPermissionRequestRef userMediaPermissionRef)
+{
+ WKMutableArrayRef array = WKMutableArrayRef();
+ for (auto& name : toImpl(userMediaPermissionRef)->videoDeviceUIDs()) {
+ String deviceName = toImpl(userMediaPermissionRef)->getDeviceNameForUID(name, WebCore::RealtimeMediaSource::Type::Video);
+ WKArrayAppendItem(array, toAPI(API::String::create(deviceName).ptr()));
+ }
+ return array;
+}
+
+WKArrayRef WKUserMediaPermissionRequestDeviceNamesAudio(WKUserMediaPermissionRequestRef userMediaPermissionRef)
+{
+ WKMutableArrayRef array = WKMutableArrayRef();
+ for (auto& name : toImpl(userMediaPermissionRef)->audioDeviceUIDs()) {
+ String deviceName = toImpl(userMediaPermissionRef)->getDeviceNameForUID(name, WebCore::RealtimeMediaSource::Type::Audio);
+ WKArrayAppendItem(array, toAPI(API::String::create(deviceName).ptr()));
+ }
+ return array;
+}
+
+WKStringRef WKUserMediaPermissionRequestFirstVideoDeviceUID(WKUserMediaPermissionRequestRef userMediaPermissionRef)
+{
+ return !toImpl(userMediaPermissionRef)->videoDeviceUIDs().isEmpty() ? reinterpret_cast<WKStringRef>(WKArrayGetItemAtIndex(WKUserMediaPermissionRequestDeviceNamesVideo(userMediaPermissionRef), 0)) : reinterpret_cast<WKStringRef>(WKStringCreateWithUTF8CString(""));
+}
+
+WKStringRef WKUserMediaPermissionRequestFirstAudioDeviceUID(WKUserMediaPermissionRequestRef userMediaPermissionRef)
+{
+ return !toImpl(userMediaPermissionRef)->audioDeviceUIDs().isEmpty() ? reinterpret_cast<WKStringRef>(WKArrayGetItemAtIndex(WKUserMediaPermissionRequestDeviceNamesAudio(userMediaPermissionRef), 0)) : reinterpret_cast<WKStringRef>(WKStringCreateWithUTF8CString(""));
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKUserMediaPermissionRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.h (188384 => 188385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.h 2015-08-13 17:25:01 UTC (rev 188384)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.h 2015-08-13 17:33:43 UTC (rev 188385)
</span><span class="lines">@@ -27,9 +27,16 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKTypeID WKUserMediaPermissionRequestGetTypeID();
</span><span class="cx">
</span><del>-WK_EXPORT void WKUserMediaPermissionRequestAllow(WKUserMediaPermissionRequestRef);
</del><ins>+WK_EXPORT void WKUserMediaPermissionRequestAllowBest(WKUserMediaPermissionRequestRef);
+WK_EXPORT void WKUserMediaPermissionRequestAllow(WKUserMediaPermissionRequestRef, WKStringRef videoDeviceUID, WKStringRef audioDeviceUID);
</ins><span class="cx"> WK_EXPORT void WKUserMediaPermissionRequestDeny(WKUserMediaPermissionRequestRef);
</span><span class="cx">
</span><ins>+WK_EXPORT WKArrayRef WKUserMediaPermissionRequestDeviceNamesVideo(WKUserMediaPermissionRequestRef);
+WK_EXPORT WKArrayRef WKUserMediaPermissionRequestDeviceNamesAudio(WKUserMediaPermissionRequestRef);
+
+WK_EXPORT WKStringRef WKUserMediaPermissionRequestFirstVideoDeviceUID(WKUserMediaPermissionRequestRef);
+WK_EXPORT WKStringRef WKUserMediaPermissionRequestFirstAudioDeviceUID(WKUserMediaPermissionRequestRef);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitUserMediaPermissionRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp (188384 => 188385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp 2015-08-13 17:25:01 UTC (rev 188384)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp 2015-08-13 17:33:43 UTC (rev 188385)
</span><span class="lines">@@ -70,9 +70,27 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> priv->madeDecision = true;
</span><del>- priv->request->allow();
</del><ins>+
+ const String& videoDevice = priv->request->firstVideoDeviceUID();
+ const String& audioDevice = priv->request->firstAudioDeviceUID();
+
+ priv->request->allow(videoDevice, audioDevice);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static void webkitUserMediaPermissionRequestAllow(WebKitPermissionRequest* request, const char* videoDeviceUID, const char* audioDeviceUID)
+{
+ ASSERT(WEBKIT_IS_USER_MEDIA_PERMISSION_REQUEST(request));
+
+ WebKitUserMediaPermissionRequestPrivate* priv = WEBKIT_USER_MEDIA_PERMISSION_REQUEST(request)->priv;
+
+ // Only one decision at a time.
+ if (priv->madeDecision)
+ return;
+
+ priv->madeDecision = true;
+ priv->request->allow(String::fromUTF8(videoDeviceUID), String::fromUTF8(audioDeviceUID));
+}
+
</ins><span class="cx"> static void webkitUserMediaPermissionRequestDeny(WebKitPermissionRequest* request)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(WEBKIT_IS_USER_MEDIA_PERMISSION_REQUEST(request));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserMediaPermissionRequestManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (188384 => 188385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2015-08-13 17:25:01 UTC (rev 188384)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2015-08-13 17:33:43 UTC (rev 188385)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> return request.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UserMediaPermissionRequestManagerProxy::didReceiveUserMediaPermissionDecision(uint64_t userMediaID, bool allowed)
</del><ins>+void UserMediaPermissionRequestManagerProxy::didReceiveUserMediaPermissionDecision(uint64_t userMediaID, bool allowed, const String& videoDeviceUID, const String& audioDeviceUID)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_page.isValid())
</span><span class="cx"> return;
</span><span class="lines">@@ -54,8 +54,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><del>- // FIXME(147062): Need to add in the support for Safari to pass strings given from user's decision on what piece of media to open
- m_page.process().send(Messages::WebPage::DidReceiveUserMediaPermissionDecision(userMediaID, allowed, "", ""), m_page.pageID());
</del><ins>+ m_page.process().send(Messages::WebPage::DidReceiveUserMediaPermissionDecision(userMediaID, allowed, videoDeviceUID, audioDeviceUID), m_page.pageID());
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(allowed);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserMediaPermissionRequestManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.h (188384 => 188385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.h 2015-08-13 17:25:01 UTC (rev 188384)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.h 2015-08-13 17:33:43 UTC (rev 188385)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> PassRefPtr<UserMediaPermissionRequestProxy> createRequest(uint64_t userMediaID, bool audio, bool video, const Vector<String>& deviceUIDsVideo, const Vector<String>& deviceUIDsAudio);
</span><span class="cx">
</span><span class="cx"> // Called by UserMediaPermissionRequestProxy when a decision is made by the user.
</span><del>- void didReceiveUserMediaPermissionDecision(uint64_t, bool allow);
</del><ins>+ void didReceiveUserMediaPermissionDecision(uint64_t, bool allow, const String& videoDeviceUID, const String& audioDeviceUID);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> HashMap<uint64_t, RefPtr<UserMediaPermissionRequestProxy>> m_pendingRequests;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserMediaPermissionRequestProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.cpp (188384 => 188385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.cpp 2015-08-13 17:25:01 UTC (rev 188384)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.cpp 2015-08-13 17:33:43 UTC (rev 188385)
</span><span class="lines">@@ -36,14 +36,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UserMediaPermissionRequestProxy::allow()
</del><ins>+void UserMediaPermissionRequestProxy::allow(const String& videoDeviceUID, const String& audioDeviceUID)
</ins><span class="cx"> {
</span><del>- m_manager.didReceiveUserMediaPermissionDecision(m_userMediaID, true);
</del><ins>+ m_manager.didReceiveUserMediaPermissionDecision(m_userMediaID, true, videoDeviceUID, audioDeviceUID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UserMediaPermissionRequestProxy::deny()
</span><span class="cx"> {
</span><del>- m_manager.didReceiveUserMediaPermissionDecision(m_userMediaID, false);
</del><ins>+ m_manager.didReceiveUserMediaPermissionDecision(m_userMediaID, false, emptyString(), emptyString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UserMediaPermissionRequestProxy::invalidate()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserMediaPermissionRequestProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.h (188384 => 188385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.h 2015-08-13 17:25:01 UTC (rev 188384)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.h 2015-08-13 17:33:43 UTC (rev 188385)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> return adoptRef(new UserMediaPermissionRequestProxy(manager, userMediaID, requiresAudio, requiresVideo, deviceUIDsVideo, deviceUIDsAudio));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void allow();
</del><ins>+ void allow(const String& videoDeviceUID, const String& audioDeviceUID);
</ins><span class="cx"> void deny();
</span><span class="cx">
</span><span class="cx"> void invalidate();
</span><span class="lines">@@ -50,6 +50,9 @@
</span><span class="cx">
</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><ins>+
+ const String& firstVideoDeviceUID() const { return !videoDeviceUIDs().isEmpty() ? videoDeviceUIDs().at(0) : emptyString(); }
+ const String& firstAudioDeviceUID() const { return !audioDeviceUIDs().isEmpty() ? audioDeviceUIDs().at(0) : emptyString(); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> UserMediaPermissionRequestProxy(UserMediaPermissionRequestManagerProxy&, uint64_t userMediaID, bool requiresAudio, bool requiresVideo, const Vector<String>& deviceUIDsVideo, const Vector<String>& deviceUIDsAudio);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessMediaStreamUserMediaPermissionRequestManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp (188384 => 188385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp 2015-08-13 17:25:01 UTC (rev 188384)
+++ trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp 2015-08-13 17:33:43 UTC (rev 188385)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> m_requestToIDMap.remove(request);
</span><span class="cx">
</span><span class="cx"> if (allowed)
</span><del>- request->userMediaAccessGranted();
</del><ins>+ request->userMediaAccessGranted(deviceUIDVideo, deviceUIDAudio);
</ins><span class="cx"> else
</span><span class="cx"> request->userMediaAccessDenied();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2UserMediacpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp (188384 => 188385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp 2015-08-13 17:25:01 UTC (rev 188384)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp 2015-08-13 17:33:43 UTC (rev 188385)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> void decidePolicyForUserMediaPermissionRequestCallBack(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKUserMediaPermissionRequestRef permissionRequest, const void* /* clientInfo */)
</span><span class="cx"> {
</span><del>- WKUserMediaPermissionRequestAllow(permissionRequest);
</del><ins>+ WKUserMediaPermissionRequestAllowBest(permissionRequest);
</ins><span class="cx"> done = true;
</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 (188384 => 188385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2015-08-13 17:25:01 UTC (rev 188384)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2015-08-13 17:33:43 UTC (rev 188385)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "PlatformWebView.h"
</span><span class="cx"> #include "StringFunctions.h"
</span><span class="cx"> #include "TestInvocation.h"
</span><ins>+#include <WebKit/WKArray.h>
</ins><span class="cx"> #include <WebKit/WKAuthenticationChallenge.h>
</span><span class="cx"> #include <WebKit/WKAuthenticationDecisionListener.h>
</span><span class="cx"> #include <WebKit/WKContextConfigurationRef.h>
</span><span class="lines">@@ -1492,9 +1493,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (auto& request : m_userMediaPermissionRequests) {
</span><del>- if (m_isUserMediaPermissionAllowed)
- WKUserMediaPermissionRequestAllow(request.get());
- else
</del><ins>+ if (m_isUserMediaPermissionAllowed) {
+ if (WKArrayGetSize(WKUserMediaPermissionRequestDeviceNamesVideo(request.get())) || WKArrayGetSize(WKUserMediaPermissionRequestDeviceNamesAudio(request.get())))
+ WKUserMediaPermissionRequestAllow(request.get(), WKUserMediaPermissionRequestFirstVideoDeviceUID(request.get()), WKUserMediaPermissionRequestFirstAudioDeviceUID(request.get()));
+ } else
</ins><span class="cx"> WKUserMediaPermissionRequestDeny(request.get());
</span><span class="cx"> }
</span><span class="cx"> m_userMediaPermissionRequests.clear();
</span></span></pre>
</div>
</div>
</body>
</html>