<!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>[187713] 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/187713">187713</a></dd>
<dt>Author</dt> <dd>mrajca@apple.com</dd>
<dt>Date</dt> <dd>2015-07-31 23:47:50 -0700 (Fri, 31 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Session: inform the UI process when the focused Content media element changes
https://bugs.webkit.org/show_bug.cgi?id=147323
Reviewed by Tim Horton.
WebCore:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::playInternal): Eventually tell the UI process that the focused Content media element changed.
* page/ChromeClient.h:
WebKit2:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::isPlayingMediaDidChange):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::focusedContentMediaElementDidChange):
* WebProcess/WebCoreSupport/WebChromeClient.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<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="#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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187712 => 187713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-08-01 06:39:36 UTC (rev 187712)
+++ trunk/Source/WebCore/ChangeLog        2015-08-01 06:47:50 UTC (rev 187713)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2015-07-27 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><ins>+ Media Session: inform the UI process when the focused Content media element changes
+ https://bugs.webkit.org/show_bug.cgi?id=147323
+
+ Reviewed by Tim Horton.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::playInternal): Eventually tell the UI process that the focused Content media element changed.
+ * page/ChromeClient.h:
+
+2015-07-27 Matt Rajca <mrajca@apple.com>
+
</ins><span class="cx"> Media Session: give media elements unique IDs
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=147322
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (187712 => 187713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp        2015-08-01 06:39:36 UTC (rev 187712)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp        2015-08-01 06:47:50 UTC (rev 187713)
</span><span class="lines">@@ -2910,7 +2910,12 @@
</span><span class="cx"> if (m_readyState == HAVE_ENOUGH_DATA || m_readyState == HAVE_FUTURE_DATA) {
</span><span class="cx"> if (m_session) {
</span><span class="cx"> m_session->addActiveMediaElement(*this);
</span><del>-
</del><ins>+
+ if (m_session->kindEnum() == MediaSession::Kind::Content) {
+ if (Page* page = document().page())
+ page->chrome().client().focusedContentMediaElementDidChange(m_elementID);
+ }
+
</ins><span class="cx"> if (!m_session->invoke()) {
</span><span class="cx"> pause();
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (187712 => 187713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h        2015-08-01 06:39:36 UTC (rev 187712)
+++ trunk/Source/WebCore/page/ChromeClient.h        2015-08-01 06:47:50 UTC (rev 187713)
</span><span class="lines">@@ -425,6 +425,7 @@
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> virtual void hasMediaSessionWithActiveMediaElementsDidChange(bool) { }
</span><span class="cx"> virtual void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&) { }
</span><ins>+ virtual void focusedContentMediaElementDidChange(uint64_t) { }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual void setPageActivityState(PageActivityState::Flags) { }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (187712 => 187713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-08-01 06:39:36 UTC (rev 187712)
+++ trunk/Source/WebKit2/ChangeLog        2015-08-01 06:47:50 UTC (rev 187713)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-07-27 Matt Rajca <mrajca@apple.com>
+
+ Media Session: inform the UI process when the focused Content media element changes
+ https://bugs.webkit.org/show_bug.cgi?id=147323
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::isPlayingMediaDidChange):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::focusedContentMediaElementDidChange):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+
</ins><span class="cx"> 2015-07-31 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop dummy Timer callbacks
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (187712 => 187713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2015-08-01 06:39:36 UTC (rev 187712)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2015-08-01 06:47:50 UTC (rev 187713)
</span><span class="lines">@@ -107,6 +107,7 @@
</span><span class="cx"> #include <WebCore/FloatRect.h>
</span><span class="cx"> #include <WebCore/FocusDirection.h>
</span><span class="cx"> #include <WebCore/MIMETypeRegistry.h>
</span><ins>+#include <WebCore/NotImplemented.h>
</ins><span class="cx"> #include <WebCore/RenderEmbeddedObject.h>
</span><span class="cx"> #include <WebCore/SerializedCryptoKeyWrap.h>
</span><span class="cx"> #include <WebCore/TextCheckerClient.h>
</span><span class="lines">@@ -5964,6 +5965,11 @@
</span><span class="cx"> Ref<WebMediaSessionMetadata> webMetadata = WebMediaSessionMetadata::create(metadata);
</span><span class="cx"> m_uiClient->mediaSessionMetadataDidChange(*this, webMetadata.ptr());
</span><span class="cx"> }
</span><ins>+
+void WebPageProxy::focusedContentMediaElementDidChange(uint64_t elementID)
+{
+ notImplemented();
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (187712 => 187713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h        2015-08-01 06:39:36 UTC (rev 187712)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h        2015-08-01 06:47:50 UTC (rev 187713)
</span><span class="lines">@@ -1032,6 +1032,7 @@
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> void hasMediaSessionWithActiveMediaElementsDidChange(bool);
</span><span class="cx"> void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&);
</span><ins>+ void focusedContentMediaElementDidChange(uint64_t);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (187712 => 187713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in        2015-08-01 06:39:36 UTC (rev 187712)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in        2015-08-01 06:47:50 UTC (rev 187713)
</span><span class="lines">@@ -427,6 +427,7 @@
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> HasMediaSessionWithActiveMediaElementsDidChange(bool state)
</span><span class="cx"> MediaSessionMetadataDidChange(WebCore::MediaSessionMetadata metadata);
</span><ins>+ FocusedContentMediaElementDidChange(uint64_t elementID)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (187712 => 187713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp        2015-08-01 06:39:36 UTC (rev 187712)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp        2015-08-01 06:47:50 UTC (rev 187713)
</span><span class="lines">@@ -1072,6 +1072,11 @@
</span><span class="cx"> {
</span><span class="cx"> m_page->send(Messages::WebPageProxy::MediaSessionMetadataDidChange(metadata));
</span><span class="cx"> }
</span><ins>+
+void WebChromeClient::focusedContentMediaElementDidChange(uint64_t elementID)
+{
+ m_page->send(Messages::WebPageProxy::FocusedContentMediaElementDidChange(elementID));
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::setPageActivityState(PageActivityState::Flags activityState)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (187712 => 187713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h        2015-08-01 06:39:36 UTC (rev 187712)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h        2015-08-01 06:47:50 UTC (rev 187713)
</span><span class="lines">@@ -297,6 +297,7 @@
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> virtual void hasMediaSessionWithActiveMediaElementsDidChange(bool) override;
</span><span class="cx"> virtual void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&) override;
</span><ins>+ virtual void focusedContentMediaElementDidChange(uint64_t) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span></span></pre>
</div>
</div>
</body>
</html>