<!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>[190262] 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/190262">190262</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-09-25 19:23:00 -0700 (Fri, 25 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up user media request internal API
https://bugs.webkit.org/show_bug.cgi?id=149527
Reviewed by Tim Horton.
Source/WebCore:
No new tests, no functional change.
* Modules/mediastream/UserMediaRequest.cpp:
(WebCore::UserMediaRequest::constraintsValidated): Use track persistent ID to create vectors
as that is what the platform code needs to map to a capture device.
(WebCore::UserMediaRequest::userMediaAccessGranted): m_chosenXXDeviceUID -> m_XXDeviceUIDAllowed.
Use the device IDs to create the MediaStream. Switch audio/video parameter order.
(WebCore::UserMediaRequest::didCreateStream): Don't assume constraints are valid.
* Modules/mediastream/UserMediaRequest.h:
(WebCore::UserMediaRequest::videoDeviceUIDs):
(WebCore::UserMediaRequest::audioDeviceUIDs):
(WebCore::UserMediaRequest::allowedVideoDeviceUID):
(WebCore::UserMediaRequest::allowedAudioDeviceUID):
(WebCore::UserMediaRequest::requiresAudio): Deleted.
(WebCore::UserMediaRequest::requiresVideo): Deleted.
(WebCore::UserMediaRequest::firstVideoDeviceUID): Deleted.
(WebCore::UserMediaRequest::firstAudioDeviceUID): Deleted.
* platform/mediastream/mac/AVMediaCaptureSource.mm:
(WebCore::AVMediaCaptureSource::AVMediaCaptureSource): Call setPersistentId.
Source/WebKit/mac:
* WebCoreSupport/WebUserMediaClient.mm:
(WebUserMediaClient::cancelRequest): Put UserMediaRequestsMap in a local instead or calling
userMediaRequestsMap() three times.
(-[WebUserMediaPolicyListener allow]): Get rid of unneeded local variables.
(-[WebUserMediaPolicyListener allowDeviceWithVideoUID]): Deleted, unused.
Source/WebKit2:
* UIProcess/API/C/WKUserMediaPermissionRequest.cpp:
(WKUserMediaPermissionRequestVideoDeviceUIDs): New, renamed from WKUserMediaPermissionRequestDeviceNamesVideo.
(WKUserMediaPermissionRequestAudioDeviceUIDs): New, renamed from WKUserMediaPermissionRequestDeviceNamesAudio.
(WKUserMediaPermissionRequestAllowBest): Deleted.
(WKUserMediaPermissionRequestDeviceNamesVideo): Deleted.
(WKUserMediaPermissionRequestDeviceNamesAudio): Deleted.
(WKUserMediaPermissionRequestFirstVideoDeviceUID): Deleted.
(WKUserMediaPermissionRequestFirstAudioDeviceUID): Deleted.
* UIProcess/API/C/WKUserMediaPermissionRequest.h:
* UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp:
(webkitUserMediaPermissionRequestAllow): Update for UserMediaRequest API change.
* UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
(WebKit::UserMediaPermissionRequestManagerProxy::createRequest): Get rid of the bool parameters.
Switch audio/video parameter order to be consistent with everywhere else.
(WebKit::UserMediaPermissionRequestManagerProxy::didReceiveUserMediaPermissionDecision): Ditto.
* UIProcess/UserMediaPermissionRequestManagerProxy.h:
* UIProcess/UserMediaPermissionRequestProxy.cpp:
(WebKit::UserMediaPermissionRequestProxy::UserMediaPermissionRequestProxy): Get rid of the bool parameters.
Switch audio/video parameter order to be consistent with everywhere else.
(WebKit::UserMediaPermissionRequestProxy::allow): Switch audio/video parameter order.
(WebKit::UserMediaPermissionRequestProxy::getDeviceNameForUID): Deleted.
* UIProcess/UserMediaPermissionRequestProxy.h:
(WebKit::UserMediaPermissionRequestProxy::create):
(WebKit::UserMediaPermissionRequestProxy::videoDeviceUIDs):
(WebKit::UserMediaPermissionRequestProxy::audioDeviceUIDs):
(WebKit::UserMediaPermissionRequestProxy::firstAudioDeviceUID):
(WebKit::UserMediaPermissionRequestProxy::requiresAudio): Deleted.
(WebKit::UserMediaPermissionRequestProxy::requiresVideo): Deleted.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::requestUserMediaPermissionForFrame): Get rid of the bool parameters.
Switch audio/video parameter order to be consistent with everywhere else.
* UIProcess/WebPageProxy.h: Ditto.
* UIProcess/WebPageProxy.messages.in: Ditto.
* WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
(WebKit::UserMediaPermissionRequestManager::startRequest): Get rid of bool params, the device
vectors have the same information.
(WebKit::UserMediaPermissionRequestManager::didReceiveUserMediaPermissionDecision): Switch audio/video
parameter order to be consistent with everywhere else. deviceUIDVideo -> videoDeviceUID,
deviceUIDAudio -> audioDeviceUID.
* WebProcess/MediaStream/UserMediaPermissionRequestManager.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::didReceiveUserMediaPermissionDecision): Switch audio/video parameter order.
* WebProcess/WebPage/WebPage.h:
Tools:
* TestWebKitAPI/Tests/WebKit2/UserMedia.cpp:
(TestWebKitAPI::decidePolicyForUserMediaPermissionRequestCallBack): Update for API changes.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::decidePolicyForUserMediaPermissionRequestIfPossible): Ditto.</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="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm</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="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessMediaStreamUserMediaPermissionRequestManagercpp">trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessMediaStreamUserMediaPermissionRequestManagerh">trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscomappleWebProcesssbin">trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</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 (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebCore/ChangeLog 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-09-25 Eric Carlson <eric.carlson@apple.com>
+
+ Clean up user media request internal API
+ https://bugs.webkit.org/show_bug.cgi?id=149527
+
+ Reviewed by Tim Horton.
+
+ No new tests, no functional change.
+
+ * Modules/mediastream/UserMediaRequest.cpp:
+ (WebCore::UserMediaRequest::constraintsValidated): Use track persistent ID to create vectors
+ as that is what the platform code needs to map to a capture device.
+ (WebCore::UserMediaRequest::userMediaAccessGranted): m_chosenXXDeviceUID -> m_XXDeviceUIDAllowed.
+ Use the device IDs to create the MediaStream. Switch audio/video parameter order.
+ (WebCore::UserMediaRequest::didCreateStream): Don't assume constraints are valid.
+ * Modules/mediastream/UserMediaRequest.h:
+ (WebCore::UserMediaRequest::videoDeviceUIDs):
+ (WebCore::UserMediaRequest::audioDeviceUIDs):
+ (WebCore::UserMediaRequest::allowedVideoDeviceUID):
+ (WebCore::UserMediaRequest::allowedAudioDeviceUID):
+ (WebCore::UserMediaRequest::requiresAudio): Deleted.
+ (WebCore::UserMediaRequest::requiresVideo): Deleted.
+ (WebCore::UserMediaRequest::firstVideoDeviceUID): Deleted.
+ (WebCore::UserMediaRequest::firstAudioDeviceUID): Deleted.
+
+ * platform/mediastream/mac/AVMediaCaptureSource.mm:
+ (WebCore::AVMediaCaptureSource::AVMediaCaptureSource): Call setPersistentId.
+
</ins><span class="cx"> 2015-09-25 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement scoped styling for shadow DOM
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -125,9 +125,10 @@
</span><span class="cx"> void UserMediaRequest::constraintsValidated(const Vector<RefPtr<RealtimeMediaSource>>& videoTracks, const Vector<RefPtr<RealtimeMediaSource>>& audioTracks)
</span><span class="cx"> {
</span><span class="cx"> for (auto& audioTrack : audioTracks)
</span><del>- m_audioDeviceUIDs.append(audioTrack->id());
</del><ins>+ m_audioDeviceUIDs.append(audioTrack->persistentID());
</ins><span class="cx"> for (auto& videoTrack : videoTracks)
</span><del>- m_videoDeviceUIDs.append(videoTrack->id());
</del><ins>+ m_videoDeviceUIDs.append(videoTrack->persistentID());
+
</ins><span class="cx"> RefPtr<UserMediaRequest> protectedThis(this);
</span><span class="cx"> callOnMainThread([protectedThis] {
</span><span class="cx"> // 2 - The constraints are valid, ask the user for access to media.
</span><span class="lines">@@ -136,14 +137,15 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UserMediaRequest::userMediaAccessGranted(const String& videoDeviceUID, const String& audioDeviceUID)
</del><ins>+void UserMediaRequest::userMediaAccessGranted(const String& audioDeviceUID, const String& videoDeviceUID)
</ins><span class="cx"> {
</span><del>- m_chosenVideoDeviceUID = videoDeviceUID;
- m_chosenAudioDeviceUID = audioDeviceUID;
</del><ins>+ m_allowedVideoDeviceUID = videoDeviceUID;
+ m_audioDeviceUIDAllowed = audioDeviceUID;
+
</ins><span class="cx"> RefPtr<UserMediaRequest> protectedThis(this);
</span><del>- callOnMainThread([protectedThis] {
</del><ins>+ callOnMainThread([protectedThis, audioDeviceUID, videoDeviceUID] {
</ins><span class="cx"> // 3 - the user granted access, ask platform to create the media stream descriptors.
</span><del>- RealtimeMediaSourceCenter::singleton().createMediaStream(protectedThis.get(), protectedThis->m_audioConstraints, protectedThis->m_videoConstraints);
</del><ins>+ RealtimeMediaSourceCenter::singleton().createMediaStream(protectedThis.get(), audioDeviceUID, videoDeviceUID);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -164,10 +166,14 @@
</span><span class="cx">
</span><span class="cx"> // 4 - Create the MediaStream and pass it to the success callback.
</span><span class="cx"> RefPtr<MediaStream> stream = MediaStream::create(*m_scriptExecutionContext, privateStream);
</span><del>- for (auto& track : stream->getAudioTracks())
- track->applyConstraints(*m_audioConstraints);
- for (auto& track : stream->getVideoTracks())
- track->applyConstraints(*m_videoConstraints);
</del><ins>+ if (m_audioConstraints) {
+ for (auto& track : stream->getAudioTracks())
+ track->applyConstraints(*m_audioConstraints);
+ }
+ if (m_videoConstraints) {
+ for (auto& track : stream->getVideoTracks())
+ track->applyConstraints(*m_videoConstraints);
+ }
</ins><span class="cx">
</span><span class="cx"> m_promise.resolve(stream);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -65,18 +65,18 @@
</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(const String& videoDeviceUID, const String& audioDeviceUID);
</del><ins>+ WEBCORE_EXPORT void userMediaAccessGranted(const String& audioDeviceUID, const String& videoDeviceUID);
</ins><span class="cx"> WEBCORE_EXPORT void userMediaAccessDenied();
</span><span class="cx">
</span><del>- bool requiresAudio() const { return m_audioConstraints; }
- bool requiresVideo() const { return m_videoConstraints; }
-
- const Vector<String>& videoDeviceUIDs() const { return m_videoDeviceUIDs; }
</del><ins>+ bool requiresAudio() const { return m_audioDeviceUIDs.size(); }
+ bool requiresVideo() const { return m_videoDeviceUIDs.size(); }
+
</ins><span class="cx"> const Vector<String>& audioDeviceUIDs() const { return m_audioDeviceUIDs; }
</span><del>-
- const String& firstVideoDeviceUID() const { return !videoDeviceUIDs().isEmpty() ? videoDeviceUIDs().at(0) : emptyString(); }
- const String& firstAudioDeviceUID() const { return !audioDeviceUIDs().isEmpty() ? audioDeviceUIDs().at(0) : emptyString(); }
</del><ins>+ const Vector<String>& videoDeviceUIDs() const { return m_videoDeviceUIDs; }
</ins><span class="cx">
</span><ins>+ const String& allowedAudioDeviceUID() const { return m_audioDeviceUIDAllowed; }
+ const String& allowedVideoDeviceUID() const { return m_allowedVideoDeviceUID; }
+
</ins><span class="cx"> private:
</span><span class="cx"> UserMediaRequest(ScriptExecutionContext*, UserMediaController*, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints, MediaDevices::Promise&&);
</span><span class="cx">
</span><span class="lines">@@ -95,12 +95,11 @@
</span><span class="cx">
</span><span class="cx"> Vector<String> m_videoDeviceUIDs;
</span><span class="cx"> Vector<String> m_audioDeviceUIDs;
</span><del>-
- String m_chosenVideoDeviceUID;
- String m_chosenAudioDeviceUID;
-
- UserMediaController* m_controller;
</del><span class="cx">
</span><ins>+ String m_allowedVideoDeviceUID;
+ String m_audioDeviceUIDAllowed;
+
+ UserMediaController* m_controller;
</ins><span class="cx"> MediaDevices::Promise m_promise;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_id.isEmpty())
</span><span class="cx"> m_id = createCanonicalUUIDString();
</span><del>- m_persistentId = m_id;
</del><ins>+ m_persistentID = m_id;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RealtimeMediaSource::reset()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -70,8 +70,8 @@
</span><span class="cx">
</span><span class="cx"> const String& id() const { return m_id; }
</span><span class="cx">
</span><del>- const String& persistentId() const { return m_persistentId; }
- virtual void setPersistentId(const String& persistentId) { m_persistentId = persistentId; }
</del><ins>+ const String& persistentID() const { return m_persistentID; }
+ virtual void setPersistentID(const String& persistentID) { m_persistentID = persistentID; }
</ins><span class="cx">
</span><span class="cx"> enum Type { None, Audio, Video };
</span><span class="cx"> Type type() const { return m_type; }
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> String m_id;
</span><del>- String m_persistentId;
</del><ins>+ String m_persistentID;
</ins><span class="cx"> Type m_type;
</span><span class="cx"> String m_name;
</span><span class="cx"> bool m_stopped;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -130,6 +130,7 @@
</span><span class="cx"> , m_isRunning(false)
</span><span class="cx"> {
</span><span class="cx"> setName(device.localizedName);
</span><ins>+ setPersistentID(device.uniqueID);
</ins><span class="cx"> m_currentStates.setSourceType(type == RealtimeMediaSource::Video ? RealtimeMediaSourceStates::Camera : RealtimeMediaSourceStates::Microphone);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-09-25 Eric Carlson <eric.carlson@apple.com>
+
+ Clean up user media request internal API
+ https://bugs.webkit.org/show_bug.cgi?id=149527
+
+ Reviewed by Tim Horton.
+
+ * WebCoreSupport/WebUserMediaClient.mm:
+ (WebUserMediaClient::cancelRequest): Put UserMediaRequestsMap in a local instead or calling
+ userMediaRequestsMap() three times.
+ (-[WebUserMediaPolicyListener allow]): Get rid of unneeded local variables.
+ (-[WebUserMediaPolicyListener allowDeviceWithVideoUID]): Deleted, unused.
+
</ins><span class="cx"> 2015-09-22 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Disable QuickLook on tvOS
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebUserMediaClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> }
</span><span class="cx"> - (id)initWithUserMediaRequest:(PassRefPtr<UserMediaRequest>)request;
</span><span class="cx"> - (void)cancelRequest;
</span><del>-- (void)allowDeviceWithVideoUID:(const String&)videoUID andAudioUID:(const String&)audioUID;
</del><span class="cx"> - (void)deny;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -114,12 +113,13 @@
</span><span class="cx">
</span><span class="cx"> void WebUserMediaClient::cancelRequest(UserMediaRequest& request)
</span><span class="cx"> {
</span><del>- UserMediaRequestsMap::iterator it = userMediaRequestsMap().find(&request);
- if (it == userMediaRequestsMap().end())
</del><ins>+ UserMediaRequestsMap& requestsMap = userMediaRequestsMap();
+ UserMediaRequestsMap::iterator it = requestsMap.find(&request);
+ if (it == requestsMap.end())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> [it->value cancelRequest];
</span><del>- userMediaRequestsMap().remove(it);
</del><ins>+ requestsMap.remove(it);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -153,22 +153,8 @@
</span><span class="cx"> if (!_request)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- const String& videoUID = _request->firstVideoDeviceUID();
- const String& audioUID = _request->firstAudioDeviceUID();
-
- _request->userMediaAccessGranted(videoUID, audioUID);
- RemoveRequestFromMap(_request.get());
-#endif
-}
</del><ins>+ _request->userMediaAccessGranted(_request->allowedAudioDeviceUID(), _request->allowedVideoDeviceUID());
</ins><span class="cx">
</span><del>-- (void)allowDeviceWithVideoUID:(const String&)videoUID andAudioUID:(const String&)audioUID
-{
-#if ENABLE(MEDIA_STREAM)
- if (!_request)
- return;
-
- _request->userMediaAccessGranted(videoUID, audioUID);
-
</del><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 (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -1,3 +1,60 @@
</span><ins>+2015-09-25 Eric Carlson <eric.carlson@apple.com>
+
+ Clean up user media request internal API
+ https://bugs.webkit.org/show_bug.cgi?id=149527
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/C/WKUserMediaPermissionRequest.cpp:
+ (WKUserMediaPermissionRequestVideoDeviceUIDs): New, renamed from WKUserMediaPermissionRequestDeviceNamesVideo.
+ (WKUserMediaPermissionRequestAudioDeviceUIDs): New, renamed from WKUserMediaPermissionRequestDeviceNamesAudio.
+ (WKUserMediaPermissionRequestAllowBest): Deleted.
+ (WKUserMediaPermissionRequestDeviceNamesVideo): Deleted.
+ (WKUserMediaPermissionRequestDeviceNamesAudio): Deleted.
+ (WKUserMediaPermissionRequestFirstVideoDeviceUID): Deleted.
+ (WKUserMediaPermissionRequestFirstAudioDeviceUID): Deleted.
+ * UIProcess/API/C/WKUserMediaPermissionRequest.h:
+
+ * UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp:
+ (webkitUserMediaPermissionRequestAllow): Update for UserMediaRequest API change.
+
+ * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+ (WebKit::UserMediaPermissionRequestManagerProxy::createRequest): Get rid of the bool parameters.
+ Switch audio/video parameter order to be consistent with everywhere else.
+ (WebKit::UserMediaPermissionRequestManagerProxy::didReceiveUserMediaPermissionDecision): Ditto.
+ * UIProcess/UserMediaPermissionRequestManagerProxy.h:
+
+ * UIProcess/UserMediaPermissionRequestProxy.cpp:
+ (WebKit::UserMediaPermissionRequestProxy::UserMediaPermissionRequestProxy): Get rid of the bool parameters.
+ Switch audio/video parameter order to be consistent with everywhere else.
+ (WebKit::UserMediaPermissionRequestProxy::allow): Switch audio/video parameter order.
+ (WebKit::UserMediaPermissionRequestProxy::getDeviceNameForUID): Deleted.
+ * UIProcess/UserMediaPermissionRequestProxy.h:
+ (WebKit::UserMediaPermissionRequestProxy::create):
+ (WebKit::UserMediaPermissionRequestProxy::videoDeviceUIDs):
+ (WebKit::UserMediaPermissionRequestProxy::audioDeviceUIDs):
+ (WebKit::UserMediaPermissionRequestProxy::firstAudioDeviceUID):
+ (WebKit::UserMediaPermissionRequestProxy::requiresAudio): Deleted.
+ (WebKit::UserMediaPermissionRequestProxy::requiresVideo): Deleted.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::requestUserMediaPermissionForFrame): Get rid of the bool parameters.
+ Switch audio/video parameter order to be consistent with everywhere else.
+ * UIProcess/WebPageProxy.h: Ditto.
+ * UIProcess/WebPageProxy.messages.in: Ditto.
+
+ * WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
+ (WebKit::UserMediaPermissionRequestManager::startRequest): Get rid of bool params, the device
+ vectors have the same information.
+ (WebKit::UserMediaPermissionRequestManager::didReceiveUserMediaPermissionDecision): Switch audio/video
+ parameter order to be consistent with everywhere else. deviceUIDVideo -> videoDeviceUID,
+ deviceUIDAudio -> audioDeviceUID.
+ * WebProcess/MediaStream/UserMediaPermissionRequestManager.h:
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::didReceiveUserMediaPermissionDecision): Switch audio/video parameter order.
+ * WebProcess/WebPage/WebPage.h:
+
</ins><span class="cx"> 2015-09-25 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] Add viewport tests and fix runUIScript() timing issues
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKUserMediaPermissionRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.cpp (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.cpp 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.cpp 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -33,53 +33,32 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-void WKUserMediaPermissionRequestAllowBest(WKUserMediaPermissionRequestRef userMediaPermissionRequestRef)
</del><ins>+void WKUserMediaPermissionRequestAllow(WKUserMediaPermissionRequestRef userMediaPermissionRequestRef, WKStringRef audioDeviceUID, WKStringRef videoDeviceUID)
</ins><span class="cx"> {
</span><del>- const String& videoDevice = toImpl(userMediaPermissionRequestRef)->firstVideoDeviceUID();
- const String& audioDevice = toImpl(userMediaPermissionRequestRef)->firstAudioDeviceUID();
- toImpl(userMediaPermissionRequestRef)->allow(videoDevice, audioDevice);
</del><ins>+ toImpl(userMediaPermissionRequestRef)->allow(toWTFString(audioDeviceUID), toWTFString(videoDeviceUID));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKUserMediaPermissionRequestAllow(WKUserMediaPermissionRequestRef userMediaPermissionRequestRef, WKStringRef videoDeviceUID, WKStringRef audioDeviceUID)
-{
- toImpl(userMediaPermissionRequestRef)->allow(toWTFString(videoDeviceUID), toWTFString(audioDeviceUID));
-}
-
</del><span class="cx"> void WKUserMediaPermissionRequestDeny(WKUserMediaPermissionRequestRef userMediaPermissionRequestRef)
</span><span class="cx"> {
</span><span class="cx"> toImpl(userMediaPermissionRequestRef)->deny();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WKArrayRef WKUserMediaPermissionRequestDeviceNamesVideo(WKUserMediaPermissionRequestRef userMediaPermissionRef)
</del><ins>+WKArrayRef WKUserMediaPermissionRequestVideoDeviceUIDs(WKUserMediaPermissionRequestRef userMediaPermissionRef)
</ins><span class="cx"> {
</span><span class="cx"> WKMutableArrayRef array = WKMutableArrayCreate();
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><del>- for (auto& name : toImpl(userMediaPermissionRef)->videoDeviceUIDs()) {
- String deviceName = toImpl(userMediaPermissionRef)->getDeviceNameForUID(name, WebCore::RealtimeMediaSource::Type::Video);
- WKArrayAppendItem(array, toAPI(API::String::create(deviceName).ptr()));
- }
</del><ins>+ for (auto& deviceUID : toImpl(userMediaPermissionRef)->videoDeviceUIDs())
+ WKArrayAppendItem(array, toAPI(API::String::create(deviceUID).ptr()));
</ins><span class="cx"> #endif
</span><span class="cx"> return array;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WKArrayRef WKUserMediaPermissionRequestDeviceNamesAudio(WKUserMediaPermissionRequestRef userMediaPermissionRef)
</del><ins>+WKArrayRef WKUserMediaPermissionRequestAudioDeviceUIDs(WKUserMediaPermissionRequestRef userMediaPermissionRef)
</ins><span class="cx"> {
</span><span class="cx"> WKMutableArrayRef array = WKMutableArrayCreate();
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><del>- for (auto& name : toImpl(userMediaPermissionRef)->audioDeviceUIDs()) {
- String deviceName = toImpl(userMediaPermissionRef)->getDeviceNameForUID(name, WebCore::RealtimeMediaSource::Type::Audio);
- WKArrayAppendItem(array, toAPI(API::String::create(deviceName).ptr()));
- }
</del><ins>+ for (auto& deviceUID : toImpl(userMediaPermissionRef)->audioDeviceUIDs())
+ WKArrayAppendItem(array, toAPI(API::String::create(deviceUID).ptr()));
</ins><span class="cx"> #endif
</span><span class="cx"> return array;
</span><span class="cx"> }
</span><del>-
-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(""));
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKUserMediaPermissionRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.h (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.h 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.h 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -27,15 +27,11 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKTypeID WKUserMediaPermissionRequestGetTypeID();
</span><span class="cx">
</span><del>-WK_EXPORT void WKUserMediaPermissionRequestAllowBest(WKUserMediaPermissionRequestRef);
-WK_EXPORT void WKUserMediaPermissionRequestAllow(WKUserMediaPermissionRequestRef, WKStringRef videoDeviceUID, WKStringRef audioDeviceUID);
</del><ins>+WK_EXPORT void WKUserMediaPermissionRequestAllow(WKUserMediaPermissionRequestRef, WKStringRef audioDeviceUID, WKStringRef videoDeviceUID);
</ins><span class="cx"> WK_EXPORT void WKUserMediaPermissionRequestDeny(WKUserMediaPermissionRequestRef);
</span><span class="cx">
</span><del>-WK_EXPORT WKArrayRef WKUserMediaPermissionRequestDeviceNamesVideo(WKUserMediaPermissionRequestRef);
-WK_EXPORT WKArrayRef WKUserMediaPermissionRequestDeviceNamesAudio(WKUserMediaPermissionRequestRef);
-
-WK_EXPORT WKStringRef WKUserMediaPermissionRequestFirstVideoDeviceUID(WKUserMediaPermissionRequestRef);
-WK_EXPORT WKStringRef WKUserMediaPermissionRequestFirstAudioDeviceUID(WKUserMediaPermissionRequestRef);
</del><ins>+WK_EXPORT WKArrayRef WKUserMediaPermissionRequestVideoDeviceUIDs(WKUserMediaPermissionRequestRef);
+WK_EXPORT WKArrayRef WKUserMediaPermissionRequestAudioDeviceUIDs(WKUserMediaPermissionRequestRef);
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitUserMediaPermissionRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -71,10 +71,13 @@
</span><span class="cx">
</span><span class="cx"> priv->madeDecision = true;
</span><span class="cx">
</span><del>- const String& videoDevice = priv->request->firstVideoDeviceUID();
- const String& audioDevice = priv->request->firstAudioDeviceUID();
</del><ins>+ auto videoDeviceUIDs = priv->request->videoDeviceUIDs();
+ auto audioDeviceUIDs = priv->request->audioDeviceUIDs();
+
+ auto videoDevice = !videoDeviceUIDs.isEmpty() ? videoDeviceUIDs[0] : emptyString();
+ auto audioDevice = !audioDeviceUIDs.isEmpty() ? audioDeviceUIDs[0] : emptyString();
</ins><span class="cx">
</span><del>- priv->request->allow(videoDevice, audioDevice);
</del><ins>+ priv->request->allow(audioDevice, videoDevice);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void webkitUserMediaPermissionRequestDeny(WebKitPermissionRequest* request)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserMediaPermissionRequestManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -38,14 +38,14 @@
</span><span class="cx"> m_pendingRequests.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<UserMediaPermissionRequestProxy> UserMediaPermissionRequestManagerProxy::createRequest(uint64_t userMediaID, bool requiresAudio, bool requiresVideo, const Vector<String>& deviceUIDsVideo, const Vector<String>& deviceUIDsAudio)
</del><ins>+PassRefPtr<UserMediaPermissionRequestProxy> UserMediaPermissionRequestManagerProxy::createRequest(uint64_t userMediaID, const Vector<String>& audioDeviceUIDs, const Vector<String>& videoDeviceUIDs)
</ins><span class="cx"> {
</span><del>- RefPtr<UserMediaPermissionRequestProxy> request = UserMediaPermissionRequestProxy::create(*this, userMediaID, requiresAudio, requiresVideo, deviceUIDsVideo, deviceUIDsAudio);
</del><ins>+ RefPtr<UserMediaPermissionRequestProxy> request = UserMediaPermissionRequestProxy::create(*this, userMediaID, audioDeviceUIDs, videoDeviceUIDs);
</ins><span class="cx"> m_pendingRequests.add(userMediaID, request.get());
</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, const String& videoDeviceUID, const String& audioDeviceUID)
</del><ins>+void UserMediaPermissionRequestManagerProxy::didReceiveUserMediaPermissionDecision(uint64_t userMediaID, bool allowed, const String& audioDeviceUID, const String& videoDeviceUID)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_page.isValid())
</span><span class="cx"> return;
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><del>- m_page.process().send(Messages::WebPage::DidReceiveUserMediaPermissionDecision(userMediaID, allowed, videoDeviceUID, audioDeviceUID), m_page.pageID());
</del><ins>+ m_page.process().send(Messages::WebPage::DidReceiveUserMediaPermissionDecision(userMediaID, allowed, audioDeviceUID, videoDeviceUID), 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 (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.h 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.h 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -33,10 +33,10 @@
</span><span class="cx"> void invalidateRequests();
</span><span class="cx">
</span><span class="cx"> // Create a request to be presented to the user.
</span><del>- PassRefPtr<UserMediaPermissionRequestProxy> createRequest(uint64_t userMediaID, bool audio, bool video, const Vector<String>& deviceUIDsVideo, const Vector<String>& deviceUIDsAudio);
</del><ins>+ PassRefPtr<UserMediaPermissionRequestProxy> createRequest(uint64_t userMediaID, const Vector<String>& audioDeviceUIDs, const Vector<String>& videoDeviceUIDs);
</ins><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, const String& videoDeviceUID, const String& audioDeviceUID);
</del><ins>+ void didReceiveUserMediaPermissionDecision(uint64_t, bool allow, const String& audioDeviceUID, const String& videoDeviceUID);
</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 (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.cpp 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.cpp 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -26,19 +26,17 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-UserMediaPermissionRequestProxy::UserMediaPermissionRequestProxy(UserMediaPermissionRequestManagerProxy& manager, uint64_t userMediaID, bool requiresAudio, bool requiresVideo, const Vector<String>& deviceUIDsVideo, const Vector<String>& deviceUIDsAudio)
</del><ins>+UserMediaPermissionRequestProxy::UserMediaPermissionRequestProxy(UserMediaPermissionRequestManagerProxy& manager, uint64_t userMediaID, const Vector<String>& audioDeviceUIDs, const Vector<String>& videoDeviceUIDs)
</ins><span class="cx"> : m_manager(manager)
</span><span class="cx"> , m_userMediaID(userMediaID)
</span><del>- , m_requiresAudio(requiresAudio)
- , m_requiresVideo(requiresVideo)
- , m_videoDeviceUIDs(deviceUIDsVideo)
- , m_audiodeviceUIDs(deviceUIDsAudio)
</del><ins>+ , m_videoDeviceUIDs(videoDeviceUIDs)
+ , m_audioDeviceUIDs(audioDeviceUIDs)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UserMediaPermissionRequestProxy::allow(const String& videoDeviceUID, const String& audioDeviceUID)
</del><ins>+void UserMediaPermissionRequestProxy::allow(const String& audioDeviceUID, const String& videoDeviceUID)
</ins><span class="cx"> {
</span><del>- m_manager.didReceiveUserMediaPermissionDecision(m_userMediaID, true, videoDeviceUID, audioDeviceUID);
</del><ins>+ m_manager.didReceiveUserMediaPermissionDecision(m_userMediaID, true, audioDeviceUID, videoDeviceUID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UserMediaPermissionRequestProxy::deny()
</span><span class="lines">@@ -51,12 +49,5 @@
</span><span class="cx"> m_manager.invalidateRequests();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(MEDIA_STREAM)
-const String& UserMediaPermissionRequestProxy::getDeviceNameForUID(const String& UID, WebCore::RealtimeMediaSource::Type type)
-{
- return WebCore::RealtimeMediaSourceCenter::singleton().sourceWithUID(UID, type, nullptr)->label();
-}
-#endif
-
</del><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserMediaPermissionRequestProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.h (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.h 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.h 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -31,9 +31,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 PassRefPtr<UserMediaPermissionRequestProxy> create(UserMediaPermissionRequestManagerProxy& manager, uint64_t userMediaID, bool requiresAudio, bool requiresVideo, const Vector<String>& deviceUIDsVideo, const Vector<String>& deviceUIDsAudio)
</del><ins>+ static PassRefPtr<UserMediaPermissionRequestProxy> create(UserMediaPermissionRequestManagerProxy& manager, uint64_t userMediaID, const Vector<String>& videoDeviceUIDs, const Vector<String>& audioDeviceUIDs)
</ins><span class="cx"> {
</span><del>- return adoptRef(new UserMediaPermissionRequestProxy(manager, userMediaID, requiresAudio, requiresVideo, deviceUIDsVideo, deviceUIDsAudio));
</del><ins>+ return adoptRef(new UserMediaPermissionRequestProxy(manager, userMediaID, 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">@@ -41,28 +41,22 @@
</span><span class="cx">
</span><span class="cx"> void invalidate();
</span><span class="cx">
</span><del>-#if ENABLE(MEDIA_STREAM)
- const String& getDeviceNameForUID(const String&, WebCore::RealtimeMediaSource::Type);
-#endif
</del><ins>+ bool requiresAudio() const { return m_audioDeviceUIDs.size(); }
+ bool requiresVideo() const { return m_videoDeviceUIDs.size(); }
</ins><span class="cx">
</span><del>- bool requiresAudio() const { return m_requiresAudio; }
- bool requiresVideo() const { return m_requiresVideo; }
-
</del><span class="cx"> const Vector<String>& videoDeviceUIDs() const { return m_videoDeviceUIDs; }
</span><del>- const Vector<String>& audioDeviceUIDs() const { return m_audiodeviceUIDs; }
</del><ins>+ const Vector<String>& audioDeviceUIDs() const { return m_audioDeviceUIDs; }
</ins><span class="cx">
</span><span class="cx"> const String& firstVideoDeviceUID() const { return !videoDeviceUIDs().isEmpty() ? videoDeviceUIDs().at(0) : emptyString(); }
</span><span class="cx"> const String& firstAudioDeviceUID() const { return !audioDeviceUIDs().isEmpty() ? audioDeviceUIDs().at(0) : emptyString(); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- UserMediaPermissionRequestProxy(UserMediaPermissionRequestManagerProxy&, uint64_t userMediaID, bool requiresAudio, bool requiresVideo, const Vector<String>& deviceUIDsVideo, const Vector<String>& deviceUIDsAudio);
</del><ins>+ UserMediaPermissionRequestProxy(UserMediaPermissionRequestManagerProxy&, uint64_t userMediaID, 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><del>- bool m_requiresAudio;
- bool m_requiresVideo;
</del><span class="cx"> Vector<String> m_videoDeviceUIDs;
</span><del>- Vector<String> m_audiodeviceUIDs;
</del><ins>+ Vector<String> m_audioDeviceUIDs;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -5279,13 +5279,13 @@
</span><span class="cx"> request->deny();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::requestUserMediaPermissionForFrame(uint64_t userMediaID, uint64_t frameID, String originIdentifier, bool audio, bool video, const Vector<String>& deviceUIDsVideo, const Vector<String>& deviceUIDsAudio)
</del><ins>+void WebPageProxy::requestUserMediaPermissionForFrame(uint64_t userMediaID, uint64_t frameID, String originIdentifier, const Vector<String>& audioDeviceUIDs, const Vector<String>& videoDeviceUIDs)
</ins><span class="cx"> {
</span><span class="cx"> WebFrameProxy* frame = m_process->webFrame(frameID);
</span><span class="cx"> MESSAGE_CHECK(frame);
</span><span class="cx">
</span><span class="cx"> RefPtr<API::SecurityOrigin> origin = API::SecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier));
</span><del>- RefPtr<UserMediaPermissionRequestProxy> request = m_userMediaPermissionRequestManager.createRequest(userMediaID, audio, video, deviceUIDsVideo, deviceUIDsAudio);
</del><ins>+ RefPtr<UserMediaPermissionRequestProxy> request = m_userMediaPermissionRequestManager.createRequest(userMediaID, audioDeviceUIDs, videoDeviceUIDs);
</ins><span class="cx">
</span><span class="cx"> if (!m_uiClient->decidePolicyForUserMediaPermissionRequest(*this, *frame, *origin.get(), *request.get()))
</span><span class="cx"> request->deny();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -1184,7 +1184,7 @@
</span><span class="cx"> void reachedApplicationCacheOriginQuota(const String& originIdentifier, uint64_t currentQuota, uint64_t totalBytesNeeded, PassRefPtr<Messages::WebPageProxy::ReachedApplicationCacheOriginQuota::DelayedReply>);
</span><span class="cx"> void requestGeolocationPermissionForFrame(uint64_t geolocationID, uint64_t frameID, String originIdentifier);
</span><span class="cx">
</span><del>- void requestUserMediaPermissionForFrame(uint64_t userMediaID, uint64_t frameID, String originIdentifier, bool audio, bool video, const Vector<String>& deviceUIDsVideo, const Vector<String>& deviceUIDsAudio);
</del><ins>+ void requestUserMediaPermissionForFrame(uint64_t userMediaID, uint64_t frameID, String originIdentifier, const Vector<String>& audioDeviceUIDs, const Vector<String>& videoDeviceUIDs);
</ins><span class="cx">
</span><span class="cx"> void runModal();
</span><span class="cx"> void notifyScrollerThumbIsVisibleInRect(const WebCore::IntRect&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> # MediaSteam messages
</span><del>- RequestUserMediaPermissionForFrame(uint64_t userMediaID, uint64_t frameID, String originIdentifier, bool audio, bool video, Vector<String> deviceUIDsVideo, Vector<String> deviceUIDsAudio)
</del><ins>+ RequestUserMediaPermissionForFrame(uint64_t userMediaID, uint64_t frameID, String originIdentifier, Vector<String> audioDeviceUIDs, Vector<String> videoDeviceUIDs)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> # Notification messages
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessMediaStreamUserMediaPermissionRequestManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> ASSERT(webFrame);
</span><span class="cx">
</span><span class="cx"> SecurityOrigin* origin = request.securityOrigin();
</span><del>- m_page.send(Messages::WebPageProxy::RequestUserMediaPermissionForFrame(requestID, webFrame->frameID(), origin->databaseIdentifier(), request.requiresAudio(), request.requiresVideo(), request.videoDeviceUIDs(), request.audioDeviceUIDs()));
</del><ins>+ m_page.send(Messages::WebPageProxy::RequestUserMediaPermissionForFrame(requestID, webFrame->frameID(), origin->databaseIdentifier(), request.audioDeviceUIDs(), request.videoDeviceUIDs()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UserMediaPermissionRequestManager::cancelRequest(UserMediaRequest& request)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> m_idToRequestMap.remove(requestID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UserMediaPermissionRequestManager::didReceiveUserMediaPermissionDecision(uint64_t requestID, bool allowed, const String& deviceUIDVideo, const String& deviceUIDAudio)
</del><ins>+void UserMediaPermissionRequestManager::didReceiveUserMediaPermissionDecision(uint64_t requestID, bool allowed, const String& audioDeviceUID, const String& videoDeviceUID)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<UserMediaRequest> request = m_idToRequestMap.take(requestID);
</span><span class="cx"> if (!request)
</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(deviceUIDVideo, deviceUIDAudio);
</del><ins>+ request->userMediaAccessGranted(audioDeviceUID, videoDeviceUID);
</ins><span class="cx"> else
</span><span class="cx"> request->userMediaAccessDenied();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessMediaStreamUserMediaPermissionRequestManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.h (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.h 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.h 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> void startRequest(WebCore::UserMediaRequest&);
</span><span class="cx"> void cancelRequest(WebCore::UserMediaRequest&);
</span><span class="cx">
</span><del>- void didReceiveUserMediaPermissionDecision(uint64_t userMediaID, bool allowed, const String& deviceUIDVideo, const String& deviceUIDAudio);
</del><ins>+ void didReceiveUserMediaPermissionDecision(uint64_t userMediaID, bool allowed, const String& audioDeviceUID, const String& videoDeviceUID);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebPage& m_page;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -3312,9 +3312,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><del>-void WebPage::didReceiveUserMediaPermissionDecision(uint64_t userMediaID, bool allowed, const String& deviceUIDVideo, const String& deviceUIDAudio)
</del><ins>+void WebPage::didReceiveUserMediaPermissionDecision(uint64_t userMediaID, bool allowed, const String& audioDeviceUID, const String& videoDeviceUID)
</ins><span class="cx"> {
</span><del>- m_userMediaPermissionRequestManager.didReceiveUserMediaPermissionDecision(userMediaID, allowed, deviceUIDVideo, deviceUIDAudio);
</del><ins>+ m_userMediaPermissionRequestManager.didReceiveUserMediaPermissionDecision(userMediaID, allowed, audioDeviceUID, videoDeviceUID);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -1107,7 +1107,7 @@
</span><span class="cx"> void didReceiveNotificationPermissionDecision(uint64_t notificationID, bool allowed);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><del>- WK_EXPORT void didReceiveUserMediaPermissionDecision(uint64_t userMediaID, bool allowed, const String& deviceUIDVideo, const String& deviceUIDAudio);
</del><ins>+ WK_EXPORT void didReceiveUserMediaPermissionDecision(uint64_t userMediaID, bool allowed, const String& audioDeviceUID, const String& videoDeviceUID);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void advanceToNextMisspelling(bool startBeforeSelection);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> # MediaSteam
</span><del>- DidReceiveUserMediaPermissionDecision(uint64_t userMediaID, bool allowed, String deviceUIDVideo, String deviceUIDAudio)
</del><ins>+ DidReceiveUserMediaPermissionDecision(uint64_t userMediaID, bool allowed, String audioDeviceUID, String videoDeviceUID)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> # Notification
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscomappleWebProcesssbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -312,3 +312,26 @@
</span><span class="cx"> (global-name "com.apple.coremedia.endpointstream.xpc")
</span><span class="cx"> (global-name "com.apple.coremedia.endpointplaybacksession.xpc")
</span><span class="cx"> (global-name "com.apple.coremedia.endpointpicker.xpc"))
</span><ins>+
+
+;; Camera access
+(allow device-camera)
+(allow file-read*
+ (literal "/Library/Preferences/com.apple.coremedia")
+ (home-literal "/Library/Preferences/com.apple.coremedia"))
+(allow mach-lookup (extension "com.apple.app-sandbox.mach"))
+(allow mach-lookup
+ (global-name "com.apple.cmio.AppleCameraAssistant")
+ ;; Apple DAL assistants
+ (global-name "com.apple.cmio.VDCAssistant")
+ (global-name "com.apple.cmio.AVCAssistant")
+ (global-name "com.apple.cmio.IIDCVideoAssistant")
+ ;; QuickTimeIIDCDigitizer assistant
+ (global-name "com.apple.IIDCAssistant"))
+(allow iokit-open
+ ;; QuickTimeUSBVDCDigitizer
+ (iokit-user-client-class "IOUSBDeviceUserClientV2")
+ (iokit-user-client-class "IOUSBInterfaceUserClientV2"))
+
+;; Microphone
+(allow device-microphone)
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Tools/ChangeLog 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-09-25 Eric Carlson <eric.carlson@apple.com>
+
+ Clean up user media request internal API
+ https://bugs.webkit.org/show_bug.cgi?id=149527
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WebKit2/UserMedia.cpp:
+ (TestWebKitAPI::decidePolicyForUserMediaPermissionRequestCallBack): Update for API changes.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::decidePolicyForUserMediaPermissionRequestIfPossible): Ditto.
+
</ins><span class="cx"> 2015-09-25 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] Add viewport tests and fix runUIScript() timing issues
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2UserMediacpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -34,7 +34,25 @@
</span><span class="cx">
</span><span class="cx"> void decidePolicyForUserMediaPermissionRequestCallBack(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKUserMediaPermissionRequestRef permissionRequest, const void* /* clientInfo */)
</span><span class="cx"> {
</span><del>- WKUserMediaPermissionRequestAllowBest(permissionRequest);
</del><ins>+ WKRetainPtr<WKArrayRef> audioDeviceUIDs = WKUserMediaPermissionRequestAudioDeviceUIDs(permissionRequest);
+ WKRetainPtr<WKArrayRef> videoDeviceUIDs = WKUserMediaPermissionRequestVideoDeviceUIDs(permissionRequest);
+
+ if (WKArrayGetSize(videoDeviceUIDs.get()) || WKArrayGetSize(audioDeviceUIDs.get())) {
+ WKRetainPtr<WKStringRef> videoDeviceUID;
+ if (WKArrayGetSize(videoDeviceUIDs.get()))
+ videoDeviceUID = reinterpret_cast<WKStringRef>(WKArrayGetItemAtIndex(videoDeviceUIDs.get(), 0));
+ else
+ videoDeviceUID = WKStringCreateWithUTF8CString("");
+
+ WKRetainPtr<WKStringRef> audioDeviceUID;
+ if (WKArrayGetSize(audioDeviceUIDs.get()))
+ audioDeviceUID = reinterpret_cast<WKStringRef>(WKArrayGetItemAtIndex(audioDeviceUIDs.get(), 0));
+ else
+ audioDeviceUID = WKStringCreateWithUTF8CString("");
+
+ WKUserMediaPermissionRequestAllow(permissionRequest, videoDeviceUID.get(), audioDeviceUID.get());
+ }
+
</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 (190261 => 190262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2015-09-26 02:10:02 UTC (rev 190261)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2015-09-26 02:23:00 UTC (rev 190262)
</span><span class="lines">@@ -1619,9 +1619,24 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (auto& request : m_userMediaPermissionRequests) {
</span><del>- if (m_isUserMediaPermissionAllowed) {
- if (WKArrayGetSize(WKUserMediaPermissionRequestDeviceNamesVideo(request.get())) || WKArrayGetSize(WKUserMediaPermissionRequestDeviceNamesAudio(request.get())))
- WKUserMediaPermissionRequestAllow(request.get(), WKUserMediaPermissionRequestFirstVideoDeviceUID(request.get()), WKUserMediaPermissionRequestFirstAudioDeviceUID(request.get()));
</del><ins>+ WKRetainPtr<WKArrayRef> audioDeviceUIDs = WKUserMediaPermissionRequestAudioDeviceUIDs(request.get());
+ WKRetainPtr<WKArrayRef> videoDeviceUIDs = WKUserMediaPermissionRequestVideoDeviceUIDs(request.get());
+
+ if (m_isUserMediaPermissionAllowed && (WKArrayGetSize(videoDeviceUIDs.get()) || WKArrayGetSize(audioDeviceUIDs.get()))) {
+ WKRetainPtr<WKStringRef> videoDeviceUID;
+ if (WKArrayGetSize(videoDeviceUIDs.get()))
+ videoDeviceUID = reinterpret_cast<WKStringRef>(WKArrayGetItemAtIndex(videoDeviceUIDs.get(), 0));
+ else
+ videoDeviceUID = WKStringCreateWithUTF8CString("");
+
+ WKRetainPtr<WKStringRef> audioDeviceUID;
+ if (WKArrayGetSize(audioDeviceUIDs.get()))
+ audioDeviceUID = reinterpret_cast<WKStringRef>(WKArrayGetItemAtIndex(audioDeviceUIDs.get(), 0));
+ else
+ audioDeviceUID = WKStringCreateWithUTF8CString("");
+
+ WKUserMediaPermissionRequestAllow(request.get(), videoDeviceUID.get(), audioDeviceUID.get());
+
</ins><span class="cx"> } else
</span><span class="cx"> WKUserMediaPermissionRequestDeny(request.get());
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>