<!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>[186538] trunk/Source</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/186538">186538</a></dd>
<dt>Author</dt> <dd>mrajca@apple.com</dd>
<dt>Date</dt> <dd>2015-07-08 16:46:16 -0700 (Wed, 08 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Session: indicate to clients whether a media session has active media elements
https://bugs.webkit.org/show_bug.cgi?id=146742
Reviewed by Tim Horton.
* UIProcess/API/C/WKPage.cpp:
(WKPageHasMediaSessionWithActiveMediaElements):
* UIProcess/API/C/WKPagePrivate.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::hasMediaSessionWithActiveMediaElementsDidChange):
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::hasMediaSessionWithActiveMediaElementsDidChange):
* UIProcess/WebPageProxy.messages.in:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::hasMediaSessionWithActiveMediaElementsDidChange):
* WebProcess/WebCoreSupport/WebChromeClient.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagePrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.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="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (186537 => 186538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2015-07-08 23:46:11 UTC (rev 186537)
+++ trunk/Source/WebCore/page/ChromeClient.h 2015-07-08 23:46:16 UTC (rev 186538)
</span><span class="lines">@@ -419,6 +419,7 @@
</span><span class="cx"> virtual void isPlayingMediaDidChange(MediaProducer::MediaStateFlags) { }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><ins>+ virtual void hasMediaSessionWithActiveMediaElementsDidChange(bool) { }
</ins><span class="cx"> virtual void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&) { }
</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 (186537 => 186538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-08 23:46:11 UTC (rev 186537)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-08 23:46:16 UTC (rev 186538)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-07-08 Matt Rajca <mrajca@apple.com>
+
+ Media Session: indicate to clients whether a media session has active media elements
+ https://bugs.webkit.org/show_bug.cgi?id=146742
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageHasMediaSessionWithActiveMediaElements):
+ * UIProcess/API/C/WKPagePrivate.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::hasMediaSessionWithActiveMediaElementsDidChange):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::hasMediaSessionWithActiveMediaElementsDidChange):
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::hasMediaSessionWithActiveMediaElementsDidChange):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+
</ins><span class="cx"> 2015-07-07 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> Media Session: propagate artwork URL with metadata to UI clients
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (186537 => 186538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-07-08 23:46:11 UTC (rev 186537)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-07-08 23:46:16 UTC (rev 186538)
</span><span class="lines">@@ -2153,6 +2153,16 @@
</span><span class="cx"> toImpl(page)->setMuted(muted);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WKPageHasMediaSessionWithActiveMediaElements(WKPageRef page)
+{
+#if ENABLE(MEDIA_SESSION)
+ return toImpl(page)->hasMediaSessionWithActiveMediaElements();
+#else
+ UNUSED_PARAM(page);
+ return false;
+#endif
+}
+
</ins><span class="cx"> void WKPageHandleMediaEvent(WKPageRef page, WKMediaEventType wkEventType)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h (186537 => 186538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2015-07-08 23:46:11 UTC (rev 186537)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2015-07-08 23:46:16 UTC (rev 186538)
</span><span class="lines">@@ -118,6 +118,7 @@
</span><span class="cx"> };
</span><span class="cx"> typedef uint32_t WKMediaEventType;
</span><span class="cx">
</span><ins>+WK_EXPORT bool WKPageHasMediaSessionWithActiveMediaElements(WKPageRef page);
</ins><span class="cx"> WK_EXPORT void WKPageHandleMediaEvent(WKPageRef page, WKMediaEventType event);
</span><span class="cx">
</span><span class="cx"> WK_EXPORT void WKPageLoadURLWithShouldOpenExternalURLsPolicy(WKPageRef page, WKURLRef url, bool shouldOpenExternalURLs);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (186537 => 186538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-07-08 23:46:11 UTC (rev 186537)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-07-08 23:46:16 UTC (rev 186538)
</span><span class="lines">@@ -5809,6 +5809,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><ins>+void WebPageProxy::hasMediaSessionWithActiveMediaElementsDidChange(bool state)
+{
+ m_hasMediaSessionWithActiveMediaElements = state;
+}
+
</ins><span class="cx"> void WebPageProxy::mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata& metadata)
</span><span class="cx"> {
</span><span class="cx"> Ref<WebMediaSessionMetadata> webMetadata = WebMediaSessionMetadata::create(metadata);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (186537 => 186538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-07-08 23:46:11 UTC (rev 186537)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-07-08 23:46:16 UTC (rev 186538)
</span><span class="lines">@@ -940,6 +940,7 @@
</span><span class="cx"> bool mayStartMediaWhenInWindow() const { return m_mayStartMediaWhenInWindow; }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><ins>+ bool hasMediaSessionWithActiveMediaElements() const { return m_hasMediaSessionWithActiveMediaElements; }
</ins><span class="cx"> void handleMediaEvent(WebCore::MediaEventType);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1025,6 +1026,7 @@
</span><span class="cx"> void isPlayingMediaDidChange(WebCore::MediaProducer::MediaStateFlags);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><ins>+ void hasMediaSessionWithActiveMediaElementsDidChange(bool);
</ins><span class="cx"> void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1762,6 +1764,10 @@
</span><span class="cx">
</span><span class="cx"> WebCore::MediaProducer::MediaStateFlags m_mediaState { WebCore::MediaProducer::IsNotPlaying };
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+ bool m_hasMediaSessionWithActiveMediaElements { false };
+#endif
+
</ins><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><span class="cx"> bool m_requiresTargetMonitoring { false };
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (186537 => 186538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-07-08 23:46:11 UTC (rev 186537)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-07-08 23:46:16 UTC (rev 186538)
</span><span class="lines">@@ -425,6 +425,7 @@
</span><span class="cx"> IsPlayingMediaDidChange(unsigned state)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><ins>+ HasMediaSessionWithActiveMediaElementsDidChange(bool state)
</ins><span class="cx"> MediaSessionMetadataDidChange(WebCore::MediaSessionMetadata metadata);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (186537 => 186538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-07-08 23:46:11 UTC (rev 186537)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-07-08 23:46:16 UTC (rev 186538)
</span><span class="lines">@@ -1062,6 +1062,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><ins>+void WebChromeClient::hasMediaSessionWithActiveMediaElementsDidChange(bool state)
+{
+ m_page->send(Messages::WebPageProxy::HasMediaSessionWithActiveMediaElementsDidChange(state));
+}
+
</ins><span class="cx"> void WebChromeClient::mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata& metadata)
</span><span class="cx"> {
</span><span class="cx"> m_page->send(Messages::WebPageProxy::MediaSessionMetadataDidChange(metadata));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (186537 => 186538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-07-08 23:46:11 UTC (rev 186537)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-07-08 23:46:16 UTC (rev 186538)
</span><span class="lines">@@ -295,6 +295,7 @@
</span><span class="cx"> virtual void setPageActivityState(WebCore::PageActivityState::Flags) override;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><ins>+ virtual void hasMediaSessionWithActiveMediaElementsDidChange(bool) override;
</ins><span class="cx"> virtual void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>