<!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>[180274] 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/180274">180274</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-02-18 11:19:44 -0800 (Wed, 18 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] pause video when a tab moves to the background on some devices
https://bugs.webkit.org/show_bug.cgi?id=141753
<rdar://problem/19814562>
Reviewed by Jer Noble.
Source/WebCore:
Test: media/video-background-tab-playback.html
* platform/audio/MediaSession.cpp:
(WebCore::MediaSession::clientDataBufferingTimerFired): Pause video when the element becomes
hidden if the BackgroundTabPlaybackRestricted is set.
* platform/audio/MediaSessionManager.cpp:
(WebCore::MediaSessionManager::applicationWillEnterBackground): Rename BackgroundPlaybackNotPermitted
to BackgroundProcessPlaybackRestricted.
(WebCore::MediaSessionManager::applicationWillEnterForeground): Ditto.
* platform/audio/MediaSessionManager.h:
* platform/audio/ios/MediaSessionManagerIOS.mm:
(WebCore::MediaSessionManageriOS::resetRestrictions): Set BackgroundTabPlaybackRestricted on
devices with restricted memory. BackgroundPlaybackNotPermitted -> BackgroundProcessPlaybackRestricted.
* testing/Internals.cpp:
(WebCore::Internals::setMediaSessionRestrictions): Add support for BackgroundTabPlaybackRestricted.
BackgroundPlaybackNotPermitted -> BackgroundProcessPlaybackRestricted.
LayoutTests:
* media/video-background-playback-expected.txt: BackgroundPlaybackNotPermitted -> BackgroundProcessPlaybackRestricted.
* media/video-background-playback.html: Ditto.
* media/video-background-tab-playback-expected.txt: Added.
* media/video-background-tab-playback.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<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>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessioncpp">trunk/Source/WebCore/platform/audio/MediaSession.cpp</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="#trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm">trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideobackgroundtabplaybackexpectedtxt">trunk/LayoutTests/media/video-background-tab-playback-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideobackgroundtabplaybackhtml">trunk/LayoutTests/media/video-background-tab-playback.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (180273 => 180274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-18 19:00:49 UTC (rev 180273)
+++ trunk/LayoutTests/ChangeLog 2015-02-18 19:19:44 UTC (rev 180274)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-02-18 Eric Carlson <eric.carlson@apple.com>
+
+ [iOS] pause video when a tab moves to the background on some devices
+ https://bugs.webkit.org/show_bug.cgi?id=141753
+ <rdar://problem/19814562>
+
+ Reviewed by Jer Noble.
+
+ * media/video-background-playback-expected.txt: BackgroundPlaybackNotPermitted -> BackgroundProcessPlaybackRestricted.
+ * media/video-background-playback.html: Ditto.
+ * media/video-background-tab-playback-expected.txt: Added.
+ * media/video-background-tab-playback.html: Added.
+
</ins><span class="cx"> 2015-02-16 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Wrong element's style is used for text-decoration-style.
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideobackgroundplaybackexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-background-playback-expected.txt (180273 => 180274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-background-playback-expected.txt 2015-02-18 19:00:49 UTC (rev 180273)
+++ trunk/LayoutTests/media/video-background-playback-expected.txt 2015-02-18 19:19:44 UTC (rev 180274)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx">
</span><span class="cx"> Test switching application state when <video> is not allowed to play in background.
</span><span class="cx">
</span><del>-RUN(internals.setMediaSessionRestrictions('video', 'BackgroundPlaybackNotPermitted'))
</del><ins>+RUN(internals.setMediaSessionRestrictions('video', 'BackgroundProcessPlaybackRestricted'))
</ins><span class="cx">
</span><span class="cx"> EVENT(canplaythrough)
</span><span class="cx"> EVENT(canplaythrough)
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideobackgroundplaybackhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-background-playback.html (180273 => 180274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-background-playback.html 2015-02-18 19:00:49 UTC (rev 180273)
+++ trunk/LayoutTests/media/video-background-playback.html 2015-02-18 19:19:44 UTC (rev 180274)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> audio = elements[1];
</span><span class="cx"> audio.src = findMediaFile("audio", "content/silence");
</span><span class="cx">
</span><del>- run("internals.setMediaSessionRestrictions('video', 'BackgroundPlaybackNotPermitted')");
</del><ins>+ run("internals.setMediaSessionRestrictions('video', 'BackgroundProcessPlaybackRestricted')");
</ins><span class="cx"> state = "foreground";
</span><span class="cx"> consoleWrite("");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideobackgroundtabplaybackexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-background-tab-playback-expected.txt (0 => 180274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-background-tab-playback-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-background-tab-playback-expected.txt 2015-02-18 19:19:44 UTC (rev 180274)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+
+Test tab with <video> moving to background when playback is not allowed in background.
+
+RUN(internals.setMediaSessionRestrictions('video', 'BackgroundTabPlaybackRestricted'))
+
+EVENT(canplaythrough)
+
+RUN(video.play())
+EVENT(playing)
+
+** Simulate switching the tab to background, video should pause.
+RUN(testRunner.setPageVisibility('hidden'))
+
+
+** 100ms timer fired...
+EXPECTED (video.paused == 'true') OK
+
+** Simulate switch back to foreground, video should remain paused.
+RUN(internals.applicationWillEnterForeground())
+
+
+** 100ms timer fired...
+EXPECTED (video.paused == 'true') OK
+
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideobackgroundtabplaybackhtmlfromrev180273trunkLayoutTestsmediavideobackgroundplaybackhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/media/video-background-tab-playback.html (from rev 180273, trunk/LayoutTests/media/video-background-playback.html) (0 => 180274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-background-tab-playback.html (rev 0)
+++ trunk/LayoutTests/media/video-background-tab-playback.html 2015-02-18 19:19:44 UTC (rev 180274)
</span><span class="lines">@@ -0,0 +1,67 @@
</span><ins>+<html>
+ <head>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
+ <script>
+ var state = 0;
+
+ function checkState()
+ {
+ consoleWrite("<br>** 100ms timer fired...");
+ switch (state) {
+ case "background":
+ testExpected("video.paused", true);
+ state = "foreground";
+ consoleWrite("<br>** Simulate switch back to foreground, video should remain paused.");
+ run("internals.applicationWillEnterForeground()");
+ setTimeout(checkState, 100);
+ consoleWrite("");
+ break;
+ case "foreground":
+ testExpected("video.paused", true);
+ consoleWrite("");
+ testRunner.resetPageVisibility();
+ endTest();
+ break;
+ }
+ }
+
+ function playing(evt)
+ {
+ consoleWrite("<br>** Simulate switching the tab to background, video should pause.");
+ run("testRunner.setPageVisibility('hidden')");
+ setTimeout(checkState, 100);
+ state = "background";
+ consoleWrite("");
+ }
+
+ function canplaythrough(evt)
+ {
+ consoleWrite("");
+ run("video.play()");
+ }
+
+ function start()
+ {
+ if (!window.internals) {
+ failTest('This test requires window.internals.');
+ return;
+ }
+
+ findMediaElement();
+ video.src = findMediaFile("video", "content/test");
+ waitForEvent('canplaythrough', canplaythrough);
+ waitForEvent('playing', playing);
+
+ run("internals.setMediaSessionRestrictions('video', 'BackgroundTabPlaybackRestricted')");
+ state = "foreground";
+ consoleWrite("");
+ }
+ </script>
+ </head>
+
+ <body onload="start()">
+ <video controls></video>
+ <p>Test tab with &lt;video&gt; moving to background when playback is not allowed in background.</p>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180273 => 180274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-18 19:00:49 UTC (rev 180273)
+++ trunk/Source/WebCore/ChangeLog 2015-02-18 19:19:44 UTC (rev 180274)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-02-18 Eric Carlson <eric.carlson@apple.com>
+
+ [iOS] pause video when a tab moves to the background on some devices
+ https://bugs.webkit.org/show_bug.cgi?id=141753
+ <rdar://problem/19814562>
+
+ Reviewed by Jer Noble.
+
+ Test: media/video-background-tab-playback.html
+
+ * platform/audio/MediaSession.cpp:
+ (WebCore::MediaSession::clientDataBufferingTimerFired): Pause video when the element becomes
+ hidden if the BackgroundTabPlaybackRestricted is set.
+
+ * platform/audio/MediaSessionManager.cpp:
+ (WebCore::MediaSessionManager::applicationWillEnterBackground): Rename BackgroundPlaybackNotPermitted
+ to BackgroundProcessPlaybackRestricted.
+ (WebCore::MediaSessionManager::applicationWillEnterForeground): Ditto.
+ * platform/audio/MediaSessionManager.h:
+
+ * platform/audio/ios/MediaSessionManagerIOS.mm:
+ (WebCore::MediaSessionManageriOS::resetRestrictions): Set BackgroundTabPlaybackRestricted on
+ devices with restricted memory. BackgroundPlaybackNotPermitted -> BackgroundProcessPlaybackRestricted.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::setMediaSessionRestrictions): Add support for BackgroundTabPlaybackRestricted.
+ BackgroundPlaybackNotPermitted -> BackgroundProcessPlaybackRestricted.
+
</ins><span class="cx"> 2015-02-16 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Wrong element's style is used for text-decoration-style.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSession.cpp (180273 => 180274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSession.cpp 2015-02-18 19:00:49 UTC (rev 180273)
+++ trunk/Source/WebCore/platform/audio/MediaSession.cpp 2015-02-18 19:19:44 UTC (rev 180274)
</span><span class="lines">@@ -190,7 +190,16 @@
</span><span class="cx">
</span><span class="cx"> void MediaSession::clientDataBufferingTimerFired()
</span><span class="cx"> {
</span><ins>+ LOG(Media, "MediaSession::visibilityChanged(%p)- visible = %s", this, m_client.elementIsHidden() ? "false" : "true");
+
</ins><span class="cx"> updateClientDataBuffering();
</span><ins>+
+ if (m_state != Playing || !m_client.elementIsHidden())
+ return;
+
+ MediaSessionManager::SessionRestrictions restrictions = MediaSessionManager::sharedManager().restrictions(mediaType());
+ if ((restrictions & MediaSessionManager::BackgroundTabPlaybackRestricted) == MediaSessionManager::BackgroundTabPlaybackRestricted)
+ pauseSession();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaSession::updateClientDataBuffering()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp (180273 => 180274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp 2015-02-18 19:00:49 UTC (rev 180273)
+++ trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp 2015-02-18 19:19:44 UTC (rev 180274)
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> LOG(Media, "MediaSessionManager::applicationWillEnterBackground");
</span><span class="cx"> Vector<MediaSession*> sessions = m_sessions;
</span><span class="cx"> for (auto* session : sessions) {
</span><del>- if (m_restrictions[session->mediaType()] & BackgroundPlaybackNotPermitted)
</del><ins>+ if (m_restrictions[session->mediaType()] & BackgroundProcessPlaybackRestricted)
</ins><span class="cx"> session->beginInterruption(MediaSession::EnteringBackground);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> LOG(Media, "MediaSessionManager::applicationWillEnterForeground");
</span><span class="cx"> Vector<MediaSession*> sessions = m_sessions;
</span><span class="cx"> for (auto* session : sessions) {
</span><del>- if (m_restrictions[session->mediaType()] & BackgroundPlaybackNotPermitted)
</del><ins>+ if (m_restrictions[session->mediaType()] & BackgroundProcessPlaybackRestricted)
</ins><span class="cx"> session->endInterruption(MediaSession::MayResumePlaying);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSessionManager.h (180273 => 180274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSessionManager.h 2015-02-18 19:00:49 UTC (rev 180273)
+++ trunk/Source/WebCore/platform/audio/MediaSessionManager.h 2015-02-18 19:19:44 UTC (rev 180274)
</span><span class="lines">@@ -62,7 +62,8 @@
</span><span class="cx"> InlineVideoPlaybackRestricted = 1 << 1,
</span><span class="cx"> MetadataPreloadingNotPermitted = 1 << 2,
</span><span class="cx"> AutoPreloadingNotPermitted = 1 << 3,
</span><del>- BackgroundPlaybackNotPermitted = 1 << 4,
</del><ins>+ BackgroundProcessPlaybackRestricted = 1 << 4,
+ BackgroundTabPlaybackRestricted = 1 << 5,
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned SessionRestrictions;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (180273 => 180274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2015-02-18 19:00:49 UTC (rev 180273)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2015-02-18 19:19:44 UTC (rev 180274)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #import "MediaPlayerSPI.h"
</span><span class="cx"> #import "MediaSession.h"
</span><span class="cx"> #import "SoftLinking.h"
</span><ins>+#import "SystemMemory.h"
</ins><span class="cx"> #import "WebCoreSystemInterface.h"
</span><span class="cx"> #import "WebCoreThreadRun.h"
</span><span class="cx"> #import <AVFoundation/AVAudioSession.h>
</span><span class="lines">@@ -127,6 +128,8 @@
</span><span class="cx">
</span><span class="cx"> void MediaSessionManageriOS::resetRestrictions()
</span><span class="cx"> {
</span><ins>+ static const size_t systemMemoryRequiredForVideoInBackgroundTabs = 1024 * 1024 * 1024;
+
</ins><span class="cx"> LOG(Media, "MediaSessionManageriOS::resetRestrictions");
</span><span class="cx">
</span><span class="cx"> MediaSessionManager::resetRestrictions();
</span><span class="lines">@@ -135,14 +138,19 @@
</span><span class="cx"> if (deviceClass == wkDeviceClassiPhone || deviceClass == wkDeviceClassiPod)
</span><span class="cx"> addRestriction(MediaSession::Video, InlineVideoPlaybackRestricted);
</span><span class="cx">
</span><ins>+ if (systemTotalMemory() < systemMemoryRequiredForVideoInBackgroundTabs) {
+ LOG(Media, "MediaSessionManageriOS::resetRestrictions - restricting video in background tabs because system memory = %zul", systemTotalMemory());
+ addRestriction(MediaSession::Video, BackgroundTabPlaybackRestricted);
+ }
+
</ins><span class="cx"> addRestriction(MediaSession::Video, ConcurrentPlaybackNotPermitted);
</span><del>- addRestriction(MediaSession::Video, BackgroundPlaybackNotPermitted);
</del><ins>+ addRestriction(MediaSession::Video, BackgroundProcessPlaybackRestricted);
</ins><span class="cx">
</span><span class="cx"> removeRestriction(MediaSession::Audio, ConcurrentPlaybackNotPermitted);
</span><del>- removeRestriction(MediaSession::Audio, BackgroundPlaybackNotPermitted);
</del><ins>+ removeRestriction(MediaSession::Audio, BackgroundProcessPlaybackRestricted);
</ins><span class="cx">
</span><span class="cx"> removeRestriction(MediaSession::WebAudio, ConcurrentPlaybackNotPermitted);
</span><del>- removeRestriction(MediaSession::WebAudio, BackgroundPlaybackNotPermitted);
</del><ins>+ removeRestriction(MediaSession::WebAudio, BackgroundProcessPlaybackRestricted);
</ins><span class="cx">
</span><span class="cx"> removeRestriction(MediaSession::Audio, MetadataPreloadingNotPermitted);
</span><span class="cx"> removeRestriction(MediaSession::Video, MetadataPreloadingNotPermitted);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (180273 => 180274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-02-18 19:00:49 UTC (rev 180273)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-02-18 19:19:44 UTC (rev 180274)
</span><span class="lines">@@ -2403,8 +2403,10 @@
</span><span class="cx"> restrictions += MediaSessionManager::MetadataPreloadingNotPermitted;
</span><span class="cx"> if (equalIgnoringCase(restrictionsString, "AutoPreloadingNotPermitted"))
</span><span class="cx"> restrictions += MediaSessionManager::AutoPreloadingNotPermitted;
</span><del>- if (equalIgnoringCase(restrictionsString, "BackgroundPlaybackNotPermitted"))
- restrictions += MediaSessionManager::BackgroundPlaybackNotPermitted;
</del><ins>+ if (equalIgnoringCase(restrictionsString, "BackgroundProcessPlaybackRestricted"))
+ restrictions += MediaSessionManager::BackgroundProcessPlaybackRestricted;
+ if (equalIgnoringCase(restrictionsString, "BackgroundTabPlaybackRestricted"))
+ restrictions += MediaSessionManager::BackgroundTabPlaybackRestricted;
</ins><span class="cx">
</span><span class="cx"> MediaSessionManager::sharedManager().addRestriction(mediaType, restrictions);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>