<!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>[213281] 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/213281">213281</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2017-03-02 07:50:09 -0800 (Thu, 02 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] UIClient may not be notified of capture state change when leaving a page
https://bugs.webkit.org/show_bug.cgi?id=169014
<rdar://problem/30632267>
Reviewed by Youenn Fablet.
Enable and update the WebKit API test WebKit2.UserMedia.
* dom/Document.cpp:
(WebCore::Document::prepareForDestruction): Always call page.updateIsPlayingMedia() if there
is active media in the document because it won't be possible when the state changes later
because the frame will have been cleared.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2UserMediacpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2getUserMediahtml">trunk/Tools/TestWebKitAPI/Tests/WebKit2/getUserMedia.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213280 => 213281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-02 15:45:58 UTC (rev 213280)
+++ trunk/Source/WebCore/ChangeLog 2017-03-02 15:50:09 UTC (rev 213281)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-02 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] UIClient may not be notified of capture state change when leaving a page
+ https://bugs.webkit.org/show_bug.cgi?id=169014
+ <rdar://problem/30632267>
+
+ Reviewed by Youenn Fablet.
+
+ Enable and update the WebKit API test WebKit2.UserMedia.
+
+ * dom/Document.cpp:
+ (WebCore::Document::prepareForDestruction): Always call page.updateIsPlayingMedia() if there
+ is active media in the document because it won't be possible when the state changes later
+ because the frame will have been cleared.
+
</ins><span class="cx"> 2017-03-02 Tomas Popela <tpopela@redhat.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Keyboard menu key should show context menu
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (213280 => 213281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2017-03-02 15:45:58 UTC (rev 213280)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-03-02 15:50:09 UTC (rev 213281)
</span><span class="lines">@@ -2327,6 +2327,11 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ if (page() && m_mediaState != MediaProducer::IsNotPlaying) {
+ m_mediaState = MediaProducer::IsNotPlaying;
+ page()->updateIsPlayingMedia(HTMLMediaElementInvalidID);
+ }
+
</ins><span class="cx"> detachFromFrame();
</span><span class="cx">
</span><span class="cx"> m_hasPreparedForDestruction = true;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2UserMediacpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp (213280 => 213281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp 2017-03-02 15:45:58 UTC (rev 213280)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp 2017-03-02 15:50:09 UTC (rev 213281)
</span><span class="lines">@@ -25,6 +25,9 @@
</span><span class="cx"> #include "PlatformUtilities.h"
</span><span class="cx"> #include "PlatformWebView.h"
</span><span class="cx"> #include "Test.h"
</span><ins>+#include <WebKit/WKPagePrivate.h>
+#include <WebKit/WKPreferencesRef.h>
+#include <WebKit/WKPreferencesRefPrivate.h>
</ins><span class="cx"> #include <WebKit/WKRetainPtr.h>
</span><span class="cx"> #include <string.h>
</span><span class="cx"> #include <vector>
</span><span class="lines">@@ -31,10 +34,16 @@
</span><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx">
</span><del>-static bool done;
</del><ins>+static bool wasPrompted;
+static bool isPlayingChanged;
+static bool didFinishLoad;
</ins><span class="cx">
</span><del>-void decidePolicyForUserMediaPermissionRequestCallBack(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKSecurityOriginRef, WKUserMediaPermissionRequestRef permissionRequest, const void* /* clientInfo */)
</del><ins>+static void nullJavaScriptCallback(WKSerializedScriptValueRef, WKErrorRef error, void*)
</ins><span class="cx"> {
</span><ins>+}
+
+static void decidePolicyForUserMediaPermissionRequestCallBack(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKSecurityOriginRef, WKUserMediaPermissionRequestRef permissionRequest, const void* /* clientInfo */)
+{
</ins><span class="cx"> WKRetainPtr<WKArrayRef> audioDeviceUIDs = WKUserMediaPermissionRequestAudioDeviceUIDs(permissionRequest);
</span><span class="cx"> WKRetainPtr<WKArrayRef> videoDeviceUIDs = WKUserMediaPermissionRequestVideoDeviceUIDs(permissionRequest);
</span><span class="cx">
</span><span class="lines">@@ -54,27 +63,73 @@
</span><span class="cx"> WKUserMediaPermissionRequestAllow(permissionRequest, audioDeviceUID.get(), videoDeviceUID.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- done = true;
</del><ins>+ wasPrompted = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-TEST(WebKit2, DISABLED_UserMediaBasic)
</del><ins>+static void isPlayingDidChangeCallback(WKPageRef page, const void*)
</ins><span class="cx"> {
</span><ins>+ isPlayingChanged = true;
+}
+
+static void didFinishLoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef, const void*)
+{
+ didFinishLoad = true;
+}
+
+TEST(WebKit2, UserMediaBasic)
+{
</ins><span class="cx"> auto context = adoptWK(WKContextCreate());
</span><del>- PlatformWebView webView(context.get());
- WKPageUIClientV5 uiClient;
- memset(&uiClient, 0, sizeof(uiClient));
</del><span class="cx">
</span><ins>+ WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(Util::toWK("GetUserMedia").get()));
+ WKPreferencesRef preferences = WKPageGroupGetPreferences(pageGroup.get());
+ WKPreferencesSetMediaStreamEnabled(preferences, true);
+ WKPreferencesSetFileAccessFromFileURLsAllowed(preferences, true);
+ WKPreferencesSetMediaCaptureRequiresSecureConnection(preferences, false);
+ WKPreferencesSetMockCaptureDevicesEnabled(preferences, true);
</ins><span class="cx">
</span><del>- uiClient.base.version = 5;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
+ memset(&loaderClient, 0, sizeof(loaderClient));
+ loaderClient.base.version = 0;
+ loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
+
+ WKPageUIClientV6 uiClient;
+ memset(&uiClient, 0, sizeof(uiClient));
+ uiClient.base.version = 6;
+ uiClient.isPlayingAudioDidChange = isPlayingDidChangeCallback;
</ins><span class="cx"> uiClient.decidePolicyForUserMediaPermissionRequest = decidePolicyForUserMediaPermissionRequestCallBack;
</span><span class="cx">
</span><ins>+ PlatformWebView webView(context.get(), pageGroup.get());
</ins><span class="cx"> WKPageSetPageUIClient(webView.page(), &uiClient.base);
</span><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</ins><span class="cx">
</span><del>- done = false;
</del><span class="cx"> auto url = adoptWK(Util::createURLForResource("getUserMedia", "html"));
</span><ins>+ ASSERT(url.get());
</ins><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span><ins>+ Util::run(&didFinishLoad);
</ins><span class="cx">
</span><del>- Util::run(&done);
</del><ins>+ WKMediaState captureState = WKPageGetMediaState(webView.page());
+ EXPECT_FALSE(captureState & kWKMediaHasActiveVideoCaptureDevice);
+ EXPECT_FALSE(captureState & kWKMediaHasActiveAudioCaptureDevice);
+
+ WKPageRunJavaScriptInMainFrame(webView.page(), Util::toWK("requestAccess()").get(), 0, nullJavaScriptCallback);
+ Util::run(&wasPrompted);
+
+ captureState = WKPageGetMediaState(webView.page());
+ if (!(captureState & kWKMediaHasActiveVideoCaptureDevice)) {
+ Util::run(&isPlayingChanged);
+ captureState = WKPageGetMediaState(webView.page());
+ }
+
+ EXPECT_TRUE(captureState & kWKMediaHasActiveVideoCaptureDevice);
+ EXPECT_FALSE(captureState & kWKMediaHasActiveAudioCaptureDevice);
+
+ isPlayingChanged = false;
+ WKPageLoadURL(webView.page(), adoptWK(Util::createURLForResource("simple", "html")).get());
+ Util::run(&isPlayingChanged);
+
+ captureState = WKPageGetMediaState(webView.page());
+ EXPECT_FALSE(captureState & kWKMediaHasActiveVideoCaptureDevice);
+ EXPECT_FALSE(captureState & kWKMediaHasActiveAudioCaptureDevice);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2getUserMediahtml"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/getUserMedia.html (213280 => 213281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/getUserMedia.html 2017-03-02 15:45:58 UTC (rev 213280)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/getUserMedia.html 2017-03-02 15:50:09 UTC (rev 213281)
</span><span class="lines">@@ -1,14 +1,15 @@
</span><del>-<script>
-function gotUserMedia(mediaStream)
-{
- console.log("Got user media");
-}
-
-function userMediaError(error)
-{
- console.log(error);
-}
-
-var options = { audio: false, video: true};
-navigator.webkitGetUserMedia(options, gotUserMedia, userMediaError);
-</script>
</del><ins>+<html>
+ <head>
+ <script>
+ function requestAccess()
+ {
+ var options = { audio: false, video: true };
+ navigator.mediaDevices.getUserMedia(options)
+ .then(stream => { console.log("Got user media"); })
+ .catch(error => { console.log(error); });
+ }
+ </script>
+ </head>
+ <body>
+ </body>
+</html>
</ins></span></pre>
</div>
</div>
</body>
</html>