<!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>[189369] 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/189369">189369</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2015-09-04 12:14:36 -0700 (Fri, 04 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Enable media layout tests to run simultaneously by ignoring system-level interruptions
https://bugs.webkit.org/show_bug.cgi?id=148807
Reviewed by Eric Carlson.
Add an internal property that, when set, will cause system-level interruption notifications
(e.g., due to simultaneous media playback in separate processes) to be ignored by the
PlatformMediaSessionManager, and cause the media playback sessions to continue normally, if
inaudibly.
* platform/audio/PlatformMediaSessionManager.h:
(WebCore::PlatformMediaSessionManager::willIgnoreSystemInterruptions):
(WebCore::PlatformMediaSessionManager::setWillIgnoreSystemInterruptions):
* platform/audio/ios/MediaSessionManagerIOS.mm:
(-[WebMediaSessionHelper interruption:]):
(-[WebMediaSessionHelper applicationWillEnterForeground:]):
(-[WebMediaSessionHelper applicationDidBecomeActive:]):
(-[WebMediaSessionHelper applicationWillResignActive:]):
(-[WebMediaSessionHelper applicationDidEnterBackground:]):
* testing/Internals.cpp:
(WebCore::Internals::resetToConsistentState):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioPlatformMediaSessionManagerh">trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189368 => 189369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-04 19:12:31 UTC (rev 189368)
+++ trunk/Source/WebCore/ChangeLog 2015-09-04 19:14:36 UTC (rev 189369)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-09-04 Jer Noble <jer.noble@apple.com>
+
+ [iOS] Enable media layout tests to run simultaneously by ignoring system-level interruptions
+ https://bugs.webkit.org/show_bug.cgi?id=148807
+
+ Reviewed by Eric Carlson.
+
+ Add an internal property that, when set, will cause system-level interruption notifications
+ (e.g., due to simultaneous media playback in separate processes) to be ignored by the
+ PlatformMediaSessionManager, and cause the media playback sessions to continue normally, if
+ inaudibly.
+
+ * platform/audio/PlatformMediaSessionManager.h:
+ (WebCore::PlatformMediaSessionManager::willIgnoreSystemInterruptions):
+ (WebCore::PlatformMediaSessionManager::setWillIgnoreSystemInterruptions):
+ * platform/audio/ios/MediaSessionManagerIOS.mm:
+ (-[WebMediaSessionHelper interruption:]):
+ (-[WebMediaSessionHelper applicationWillEnterForeground:]):
+ (-[WebMediaSessionHelper applicationDidBecomeActive:]):
+ (-[WebMediaSessionHelper applicationWillResignActive:]):
+ (-[WebMediaSessionHelper applicationDidEnterBackground:]):
+ * testing/Internals.cpp:
+ (WebCore::Internals::resetToConsistentState):
+
</ins><span class="cx"> 2015-09-04 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Need to be able to test default behaviors on force click
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioPlatformMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h (189368 => 189369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h 2015-09-04 19:12:31 UTC (rev 189368)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h 2015-09-04 19:14:36 UTC (rev 189369)
</span><span class="lines">@@ -52,6 +52,9 @@
</span><span class="cx"> int count(PlatformMediaSession::MediaType) const;
</span><span class="cx"> bool activeAudioSessionRequired() const;
</span><span class="cx">
</span><ins>+ bool willIgnoreSystemInterruptions() const { return m_willIgnoreSystemInterruptions; }
+ void setWillIgnoreSystemInterruptions(bool ignore) { m_willIgnoreSystemInterruptions = ignore; }
+
</ins><span class="cx"> WEBCORE_EXPORT void beginInterruption(PlatformMediaSession::InterruptionType);
</span><span class="cx"> WEBCORE_EXPORT void endInterruption(PlatformMediaSession::EndInterruptionFlags);
</span><span class="cx">
</span><span class="lines">@@ -129,6 +132,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_interrupted { false };
</span><span class="cx"> mutable bool m_isApplicationInBackground { false };
</span><ins>+ bool m_willIgnoreSystemInterruptions { false };
</ins><span class="cx"> };
</span><span class="cx">
</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 (189368 => 189369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2015-09-04 19:12:31 UTC (rev 189368)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2015-09-04 19:14:36 UTC (rev 189369)
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)interruption:(NSNotification *)notification
</span><span class="cx"> {
</span><del>- if (!_callback)
</del><ins>+ if (!_callback || _callback->willIgnoreSystemInterruptions())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> NSUInteger type = [[[notification userInfo] objectForKey:AVAudioSessionInterruptionTypeKey] unsignedIntegerValue];
</span><span class="lines">@@ -412,7 +412,7 @@
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(notification);
</span><span class="cx">
</span><del>- if (!_callback)
</del><ins>+ if (!_callback || _callback->willIgnoreSystemInterruptions())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> LOG(Media, "-[WebMediaSessionHelper applicationWillEnterForeground]");
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(notification);
</span><span class="cx">
</span><del>- if (!_callback)
</del><ins>+ if (!_callback || _callback->willIgnoreSystemInterruptions())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> LOG(Media, "-[WebMediaSessionHelper applicationDidBecomeActive]");
</span><span class="lines">@@ -446,7 +446,7 @@
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(notification);
</span><span class="cx">
</span><del>- if (!_callback)
</del><ins>+ if (!_callback || _callback->willIgnoreSystemInterruptions())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> LOG(Media, "-[WebMediaSessionHelper applicationWillResignActive]");
</span><span class="lines">@@ -478,7 +478,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)applicationDidEnterBackground:(NSNotification *)notification
</span><span class="cx"> {
</span><del>- if (!_callback)
</del><ins>+ if (!_callback || _callback->willIgnoreSystemInterruptions())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> LOG(Media, "-[WebMediaSessionHelper applicationDidEnterBackground]");
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (189368 => 189369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-09-04 19:12:31 UTC (rev 189368)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-09-04 19:14:36 UTC (rev 189369)
</span><span class="lines">@@ -333,6 +333,7 @@
</span><span class="cx"> ApplicationCacheStorage::singleton().setDefaultOriginQuota(ApplicationCacheStorage::noQuota());
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> PlatformMediaSessionManager::sharedManager().resetRestrictions();
</span><ins>+ PlatformMediaSessionManager::sharedManager().setWillIgnoreSystemInterruptions(true);
</ins><span class="cx"> #endif
</span><span class="cx"> #if HAVE(ACCESSIBILITY)
</span><span class="cx"> AXObjectCache::setEnhancedUserInterfaceAccessibility(false);
</span></span></pre>
</div>
</div>
</body>
</html>