<!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>[208606] 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/208606">208606</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2016-11-11 13:45:21 -0800 (Fri, 11 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] defer resolution of getUserMedia promise made in a background tab
https://bugs.webkit.org/show_bug.cgi?id=164643
<rdar://problem/29048317>
Reviewed by Brady Eidson.
Source/WebCore:
Test: fast/mediastream/get-user-media-background-tab.html
Do not start producing data when the document does not allow media
to start playing. Instead, register with the document for a callback
when playback is allowed and start then.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::~MediaStream):
(WebCore::MediaStream::mediaCanStart):
(WebCore::MediaStream::startProducingData):
(WebCore::MediaStream::stopProducingData):
(WebCore::MediaStream::pageMutedStateDidChange):
* Modules/mediastream/MediaStream.h:
* Modules/webaudio/AudioContext.cpp:
(WebCore::AudioContext::mediaCanStart): Deal with API change.
* Modules/webaudio/AudioContext.h:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::mediaCanStart): Ditto.
* html/HTMLMediaElement.h:
* page/MediaCanStartListener.h:
* page/Page.cpp:
(WebCore::Page::takeAnyMediaCanStartListener): Return the listener and document.
(WebCore::Page::setCanStartMedia): Pass the document to the listener.
* page/Page.h:
Source/WebKit2:
Do not ask for user for access to capture devices when the document does not
allow media to play, wait until playback is allowed.
* WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
(WebKit::UserMediaPermissionRequestManager::startUserMediaRequest):
(WebKit::UserMediaPermissionRequestManager::sendUserMediaRequest):
(WebKit::UserMediaPermissionRequestManager::mediaCanStart):
(WebKit::UserMediaPermissionRequestManager::grantUserMediaDevicesSandboxExtension):
* WebProcess/MediaStream/UserMediaPermissionRequestManager.h:
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::mediaCanStart):
* WebProcess/Plugins/PluginView.h:
LayoutTests:
* fast/mediastream/get-user-media-background-tab-expected.txt: Added.
* fast/mediastream/get-user-media-background-tab.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamcpp">trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamh">trunk/Source/WebCore/Modules/mediastream/MediaStream.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioContextcpp">trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioContexth">trunk/Source/WebCore/Modules/webaudio/AudioContext.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorepageMediaCanStartListenerh">trunk/Source/WebCore/page/MediaCanStartListener.h</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewh">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmediastreamgetusermediabackgroundtabexpectedtxt">trunk/LayoutTests/fast/mediastream/get-user-media-background-tab-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamgetusermediabackgroundtabhtml">trunk/LayoutTests/fast/mediastream/get-user-media-background-tab.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208605 => 208606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-11 21:20:01 UTC (rev 208605)
+++ trunk/LayoutTests/ChangeLog 2016-11-11 21:45:21 UTC (rev 208606)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-11-11 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] defer resolution of getUserMedia promise made in a background tab
+ https://bugs.webkit.org/show_bug.cgi?id=164643
+ <rdar://problem/29048317>
+
+ Reviewed by Brady Eidson.
+
+ * fast/mediastream/get-user-media-background-tab-expected.txt: Added.
+ * fast/mediastream/get-user-media-background-tab.html: Added.
+
</ins><span class="cx"> 2016-11-10 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename CryptoKeyUsage to CryptoKeyUsageBitmap and CryptoKey::Usage to CryptoKeyUsage
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamgetusermediabackgroundtabexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/get-user-media-background-tab-expected.txt (0 => 208606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/get-user-media-background-tab-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/mediastream/get-user-media-background-tab-expected.txt 2016-11-11 21:45:21 UTC (rev 208606)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+Tests getUserMedia called from a background thread.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+tabState = 'background'
+PASS navigator.mediaDevices.getUserMedia({audio:true}).then(gotStream).catch(fail) did not throw exception.
+PASS navigator.mediaDevices.getUserMedia({audio:true}).then(gotStream).catch(fail) did not throw exception.
+PASS navigator.mediaDevices.getUserMedia({audio:true}).then(gotStream).catch(fail) did not throw exception.
+PASS navigator.mediaDevices.getUserMedia({audio:true}).then(gotStream).catch(fail) did not throw exception.
+
+** timer fired **
+PASS tabState is 'background'
+tabState = 'foreground'
+
+** getUserMedia() promise resolved **
+PASS tabState is 'foreground'
+PASS stream.getAudioTracks().length is 1
+
+** getUserMedia() promise resolved **
+PASS tabState is 'foreground'
+PASS stream.getAudioTracks().length is 1
+
+** getUserMedia() promise resolved **
+PASS tabState is 'foreground'
+PASS stream.getAudioTracks().length is 1
+
+** getUserMedia() promise resolved **
+PASS tabState is 'foreground'
+PASS stream.getAudioTracks().length is 1
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamgetusermediabackgroundtabhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/get-user-media-background-tab.html (0 => 208606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/get-user-media-background-tab.html (rev 0)
+++ trunk/LayoutTests/fast/mediastream/get-user-media-background-tab.html 2016-11-11 21:45:21 UTC (rev 208606)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="../../resources/js-test-pre.js"></script>
+ <script>
+ let tabState;
+ let streamCount = 4;
+ let streams = 0;
+
+ function gotStream(s)
+ {
+ debug('<br>** getUserMedia() promise resolved **')
+ shouldBe('tabState', "'foreground'");
+ stream = s;
+ shouldBe('stream.getAudioTracks().length', '1');
+ if (++streams == streamCount)
+ finishJSTest();
+ }
+
+ function fail(error)
+ {
+ testFailed(`getUserMedia() failed, error = ${error}`);
+ finishJSTest();
+ }
+
+ function checkState()
+ {
+ debug('<br>** timer fired **')
+ shouldBe('tabState', "'background'");
+ evalAndLog(`tabState = 'foreground'`);
+ if (internals)
+ internals.settings.setCanStartMedia(true);
+ }
+
+ function start()
+ {
+ description("Tests getUserMedia called from a background thread.");
+ evalAndLog(`tabState = 'background'`);
+ if (window.testRunner) {
+ internals.settings.setCanStartMedia(false);
+ testRunner.setUserMediaPermission(true);
+ }
+ for (var i = 0; i < streamCount; i++)
+ shouldNotThrow('navigator.mediaDevices.getUserMedia({audio:true}).then(gotStream).catch(fail)');
+ setTimeout(checkState, 200);
+ }
+
+ window.jsTestIsAsync = true;
+ window.successfullyParsed = true;
+
+ </script>
+ <script src="../../resources/js-test-post.js"></script>
+ </head>
+ <body onload="start()">
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208605 => 208606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-11 21:20:01 UTC (rev 208605)
+++ trunk/Source/WebCore/ChangeLog 2016-11-11 21:45:21 UTC (rev 208606)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2016-11-11 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] defer resolution of getUserMedia promise made in a background tab
+ https://bugs.webkit.org/show_bug.cgi?id=164643
+ <rdar://problem/29048317>
+
+ Reviewed by Brady Eidson.
+
+ Test: fast/mediastream/get-user-media-background-tab.html
+
+ Do not start producing data when the document does not allow media
+ to start playing. Instead, register with the document for a callback
+ when playback is allowed and start then.
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::~MediaStream):
+ (WebCore::MediaStream::mediaCanStart):
+ (WebCore::MediaStream::startProducingData):
+ (WebCore::MediaStream::stopProducingData):
+ (WebCore::MediaStream::pageMutedStateDidChange):
+ * Modules/mediastream/MediaStream.h:
+
+ * Modules/webaudio/AudioContext.cpp:
+ (WebCore::AudioContext::mediaCanStart): Deal with API change.
+ * Modules/webaudio/AudioContext.h:
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::mediaCanStart): Ditto.
+ * html/HTMLMediaElement.h:
+ * page/MediaCanStartListener.h:
+
+ * page/Page.cpp:
+ (WebCore::Page::takeAnyMediaCanStartListener): Return the listener and document.
+ (WebCore::Page::setCanStartMedia): Pass the document to the listener.
+ * page/Page.h:
+
</ins><span class="cx"> 2016-11-11 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> RenderFlowThread's containing block cache should be invalidated before calling styleDidChange.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (208605 => 208606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2016-11-11 21:20:01 UTC (rev 208605)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2016-11-11 21:45:21 UTC (rev 208606)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2011, 2012, 2015 Ericsson AB. All rights reserved.
</span><del>- * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "MediaStreamRegistry.h"
</span><span class="cx"> #include "MediaStreamTrackEvent.h"
</span><span class="cx"> #include "Page.h"
</span><span class="lines">@@ -111,8 +112,11 @@
</span><span class="cx"> m_private->removeObserver(*this);
</span><span class="cx"> for (auto& track : m_trackSet.values())
</span><span class="cx"> track->removeObserver(this);
</span><del>- if (Document* document = this->document())
</del><ins>+ if (Document* document = this->document()) {
</ins><span class="cx"> document->removeAudioProducer(this);
</span><ins>+ if (m_isWaitingUntilMediaCanStart)
+ document->removeMediaCanStartListener(this);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaStream> MediaStream::clone()
</span><span class="lines">@@ -247,6 +251,41 @@
</span><span class="cx"> statusDidChange();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaStream::mediaCanStart(Document& document)
+{
+ ASSERT_UNUSED(document, &document == this->document());
+ ASSERT(m_isWaitingUntilMediaCanStart);
+ if (m_isWaitingUntilMediaCanStart) {
+ m_isWaitingUntilMediaCanStart = false;
+ startProducingData();
+ }
+}
+
+void MediaStream::startProducingData()
+{
+ Document* document = this->document();
+ if (!document || !document->page())
+ return;
+
+ // If we can't start a load right away, start it later.
+ if (!document->page()->canStartMedia()) {
+ LOG(Media, "MediaStream::startProducingData(%p) - not allowed to start in background, waiting", this);
+ if (m_isWaitingUntilMediaCanStart)
+ return;
+
+ m_isWaitingUntilMediaCanStart = true;
+ document->addMediaCanStartListener(this);
+ return;
+ }
+
+ m_private->startProducingData();
+}
+
+void MediaStream::stopProducingData()
+{
+ m_private->stopProducingData();
+}
+
</ins><span class="cx"> void MediaStream::pageMutedStateDidChange()
</span><span class="cx"> {
</span><span class="cx"> if (!m_isActive)
</span><span class="lines">@@ -262,9 +301,9 @@
</span><span class="cx">
</span><span class="cx"> m_externallyMuted = pageMuted;
</span><span class="cx"> if (pageMuted)
</span><del>- m_private->stopProducingData();
</del><ins>+ stopProducingData();
</ins><span class="cx"> else
</span><del>- m_private->startProducingData();
</del><ins>+ startProducingData();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaProducer::MediaStateFlags MediaStream::mediaState() const
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (208605 => 208606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2016-11-11 21:20:01 UTC (rev 208605)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2016-11-11 21:45:21 UTC (rev 208606)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "ContextDestructionObserver.h"
</span><span class="cx"> #include "EventTarget.h"
</span><span class="cx"> #include "ExceptionBase.h"
</span><ins>+#include "MediaCanStartListener.h"
</ins><span class="cx"> #include "MediaProducer.h"
</span><span class="cx"> #include "MediaStreamPrivate.h"
</span><span class="cx"> #include "MediaStreamTrack.h"
</span><span class="lines">@@ -47,7 +48,15 @@
</span><span class="cx">
</span><span class="cx"> class Document;
</span><span class="cx">
</span><del>-class MediaStream final : public URLRegistrable, public EventTargetWithInlineData, public ContextDestructionObserver, public MediaStreamTrack::Observer, public MediaStreamPrivate::Observer, private MediaProducer, public RefCounted<MediaStream> {
</del><ins>+class MediaStream final
+ : public URLRegistrable
+ , public EventTargetWithInlineData
+ , public ContextDestructionObserver
+ , public MediaStreamTrack::Observer
+ , public MediaStreamPrivate::Observer
+ , private MediaProducer
+ , private MediaCanStartListener
+ , public RefCounted<MediaStream> {
</ins><span class="cx"> public:
</span><span class="cx"> class Observer {
</span><span class="cx"> public:
</span><span class="lines">@@ -78,6 +87,9 @@
</span><span class="cx">
</span><span class="cx"> MediaStreamPrivate* privateStream() const { return m_private.get(); }
</span><span class="cx">
</span><ins>+ void startProducingData();
+ void stopProducingData();
+
</ins><span class="cx"> // EventTarget
</span><span class="cx"> EventTargetInterface eventTargetInterface() const final { return MediaStreamEventTargetInterfaceType; }
</span><span class="cx"> ScriptExecutionContext* scriptExecutionContext() const final { return ContextDestructionObserver::scriptExecutionContext(); }
</span><span class="lines">@@ -118,6 +130,9 @@
</span><span class="cx"> void pageMutedStateDidChange() final;
</span><span class="cx"> MediaProducer::MediaStateFlags mediaState() const final;
</span><span class="cx">
</span><ins>+ // MediaCanStartListener
+ void mediaCanStart(Document&) final;
+
</ins><span class="cx"> bool internalAddTrack(Ref<MediaStreamTrack>&&, StreamModifier);
</span><span class="cx"> bool internalRemoveTrack(const String&, StreamModifier);
</span><span class="cx">
</span><span class="lines">@@ -142,6 +157,7 @@
</span><span class="cx"> bool m_isActive { false };
</span><span class="cx"> bool m_isMuted { true };
</span><span class="cx"> bool m_externallyMuted { false };
</span><ins>+ bool m_isWaitingUntilMediaCanStart { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp (208605 => 208606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2016-11-11 21:20:01 UTC (rev 208605)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2016-11-11 21:45:21 UTC (rev 208606)
</span><span class="lines">@@ -957,8 +957,9 @@
</span><span class="cx"> setState(State::Running);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AudioContext::mediaCanStart()
</del><ins>+void AudioContext::mediaCanStart(Document& document)
</ins><span class="cx"> {
</span><ins>+ ASSERT_UNUSED(document, &document == this->document());
</ins><span class="cx"> removeBehaviorRestriction(AudioContext::RequirePageConsentForAudioStartRestriction);
</span><span class="cx"> mayResumePlayback(true);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.h (208605 => 208606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioContext.h 2016-11-11 21:20:01 UTC (rev 208605)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.h 2016-11-11 21:45:21 UTC (rev 208606)
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx">
</span><span class="cx"> void scheduleNodeDeletion();
</span><span class="cx">
</span><del>- void mediaCanStart() override;
</del><ins>+ void mediaCanStart(Document&) override;
</ins><span class="cx">
</span><span class="cx"> // MediaProducer
</span><span class="cx"> MediaProducer::MediaStateFlags mediaState() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (208605 => 208606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-11-11 21:20:01 UTC (rev 208605)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-11-11 21:45:21 UTC (rev 208606)
</span><span class="lines">@@ -5664,8 +5664,9 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void HTMLMediaElement::mediaCanStart()
</del><ins>+void HTMLMediaElement::mediaCanStart(Document& document)
</ins><span class="cx"> {
</span><ins>+ ASSERT_UNUSED(document, &document == &this->document());
</ins><span class="cx"> LOG(Media, "HTMLMediaElement::mediaCanStart(%p) - m_isWaitingUntilMediaCanStart = %s, m_pausedInternal = %s",
</span><span class="cx"> this, boolString(m_isWaitingUntilMediaCanStart), boolString(m_pausedInternal) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (208605 => 208606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2016-11-11 21:20:01 UTC (rev 208605)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2016-11-11 21:45:21 UTC (rev 208606)
</span><span class="lines">@@ -727,7 +727,7 @@
</span><span class="cx">
</span><span class="cx"> void setPlaybackRateInternal(double);
</span><span class="cx">
</span><del>- void mediaCanStart() override;
</del><ins>+ void mediaCanStart(Document&) final;
</ins><span class="cx">
</span><span class="cx"> void invalidateCachedTime() const;
</span><span class="cx"> void refreshCachedTime() const;
</span></span></pre></div>
<a id="trunkSourceWebCorepageMediaCanStartListenerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/MediaCanStartListener.h (208605 => 208606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/MediaCanStartListener.h 2016-11-11 21:20:01 UTC (rev 208605)
+++ trunk/Source/WebCore/page/MediaCanStartListener.h 2016-11-11 21:45:21 UTC (rev 208606)
</span><span class="lines">@@ -27,9 +27,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class Document;
+
</ins><span class="cx"> class MediaCanStartListener {
</span><span class="cx"> public:
</span><del>- virtual void mediaCanStart() = 0;
</del><ins>+ virtual void mediaCanStart(Document&) = 0;
</ins><span class="cx"> protected:
</span><span class="cx"> virtual ~MediaCanStartListener() { }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (208605 => 208606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2016-11-11 21:20:01 UTC (rev 208605)
+++ trunk/Source/WebCore/page/Page.cpp 2016-11-11 21:45:21 UTC (rev 208606)
</span><span class="lines">@@ -555,15 +555,15 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline MediaCanStartListener* Page::takeAnyMediaCanStartListener()
</del><ins>+inline Optional<std::pair<MediaCanStartListener&, Document&>> Page::takeAnyMediaCanStartListener()
</ins><span class="cx"> {
</span><span class="cx"> for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx"> if (!frame->document())
</span><span class="cx"> continue;
</span><span class="cx"> if (MediaCanStartListener* listener = frame->document()->takeAnyMediaCanStartListener())
</span><del>- return listener;
</del><ins>+ return { { *listener, *frame->document() } };
</ins><span class="cx"> }
</span><del>- return 0;
</del><ins>+ return Nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::setCanStartMedia(bool canStartMedia)
</span><span class="lines">@@ -574,10 +574,10 @@
</span><span class="cx"> m_canStartMedia = canStartMedia;
</span><span class="cx">
</span><span class="cx"> while (m_canStartMedia) {
</span><del>- MediaCanStartListener* listener = takeAnyMediaCanStartListener();
</del><ins>+ auto listener = takeAnyMediaCanStartListener();
</ins><span class="cx"> if (!listener)
</span><span class="cx"> break;
</span><del>- listener->mediaCanStart();
</del><ins>+ listener->first.mediaCanStart(listener->second);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (208605 => 208606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2016-11-11 21:20:01 UTC (rev 208605)
+++ trunk/Source/WebCore/page/Page.h 2016-11-11 21:45:21 UTC (rev 208606)
</span><span class="lines">@@ -549,7 +549,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned findMatchesForText(const String&, FindOptions, unsigned maxMatchCount, ShouldHighlightMatches, ShouldMarkMatches);
</span><span class="cx">
</span><del>- MediaCanStartListener* takeAnyMediaCanStartListener();
</del><ins>+ Optional<std::pair<MediaCanStartListener&, Document&>> takeAnyMediaCanStartListener();
</ins><span class="cx">
</span><span class="cx"> Vector<Ref<PluginViewBase>> pluginViews();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208605 => 208606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-11-11 21:20:01 UTC (rev 208605)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-11 21:45:21 UTC (rev 208606)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-11-11 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] defer resolution of getUserMedia promise made in a background tab
+ https://bugs.webkit.org/show_bug.cgi?id=164643
+ <rdar://problem/29048317>
+
+ Reviewed by Brady Eidson.
+
+ Do not ask for user for access to capture devices when the document does not
+ allow media to play, wait until playback is allowed.
+
+ * WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
+ (WebKit::UserMediaPermissionRequestManager::startUserMediaRequest):
+ (WebKit::UserMediaPermissionRequestManager::sendUserMediaRequest):
+ (WebKit::UserMediaPermissionRequestManager::mediaCanStart):
+ (WebKit::UserMediaPermissionRequestManager::grantUserMediaDevicesSandboxExtension):
+ * WebProcess/MediaStream/UserMediaPermissionRequestManager.h:
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::mediaCanStart):
+ * WebProcess/Plugins/PluginView.h:
+
</ins><span class="cx"> 2016-11-11 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Move Node from ExceptionCode to ExceptionOr
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessMediaStreamUserMediaPermissionRequestManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp (208605 => 208606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp 2016-11-11 21:20:01 UTC (rev 208605)
+++ trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp 2016-11-11 21:45:21 UTC (rev 208606)
</span><span class="lines">@@ -60,6 +60,27 @@
</span><span class="cx"> Document* document = request.document();
</span><span class="cx"> Frame* frame = document ? document->frame() : nullptr;
</span><span class="cx">
</span><ins>+ if (!frame || !document->page()) {
+ request.deny(UserMediaRequest::OtherFailure, emptyString());
+ return;
+ }
+
+ if (document->page()->canStartMedia()) {
+ sendUserMediaRequest(request);
+ return;
+ }
+
+ auto& pendingRequests = m_blockedRequests.add(document, Vector<RefPtr<UserMediaRequest>>()).iterator->value;
+ if (pendingRequests.isEmpty())
+ document->addMediaCanStartListener(this);
+ pendingRequests.append(&request);
+}
+
+void UserMediaPermissionRequestManager::sendUserMediaRequest(UserMediaRequest& request)
+{
+ Document* document = request.document();
+ Frame* frame = document ? document->frame() : nullptr;
+
</ins><span class="cx"> if (!frame) {
</span><span class="cx"> request.deny(UserMediaRequest::OtherFailure, emptyString());
</span><span class="cx"> return;
</span><span class="lines">@@ -83,14 +104,46 @@
</span><span class="cx"> if (!requestID)
</span><span class="cx"> return;
</span><span class="cx"> m_idToUserMediaRequestMap.remove(requestID);
</span><ins>+ removeMediaRequestFromMaps(request);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void UserMediaPermissionRequestManager::mediaCanStart(Document& document)
+{
+ auto pendingRequests = m_blockedRequests.take(&document);
+ while (!pendingRequests.isEmpty()) {
+ if (!document.page()->canStartMedia()) {
+ m_blockedRequests.add(&document, pendingRequests);
+ document.addMediaCanStartListener(this);
+ break;
+ }
+
+ sendUserMediaRequest(*pendingRequests.takeLast());
+ }
+}
+
+void UserMediaPermissionRequestManager::removeMediaRequestFromMaps(UserMediaRequest& request)
+{
+ auto pendingRequests = m_blockedRequests.take(request.document());
+ for (auto& pendingRequest : pendingRequests) {
+ if (&request != pendingRequest.get())
+ continue;
+
+ if (pendingRequests.isEmpty())
+ request.document()->removeMediaCanStartListener(this);
+ else
+ m_blockedRequests.add(request.document(), pendingRequests);
+ break;
+ }
+
+ m_userMediaRequestToIDMap.remove(&request);
+}
+
</ins><span class="cx"> void UserMediaPermissionRequestManager::userMediaAccessWasGranted(uint64_t requestID, const String& audioDeviceUID, const String& videoDeviceUID)
</span><span class="cx"> {
</span><span class="cx"> auto request = m_idToUserMediaRequestMap.take(requestID);
</span><span class="cx"> if (!request)
</span><span class="cx"> return;
</span><del>- m_userMediaRequestToIDMap.remove(request);
</del><ins>+ removeMediaRequestFromMaps(*request);
</ins><span class="cx">
</span><span class="cx"> request->allow(audioDeviceUID, videoDeviceUID);
</span><span class="cx"> }
</span><span class="lines">@@ -100,7 +153,7 @@
</span><span class="cx"> auto request = m_idToUserMediaRequestMap.take(requestID);
</span><span class="cx"> if (!request)
</span><span class="cx"> return;
</span><del>- m_userMediaRequestToIDMap.remove(request);
</del><ins>+ removeMediaRequestFromMaps(*request);
</ins><span class="cx">
</span><span class="cx"> request->deny(reason, invalidConstraint);
</span><span class="cx"> }
</span><span class="lines">@@ -150,7 +203,7 @@
</span><span class="cx"> ASSERT(m_userMediaDeviceSandboxExtensions.size() <= 2);
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < sandboxExtensionHandles.size(); i++) {
</span><del>- if (RefPtr<SandboxExtension> extension = SandboxExtension::create(sandboxExtensionHandles[i])) {
</del><ins>+ if (auto extension = SandboxExtension::create(sandboxExtensionHandles[i])) {
</ins><span class="cx"> extension->consume();
</span><span class="cx"> m_userMediaDeviceSandboxExtensions.append(extension.release());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessMediaStreamUserMediaPermissionRequestManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.h (208605 => 208606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.h 2016-11-11 21:20:01 UTC (rev 208605)
+++ trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.h 2016-11-11 21:45:21 UTC (rev 208606)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><span class="cx"> #include "SandboxExtension.h"
</span><ins>+#include <WebCore/MediaCanStartListener.h>
</ins><span class="cx"> #include <WebCore/MediaConstraints.h>
</span><span class="cx"> #include <WebCore/MediaDevicesEnumerationRequest.h>
</span><span class="cx"> #include <WebCore/UserMediaClient.h>
</span><span class="lines">@@ -35,7 +36,8 @@
</span><span class="cx">
</span><span class="cx"> class WebPage;
</span><span class="cx">
</span><del>-class UserMediaPermissionRequestManager {
</del><ins>+class UserMediaPermissionRequestManager
+ : private WebCore::MediaCanStartListener {
</ins><span class="cx"> public:
</span><span class="cx"> explicit UserMediaPermissionRequestManager(WebPage&);
</span><span class="cx"> ~UserMediaPermissionRequestManager();
</span><span class="lines">@@ -52,6 +54,13 @@
</span><span class="cx"> void grantUserMediaDevicesSandboxExtension(const SandboxExtension::HandleArray&);
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ void sendUserMediaRequest(WebCore::UserMediaRequest&);
+
+ // WebCore::MediaCanStartListener
+ void mediaCanStart(WebCore::Document&) override;
+
+ void removeMediaRequestFromMaps(WebCore::UserMediaRequest&);
+
</ins><span class="cx"> WebPage& m_page;
</span><span class="cx">
</span><span class="cx"> HashMap<uint64_t, RefPtr<WebCore::UserMediaRequest>> m_idToUserMediaRequestMap;
</span><span class="lines">@@ -61,6 +70,8 @@
</span><span class="cx"> HashMap<RefPtr<WebCore::MediaDevicesEnumerationRequest>, uint64_t> m_mediaDevicesEnumerationRequestToIDMap;
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<SandboxExtension>> m_userMediaDeviceSandboxExtensions;
</span><ins>+
+ HashMap<RefPtr<WebCore::Document>, Vector<RefPtr<WebCore::UserMediaRequest>>> m_blockedRequests;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (208605 => 208606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2016-11-11 21:20:01 UTC (rev 208605)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2016-11-11 21:45:21 UTC (rev 208606)
</span><span class="lines">@@ -1371,7 +1371,7 @@
</span><span class="cx"> m_plugin->setFocus(hasFocus);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PluginView::mediaCanStart()
</del><ins>+void PluginView::mediaCanStart(WebCore::Document&)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_isWaitingUntilMediaCanStart);
</span><span class="cx"> m_isWaitingUntilMediaCanStart = false;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (208605 => 208606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2016-11-11 21:20:01 UTC (rev 208605)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2016-11-11 21:45:21 UTC (rev 208606)
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> void clipRectChanged() override;
</span><span class="cx">
</span><span class="cx"> // WebCore::MediaCanStartListener
</span><del>- void mediaCanStart() override;
</del><ins>+ void mediaCanStart(WebCore::Document&) override;
</ins><span class="cx">
</span><span class="cx"> // WebCore::MediaProducer
</span><span class="cx"> MediaProducer::MediaStateFlags mediaState() const override { return m_pluginIsPlayingAudio ? MediaProducer::IsPlayingAudio : MediaProducer::IsNotPlaying; }
</span></span></pre>
</div>
</div>
</body>
</html>