<!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>[163390] 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/163390">163390</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2014-02-04 11:09:34 -0800 (Tue, 04 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refine MediaSession interruptions
https://bugs.webkit.org/show_bug.cgi?id=128125
Reviewed by Jer Noble.
Source/WebCore:
Test: media/video-background-playback.html
* WebCore.exp.in: Export applicationWillEnterForeground and applicationWillEnterBackground for
Internals.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::play): Ask the media session if playback is allowed instead of check
to see if it is interrupted directly.
(WebCore::HTMLMediaElement::pause): Ask the media session if pausing is allowed instead of check
to see if it is interrupted directly.
(WebCore::HTMLMediaElement::mediaType): Return media type based on media characteristics once
the information is available.
(WebCore::HTMLMediaElement::resumePlayback): New.
* html/HTMLMediaElement.h:
* html/HTMLMediaSession.cpp:
(WebCore::restrictionName): New, use for logging only.
(WebCore::HTMLMediaSession::addBehaviorRestriction): Log restriction changes.
(WebCore::HTMLMediaSession::removeBehaviorRestriction): Ditto.
* html/HTMLMediaSession.h:
* platform/audio/MediaSession.cpp:
(WebCore::stateName): New, used for logging.
(WebCore::MediaSession::MediaSession): Don't cache client media type because it can change.
(WebCore::MediaSession::setState): Log state changes.
(WebCore::MediaSession::beginInterruption): Remember the current state in case we want to use it
to restore state when the interruption ends.
(WebCore::MediaSession::endInterruption): Resume playback if appropriate.
(WebCore::MediaSession::clientWillBeginPlayback): Track the client's playback state.
(WebCore::MediaSession::clientWillPausePlayback): Ditto.
(WebCore::MediaSession::mediaType): Ask client for state.
* platform/audio/MediaSession.h:
* platform/audio/MediaSessionManager.cpp:
(WebCore::MediaSessionManager::MediaSessionManager): m_interruptions -> m_interrupted.
(WebCore::MediaSessionManager::beginInterruption): Don't assume interruptions are always balanced.
(WebCore::MediaSessionManager::endInterruption): Ditto.
(WebCore::MediaSessionManager::addSession):
(WebCore::MediaSessionManager::applicationWillEnterBackground): Interrupt client if it is not
allowed to play in the background.
(WebCore::MediaSessionManager::applicationWillEnterForeground): End client interruption if it
was stopped by an interruption.
* platform/audio/MediaSessionManager.h:
* platform/audio/ios/MediaSessionManagerIOS.h:
* platform/audio/ios/MediaSessionManagerIOS.mm:
(WebCore::MediaSessionManageriOS::~MediaSessionManageriOS): Clear the helper callback.
(WebCore::MediaSessionManageriOS::resetRestrictions): Mark video as not allowed to play
while the application is in the background. Register for application suspend/resume
notifications.
(-[WebMediaSessionHelper clearCallback]): Set _callback to nil.
(-[WebMediaSessionHelper applicationWillEnterForeground:]): New, notify client of application
state change.
(-[WebMediaSessionHelper applicationWillResignActive:]): Ditto.
* platform/audio/mac/AudioDestinationMac.h: Add resumePlayback.
* testing/Internals.cpp:
(WebCore::Internals::applicationWillEnterForeground): New, simulate application context switch.
(WebCore::Internals::applicationWillEnterBackground): Ditto.
(WebCore::Internals::setMediaSessionRestrictions): Add "BackgroundPlaybackNotPermitted" restriction.
* testing/Internals.h:
* testing/Internals.idl:
Source/WebKit:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Export applicationWillEnterForeground
and applicationWillEnterBackground for Internals.
LayoutTests:
* media/video-background-playback-expected.txt: Added.
* media/video-background-playback.html: Added.
* media/video-interruption-active-when-element-created-expected.txt: Removed.
* media/video-interruption-active-when-element-created.html: Removed.
* media/video-interruption-with-resume-allowing-play-expected.txt:
* media/video-interruption-with-resume-allowing-play.html:
* media/video-interruption-with-resume-not-allowing-play-expected.txt:
* media/video-interruption-with-resume-not-allowing-play.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediavideointerruptionwithresumeallowingplayexpectedtxt">trunk/LayoutTests/media/video-interruption-with-resume-allowing-play-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideointerruptionwithresumeallowingplayhtml">trunk/LayoutTests/media/video-interruption-with-resume-allowing-play.html</a></li>
<li><a href="#trunkLayoutTestsmediavideointerruptionwithresumenotallowingplayexpectedtxt">trunk/LayoutTests/media/video-interruption-with-resume-not-allowing-play-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideointerruptionwithresumenotallowingplayhtml">trunk/LayoutTests/media/video-interruption-with-resume-not-allowing-play.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</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="#trunkSourceWebCorehtmlHTMLMediaSessioncpp">trunk/Source/WebCore/html/HTMLMediaSession.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaSessionh">trunk/Source/WebCore/html/HTMLMediaSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessioncpp">trunk/Source/WebCore/platform/audio/MediaSession.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessionh">trunk/Source/WebCore/platform/audio/MediaSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessionManagercpp">trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessionManagerh">trunk/Source/WebCore/platform/audio/MediaSessionManager.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSh">trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm">trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacAudioDestinationMach">trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.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>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin">trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideobackgroundplaybackexpectedtxt">trunk/LayoutTests/media/video-background-playback-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideobackgroundplaybackhtml">trunk/LayoutTests/media/video-background-playback.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideointerruptionactivewhenelementcreatedexpectedtxt">trunk/LayoutTests/media/video-interruption-active-when-element-created-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideointerruptionactivewhenelementcreatedhtml">trunk/LayoutTests/media/video-interruption-active-when-element-created.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/LayoutTests/ChangeLog 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-04 Eric Carlson <eric.carlson@apple.com>
+
+ Refine MediaSession interruptions
+ https://bugs.webkit.org/show_bug.cgi?id=128125
+
+ Reviewed by Jer Noble.
+
+ * media/video-background-playback-expected.txt: Added.
+ * media/video-background-playback.html: Added.
+ * media/video-interruption-active-when-element-created-expected.txt: Removed.
+ * media/video-interruption-active-when-element-created.html: Removed.
+ * media/video-interruption-with-resume-allowing-play.html:
+ * media/video-interruption-with-resume-not-allowing-play.html:
+
</ins><span class="cx"> 2014-02-04 Radu Stavila <stavila@adobe.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r159609): Images are corrupted when hovering over buttons @ github.com
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideobackgroundplaybackexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-background-playback-expected.txt (0 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-background-playback-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-background-playback-expected.txt 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+
+Test switching application state when <video> is not allowed to play in background.
+
+RUN(internals.setMediaSessionRestrictions('video', 'BackgroundPlaybackNotPermitted'))
+
+EVENT(canplaythrough)
+EVENT(canplaythrough)
+
+RUN(audio.play())
+RUN(video.play())
+EVENT(playing)
+EVENT(playing)
+
+** Simulate switch to background, video should pause.
+RUN(internals.applicationWillEnterBackground())
+
+EVENT(pause)
+
+** 100ms timer fired...
+EXPECTED (video.paused == 'true') OK
+EXPECTED (audio.paused == 'false') OK
+
+** Simulate switch back to foreground, video should resume.
+RUN(internals.applicationWillEnterForeground())
+
+EVENT(playing)
+
+** 100ms timer fired...
+EXPECTED (video.paused == 'false') OK
+EXPECTED (audio.paused == 'false') OK
+
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideobackgroundplaybackhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-background-playback.html (0 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-background-playback.html (rev 0)
+++ trunk/LayoutTests/media/video-background-playback.html 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -0,0 +1,93 @@
</span><ins>+<html>
+ <head>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
+ <script>
+ var playCount = 0;
+ var playThroughCount = 0;
+ var state = 0;
+ var audio;
+ var video
+
+ function logEvent(evt)
+ {
+ consoleWrite("EVENT(" + evt.type + ")");
+ }
+
+ function checkState()
+ {
+ consoleWrite("<br>** 100ms timer fired...");
+ switch (state) {
+ case "background":
+ testExpected("video.paused", true);
+ testExpected("audio.paused", false);
+ state = "foreground";
+ consoleWrite("<br>** Simulate switch back to foreground, video should resume.");
+ run("internals.applicationWillEnterForeground()");
+ setTimeout(checkState, 100);
+ consoleWrite("");
+ break;
+ case "foreground":
+ testExpected("video.paused", false);
+ testExpected("audio.paused", false);
+ consoleWrite("");
+ endTest();
+ break;
+ }
+ }
+
+ function playing(evt)
+ {
+ logEvent(evt);
+ if (++playCount != 2)
+ return;
+
+ consoleWrite("<br>** Simulate switch to background, video should pause.");
+ run("internals.applicationWillEnterBackground()");
+ setTimeout(checkState, 100);
+ state = "background";
+ consoleWrite("");
+ }
+
+ function canplaythrough(evt)
+ {
+ logEvent(evt);
+ if (++playThroughCount < 2)
+ return;
+ consoleWrite("");
+ run("audio.play()");
+ run("video.play()");
+ }
+
+ function start()
+ {
+ if (!window.internals) {
+ failTest('This test requires window.internals.');
+ return;
+ }
+
+ var elements = document.getElementsByTagName('video');
+ for (var i = 0; i < elements.length; ++i) {
+ elements[i].addEventListener("canplaythrough", canplaythrough);
+ elements[i].addEventListener('playing', playing);
+ elements[i].addEventListener('pause', logEvent);
+ }
+ video = elements[0];
+ video.src = findMediaFile("video", "content/test");
+
+ audio = elements[1];
+ audio.src = findMediaFile("audio", "content/silence");
+
+ run("internals.setMediaSessionRestrictions('video', 'BackgroundPlaybackNotPermitted')");
+ state = "foreground";
+ consoleWrite("");
+ }
+ </script>
+ </head>
+
+ <body onload="start()">
+ <video controls id="one"></video>
+ <video controls id="two"></video>
+ <p>Test switching application state when &lt;video&gt; is not allowed to play in background.</p>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideointerruptionactivewhenelementcreatedexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/media/video-interruption-active-when-element-created-expected.txt (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-interruption-active-when-element-created-expected.txt 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/LayoutTests/media/video-interruption-active-when-element-created-expected.txt 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>-Test a <video> element crated during interruption behaves correctly.
-
-RUN(internals.beginMediaSessionInterruption())
-RUN(video = document.createElement('video'))
-RUN(document.body.appendChild(video))
-EVENT(canplaythrough)
-
-RUN(video.play())
-100ms timer fired...
-EXPECTED (video.paused == 'true') OK
-RUN(internals.endMediaSessionInterruption('MayResumePlaying'))
-EVENT(playing)
-
-END OF TEST
-
</del></span></pre></div>
<a id="trunkLayoutTestsmediavideointerruptionactivewhenelementcreatedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/media/video-interruption-active-when-element-created.html (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-interruption-active-when-element-created.html 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/LayoutTests/media/video-interruption-active-when-element-created.html 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -1,56 +0,0 @@
</span><del>-<html>
- <head>
- <script src=media-file.js></script>
- <script src=video-test.js></script>
- <script>
- var state = 0;
-
- function checkState()
- {
- consoleWrite("100ms timer fired...");
- testExpected("video.paused", true);
- state = "resuming";
- run("internals.endMediaSessionInterruption('MayResumePlaying')");
- }
-
- function playing()
- {
- if (state != "resuming")
- {
- consoleWrite("");
- failTest("<b>Playback started during interruption.</b>");
- return;
- }
-
- consoleWrite("");
- endTest();
- }
-
- function canplaythrough()
- {
- consoleWrite("");
- run("video.play()");
- setTimeout(checkState, 100);
- }
-
- function start()
- {
- if (!window.internals) {
- failTest('This test requires window.internals.');
- return;
- }
- run("internals.beginMediaSessionInterruption()");;
- run("video = document.createElement('video')");
- run("document.body.appendChild(video)");
- waitForEvent('canplaythrough', canplaythrough);
- waitForEvent('playing', playing);
- video.src = findMediaFile("video", "content/test");
- state = "interrupted";
- }
- </script>
- </head>
-
- <body onload="start()">
- <p>Test a &lt;video&gt; element crated during interruption behaves correctly.</p>
- </body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsmediavideointerruptionwithresumeallowingplayexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-interruption-with-resume-allowing-play-expected.txt (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-interruption-with-resume-allowing-play-expected.txt 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/LayoutTests/media/video-interruption-with-resume-allowing-play-expected.txt 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -2,13 +2,18 @@
</span><span class="cx"> Test that play() during interruption does nothing, ending interruption allows playback to resume.
</span><span class="cx">
</span><span class="cx"> EVENT(canplaythrough)
</span><ins>+RUN(video.play())
</ins><span class="cx">
</span><ins>+EVENT(playing)
+EXPECTED (video.paused == 'false') OK
</ins><span class="cx"> RUN(internals.beginMediaSessionInterruption())
</span><del>-RUN(video.play())
</del><ins>+
</ins><span class="cx"> 100ms timer fired...
</span><span class="cx"> EXPECTED (video.paused == 'true') OK
</span><span class="cx"> RUN(internals.endMediaSessionInterruption('MayResumePlaying'))
</span><ins>+
</ins><span class="cx"> EVENT(playing)
</span><ins>+EXPECTED (video.paused == 'false') OK
</ins><span class="cx">
</span><span class="cx"> END OF TEST
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideointerruptionwithresumeallowingplayhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-interruption-with-resume-allowing-play.html (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-interruption-with-resume-allowing-play.html 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/LayoutTests/media/video-interruption-with-resume-allowing-play.html 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -7,33 +7,34 @@
</span><span class="cx">
</span><span class="cx"> function checkState()
</span><span class="cx"> {
</span><del>- consoleWrite("100ms timer fired...");
- testExpected("video.paused", true);
- state = "resuming";
- run("internals.endMediaSessionInterruption('MayResumePlaying')");
- }
-
- function playing()
- {
- if (state != "resuming")
- {
</del><ins>+ switch (state) {
+ case "playing":
+ testExpected("video.paused", false);
+ state = "interrupted";
+ run("internals.beginMediaSessionInterruption()");;
+ setTimeout(checkState, 100);
</ins><span class="cx"> consoleWrite("");
</span><del>- failTest("<b>Playback started during interruption.</b>");
- return;
</del><ins>+ break;
+ case "interrupted":
+ consoleWrite("100ms timer fired...");
+ testExpected("video.paused", true);
+ state = "resuming";
+ run("internals.endMediaSessionInterruption('MayResumePlaying')");
+ consoleWrite("");
+ break;
+ case "resuming":
+ testExpected("video.paused", false);
+ consoleWrite("");
+ endTest();
+ break;
</ins><span class="cx"> }
</span><del>-
- consoleWrite("");
- endTest();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function canplaythrough()
</span><span class="cx"> {
</span><ins>+ state = "playing";
+ run("video.play()");
</ins><span class="cx"> consoleWrite("");
</span><del>-
- run("internals.beginMediaSessionInterruption()");;
- state = "interrupted";
- run("video.play()");
- setTimeout(checkState, 100);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function start()
</span><span class="lines">@@ -45,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> findMediaElement();
</span><span class="cx"> waitForEvent('canplaythrough', canplaythrough);
</span><del>- waitForEvent('playing', playing);
</del><ins>+ waitForEvent('playing', checkState);
</ins><span class="cx"> video.src = findMediaFile("video", "content/test");
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideointerruptionwithresumenotallowingplayexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-interruption-with-resume-not-allowing-play-expected.txt (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-interruption-with-resume-not-allowing-play-expected.txt 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/LayoutTests/media/video-interruption-with-resume-not-allowing-play-expected.txt 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -1,13 +1,16 @@
</span><span class="cx">
</span><del>-Test that play() during interruption does nothing, ending interruption does not allow playback to resume.
</del><ins>+Test that playback is paused by an interruption, and that ending the interruption does automatically resume playback.
</ins><span class="cx">
</span><span class="cx"> EVENT(canplaythrough)
</span><ins>+RUN(video.play())
</ins><span class="cx">
</span><ins>+EVENT(playing)
</ins><span class="cx"> RUN(internals.beginMediaSessionInterruption())
</span><del>-RUN(video.play())
</del><ins>+
</ins><span class="cx"> 100ms timer fired...
</span><span class="cx"> EXPECTED (video.paused == 'true') OK
</span><span class="cx"> RUN(internals.endMediaSessionInterruption(''))
</span><ins>+
</ins><span class="cx"> 100ms timer fired...
</span><span class="cx"> EXPECTED (video.paused == 'true') OK
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideointerruptionwithresumenotallowingplayhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-interruption-with-resume-not-allowing-play.html (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-interruption-with-resume-not-allowing-play.html 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/LayoutTests/media/video-interruption-with-resume-not-allowing-play.html 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -7,15 +7,13 @@
</span><span class="cx">
</span><span class="cx"> function playing()
</span><span class="cx"> {
</span><del>- if (state == "resuming")
- failTest("<b>Playback started after interruption.</b>");
- else
- failTest("<b>Playback started during interruption.</b>");
</del><ins>+ run("internals.beginMediaSessionInterruption()");;
+ setTimeout(checkState, 100);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function checkState()
</span><span class="cx"> {
</span><del>- consoleWrite("100ms timer fired...");
</del><ins>+ consoleWrite("<br>100ms timer fired...");
</ins><span class="cx"> testExpected("video.paused", true);
</span><span class="cx"> switch (state) {
</span><span class="cx"> case "interrupted":
</span><span class="lines">@@ -32,12 +30,9 @@
</span><span class="cx">
</span><span class="cx"> function canplaythrough()
</span><span class="cx"> {
</span><del>- consoleWrite("");
-
- run("internals.beginMediaSessionInterruption()");;
</del><span class="cx"> state = "interrupted";
</span><span class="cx"> run("video.play()");
</span><del>- setTimeout(checkState, 100);
</del><ins>+ consoleWrite("");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function start()
</span><span class="lines">@@ -57,6 +52,6 @@
</span><span class="cx">
</span><span class="cx"> <body onload="start()">
</span><span class="cx"> <video controls ></video>
</span><del>- <p>Test that play() during interruption does nothing, ending interruption does not allow playback to resume.</p>
</del><ins>+ <p>Test that playback is paused by an interruption, and that ending the interruption does automatically resume playback.</p>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/Source/WebCore/ChangeLog 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -1,3 +1,74 @@
</span><ins>+2014-02-04 Eric Carlson <eric.carlson@apple.com>
+
+ Refine MediaSession interruptions
+ https://bugs.webkit.org/show_bug.cgi?id=128125
+
+ Reviewed by Jer Noble.
+
+ Test: media/video-background-playback.html
+
+ * WebCore.exp.in: Export applicationWillEnterForeground and applicationWillEnterBackground for
+ Internals.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::play): Ask the media session if playback is allowed instead of check
+ to see if it is interrupted directly.
+ (WebCore::HTMLMediaElement::pause): Ask the media session if pausing is allowed instead of check
+ to see if it is interrupted directly.
+ (WebCore::HTMLMediaElement::mediaType): Return media type based on media characteristics once
+ the information is available.
+ (WebCore::HTMLMediaElement::resumePlayback): New.
+ * html/HTMLMediaElement.h:
+
+ * html/HTMLMediaSession.cpp:
+ (WebCore::restrictionName): New, use for logging only.
+ (WebCore::HTMLMediaSession::addBehaviorRestriction): Log restriction changes.
+ (WebCore::HTMLMediaSession::removeBehaviorRestriction): Ditto.
+ * html/HTMLMediaSession.h:
+
+ * platform/audio/MediaSession.cpp:
+ (WebCore::stateName): New, used for logging.
+ (WebCore::MediaSession::MediaSession): Don't cache client media type because it can change.
+ (WebCore::MediaSession::setState): Log state changes.
+ (WebCore::MediaSession::beginInterruption): Remember the current state in case we want to use it
+ to restore state when the interruption ends.
+ (WebCore::MediaSession::endInterruption): Resume playback if appropriate.
+ (WebCore::MediaSession::clientWillBeginPlayback): Track the client's playback state.
+ (WebCore::MediaSession::clientWillPausePlayback): Ditto.
+ (WebCore::MediaSession::mediaType): Ask client for state.
+ * platform/audio/MediaSession.h:
+
+ * platform/audio/MediaSessionManager.cpp:
+ (WebCore::MediaSessionManager::MediaSessionManager): m_interruptions -> m_interrupted.
+ (WebCore::MediaSessionManager::beginInterruption): Don't assume interruptions are always balanced.
+ (WebCore::MediaSessionManager::endInterruption): Ditto.
+ (WebCore::MediaSessionManager::addSession):
+ (WebCore::MediaSessionManager::applicationWillEnterBackground): Interrupt client if it is not
+ allowed to play in the background.
+ (WebCore::MediaSessionManager::applicationWillEnterForeground): End client interruption if it
+ was stopped by an interruption.
+ * platform/audio/MediaSessionManager.h:
+
+ * platform/audio/ios/MediaSessionManagerIOS.h:
+ * platform/audio/ios/MediaSessionManagerIOS.mm:
+ (WebCore::MediaSessionManageriOS::~MediaSessionManageriOS): Clear the helper callback.
+ (WebCore::MediaSessionManageriOS::resetRestrictions): Mark video as not allowed to play
+ while the application is in the background. Register for application suspend/resume
+ notifications.
+ (-[WebMediaSessionHelper clearCallback]): Set _callback to nil.
+ (-[WebMediaSessionHelper applicationWillEnterForeground:]): New, notify client of application
+ state change.
+ (-[WebMediaSessionHelper applicationWillResignActive:]): Ditto.
+
+ * platform/audio/mac/AudioDestinationMac.h: Add resumePlayback.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::applicationWillEnterForeground): New, simulate application context switch.
+ (WebCore::Internals::applicationWillEnterBackground): Ditto.
+ (WebCore::Internals::setMediaSessionRestrictions): Add "BackgroundPlaybackNotPermitted" restriction.
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2014-02-04 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove CPP bindings generator.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -760,6 +760,8 @@
</span><span class="cx"> __ZN7WebCore19MediaSessionManager15endInterruptionENS_12MediaSession20EndInterruptionFlagsE
</span><span class="cx"> __ZN7WebCore19MediaSessionManager17beginInterruptionEv
</span><span class="cx"> __ZN7WebCore19MediaSessionManager17removeRestrictionENS_12MediaSession9MediaTypeEj
</span><ins>+__ZNK7WebCore19MediaSessionManager30applicationWillEnterBackgroundEv
+__ZNK7WebCore19MediaSessionManager30applicationWillEnterForegroundEv
</ins><span class="cx"> __ZN7WebCore19ResourceRequestBase11setHTTPBodyEN3WTF10PassRefPtrINS_8FormDataEEE
</span><span class="cx"> __ZN7WebCore19ResourceRequestBase13setHTTPMethodERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldEPKcRKN3WTF6StringE
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -2648,8 +2648,8 @@
</span><span class="cx"> if (ScriptController::processingUserGesture())
</span><span class="cx"> removeBehaviorsRestrictionsAfterFirstUserGesture();
</span><span class="cx">
</span><del>- if (m_mediaSession->state() == MediaSession::Interrupted) {
- m_resumePlaybackAfterInterruption = true;
</del><ins>+ if (!m_mediaSession->clientWillBeginPlayback()) {
+ LOG(Media, " returning because of interruption");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2695,11 +2695,11 @@
</span><span class="cx"> if (!m_mediaSession->playbackPermitted(*this))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_mediaSession->state() == MediaSession::Interrupted) {
- m_resumePlaybackAfterInterruption = false;
</del><ins>+ if (!m_mediaSession->clientWillPausePlayback()) {
+ LOG(Media, " returning because of interruption");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> pauseInternal();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4268,8 +4268,6 @@
</span><span class="cx"> invalidateCachedTime();
</span><span class="cx">
</span><span class="cx"> if (playerPaused) {
</span><del>- m_mediaSession->clientWillBeginPlayback();
-
</del><span class="cx"> if (m_mediaSession->requiresFullscreenForVideoPlayback(*this))
</span><span class="cx"> enterFullscreen();
</span><span class="cx">
</span><span class="lines">@@ -4289,7 +4287,7 @@
</span><span class="cx"> startPlaybackProgressTimer();
</span><span class="cx"> m_playing = true;
</span><span class="cx">
</span><del>- } else { // Should not be playing right now
</del><ins>+ } else {
</ins><span class="cx"> if (!playerPaused)
</span><span class="cx"> m_player->pause();
</span><span class="cx"> refreshCachedTime();
</span><span class="lines">@@ -5762,39 +5760,29 @@
</span><span class="cx">
</span><span class="cx"> MediaSession::MediaType HTMLMediaElement::mediaType() const
</span><span class="cx"> {
</span><ins>+ if (m_player && m_readyState >= HAVE_METADATA)
+ return hasVideo() ? MediaSession::Video : MediaSession::Audio;
+
</ins><span class="cx"> if (hasTagName(HTMLNames::videoTag))
</span><span class="cx"> return MediaSession::Video;
</span><span class="cx">
</span><span class="cx"> return MediaSession::Audio;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::beginInterruption()
</del><ins>+void HTMLMediaElement::pausePlayback()
</ins><span class="cx"> {
</span><del>- LOG(Media, "HTMLMediaElement::beginInterruption");
-
- m_resumePlaybackAfterInterruption = !paused();
- if (m_resumePlaybackAfterInterruption)
</del><ins>+ LOG(Media, "HTMLMediaElement::pausePlayback - paused = %s", boolString(paused()));
+ if (!paused())
</ins><span class="cx"> pause();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::endInterruption(MediaSession::EndInterruptionFlags flags)
</del><ins>+void HTMLMediaElement::resumePlayback()
</ins><span class="cx"> {
</span><del>- bool shouldResumePlayback = m_resumePlaybackAfterInterruption;
- m_resumePlaybackAfterInterruption = false;
-
- if (!flags & MediaSession::MayResumePlaying)
- return;
-
- if (shouldResumePlayback)
</del><ins>+ LOG(Media, "HTMLMediaElement::resumePlayback - paused = %s", boolString(paused()));
+ if (paused())
</ins><span class="cx"> play();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::pausePlayback()
-{
- if (!paused())
- pause();
</del><span class="cx"> }
</span><span class="cx">
</span><del>-}
-
</del><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -669,10 +669,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual MediaSession::MediaType mediaType() const override;
</span><del>-
- virtual void beginInterruption() override;
- virtual void endInterruption(MediaSession::EndInterruptionFlags) override;
</del><span class="cx"> virtual void pausePlayback() override;
</span><ins>+ virtual void resumePlayback() override;
</ins><span class="cx">
</span><span class="cx"> Timer<HTMLMediaElement> m_loadTimer;
</span><span class="cx"> Timer<HTMLMediaElement> m_progressEventTimer;
</span><span class="lines">@@ -780,8 +778,6 @@
</span><span class="cx"> bool m_platformLayerBorrowed : 1;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool m_resumePlaybackAfterInterruption : 1;
-
</del><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> bool m_tracksAreReady : 1;
</span><span class="cx"> bool m_haveVisibleTextTrack : 1;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaSession.cpp (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaSession.cpp 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/Source/WebCore/html/HTMLMediaSession.cpp 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -42,6 +42,27 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+#if !LOG_DISABLED
+static const char* restrictionName(HTMLMediaSession::BehaviorRestrictions restriction)
+{
+#define CASE(_restriction) case HTMLMediaSession::_restriction: return #_restriction; break;
+ switch (restriction) {
+ CASE(NoRestrictions);
+ CASE(RequireUserGestureForLoad);
+ CASE(RequireUserGestureForRateChange);
+ CASE(RequireUserGestureForFullscreen);
+ CASE(RequirePageConsentToLoadMedia);
+ CASE(RequirePageConsentToResumeMedia);
+#if ENABLE(IOS_AIRPLAY)
+ CASE(RequireUserGestureToShowPlaybackTargetPicker);
+#endif
+ }
+
+ ASSERT_NOT_REACHED();
+ return "";
+}
+#endif
+
</ins><span class="cx"> static void initializeAudioSession()
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -71,11 +92,13 @@
</span><span class="cx">
</span><span class="cx"> void HTMLMediaSession::addBehaviorRestriction(BehaviorRestrictions restriction)
</span><span class="cx"> {
</span><ins>+ LOG(Media, "HTMLMediaSession::addBehaviorRestriction - adding %s", restrictionName(restriction));
</ins><span class="cx"> m_restrictions |= restriction;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaSession::removeBehaviorRestriction(BehaviorRestrictions restriction)
</span><span class="cx"> {
</span><ins>+ LOG(Media, "HTMLMediaSession::removeBehaviorRestriction - removing %s", restrictionName(restriction));
</ins><span class="cx"> m_restrictions &= ~restriction;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -159,11 +182,6 @@
</span><span class="cx"> return preload;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaSession::clientWillBeginPlayback() const
-{
- MediaSessionManager::sharedManager().sessionWillBeginPlayback(*this);
-}
-
</del><span class="cx"> bool HTMLMediaSession::requiresFullscreenForVideoPlayback(const HTMLMediaElement& element) const
</span><span class="cx"> {
</span><span class="cx"> if (!MediaSessionManager::sharedManager().sessionRestrictsInlineVideoPlayback(*this))
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaSession.h (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaSession.h 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/Source/WebCore/html/HTMLMediaSession.h 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -42,8 +42,6 @@
</span><span class="cx"> HTMLMediaSession(MediaSessionClient&);
</span><span class="cx"> virtual ~HTMLMediaSession() { }
</span><span class="cx">
</span><del>- void clientWillBeginPlayback() const;
-
</del><span class="cx"> bool playbackPermitted(const HTMLMediaElement&) const;
</span><span class="cx"> bool dataLoadingPermitted(const HTMLMediaElement&) const;
</span><span class="cx"> bool fullscreenPermitted(const HTMLMediaElement&) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSession.cpp (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSession.cpp 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/Source/WebCore/platform/audio/MediaSession.cpp 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -32,6 +32,20 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static const char* stateName(MediaSession::State state)
+{
+#define CASE(_state) case MediaSession::_state: return #_state; break;
+ switch (state) {
+ CASE(Idle);
+ CASE(Playing);
+ CASE(Paused);
+ CASE(Interrupted);
+ }
+
+ ASSERT_NOT_REACHED();
+ return "";
+}
+
</ins><span class="cx"> std::unique_ptr<MediaSession> MediaSession::create(MediaSessionClient& client)
</span><span class="cx"> {
</span><span class="cx"> return std::make_unique<MediaSession>(client);
</span><span class="lines">@@ -39,10 +53,11 @@
</span><span class="cx">
</span><span class="cx"> MediaSession::MediaSession(MediaSessionClient& client)
</span><span class="cx"> : m_client(client)
</span><del>- , m_state(Running)
</del><ins>+ , m_state(Idle)
+ , m_stateToRestore(Idle)
+ , m_notifyingClient(false)
</ins><span class="cx"> {
</span><del>- m_type = m_client.mediaType();
- ASSERT(m_type >= None && m_type <= WebAudio);
</del><ins>+ ASSERT(m_client.mediaType() >= None && m_client.mediaType() <= WebAudio);
</ins><span class="cx"> MediaSessionManager::sharedManager().addSession(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -51,24 +66,65 @@
</span><span class="cx"> MediaSessionManager::sharedManager().removeSession(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaSession::setState(State state)
+{
+ LOG(Media, "MediaSession::setState - %s", stateName(state));
+ m_state = state;
+}
+
</ins><span class="cx"> void MediaSession::beginInterruption()
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaSession::beginInterruption");
</span><del>- m_state = Interrupted;
- m_client.beginInterruption();
</del><ins>+
+ m_stateToRestore = state();
+ m_notifyingClient = true;
+ client().pausePlayback();
+ setState(Interrupted);
+ m_notifyingClient = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaSession::endInterruption(EndInterruptionFlags flags)
</span><span class="cx"> {
</span><del>- LOG(Media, "MediaSession::endInterruption");
- m_state = Running;
- m_client.endInterruption(flags);
</del><ins>+ LOG(Media, "MediaSession::endInterruption - flags = %i, stateToRestore = %s", (int)flags, stateName(m_stateToRestore));
+
+ State stateToRestore = m_stateToRestore;
+ m_stateToRestore = Idle;
+ setState(Paused);
+
+ if (flags & MayResumePlaying && stateToRestore == Playing) {
+ LOG(Media, "MediaSession::endInterruption - resuming playback");
+ client().resumePlayback();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MediaSession::clientWillBeginPlayback()
+{
+ setState(Playing);
+ MediaSessionManager::sharedManager().sessionWillBeginPlayback(*this);
+ return true;
+}
+
+bool MediaSession::clientWillPausePlayback()
+{
+ if (state() == Interrupted) {
+ if (!m_notifyingClient)
+ m_stateToRestore = Paused;
+ return false;
+ }
+
+ setState(Paused);
+ return true;
+}
+
</ins><span class="cx"> void MediaSession::pauseSession()
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaSession::pauseSession");
</span><span class="cx"> m_client.pausePlayback();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+MediaSession::MediaType MediaSession::mediaType() const
+{
+ return m_client.mediaType();
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSession.h (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSession.h 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/Source/WebCore/platform/audio/MediaSession.h 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -45,15 +45,16 @@
</span><span class="cx"> Audio,
</span><span class="cx"> WebAudio,
</span><span class="cx"> };
</span><del>-
- MediaType mediaType() const { return m_type; }
</del><ins>+ MediaType mediaType() const;
</ins><span class="cx">
</span><span class="cx"> enum State {
</span><del>- Running,
</del><ins>+ Idle,
+ Playing,
+ Paused,
</ins><span class="cx"> Interrupted,
</span><span class="cx"> };
</span><span class="cx"> State state() const { return m_state; }
</span><del>- void setState(State state) { m_state = state; }
</del><ins>+ void setState(State);
</ins><span class="cx">
</span><span class="cx"> enum EndInterruptionFlags {
</span><span class="cx"> NoFlags = 0,
</span><span class="lines">@@ -62,6 +63,12 @@
</span><span class="cx"> void beginInterruption();
</span><span class="cx"> void endInterruption(EndInterruptionFlags);
</span><span class="cx">
</span><ins>+ void applicationWillEnterForeground() const;
+ void applicationWillEnterBackground() const;
+
+ bool clientWillBeginPlayback();
+ bool clientWillPausePlayback();
+
</ins><span class="cx"> void pauseSession();
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="lines">@@ -69,8 +76,9 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> MediaSessionClient& m_client;
</span><del>- MediaType m_type;
</del><span class="cx"> State m_state;
</span><ins>+ State m_stateToRestore;
+ bool m_notifyingClient;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class MediaSessionClient {
</span><span class="lines">@@ -79,10 +87,7 @@
</span><span class="cx"> MediaSessionClient() { }
</span><span class="cx">
</span><span class="cx"> virtual MediaSession::MediaType mediaType() const = 0;
</span><del>-
- virtual void beginInterruption() { }
- virtual void endInterruption(MediaSession::EndInterruptionFlags) { }
-
</del><ins>+ virtual void resumePlayback() = 0;
</ins><span class="cx"> virtual void pausePlayback() = 0;
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "MediaSessionManager.h"
</span><span class="cx">
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "MediaSession.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -39,7 +40,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> MediaSessionManager::MediaSessionManager()
</span><del>- : m_interruptions(0)
</del><ins>+ : m_interrupted(false)
</ins><span class="cx"> {
</span><span class="cx"> resetRestrictions();
</span><span class="cx"> }
</span><span class="lines">@@ -78,19 +79,18 @@
</span><span class="cx">
</span><span class="cx"> void MediaSessionManager::beginInterruption()
</span><span class="cx"> {
</span><del>- if (++m_interruptions > 1)
- return;
</del><ins>+ LOG(Media, "MediaSessionManager::beginInterruption");
</ins><span class="cx">
</span><ins>+ m_interrupted = true;
</ins><span class="cx"> for (auto* session : m_sessions)
</span><span class="cx"> session->beginInterruption();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaSessionManager::endInterruption(MediaSession::EndInterruptionFlags flags)
</span><span class="cx"> {
</span><del>- ASSERT(m_interruptions > 0);
- if (--m_interruptions)
- return;
-
</del><ins>+ LOG(Media, "MediaSessionManager::endInterruption");
+
+ m_interrupted = false;
</ins><span class="cx"> for (auto* session : m_sessions)
</span><span class="cx"> session->endInterruption(flags);
</span><span class="cx"> }
</span><span class="lines">@@ -98,7 +98,8 @@
</span><span class="cx"> void MediaSessionManager::addSession(MediaSession& session)
</span><span class="cx"> {
</span><span class="cx"> m_sessions.append(&session);
</span><del>- session.setState(m_interruptions ? MediaSession::Interrupted : MediaSession::Running);
</del><ins>+ if (m_interrupted)
+ session.setState(MediaSession::Interrupted);
</ins><span class="cx"> updateSessionState();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -157,6 +158,24 @@
</span><span class="cx"> return m_restrictions[sessionType] & InlineVideoPlaybackRestricted;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaSessionManager::applicationWillEnterBackground() const
+{
+ LOG(Media, "MediaSessionManager::applicationWillEnterBackground");
+ for (auto* session : m_sessions) {
+ if (m_restrictions[session->mediaType()] & BackgroundPlaybackNotPermitted)
+ session->beginInterruption();
+ }
+}
+
+void MediaSessionManager::applicationWillEnterForeground() const
+{
+ LOG(Media, "MediaSessionManager::applicationWillEnterForeground");
+ for (auto* session : m_sessions) {
+ if (m_restrictions[session->mediaType()] & BackgroundPlaybackNotPermitted)
+ session->endInterruption(MediaSession::MayResumePlaying);
+ }
+}
+
</ins><span class="cx"> #if !PLATFORM(MAC)
</span><span class="cx"> void MediaSessionManager::updateSessionState()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSessionManager.h (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSessionManager.h 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/Source/WebCore/platform/audio/MediaSessionManager.h 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -47,12 +47,16 @@
</span><span class="cx"> void beginInterruption();
</span><span class="cx"> void endInterruption(MediaSession::EndInterruptionFlags);
</span><span class="cx">
</span><ins>+ void applicationWillEnterForeground() const;
+ void applicationWillEnterBackground() const;
+
</ins><span class="cx"> enum SessionRestrictionFlags {
</span><span class="cx"> NoRestrictions = 0,
</span><span class="cx"> ConcurrentPlaybackNotPermitted = 1 << 0,
</span><span class="cx"> InlineVideoPlaybackRestricted = 1 << 1,
</span><span class="cx"> MetadataPreloadingNotPermitted = 1 << 2,
</span><span class="cx"> AutoPreloadingNotPermitted = 1 << 3,
</span><ins>+ BackgroundPlaybackNotPermitted = 1 << 4,
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned SessionRestrictions;
</span><span class="cx">
</span><span class="lines">@@ -62,6 +66,7 @@
</span><span class="cx"> virtual void resetRestrictions();
</span><span class="cx">
</span><span class="cx"> void sessionWillBeginPlayback(const MediaSession&) const;
</span><ins>+
</ins><span class="cx"> bool sessionRestrictsInlineVideoPlayback(const MediaSession&) const;
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="lines">@@ -77,7 +82,7 @@
</span><span class="cx"> SessionRestrictions m_restrictions[MediaSession::WebAudio + 1];
</span><span class="cx">
</span><span class="cx"> Vector<MediaSession*> m_sessions;
</span><del>- int m_interruptions;
</del><ins>+ bool m_interrupted;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> class MediaSessionManageriOS : public MediaSessionManager {
</span><span class="cx"> public:
</span><del>- virtual ~MediaSessionManageriOS() { }
</del><ins>+ virtual ~MediaSessionManageriOS();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class MediaSessionManager;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -31,24 +31,30 @@
</span><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "MediaSession.h"
</span><span class="cx"> #import "SoftLinking.h"
</span><ins>+#import "WebCoreSystemInterface.h"
</ins><span class="cx"> #import "WebCoreThreadRun.h"
</span><del>-#import "WebCoreSystemInterface.h"
</del><span class="cx"> #import <AVFoundation/AVAudioSession.h>
</span><ins>+#import <UIKit/UIApplication.h>
</ins><span class="cx"> #import <objc/runtime.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_FRAMEWORK(AVFoundation)
</span><ins>+SOFT_LINK_FRAMEWORK(UIKit)
</ins><span class="cx">
</span><span class="cx"> SOFT_LINK_CLASS(AVFoundation, AVAudioSession)
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVAudioSessionInterruptionNotification, NSString *)
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVAudioSessionInterruptionTypeKey, NSString *)
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVAudioSessionInterruptionOptionKey, NSString *)
</span><ins>+SOFT_LINK_POINTER(UIKit, UIApplicationWillResignActiveNotification, NSString *)
+SOFT_LINK_POINTER(UIKit, UIApplicationWillEnterForegroundNotification, NSString *)
</ins><span class="cx">
</span><span class="cx"> #define AVAudioSession getAVAudioSessionClass()
</span><span class="cx"> #define AVAudioSessionInterruptionNotification getAVAudioSessionInterruptionNotification()
</span><span class="cx"> #define AVAudioSessionInterruptionTypeKey getAVAudioSessionInterruptionTypeKey()
</span><span class="cx"> #define AVAudioSessionInterruptionOptionKey getAVAudioSessionInterruptionOptionKey()
</span><ins>+#define UIApplicationWillResignActiveNotification getUIApplicationWillResignActiveNotification()
+#define UIApplicationWillEnterForegroundNotification getUIApplicationWillEnterForegroundNotification()
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -57,10 +63,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (id)initWithCallback:(MediaSessionManageriOS*)callback;
</span><ins>+- (void)clearCallback;
</ins><span class="cx"> - (void)interruption:(NSNotification*)notification;
</span><ins>+- (void)applicationWillEnterForeground:(NSNotification*)notification;
+- (void)applicationWillResignActive:(NSNotification*)notification;
</ins><span class="cx"> @end
</span><span class="cx">
</span><del>-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> MediaSessionManager& MediaSessionManager::sharedManager()
</span><span class="lines">@@ -76,6 +84,11 @@
</span><span class="cx"> resetRestrictions();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+MediaSessionManageriOS::~MediaSessionManageriOS()
+{
+ [m_objcObserver clearCallback];
+}
+
</ins><span class="cx"> void MediaSessionManageriOS::resetRestrictions()
</span><span class="cx"> {
</span><span class="cx"> MediaSessionManager::resetRestrictions();
</span><span class="lines">@@ -85,6 +98,8 @@
</span><span class="cx"> addRestriction(MediaSession::Video, InlineVideoPlaybackRestricted);
</span><span class="cx">
</span><span class="cx"> addRestriction(MediaSession::Video, ConcurrentPlaybackNotPermitted);
</span><ins>+ addRestriction(MediaSession::Video, BackgroundPlaybackNotPermitted);
+
</ins><span class="cx"> removeRestriction(MediaSession::Audio, MetadataPreloadingNotPermitted);
</span><span class="cx"> removeRestriction(MediaSession::Video, MetadataPreloadingNotPermitted);
</span><span class="cx"> addRestriction(MediaSession::Audio, AutoPreloadingNotPermitted);
</span><span class="lines">@@ -104,7 +119,11 @@
</span><span class="cx">
</span><span class="cx"> NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
</span><span class="cx"> [center addObserver:self selector:@selector(interruption:) name:AVAudioSessionInterruptionNotification object:[AVAudioSession sharedInstance]];
</span><del>-
</del><ins>+
+ // FIXME: These need to be piped through from the UI process in WK2 mode.
+ [center addObserver:self selector:@selector(applicationWillEnterForeground:) name:UIApplicationWillEnterForegroundNotification object:nil];
+ [center addObserver:self selector:@selector(applicationWillResignActive:) name:UIApplicationWillResignActiveNotification object:nil];
+
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -114,6 +133,11 @@
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)clearCallback
+{
+ _callback = nil;
+}
+
</ins><span class="cx"> - (void)interruption:(NSNotification *)notification
</span><span class="cx"> {
</span><span class="cx"> if (!_callback)
</span><span class="lines">@@ -137,6 +161,36 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)applicationWillEnterForeground:(NSNotification *)notification
+{
+ UNUSED_PARAM(notification);
+
+ if (!_callback)
+ return;
+
+ WebThreadRun(^{
+ if (!_callback)
+ return;
+
+ _callback->applicationWillEnterForeground();
+ });
+}
+
+- (void)applicationWillResignActive:(NSNotification *)notification
+{
+ UNUSED_PARAM(notification);
+
+ if (!_callback)
+ return;
+
+ WebThreadRun(^{
+ if (!_callback)
+ return;
+
+ _callback->applicationWillEnterBackground();
+ });
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacAudioDestinationMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.h (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.h 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.h 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -47,7 +47,9 @@
</span><span class="cx"> virtual void start() override;
</span><span class="cx"> virtual void stop() override;
</span><span class="cx"> virtual bool isPlaying() override { return m_isPlaying; }
</span><ins>+
</ins><span class="cx"> virtual void pausePlayback() override { stop(); }
</span><ins>+ virtual void resumePlayback() override { start(); }
</ins><span class="cx">
</span><span class="cx"> virtual float sampleRate() const override { return m_sampleRate; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/Source/WebCore/testing/Internals.cpp 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -2188,6 +2188,16 @@
</span><span class="cx"> MediaSessionManager::sharedManager().endInterruption(flags);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Internals::applicationWillEnterForeground() const
+{
+ MediaSessionManager::sharedManager().applicationWillEnterForeground();
+}
+
+void Internals::applicationWillEnterBackground() const
+{
+ MediaSessionManager::sharedManager().applicationWillEnterBackground();
+}
+
</ins><span class="cx"> void Internals::setMediaSessionRestrictions(const String& mediaTypeString, const String& restrictionsString, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> MediaSession::MediaType mediaType = MediaSession::None;
</span><span class="lines">@@ -2215,6 +2225,8 @@
</span><span class="cx"> restrictions += MediaSessionManager::MetadataPreloadingNotPermitted;
</span><span class="cx"> if (equalIgnoringCase(restrictionsString, "AutoPreloadingNotPermitted"))
</span><span class="cx"> restrictions += MediaSessionManager::AutoPreloadingNotPermitted;
</span><ins>+ if (equalIgnoringCase(restrictionsString, "BackgroundPlaybackNotPermitted"))
+ restrictions += MediaSessionManager::BackgroundPlaybackNotPermitted;
</ins><span class="cx">
</span><span class="cx"> MediaSessionManager::sharedManager().addRestriction(mediaType, restrictions);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/Source/WebCore/testing/Internals.h 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -326,6 +326,8 @@
</span><span class="cx">
</span><span class="cx"> void beginMediaSessionInterruption();
</span><span class="cx"> void endMediaSessionInterruption(const String&);
</span><ins>+ void applicationWillEnterForeground() const;
+ void applicationWillEnterBackground() const;
</ins><span class="cx"> void setMediaSessionRestrictions(const String& mediaType, const String& restrictions, ExceptionCode& ec);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/Source/WebCore/testing/Internals.idl 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -274,5 +274,7 @@
</span><span class="cx">
</span><span class="cx"> void beginMediaSessionInterruption();
</span><span class="cx"> void endMediaSessionInterruption(DOMString flags);
</span><ins>+ void applicationWillEnterForeground();
+ void applicationWillEnterBackground();
</ins><span class="cx"> [RaisesException] void setMediaSessionRestrictions(DOMString mediaType, DOMString restrictions);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/Source/WebKit/ChangeLog 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-04 Eric Carlson <eric.carlson@apple.com>
+
+ Refine MediaSession interruptions
+ https://bugs.webkit.org/show_bug.cgi?id=128125
+
+ Reviewed by Jer Noble.
+
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Export applicationWillEnterForeground
+ and applicationWillEnterBackground for Internals.
+
</ins><span class="cx"> 2014-02-04 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r163376.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (163389 => 163390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-02-04 18:51:07 UTC (rev 163389)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-02-04 19:09:34 UTC (rev 163390)
</span><span class="lines">@@ -250,6 +250,8 @@
</span><span class="cx"> symbolWithPointer(?addRestriction@MediaSessionManager@WebCore@@QAEXW4MediaType@MediaSession@2@I@Z, ?addRestriction@MediaSessionManager@WebCore@@QEAAXW4MediaType@MediaSession@2@I@Z)
</span><span class="cx"> symbolWithPointer(?removeRestriction@MediaSessionManager@WebCore@@QAEXW4MediaType@MediaSession@2@I@Z, ?removeRestriction@MediaSessionManager@WebCore@@QEAAXW4MediaType@MediaSession@2@I@Z)
</span><span class="cx"> symbolWithPointer(?restrictions@MediaSessionManager@WebCore@@QAEIW4MediaType@MediaSession@2@@Z, ?restrictions@MediaSessionManager@WebCore@@QEAAIW4MediaType@MediaSession@2@@Z)
</span><ins>+ symbolWithPointer(?applicationWillEnterForeground@MediaSessionManager@WebCore@@QBEXXZ, ?applicationWillEnterForeground@MediaSessionManager@WebCore@@QBEXXZ)
+ symbolWithPointer(?applicationWillEnterBackground@MediaSessionManager@WebCore@@QBEXXZ, ?applicationWillEnterBackground@MediaSessionManager@WebCore@@QBEXXZ)
</ins><span class="cx"> ?localUserSpecificStorageDirectory@WebCore@@YA?AVString@WTF@@XZ
</span><span class="cx"> symbolWithPointer(?namedItem@StaticNodeList@WebCore@@UBEPAVNode@2@ABVAtomicString@WTF@@@Z, ?namedItem@StaticNodeList@WebCore@@UEBAPEAVNode@2@AEBVAtomicString@WTF@@@Z)
</span><span class="cx"> ?number@String@WTF@@SA?AV12@_J@Z
</span></span></pre>
</div>
</div>
</body>
</html>