<!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>[190799] branches/safari-601.1.46-branch</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/190799">190799</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-10-09 07:22:26 -0700 (Fri, 09 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190604">r190604</a>. rdar://problem/22993012</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchLayoutTestsmediavideobackgroundplaybackexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/media/video-background-playback-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsmediavideobackgroundplaybackhtml">branches/safari-601.1.46-branch/LayoutTests/media/video-background-playback.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsmediavideobackgroundtabplaybackexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/media/video-background-tab-playback-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsmediavideobackgroundtabplaybackhtml">branches/safari-601.1.46-branch/LayoutTests/media/video-background-tab-playback.html</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformaudioPlatformMediaSessionh">branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSession.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformaudioPlatformMediaSessionManagercpp">branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformaudioPlatformMediaSessionManagerh">branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformaudioiosMediaSessionManagerIOSh">branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm">branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebCoretestingInternalscpp">branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoretestingInternalsh">branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoretestingInternalsidl">branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.idl</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2ChangeLog">branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessiosWebPageProxyIOSmm">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2WebProcessWebPageWebPageh">branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2WebProcessWebPageWebPagemessagesin">branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm">branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-10-08 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190604. rdar://problem/22993012
+
+ 2015-10-05 Jer Noble <jer.noble@apple.com>
+
+ [iOS] REGRESSION(r190434): Media continues to play when locking screen
+ https://bugs.webkit.org/show_bug.cgi?id=149822
+
+ Reviewed by Brent Fulgham.
+
+ applicationWillEnterForeground() -> applicationDidEnterForeground().
+
+ * media/video-background-playback-expected.txt:
+ * media/video-background-playback.html:
+ * media/video-background-tab-playback-expected.txt:
+ * media/video-background-tab-playback.html:
+
+2015-10-08 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r190602. rdar://problem/22995810
</span><span class="cx">
</span><span class="cx"> 2015-10-05 Alex Christensen <achristensen@webkit.org>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsmediavideobackgroundplaybackexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/media/video-background-playback-expected.txt (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/media/video-background-playback-expected.txt 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/LayoutTests/media/video-background-playback-expected.txt 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> EXPECTED (audio.paused == 'false') OK
</span><span class="cx">
</span><span class="cx"> ** Simulate switch back to foreground, video should resume.
</span><del>-RUN(internals.applicationWillEnterForeground())
</del><ins>+RUN(internals.applicationDidEnterForeground())
</ins><span class="cx">
</span><span class="cx"> EVENT(playing)
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsmediavideobackgroundplaybackhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/media/video-background-playback.html (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/media/video-background-playback.html 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/LayoutTests/media/video-background-playback.html 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> testExpected("audio.paused", false);
</span><span class="cx"> state = "foreground";
</span><span class="cx"> consoleWrite("<br>** Simulate switch back to foreground, video should resume.");
</span><del>- run("internals.applicationWillEnterForeground()");
</del><ins>+ run("internals.applicationDidEnterForeground()");
</ins><span class="cx"> setTimeout(checkState, 100);
</span><span class="cx"> consoleWrite("");
</span><span class="cx"> break;
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsmediavideobackgroundtabplaybackexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/media/video-background-tab-playback-expected.txt (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/media/video-background-tab-playback-expected.txt 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/LayoutTests/media/video-background-tab-playback-expected.txt 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> EXPECTED (video.paused == 'true') OK
</span><span class="cx">
</span><span class="cx"> ** Simulate switch back to foreground, video should remain paused.
</span><del>-RUN(internals.applicationWillEnterForeground())
</del><ins>+RUN(internals.applicationDidEnterForeground())
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> ** 100ms timer fired...
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsmediavideobackgroundtabplaybackhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/media/video-background-tab-playback.html (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/media/video-background-tab-playback.html 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/LayoutTests/media/video-background-tab-playback.html 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> testExpected("video.paused", true);
</span><span class="cx"> state = "foreground";
</span><span class="cx"> consoleWrite("<br>** Simulate switch back to foreground, video should remain paused.");
</span><del>- run("internals.applicationWillEnterForeground()");
</del><ins>+ run("internals.applicationDidEnterForeground()");
</ins><span class="cx"> setTimeout(checkState, 100);
</span><span class="cx"> consoleWrite("");
</span><span class="cx"> break;
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -1,5 +1,47 @@
</span><span class="cx"> 2015-10-08 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190604. rdar://problem/22993012
+
+ 2015-10-05 Jer Noble <jer.noble@apple.com>
+
+ [iOS] REGRESSION(r190434): Media continues to play when locking screen
+ https://bugs.webkit.org/show_bug.cgi?id=149822
+
+ Reviewed by Brent Fulgham.
+
+ In MediaSessionManagerIOS.mm, both -applicationWillEnterForeground: and
+ -applicationDidBecomeActive: called
+ PlatformMediaSessionManager::applicationWillEnterForeground(), leading to the
+ PlatformMediaSession's m_interruptionCount becoming increasingly unbalanced.
+
+ Rename PlatformMediaSessionManager::applicationWillEnterForeground() to
+ applicationDidEnterForeground() to more correctly reflect when this notification will be
+ called. Add a new method, MediaSessionManagerIOS::applicationWillEnterForeground(bool),
+ whose paramater is whether the screen was locked. This allows the beginInterruption() and
+ endInterruption() methods to be correctly balanced.
+
+ Drive-by fix: remove the unimplemented declarations for application{will,did}Enter{Fore,Back}ground()
+ from PlatformMediaSession.h.
+
+ * platform/audio/PlatformMediaSession.h:
+ * platform/audio/PlatformMediaSessionManager.cpp:
+ (WebCore::PlatformMediaSessionManager::applicationDidEnterForeground):
+ (WebCore::PlatformMediaSessionManager::applicationWillEnterForeground): Deleted.
+ * platform/audio/PlatformMediaSessionManager.h:
+ * platform/audio/ios/MediaSessionManagerIOS.h:
+ * platform/audio/ios/MediaSessionManagerIOS.mm:
+ (WebCore::MediaSessionManageriOS::applicationDidEnterBackground):
+ (WebCore::MediaSessionManageriOS::applicationWillEnterForeground):
+ (-[WebMediaSessionHelper applicationWillEnterForeground:]):
+ (-[WebMediaSessionHelper applicationDidBecomeActive:]):
+ * testing/Internals.cpp:
+ (WebCore::Internals::applicationDidEnterForeground):
+ (WebCore::Internals::applicationWillEnterForeground): Deleted.
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
+2015-10-08 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r190602. rdar://problem/22995810
</span><span class="cx">
</span><span class="cx"> 2015-10-05 Alex Christensen <achristensen@webkit.org>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformaudioPlatformMediaSessionh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSession.h (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSession.h 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSession.h 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -84,10 +84,6 @@
</span><span class="cx"> void beginInterruption(InterruptionType);
</span><span class="cx"> void endInterruption(EndInterruptionFlags);
</span><span class="cx">
</span><del>- void applicationWillEnterForeground() const;
- void applicationWillEnterBackground() const;
- void applicationDidEnterBackground(bool isSuspendedUnderLock) const;
-
</del><span class="cx"> bool clientWillBeginPlayback();
</span><span class="cx"> bool clientWillPausePlayback();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformaudioPlatformMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -289,9 +289,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PlatformMediaSessionManager::applicationWillEnterForeground() const
</del><ins>+void PlatformMediaSessionManager::applicationDidEnterForeground() const
</ins><span class="cx"> {
</span><del>- LOG(Media, "PlatformMediaSessionManager::applicationWillEnterForeground");
</del><ins>+ LOG(Media, "PlatformMediaSessionManager::applicationDidEnterForeground");
</ins><span class="cx">
</span><span class="cx"> if (!m_isApplicationInBackground)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformaudioPlatformMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.h (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.h 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.h 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> WEBCORE_EXPORT void beginInterruption(PlatformMediaSession::InterruptionType);
</span><span class="cx"> WEBCORE_EXPORT void endInterruption(PlatformMediaSession::EndInterruptionFlags);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void applicationWillEnterForeground() const;
</del><ins>+ WEBCORE_EXPORT void applicationDidEnterForeground() const;
</ins><span class="cx"> WEBCORE_EXPORT void applicationWillEnterBackground() const;
</span><span class="cx">
</span><span class="cx"> void stopAllMediaPlaybackForDocument(const Document*);
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformaudioiosMediaSessionManagerIOSh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> void externalOutputDeviceAvailableDidChange();
</span><span class="cx"> virtual bool hasWirelessTargetsAvailable() override;
</span><span class="cx"> void applicationDidEnterBackground(bool isSuspendedUnderLock);
</span><ins>+ void applicationWillEnterForeground(bool isSuspendedUnderLock);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class PlatformMediaSessionManager;
</span><span class="lines">@@ -67,6 +68,7 @@
</span><span class="cx"> virtual bool sessionCanLoadMedia(const PlatformMediaSession&) const override;
</span><span class="cx">
</span><span class="cx"> RetainPtr<WebMediaSessionHelper> m_objcObserver;
</span><ins>+ bool m_isInBackground { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -252,6 +252,10 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaSessionManageriOS::applicationDidEnterBackground");
</span><span class="cx">
</span><ins>+ if (m_isInBackground)
+ return;
+ m_isInBackground = true;
+
</ins><span class="cx"> if (!isSuspendedUnderLock)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -262,7 +266,24 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaSessionManageriOS::applicationWillEnterForeground(bool isSuspendedUnderLock)
+{
+ LOG(Media, "MediaSessionManageriOS::applicationWillEnterForeground");
</ins><span class="cx">
</span><ins>+ if (!m_isInBackground)
+ return;
+ m_isInBackground = false;
+
+ if (!isSuspendedUnderLock)
+ return;
+
+ Vector<PlatformMediaSession*> sessions = this->sessions();
+ for (auto* session : sessions) {
+ if (restrictions(session->mediaType()) & BackgroundProcessPlaybackRestricted)
+ session->endInterruption(PlatformMediaSession::MayResumePlaying);
+ }
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> @implementation WebMediaSessionHelper
</span><span class="lines">@@ -432,11 +453,13 @@
</span><span class="cx">
</span><span class="cx"> LOG(Media, "-[WebMediaSessionHelper applicationWillEnterForeground]");
</span><span class="cx">
</span><ins>+ BOOL isSuspendedUnderLock = [[[notification userInfo] objectForKey:@"isSuspendedUnderLock"] boolValue];
+
</ins><span class="cx"> WebThreadRun(^{
</span><span class="cx"> if (!_callback)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- _callback->applicationWillEnterForeground();
</del><ins>+ _callback->applicationWillEnterForeground(isSuspendedUnderLock);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -453,7 +476,7 @@
</span><span class="cx"> if (!_callback)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- _callback->applicationWillEnterForeground();
</del><ins>+ _callback->applicationDidEnterForeground();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.cpp (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.cpp 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.cpp 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -2642,9 +2642,9 @@
</span><span class="cx"> PlatformMediaSessionManager::sharedManager().endInterruption(flags);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Internals::applicationWillEnterForeground() const
</del><ins>+void Internals::applicationDidEnterForeground() const
</ins><span class="cx"> {
</span><del>- PlatformMediaSessionManager::sharedManager().applicationWillEnterForeground();
</del><ins>+ PlatformMediaSessionManager::sharedManager().applicationDidEnterForeground();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Internals::applicationWillEnterBackground() const
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.h (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.h 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.h 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> void beginMediaSessionInterruption(const String&, ExceptionCode&);
</span><span class="cx"> void endMediaSessionInterruption(const String&);
</span><del>- void applicationWillEnterForeground() const;
</del><ins>+ void applicationDidEnterForeground() const;
</ins><span class="cx"> void applicationWillEnterBackground() const;
</span><span class="cx"> void setMediaSessionRestrictions(const String& mediaType, const String& restrictions, ExceptionCode&);
</span><span class="cx"> void setMediaElementRestrictions(HTMLMediaElement*, const String& restrictions, ExceptionCode&);
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.idl (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.idl 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.idl 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -351,13 +351,13 @@
</span><span class="cx">
</span><span class="cx"> [Conditional=VIDEO, RaisesException] void beginMediaSessionInterruption(DOMString interruptionType);
</span><span class="cx"> [Conditional=VIDEO] void endMediaSessionInterruption(DOMString flags);
</span><del>- [Conditional=VIDEO] void applicationWillEnterForeground();
</del><ins>+ [Conditional=VIDEO] void applicationDidEnterForeground();
</ins><span class="cx"> [Conditional=VIDEO] void applicationWillEnterBackground();
</span><span class="cx"> [Conditional=VIDEO, RaisesException] void setMediaSessionRestrictions(DOMString mediaType, DOMString restrictions);
</span><span class="cx"> [Conditional=VIDEO, RaisesException] void setMediaElementRestrictions(HTMLMediaElement element, DOMString restrictions);
</span><span class="cx"> [Conditional=WEB_AUDIO, RaisesException] void setAudioContextRestrictions(AudioContext context, DOMString restrictions);
</span><span class="cx"> [Conditional=VIDEO, RaisesException] void postRemoteControlCommand(DOMString command);
</span><del>-
</del><ins>+
</ins><span class="cx"> [Conditional=VIDEO] void simulateSystemSleep();
</span><span class="cx"> [Conditional=VIDEO] void simulateSystemWake();
</span><span class="cx"> [Conditional=VIDEO] boolean elementIsBlockingDisplaySleep(Element element);
</span><span class="lines">@@ -367,7 +367,7 @@
</span><span class="cx">
</span><span class="cx"> void setPageMuted(boolean muted);
</span><span class="cx"> boolean isPagePlayingAudio();
</span><del>-
</del><ins>+
</ins><span class="cx"> File createFile(DOMString url);
</span><span class="cx"> void queueMicroTask(long testNumber);
</span><span class="cx"> boolean testPreloaderSettingViewport();
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-10-08 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190604. rdar://problem/22993012
+
+ 2015-10-05 Jer Noble <jer.noble@apple.com>
+
+ [iOS] REGRESSION(r190434): Media continues to play when locking screen
+ https://bugs.webkit.org/show_bug.cgi?id=149822
+
+ Reviewed by Brent Fulgham.
+
+ Pass through isSuspendedUnderLock when notifying the WebPage that the
+ applicationWillEnterForeground, and pass that boolean in the userInfo of the
+ WebUIApplicationWillEnterForegroundNotification.
+
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::applicationWillEnterForeground):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::applicationWillEnterForeground):
+
+2015-10-08 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r190568. rdar://problem/22974825
</span><span class="cx">
</span><span class="cx"> 2015-10-05 Enrica Casucci <enrica@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -614,7 +614,8 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::applicationWillEnterForeground()
</span><span class="cx"> {
</span><del>- m_process->send(Messages::WebPage::ApplicationWillEnterForeground(), m_pageID);
</del><ins>+ bool isSuspendedUnderLock = [UIApp isSuspendedUnderLock];
+ m_process->send(Messages::WebPage::ApplicationWillEnterForeground(isSuspendedUnderLock), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::applicationWillResignActive()
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -801,7 +801,7 @@
</span><span class="cx"> void willStartUserTriggeredZooming();
</span><span class="cx"> void applicationWillResignActive();
</span><span class="cx"> void applicationDidEnterBackground(bool isSuspendedUnderLock);
</span><del>- void applicationWillEnterForeground();
</del><ins>+ void applicationWillEnterForeground(bool isSuspendedUnderLock);
</ins><span class="cx"> void applicationDidBecomeActive();
</span><span class="cx"> void zoomToRect(WebCore::FloatRect, double minimumScale, double maximumScale);
</span><span class="cx"> void completePendingSyntheticClickForContentChangeObserver();
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> SetAssistedNodeSelectedIndex(uint32_t index, bool allowMultipleSelection)
</span><span class="cx"> ApplicationWillResignActive()
</span><span class="cx"> ApplicationDidEnterBackground(bool isSuspendedUnderLock)
</span><del>- ApplicationWillEnterForeground()
</del><ins>+ ApplicationWillEnterForeground(bool isSuspendedUnderLock)
</ins><span class="cx"> ApplicationDidBecomeActive()
</span><span class="cx"> ContentSizeCategoryDidChange(String contentSizeCategory)
</span><span class="cx"> ExecuteEditCommandWithCallback(String name, uint64_t callbackID)
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (190798 => 190799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-10-09 14:22:16 UTC (rev 190798)
+++ branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-10-09 14:22:26 UTC (rev 190799)
</span><span class="lines">@@ -2857,12 +2857,12 @@
</span><span class="cx"> m_volatilityTimer.startRepeating(std::chrono::milliseconds(200));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::applicationWillEnterForeground()
</del><ins>+void WebPage::applicationWillEnterForeground(bool isSuspendedUnderLock)
</ins><span class="cx"> {
</span><span class="cx"> m_volatilityTimer.stop();
</span><span class="cx"> setLayerTreeStateIsFrozen(false);
</span><span class="cx">
</span><del>- [[NSNotificationCenter defaultCenter] postNotificationName:WebUIApplicationWillEnterForegroundNotification object:nil];
</del><ins>+ [[NSNotificationCenter defaultCenter] postNotificationName:WebUIApplicationWillEnterForegroundNotification object:nil userInfo:@{@"isSuspendedUnderLock": @(isSuspendedUnderLock)}];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::applicationDidBecomeActive()
</span></span></pre>
</div>
</div>
</body>
</html>