<!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>[187004] 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/187004">187004</a></dd>
<dt>Author</dt> <dd>mrajca@apple.com</dd>
<dt>Date</dt> <dd>2015-07-18 18:30:44 -0700 (Sat, 18 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Session: add infrastructure for testing interruptions
https://bugs.webkit.org/show_bug.cgi?id=147060
Reviewed by Eric Carlson.
* Modules/mediasession/MediaSession.h: Export methods to be used with tests.
* Modules/mediasession/MediaSessionManager.h: Ditto.
* bindings/scripts/CodeGeneratorJS.pm: JSMediaSession needs to be marked with WEBCORE_EXPORT so it works with JSInternals.
* testing/Internals.cpp:
(WebCore::Internals::sendMediaSessionStartOfInterruptionNotification): Let tests send interruptions to MediaSessionManager.
(WebCore::Internals::sendMediaSessionEndOfInterruptionNotification): Ditto.
(WebCore::Internals::mediaSessionCurrentState): Expose the current state of media sessions to tests.
* testing/Internals.h:
* testing/Internals.idl: Add interfaces for sending interruptions from JS tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionMediaSessionh">trunk/Source/WebCore/Modules/mediasession/MediaSession.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionMediaSessionManagerh">trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</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 (187003 => 187004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-19 00:36:45 UTC (rev 187003)
+++ trunk/Source/WebCore/ChangeLog 2015-07-19 01:30:44 UTC (rev 187004)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-07-17 Matt Rajca <mrajca@apple.com>
+
+ Media Session: add infrastructure for testing interruptions
+ https://bugs.webkit.org/show_bug.cgi?id=147060
+
+ Reviewed by Eric Carlson.
+
+ * Modules/mediasession/MediaSession.h: Export methods to be used with tests.
+ * Modules/mediasession/MediaSessionManager.h: Ditto.
+ * bindings/scripts/CodeGeneratorJS.pm: JSMediaSession needs to be marked with WEBCORE_EXPORT so it works with JSInternals.
+ * testing/Internals.cpp:
+ (WebCore::Internals::sendMediaSessionStartOfInterruptionNotification): Let tests send interruptions to MediaSessionManager.
+ (WebCore::Internals::sendMediaSessionEndOfInterruptionNotification): Ditto.
+ (WebCore::Internals::mediaSessionCurrentState): Expose the current state of media sessions to tests.
+ * testing/Internals.h:
+ * testing/Internals.idl: Add interfaces for sending interruptions from JS tests.
+
</ins><span class="cx"> 2015-07-18 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Reduce PassRefPtr in WebKit2 - 3
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.h (187003 => 187004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2015-07-19 00:36:45 UTC (rev 187003)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2015-07-19 01:30:44 UTC (rev 187004)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> Kind kindEnum() const { return m_kind; }
</span><span class="cx"> MediaRemoteControls* controls(bool& isNull);
</span><span class="cx">
</span><del>- State currentState() const { return m_currentState; }
</del><ins>+ WEBCORE_EXPORT State currentState() const { return m_currentState; }
</ins><span class="cx"> bool hasActiveMediaElements() const;
</span><span class="cx">
</span><span class="cx"> void setMetadata(const Dictionary&);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.h (187003 => 187004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.h 2015-07-19 00:36:45 UTC (rev 187003)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.h 2015-07-19 01:30:44 UTC (rev 187004)
</span><span class="lines">@@ -39,14 +39,14 @@
</span><span class="cx"> class MediaSessionManager : public MediaSessionInterruptionProviderClient {
</span><span class="cx"> friend class NeverDestroyed<MediaSessionManager>;
</span><span class="cx"> public:
</span><del>- static MediaSessionManager& singleton();
</del><ins>+ WEBCORE_EXPORT static MediaSessionManager& singleton();
</ins><span class="cx">
</span><span class="cx"> void togglePlayback();
</span><span class="cx"> void skipToNextTrack();
</span><span class="cx"> void skipToPreviousTrack();
</span><span class="cx">
</span><del>- void didReceiveStartOfInterruptionNotification(MediaSessionInterruptingCategory) override;
- void didReceiveEndOfInterruptionNotification(MediaSessionInterruptingCategory) override;
</del><ins>+ WEBCORE_EXPORT void didReceiveStartOfInterruptionNotification(MediaSessionInterruptingCategory) override;
+ WEBCORE_EXPORT void didReceiveEndOfInterruptionNotification(MediaSessionInterruptingCategory) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class MediaSession;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (187003 => 187004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-07-19 00:36:45 UTC (rev 187003)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-07-19 01:30:44 UTC (rev 187004)
</span><span class="lines">@@ -246,6 +246,7 @@
</span><span class="cx"> "JSFile" => 1,
</span><span class="cx"> "JSHTMLElement" => 1,
</span><span class="cx"> "JSHTMLMediaElement" => 1,
</span><ins>+ "JSMediaSession" => 1,
</ins><span class="cx"> "JSNode" => 1,
</span><span class="cx"> "JSNotification" => 1,
</span><span class="cx"> "JSRange" => 1,
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (187003 => 187004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-07-19 00:36:45 UTC (rev 187003)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-07-19 01:30:44 UTC (rev 187004)
</span><span class="lines">@@ -190,6 +190,11 @@
</span><span class="cx"> #include "AudioContext.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+#include "MediaSession.h"
+#include "MediaSessionManager.h"
+#endif
+
</ins><span class="cx"> using JSC::CodeBlock;
</span><span class="cx"> using JSC::FunctionExecutable;
</span><span class="cx"> using JSC::JSFunction;
</span><span class="lines">@@ -2758,6 +2763,41 @@
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(VIDEO)
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+static MediaSessionInterruptingCategory interruptingCategoryFromString(const String& interruptingCategoryString)
+{
+ if (interruptingCategoryString == "content")
+ return MediaSessionInterruptingCategory::Content;
+ if (interruptingCategoryString == "transient")
+ return MediaSessionInterruptingCategory::Transient;
+ if (interruptingCategoryString == "transient-solo")
+ return MediaSessionInterruptingCategory::TransientSolo;
+ ASSERT_NOT_REACHED();
+}
+
+void Internals::sendMediaSessionStartOfInterruptionNotification(const String& interruptingCategoryString)
+{
+ MediaSessionManager::singleton().didReceiveStartOfInterruptionNotification(interruptingCategoryFromString(interruptingCategoryString));
+}
+
+void Internals::sendMediaSessionEndOfInterruptionNotification(const String& interruptingCategoryString)
+{
+ MediaSessionManager::singleton().didReceiveEndOfInterruptionNotification(interruptingCategoryFromString(interruptingCategoryString));
+}
+
+String Internals::mediaSessionCurrentState(MediaSession* session) const
+{
+ switch (session->currentState()) {
+ case MediaSession::State::Active:
+ return "active";
+ case MediaSession::State::Interrupted:
+ return "interrupted";
+ case MediaSession::State::Idle:
+ return "idle";
+ }
+}
+#endif // ENABLE(MEDIA_SESSION)
+
</ins><span class="cx"> #if ENABLE(WEB_AUDIO)
</span><span class="cx"> void Internals::setAudioContextRestrictions(AudioContext* context, const String &restrictionsString, ExceptionCode &ec)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (187003 => 187004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2015-07-19 00:36:45 UTC (rev 187003)
+++ trunk/Source/WebCore/testing/Internals.h 2015-07-19 01:30:44 UTC (rev 187004)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> class InspectorFrontendClientDummy;
</span><span class="cx"> class InternalSettings;
</span><span class="cx"> class MallocStatistics;
</span><ins>+class MediaSession;
</ins><span class="cx"> class MemoryInfo;
</span><span class="cx"> class Node;
</span><span class="cx"> class Page;
</span><span class="lines">@@ -392,6 +393,12 @@
</span><span class="cx"> bool elementIsBlockingDisplaySleep(Element*) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+ void sendMediaSessionStartOfInterruptionNotification(const String&);
+ void sendMediaSessionEndOfInterruptionNotification(const String&);
+ String mediaSessionCurrentState(MediaSession*) const;
+#endif
+
</ins><span class="cx"> #if ENABLE(WEB_AUDIO)
</span><span class="cx"> void setAudioContextRestrictions(AudioContext*, const String& restrictions, ExceptionCode&);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (187003 => 187004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2015-07-19 00:36:45 UTC (rev 187003)
+++ trunk/Source/WebCore/testing/Internals.idl 2015-07-19 01:30:44 UTC (rev 187004)
</span><span class="lines">@@ -45,6 +45,12 @@
</span><span class="cx"> "ResourceLoadPriorityVeryHigh"
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+enum MediaSessionInterruptingCategory {
+ "content",
+ "transient",
+ "transient-solo"
+};
+
</ins><span class="cx"> [
</span><span class="cx"> NoInterfaceObject,
</span><span class="cx"> ] interface Internals {
</span><span class="lines">@@ -351,6 +357,9 @@
</span><span class="cx">
</span><span class="cx"> [Conditional=VIDEO] void beginMediaSessionInterruption();
</span><span class="cx"> [Conditional=VIDEO] void endMediaSessionInterruption(DOMString flags);
</span><ins>+ [Conditional=MEDIA_SESSION] void sendMediaSessionStartOfInterruptionNotification(MediaSessionInterruptingCategory category);
+ [Conditional=MEDIA_SESSION] void sendMediaSessionEndOfInterruptionNotification(MediaSessionInterruptingCategory category);
+ [Conditional=MEDIA_SESSION] DOMString mediaSessionCurrentState(MediaSession session);
</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>