<!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>[187256] trunk/Source/WebCore</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/187256">187256</a></dd>
<dt>Author</dt> <dd>mrajca@apple.com</dd>
<dt>Date</dt> <dd>2015-07-23 15:02:07 -0700 (Thu, 23 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Session: add infrastructure for testing ducking https://bugs.webkit.org/show_bug.cgi?id=147080
Reviewed by Jer Noble.
We need to expose a media element's underlying media player's volume to tests so we can test ducking.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::playerVolume):
* html/HTMLMediaElement.h:
* testing/Internals.cpp:
(WebCore::Internals::mediaElementPlayerVolume):
* testing/Internals.h:
* testing/Internals.idl:</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="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187255 => 187256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-23 22:00:16 UTC (rev 187255)
+++ trunk/Source/WebCore/ChangeLog 2015-07-23 22:02:07 UTC (rev 187256)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-07-23 Matt Rajca <mrajca@apple.com>
+
+ Media Session: add infrastructure for testing ducking https://bugs.webkit.org/show_bug.cgi?id=147080
+
+ Reviewed by Jer Noble.
+
+ We need to expose a media element's underlying media player's volume to tests so we can test ducking.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::playerVolume):
+ * html/HTMLMediaElement.h:
+ * testing/Internals.cpp:
+ (WebCore::Internals::mediaElementPlayerVolume):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2015-07-21 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Add an explicit API to allow media documents to (temporarily) play inline
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (187255 => 187256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-07-23 22:00:16 UTC (rev 187255)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-07-23 22:02:07 UTC (rev 187256)
</span><span class="lines">@@ -6479,6 +6479,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><ins>+double HTMLMediaElement::playerVolume() const
+{
+ return m_player ? m_player->volume() : 0;
+}
</ins><span class="cx">
</span><span class="cx"> MediaSession* HTMLMediaElement::session() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (187255 => 187256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2015-07-23 22:00:16 UTC (rev 187255)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2015-07-23 22:02:07 UTC (rev 187256)
</span><span class="lines">@@ -420,6 +420,8 @@
</span><span class="cx"> void mediaLoadingFailedFatally(MediaPlayerEnums::NetworkState);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><ins>+ WEBCORE_EXPORT double playerVolume() const;
+
</ins><span class="cx"> const String& kind() const { return m_kind; }
</span><span class="cx"> void setKind(const String& kind) { m_kind = kind; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (187255 => 187256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-07-23 22:00:16 UTC (rev 187255)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-07-23 22:02:07 UTC (rev 187256)
</span><span class="lines">@@ -2809,6 +2809,12 @@
</span><span class="cx"> return "idle";
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+double Internals::mediaElementPlayerVolume(HTMLMediaElement* element) const
+{
+ ASSERT_ARG(element, element);
+ return element->playerVolume();
+}
</ins><span class="cx"> #endif // ENABLE(MEDIA_SESSION)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_AUDIO)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (187255 => 187256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2015-07-23 22:00:16 UTC (rev 187255)
+++ trunk/Source/WebCore/testing/Internals.h 2015-07-23 22:02:07 UTC (rev 187256)
</span><span class="lines">@@ -398,6 +398,7 @@
</span><span class="cx"> void sendMediaSessionStartOfInterruptionNotification(const String&);
</span><span class="cx"> void sendMediaSessionEndOfInterruptionNotification(const String&);
</span><span class="cx"> String mediaSessionCurrentState(MediaSession*) const;
</span><ins>+ double mediaElementPlayerVolume(HTMLMediaElement*) const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_AUDIO)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (187255 => 187256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2015-07-23 22:00:16 UTC (rev 187255)
+++ trunk/Source/WebCore/testing/Internals.idl 2015-07-23 22:02:07 UTC (rev 187256)
</span><span class="lines">@@ -361,6 +361,7 @@
</span><span class="cx"> [Conditional=MEDIA_SESSION] void sendMediaSessionStartOfInterruptionNotification(MediaSessionInterruptingCategory category);
</span><span class="cx"> [Conditional=MEDIA_SESSION] void sendMediaSessionEndOfInterruptionNotification(MediaSessionInterruptingCategory category);
</span><span class="cx"> [Conditional=MEDIA_SESSION] DOMString mediaSessionCurrentState(MediaSession session);
</span><ins>+ [Conditional=MEDIA_SESSION] double mediaElementPlayerVolume(HTMLMediaElement element);
</ins><span class="cx"> [Conditional=VIDEO] void applicationWillEnterForeground();
</span><span class="cx"> [Conditional=VIDEO] void applicationWillEnterBackground();
</span><span class="cx"> [Conditional=VIDEO, RaisesException] void setMediaSessionRestrictions(DOMString mediaType, DOMString restrictions);
</span></span></pre>
</div>
</div>
</body>
</html>