<!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>[190362] 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/190362">190362</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-09-30 12:16:51 -0700 (Wed, 30 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/190262">r190262</a>): User media unit test failures after <a href="http://trac.webkit.org/projects/webkit/changeset/190262">r190262</a>
https://bugs.webkit.org/show_bug.cgi?id=149580
Reviewed by Darin Adler.
Source/WebCore:
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::getStats): Drive-by fix to deal with optional param.
* Modules/mediastream/UserMediaRequest.cpp:
(WebCore::UserMediaRequest::constraintsValidated): Swap the track parameter order.
* Modules/mediastream/UserMediaRequest.h:
* platform/mediastream/MediaStreamCreationClient.h:
(WebCore::MediaStreamCreationClient::validateRequestConstraints): Swap the track parameter order.
* platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp:
(WebCore::RealtimeMediaSourceCenterMac::validateRequestConstraints): If there is no
constraint for a media type, don't return a device of that type.
* platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp:
(WebCore::RealtimeMediaSourceCenterOwr::mediaSourcesAvailable): Ditto.
* platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::MockRealtimeMediaSourceCenter::validateRequestConstraints): Ditto.
* platform/mock/TimerEventBasedMock.h:
(WebCore::TimerEvent::~TimerEvent): Clear the m_mock pointer.
* platform/mock/UserMediaClientMock.h:
(WebCore::UserMediaClientMock::fire): Deal with empty device vectors.
* testing/Internals.cpp:
(WebCore::Internals::Internals): Don't register UserMediaController, it isn't needed for
WKTR.
Tools:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::decidePolicyForUserMediaPermissionRequestIfPossible): Fix parameter
order to WKUserMediaPermissionRequestAllow.
LayoutTests:
* platform/gtk/TestExpectations: Unskip tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp</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="#trunkSourceWebCoreplatformmediastreamMediaStreamCreationClienth">trunk/Source/WebCore/platform/mediastream/MediaStreamCreationClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeMediaSourceCenterMaccpp">trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamopenwebrtcRealtimeMediaSourceCenterOwrcpp">trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeMediaSourceCentercpp">trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockTimerEventBasedMockh">trunk/Source/WebCore/platform/mock/TimerEventBasedMock.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockUserMediaClientMockh">trunk/Source/WebCore/platform/mock/UserMediaClientMock.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190361 => 190362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-30 19:10:40 UTC (rev 190361)
+++ trunk/LayoutTests/ChangeLog 2015-09-30 19:16:51 UTC (rev 190362)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-09-30 Eric Carlson <eric.carlson@apple.com>
+
+ REGRESSION(r190262): User media unit test failures after r190262
+ https://bugs.webkit.org/show_bug.cgi?id=149580
+
+ Reviewed by Darin Adler.
+
+ * platform/gtk/TestExpectations: Unskip tests.
+
</ins><span class="cx"> 2015-09-29 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Update iOS-simulator results for fast/text/mark-matches-overflow-clip.html
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (190361 => 190362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2015-09-30 19:10:40 UTC (rev 190361)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2015-09-30 19:16:51 UTC (rev 190362)
</span><span class="lines">@@ -698,26 +698,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/144771 editing/selection/selection-invalid-offset.html [ Crash ]
</span><span class="cx">
</span><del>-webkit.org/b/149580 fast/mediastream/MediaDevices-getUserMedia.html [ Crash ]
-webkit.org/b/149580 fast/mediastream/MediaStream-add-ended-tracks.html [ Crash ]
-webkit.org/b/149580 fast/mediastream/MediaStream-add-remove-tracks.html [ Crash ]
-webkit.org/b/149580 fast/mediastream/MediaStream-add-tracks-to-inactive-stream.html [ Crash ]
-webkit.org/b/149580 fast/mediastream/MediaStream-clone.html [ Crash ]
-webkit.org/b/149580 fast/mediastream/MediaStream-construct-with-ended-tracks.html [ Crash ]
-webkit.org/b/149580 fast/mediastream/MediaStream-getTracks.html [ Crash ]
-webkit.org/b/149580 fast/mediastream/MediaStreamConstructor.html [ Crash ]
-webkit.org/b/149580 fast/mediastream/MediaStreamTrack-clone.html [ Crash ]
-webkit.org/b/149580 fast/mediastream/MediaStreamTrack-kind.html [ Crash ]
-webkit.org/b/149580 fast/mediastream/MediaStreamTrack-stop.html [ Crash ]
-webkit.org/b/149580 fast/mediastream/MediaStreamTrackEvent-constructor.html [ Crash ]
-webkit.org/b/149580 fast/mediastream/delayed-permission-allowed.html [ Crash ]
-webkit.org/b/149580 fast/mediastream/delayed-permission-denied.html [ Crash ]
-webkit.org/b/149580 fast/mediastream/error.html [ Crash ]
-webkit.org/b/149580 fast/mediastream/getusermedia.html [ Crash ]
-webkit.org/b/149580 fast/mediastream/success.html [ Crash ]
-webkit.org/b/149580 http/tests/media/media-stream/disconnected-frame-permission-denied.html [ Crash ]
-webkit.org/b/149580 http/tests/media/media-stream/disconnected-frame.html [ Crash ]
-
</del><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # End of Crashing tests
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="lines">@@ -1398,21 +1378,6 @@
</span><span class="cx"> webkit.org/b/146731 fast/events/touch/touch-scaled-scrolled.html [ Timeout ]
</span><span class="cx"> webkit.org/b/146731 fast/events/touch/touch-stale-node-crash.html [ Timeout ]
</span><span class="cx">
</span><del>-webkit.org/b/148567 fast/mediastream/MediaDevices-getUserMedia.html [ Timeout ]
-webkit.org/b/148567 fast/mediastream/MediaStream-add-ended-tracks.html [ Timeout ]
-webkit.org/b/148567 fast/mediastream/MediaStream-add-remove-tracks.html [ Timeout ]
-webkit.org/b/148567 fast/mediastream/MediaStream-add-tracks-to-inactive-stream.html [ Timeout ]
-webkit.org/b/148567 fast/mediastream/MediaStream-clone.html [ Timeout ]
-webkit.org/b/148567 fast/mediastream/MediaStream-construct-with-ended-tracks.html [ Timeout ]
-webkit.org/b/148567 fast/mediastream/MediaStream-getTracks.html [ Timeout ]
-webkit.org/b/148567 fast/mediastream/MediaStreamConstructor.html [ Timeout ]
-webkit.org/b/148567 fast/mediastream/MediaStreamTrack-clone.html [ Timeout ]
-webkit.org/b/148567 fast/mediastream/MediaStreamTrack-kind.html [ Timeout ]
-webkit.org/b/148567 fast/mediastream/MediaStreamTrack-stop.html [ Timeout ]
-webkit.org/b/148567 fast/mediastream/delayed-permission-allowed.html [ Timeout ]
-webkit.org/b/148567 fast/mediastream/getusermedia.html [ Timeout ]
-webkit.org/b/148567 fast/mediastream/success.html [ Timeout ]
-
</del><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # End of Tests timing out
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190361 => 190362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-30 19:10:40 UTC (rev 190361)
+++ trunk/Source/WebCore/ChangeLog 2015-09-30 19:16:51 UTC (rev 190362)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2015-09-30 Eric Carlson <eric.carlson@apple.com>
+
+ REGRESSION(r190262): User media unit test failures after r190262
+ https://bugs.webkit.org/show_bug.cgi?id=149580
+
+ Reviewed by Darin Adler.
+
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::getStats): Drive-by fix to deal with optional param.
+
+ * Modules/mediastream/UserMediaRequest.cpp:
+ (WebCore::UserMediaRequest::constraintsValidated): Swap the track parameter order.
+ * Modules/mediastream/UserMediaRequest.h:
+
+ * platform/mediastream/MediaStreamCreationClient.h:
+ (WebCore::MediaStreamCreationClient::validateRequestConstraints): Swap the track parameter order.
+
+ * platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp:
+ (WebCore::RealtimeMediaSourceCenterMac::validateRequestConstraints): If there is no
+ constraint for a media type, don't return a device of that type.
+
+ * platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp:
+ (WebCore::RealtimeMediaSourceCenterOwr::mediaSourcesAvailable): Ditto.
+
+ * platform/mock/MockRealtimeMediaSourceCenter.cpp:
+ (WebCore::MockRealtimeMediaSourceCenter::validateRequestConstraints): Ditto.
+
+ * platform/mock/TimerEventBasedMock.h:
+ (WebCore::TimerEvent::~TimerEvent): Clear the m_mock pointer.
+
+ * platform/mock/UserMediaClientMock.h:
+ (WebCore::UserMediaClientMock::fire): Deal with empty device vectors.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::Internals): Don't register UserMediaController, it isn't needed for
+ WKTR.
+
</ins><span class="cx"> 2015-09-29 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Use separate style resolver for user agent shadow trees
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (190361 => 190362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2015-09-30 19:10:40 UTC (rev 190361)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2015-09-30 19:16:51 UTC (rev 190362)
</span><span class="lines">@@ -529,7 +529,9 @@
</span><span class="cx">
</span><span class="cx"> void RTCPeerConnection::getStats(PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback, PassRefPtr<MediaStreamTrack> selector)
</span><span class="cx"> {
</span><del>- RefPtr<RTCStatsRequestImpl> statsRequest = RTCStatsRequestImpl::create(scriptExecutionContext(), successCallback, errorCallback, &selector->privateTrack());
</del><ins>+ RefPtr<MediaStreamTrack> track = selector;
+ RefPtr<RTCStatsRequestImpl> statsRequest = RTCStatsRequestImpl::create(scriptExecutionContext(), successCallback, errorCallback, track ? &track->privateTrack() : nullptr);
+
</ins><span class="cx"> // FIXME: Add passing selector as part of the statsRequest.
</span><span class="cx"> m_peerHandler->getStats(statsRequest.release());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (190361 => 190362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-09-30 19:10:40 UTC (rev 190361)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-09-30 19:16:51 UTC (rev 190362)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> RealtimeMediaSourceCenter::singleton().validateRequestConstraints(this, m_audioConstraints, m_videoConstraints);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UserMediaRequest::constraintsValidated(const Vector<RefPtr<RealtimeMediaSource>>& videoTracks, const Vector<RefPtr<RealtimeMediaSource>>& audioTracks)
</del><ins>+void UserMediaRequest::constraintsValidated(const Vector<RefPtr<RealtimeMediaSource>>& audioTracks, const Vector<RefPtr<RealtimeMediaSource>>& videoTracks)
</ins><span class="cx"> {
</span><span class="cx"> for (auto& audioTrack : audioTracks)
</span><span class="cx"> m_audioDeviceUIDs.append(audioTrack->persistentID());
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h (190361 => 190362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2015-09-30 19:10:40 UTC (rev 190361)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2015-09-30 19:16:51 UTC (rev 190362)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> UserMediaRequest(ScriptExecutionContext*, UserMediaController*, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints, MediaDevices::Promise&&);
</span><span class="cx">
</span><span class="cx"> // MediaStreamCreationClient
</span><del>- virtual void constraintsValidated(const Vector<RefPtr<RealtimeMediaSource>>&, const Vector<RefPtr<RealtimeMediaSource>>&) override final;
</del><ins>+ virtual void constraintsValidated(const Vector<RefPtr<RealtimeMediaSource>>& audioTracks, const Vector<RefPtr<RealtimeMediaSource>>& videoTracks) override final;
</ins><span class="cx"> virtual void constraintsInvalid(const String& constraintName) override final;
</span><span class="cx"> virtual void didCreateStream(PassRefPtr<MediaStreamPrivate>) override final;
</span><span class="cx"> virtual void failedToCreateStreamWithConstraintsError(const String& constraintName) override final;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamCreationClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamCreationClient.h (190361 => 190362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamCreationClient.h 2015-09-30 19:10:40 UTC (rev 190361)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamCreationClient.h 2015-09-30 19:16:51 UTC (rev 190362)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~MediaStreamCreationClient() { }
</span><span class="cx">
</span><del>- virtual void constraintsValidated(const Vector<RefPtr<RealtimeMediaSource>>& videoTracks, const Vector<RefPtr<RealtimeMediaSource>>& audioTracks) = 0;
</del><ins>+ virtual void constraintsValidated(const Vector<RefPtr<RealtimeMediaSource>>& audioTracks, const Vector<RefPtr<RealtimeMediaSource>>& videoTracks) = 0;
</ins><span class="cx"> virtual void constraintsInvalid(const String& constraintName) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void didCreateStream(PassRefPtr<MediaStreamPrivate>) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeMediaSourceCenterMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp (190361 => 190362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp 2015-09-30 19:10:40 UTC (rev 190361)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp 2015-09-30 19:16:51 UTC (rev 190362)
</span><span class="lines">@@ -60,6 +60,9 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(client);
</span><span class="cx">
</span><ins>+ Vector<RefPtr<RealtimeMediaSource>> audioSources;
+ Vector<RefPtr<RealtimeMediaSource>> videoSources;
+
</ins><span class="cx"> if (audioConstraints) {
</span><span class="cx"> String invalidConstraint;
</span><span class="cx"> AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(nil, RealtimeMediaSource::Audio, audioConstraints.get(), invalidConstraint);
</span><span class="lines">@@ -67,6 +70,8 @@
</span><span class="cx"> client->constraintsInvalid(invalidConstraint);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+
+ audioSources = AVCaptureDeviceManager::singleton().bestSourcesForTypeAndConstraints(RealtimeMediaSource::Type::Audio, audioConstraints);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (videoConstraints) {
</span><span class="lines">@@ -76,10 +81,10 @@
</span><span class="cx"> client->constraintsInvalid(invalidConstraint);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+
+ videoSources = AVCaptureDeviceManager::singleton().bestSourcesForTypeAndConstraints(RealtimeMediaSource::Type::Video, videoConstraints);
</ins><span class="cx"> }
</span><del>- Vector<RefPtr<RealtimeMediaSource>> bestVideoSources = AVCaptureDeviceManager::singleton().bestSourcesForTypeAndConstraints(RealtimeMediaSource::Type::Video, videoConstraints);
- Vector<RefPtr<RealtimeMediaSource>> bestAudioSources = AVCaptureDeviceManager::singleton().bestSourcesForTypeAndConstraints(RealtimeMediaSource::Type::Audio, audioConstraints);
- client->constraintsValidated(bestVideoSources, bestAudioSources);
</del><ins>+ client->constraintsValidated(audioSources, videoSources);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RealtimeMediaSourceCenterMac::createMediaStream(PassRefPtr<MediaStreamCreationClient> prpQueryClient, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamopenwebrtcRealtimeMediaSourceCenterOwrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp (190361 => 190362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp 2015-09-30 19:10:40 UTC (rev 190361)
+++ trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp 2015-09-30 19:16:51 UTC (rev 190362)
</span><span class="lines">@@ -162,6 +162,9 @@
</span><span class="cx">
</span><span class="cx"> void RealtimeMediaSourceCenterOwr::mediaSourcesAvailable(GList* sources)
</span><span class="cx"> {
</span><ins>+ Vector<RefPtr<RealtimeMediaSource>> audioSources;
+ Vector<RefPtr<RealtimeMediaSource>> videoSources;
+
</ins><span class="cx"> for (auto item = sources; item; item = item->next) {
</span><span class="cx"> OwrMediaSource* source = OWR_MEDIA_SOURCE(item->data);
</span><span class="cx">
</span><span class="lines">@@ -187,10 +190,14 @@
</span><span class="cx"> if (sourceIterator == m_sourceMap.end())
</span><span class="cx"> m_sourceMap.add(id, mediaSource);
</span><span class="cx">
</span><ins>+ if (mediaType & OWR_MEDIA_TYPE_AUDIO)
+ audioSources.append(mediaSource);
+ else if (mediaType & OWR_MEDIA_TYPE_VIDEO)
+ videoSources.append(mediaSource);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // TODO: Make sure contraints are actually validated by checking source types.
</span><del>- m_client->constraintsValidated(Vector<RefPtr<RealtimeMediaSource>>(), Vector<RefPtr<RealtimeMediaSource>>());
</del><ins>+ m_client->constraintsValidated(audioSources, videoSources);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<RealtimeMediaSource> RealtimeMediaSourceCenterOwr::firstSource(RealtimeMediaSource::Type type)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeMediaSourceCentercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp (190361 => 190362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp 2015-09-30 19:10:40 UTC (rev 190361)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp 2015-09-30 19:16:51 UTC (rev 190362)
</span><span class="lines">@@ -131,23 +131,41 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(client);
</span><span class="cx">
</span><ins>+ Vector<RefPtr<RealtimeMediaSource>> audioSources;
+ Vector<RefPtr<RealtimeMediaSource>> videoSources;
+ MockSourceMap& map = mockSourceMap();
+
</ins><span class="cx"> if (audioConstraints) {
</span><span class="cx"> String invalidQuery = MediaConstraintsMock::verifyConstraints(audioConstraints);
</span><span class="cx"> if (!invalidQuery.isEmpty()) {
</span><span class="cx"> client->constraintsInvalid(invalidQuery);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+
+ MockSourceMap::iterator it = map.find(mockAudioSourceID());
+ ASSERT(it != map.end());
+
+ RefPtr<RealtimeMediaSource> audioSource = it->value;
+ audioSource->reset();
+ audioSources.append(audioSource.release());
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (videoConstraints) {
</span><span class="cx"> String invalidQuery = MediaConstraintsMock::verifyConstraints(videoConstraints);
</span><span class="cx"> if (!invalidQuery.isEmpty()) {
</span><span class="cx"> client->constraintsInvalid(invalidQuery);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+
+ MockSourceMap::iterator it = map.find(mockVideoSourceID());
+ ASSERT(it != map.end());
+
+ RefPtr<RealtimeMediaSource> videoSource = it->value;
+ videoSource->reset();
+ videoSources.append(videoSource.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- client->constraintsValidated(Vector<RefPtr<RealtimeMediaSource>>(), Vector<RefPtr<RealtimeMediaSource>>());
</del><ins>+ client->constraintsValidated(audioSources, videoSources);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MockRealtimeMediaSourceCenter::createMediaStream(PassRefPtr<MediaStreamCreationClient> prpQueryClient, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockTimerEventBasedMockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/TimerEventBasedMock.h (190361 => 190362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/TimerEventBasedMock.h 2015-09-30 19:10:40 UTC (rev 190361)
+++ trunk/Source/WebCore/platform/mock/TimerEventBasedMock.h 2015-09-30 19:16:51 UTC (rev 190362)
</span><span class="lines">@@ -66,7 +66,10 @@
</span><span class="cx"> m_timer.startOneShot(0.5);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual ~TimerEvent() { }
</del><ins>+ virtual ~TimerEvent()
+ {
+ m_mock = nullptr;
+ }
</ins><span class="cx">
</span><span class="cx"> void timerFired()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockUserMediaClientMockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/UserMediaClientMock.h (190361 => 190362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/UserMediaClientMock.h 2015-09-30 19:10:40 UTC (rev 190361)
+++ trunk/Source/WebCore/platform/mock/UserMediaClientMock.h 2015-09-30 19:16:51 UTC (rev 190362)
</span><span class="lines">@@ -44,10 +44,17 @@
</span><span class="cx">
</span><span class="cx"> void fire() override
</span><span class="cx"> {
</span><del>- if (m_requestSuccess)
- m_request->userMediaAccessGranted(m_request->videoDeviceUIDs().at(0), m_request->audioDeviceUIDs().at(0));
- else
</del><ins>+ if (!m_requestSuccess) {
</ins><span class="cx"> m_request->userMediaAccessDenied();
</span><ins>+ return;
+ }
+
+ auto audioDeviceUIDs = m_request->audioDeviceUIDs();
+ auto videoDeviceUIDs = m_request->videoDeviceUIDs();
+ String allowedAudioUID = audioDeviceUIDs.size() ? audioDeviceUIDs.at(0) : emptyString();
+ String videoAudioUID = videoDeviceUIDs.size() ? videoDeviceUIDs.at(0) : emptyString();
+
+ m_request->userMediaAccessGranted(allowedAudioUID, videoAudioUID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (190361 => 190362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-09-30 19:10:40 UTC (rev 190361)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-09-30 19:16:51 UTC (rev 190362)
</span><span class="lines">@@ -387,8 +387,6 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> MockRealtimeMediaSourceCenter::registerMockRealtimeMediaSourceCenter();
</span><span class="cx"> enableMockRTCPeerConnectionHandler();
</span><del>- document->page()->removeSupplement(UserMediaController::supplementName());
- WebCore::provideUserMediaTo(document->page(), new UserMediaClientMock());
</del><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (190361 => 190362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-30 19:10:40 UTC (rev 190361)
+++ trunk/Tools/ChangeLog 2015-09-30 19:16:51 UTC (rev 190362)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-09-30 Eric Carlson <eric.carlson@apple.com>
+
+ REGRESSION(r190262): User media unit test failures after r190262
+ https://bugs.webkit.org/show_bug.cgi?id=149580
+
+ Reviewed by Darin Adler.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::decidePolicyForUserMediaPermissionRequestIfPossible): Fix parameter
+ order to WKUserMediaPermissionRequestAllow.
+
</ins><span class="cx"> 2015-09-30 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Add iOS builders and testers
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (190361 => 190362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2015-09-30 19:10:40 UTC (rev 190361)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2015-09-30 19:16:51 UTC (rev 190362)
</span><span class="lines">@@ -1669,7 +1669,7 @@
</span><span class="cx"> else
</span><span class="cx"> audioDeviceUID = WKStringCreateWithUTF8CString("");
</span><span class="cx">
</span><del>- WKUserMediaPermissionRequestAllow(request.get(), videoDeviceUID.get(), audioDeviceUID.get());
</del><ins>+ WKUserMediaPermissionRequestAllow(request.get(), audioDeviceUID.get(), videoDeviceUID.get());
</ins><span class="cx">
</span><span class="cx"> } else
</span><span class="cx"> WKUserMediaPermissionRequestDeny(request.get());
</span></span></pre>
</div>
</div>
</body>
</html>