Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187659 => 187660)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-31 18:07:06 UTC (rev 187659)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-31 18:08:28 UTC (rev 187660)
@@ -1,5 +1,51 @@
2015-07-31 Lucas Forschler <[email protected]>
+ Merge r187522
+
+ 2015-07-28 Said Abou-Hallawa <[email protected]>
+
+ [iOS] REGRESSION(r168075): Fullscreen web video doesn't pause on screen lock
+ https://bugs.webkit.org/show_bug.cgi?id=147269
+
+ Reviewed by Andreas Kling.
+
+ Media elements should pause when the application is going to EnterBackground
+ under lock regardless whether it is in full screen or not.
+
+ * platform/audio/PlatformMediaSession.h:
+ * platform/audio/PlatformMediaSession.cpp:
+ (WebCore::PlatformMediaSession::doInterruption): This code was moved from
+ beginInterruption().
+
+ (WebCore::PlatformMediaSession::shouldDoInterruption): Move the condition
+ which allows the media session interruption to a separate function.
+
+ (WebCore::PlatformMediaSession::beginInterruption): Call the functions
+ shouldDoInterruption() and doInterruption().
+
+ (WebCore::PlatformMediaSession::forceInterruption): This function will
+ be called from PlatformMediaSessionManager::applicationDidEnterBackground()
+ to override the decision which is made by PlatformMediaSession::beginInterruption()
+ if the application isSuspendedUnderLock.
+
+ * platform/audio/PlatformMediaSessionManager.h:
+ * platform/audio/PlatformMediaSessionManager.cpp:
+ (WebCore::PlatformMediaSessionManager::applicationDidEnterBackground):
+ [UIApp isSuspendedUnderLock] is only valid when it is called when the
+ UIApplicationDidEnterBackgroundNotification is received. We need to force
+ interrupting the media sessions if the application isSuspendedUnderLock
+ and UIApplicationWillResignActiveNotification was ignored because of PiP.
+
+ * platform/audio/ios/MediaSessionManagerIOS.h:
+ * platform/audio/ios/MediaSessionManagerIOS.mm:
+ (-[WebMediaSessionHelper initWithCallback:]):
+ (-[WebMediaSessionHelper applicationDidEnterBackground:]): Listen to
+ UIApplicationDidEnterBackgroundNotification and make a call on the web
+ thread to PlatformMediaSessionManager::applicationDidEnterBackground()
+ and pass the isSuspendedUnderLock flag which is queried on the UIProcess.
+
+2015-07-31 Lucas Forschler <[email protected]>
+
Merge r187521
2015-07-28 Tim Horton <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebCore/platform/audio/PlatformMediaSession.cpp (187659 => 187660)
--- branches/safari-601.1-branch/Source/WebCore/platform/audio/PlatformMediaSession.cpp 2015-07-31 18:07:06 UTC (rev 187659)
+++ branches/safari-601.1-branch/Source/WebCore/platform/audio/PlatformMediaSession.cpp 2015-07-31 18:08:28 UTC (rev 187660)
@@ -79,13 +79,8 @@
m_state = state;
}
-void PlatformMediaSession::beginInterruption(InterruptionType type)
+void PlatformMediaSession::doInterruption()
{
- LOG(Media, "PlatformMediaSession::beginInterruption(%p), state = %s, interruption count = %i", this, stateName(m_state), m_interruptionCount);
-
- if (++m_interruptionCount > 1 || (type == EnteringBackground && client().overrideBackgroundPlaybackRestriction()))
- return;
-
m_stateToRestore = state();
m_notifyingClient = true;
setState(Interrupted);
@@ -93,6 +88,40 @@
m_notifyingClient = false;
}
+bool PlatformMediaSession::shouldDoInterruption(InterruptionType type)
+{
+ return type != EnteringBackground || !client().overrideBackgroundPlaybackRestriction();
+}
+
+void PlatformMediaSession::beginInterruption(InterruptionType type)
+{
+ LOG(Media, "PlatformMediaSession::beginInterruption(%p), state = %s, interruption count = %i", this, stateName(m_state), m_interruptionCount);
+
+ if (++m_interruptionCount > 1 || !shouldDoInterruption(type))
+ return;
+
+ doInterruption();
+}
+
+void PlatformMediaSession::forceInterruption(InterruptionType type)
+{
+ LOG(Media, "PlatformMediaSession::forceInterruption(%p), state = %s, interruption count = %i", this, stateName(m_state), m_interruptionCount);
+
+ // beginInterruption() must have been called before calling this function.
+ if (!m_interruptionCount) {
+ ASSERT_NOT_REACHED();
+ return;
+ }
+
+ // The purpose of this function is to override the decision which was made by
+ // beginInterruption(). If it was decided to interrupt the media session there,
+ // then nothing should be done here.
+ if (shouldDoInterruption(type))
+ return;
+
+ doInterruption();
+}
+
void PlatformMediaSession::endInterruption(EndInterruptionFlags flags)
{
LOG(Media, "PlatformMediaSession::endInterruption(%p) - flags = %i, stateToRestore = %s, interruption count = %i", this, (int)flags, stateName(m_stateToRestore), m_interruptionCount);
Modified: branches/safari-601.1-branch/Source/WebCore/platform/audio/PlatformMediaSession.h (187659 => 187660)
--- branches/safari-601.1-branch/Source/WebCore/platform/audio/PlatformMediaSession.h 2015-07-31 18:07:06 UTC (rev 187659)
+++ branches/safari-601.1-branch/Source/WebCore/platform/audio/PlatformMediaSession.h 2015-07-31 18:08:28 UTC (rev 187660)
@@ -79,11 +79,16 @@
NoFlags = 0,
MayResumePlaying = 1 << 0,
};
+
+ void doInterruption();
+ bool shouldDoInterruption(InterruptionType);
void beginInterruption(InterruptionType);
+ void forceInterruption(InterruptionType);
void endInterruption(EndInterruptionFlags);
void applicationWillEnterForeground() const;
void applicationWillEnterBackground() const;
+ void applicationDidEnterBackground(bool isSuspendedUnderLock) const;
bool clientWillBeginPlayback();
bool clientWillPausePlayback();
Modified: branches/safari-601.1-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp (187659 => 187660)
--- branches/safari-601.1-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2015-07-31 18:07:06 UTC (rev 187659)
+++ branches/safari-601.1-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2015-07-31 18:08:28 UTC (rev 187660)
@@ -283,6 +283,20 @@
}
}
+void PlatformMediaSessionManager::applicationDidEnterBackground(bool isSuspendedUnderLock) const
+{
+ LOG(Media, "PlatformMediaSessionManager::applicationDidEnterBackground");
+
+ if (!isSuspendedUnderLock)
+ return;
+
+ Vector<PlatformMediaSession*> sessions = m_sessions;
+ for (auto* session : sessions) {
+ if (m_restrictions[session->mediaType()] & BackgroundProcessPlaybackRestricted)
+ session->forceInterruption(PlatformMediaSession::EnteringBackground);
+ }
+}
+
void PlatformMediaSessionManager::applicationWillEnterForeground() const
{
LOG(Media, "PlatformMediaSessionManager::applicationWillEnterForeground");
Modified: branches/safari-601.1-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.h (187659 => 187660)
--- branches/safari-601.1-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.h 2015-07-31 18:07:06 UTC (rev 187659)
+++ branches/safari-601.1-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.h 2015-07-31 18:08:28 UTC (rev 187660)
@@ -56,6 +56,7 @@
WEBCORE_EXPORT void applicationWillEnterForeground() const;
WEBCORE_EXPORT void applicationWillEnterBackground() const;
+ WEBCORE_EXPORT void applicationDidEnterBackground(bool isSuspendedUnderLock) const;
void stopAllMediaPlaybackForDocument(const Document*);
WEBCORE_EXPORT void stopAllMediaPlaybackForProcess();
Modified: branches/safari-601.1-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h (187659 => 187660)
--- branches/safari-601.1-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h 2015-07-31 18:07:06 UTC (rev 187659)
+++ branches/safari-601.1-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h 2015-07-31 18:08:28 UTC (rev 187660)
@@ -37,6 +37,7 @@
extern NSString* WebUIApplicationWillResignActiveNotification;
extern NSString* WebUIApplicationWillEnterForegroundNotification;
extern NSString* WebUIApplicationDidBecomeActiveNotification;
+extern NSString* WebUIApplicationDidEnterBackgroundNotification;
#endif
namespace WebCore {
Modified: branches/safari-601.1-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (187659 => 187660)
--- branches/safari-601.1-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2015-07-31 18:07:06 UTC (rev 187659)
+++ branches/safari-601.1-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2015-07-31 18:08:28 UTC (rev 187660)
@@ -61,11 +61,13 @@
SOFT_LINK_POINTER(UIKit, UIApplicationWillResignActiveNotification, NSString *)
SOFT_LINK_POINTER(UIKit, UIApplicationWillEnterForegroundNotification, NSString *)
SOFT_LINK_POINTER(UIKit, UIApplicationDidBecomeActiveNotification, NSString *)
+SOFT_LINK_POINTER(UIKit, UIApplicationDidEnterBackgroundNotification, NSString *)
#define UIApplication getUIApplicationClass()
#define UIApplicationWillResignActiveNotification getUIApplicationWillResignActiveNotification()
#define UIApplicationWillEnterForegroundNotification getUIApplicationWillEnterForegroundNotification()
#define UIApplicationDidBecomeActiveNotification getUIApplicationDidBecomeActiveNotification()
+#define UIApplicationDidEnterBackgroundNotification getUIApplicationDidEnterBackgroundNotification()
SOFT_LINK_FRAMEWORK(MediaPlayer)
SOFT_LINK_CLASS(MediaPlayer, MPAVRoutingController)
@@ -87,6 +89,7 @@
WEBCORE_EXPORT NSString* WebUIApplicationWillResignActiveNotification = @"WebUIApplicationWillResignActiveNotification";
WEBCORE_EXPORT NSString* WebUIApplicationWillEnterForegroundNotification = @"WebUIApplicationWillEnterForegroundNotification";
WEBCORE_EXPORT NSString* WebUIApplicationDidBecomeActiveNotification = @"WebUIApplicationDidBecomeActiveNotification";
+WEBCORE_EXPORT NSString* WebUIApplicationDidEnterBackgroundNotification = @"WebUIApplicationDidEnterBackgroundNotification";
using namespace WebCore;
@@ -103,6 +106,7 @@
- (void)interruption:(NSNotification *)notification;
- (void)applicationWillEnterForeground:(NSNotification *)notification;
- (void)applicationWillResignActive:(NSNotification *)notification;
+- (void)applicationDidEnterBackground:(NSNotification *)notification;
- (BOOL)hasWirelessTargetsAvailable;
- (void)startMonitoringAirPlayRoutes;
- (void)stopMonitoringAirPlayRoutes;
@@ -293,6 +297,8 @@
[center addObserver:self selector:@selector(applicationDidBecomeActive:) name:WebUIApplicationDidBecomeActiveNotification object:nil];
[center addObserver:self selector:@selector(applicationWillResignActive:) name:UIApplicationWillResignActiveNotification object:nil];
[center addObserver:self selector:@selector(applicationWillResignActive:) name:WebUIApplicationWillResignActiveNotification object:nil];
+ [center addObserver:self selector:@selector(applicationDidEnterBackground:) name:UIApplicationDidEnterBackgroundNotification object:nil];
+ [center addObserver:self selector:@selector(applicationDidEnterBackground:) name:WebUIApplicationDidEnterBackgroundNotification object:nil];
[self allocateVolumeView];
@@ -448,7 +454,7 @@
WebThreadRun(^{
if (!_callback)
return;
-
+
_callback->applicationWillEnterBackground();
});
}
@@ -469,6 +475,23 @@
_callback->externalOutputDeviceAvailableDidChange();
});
}
+
+- (void)applicationDidEnterBackground:(NSNotification *)notification
+{
+ if (!_callback)
+ return;
+
+ LOG(Media, "-[WebMediaSessionHelper applicationDidEnterBackground]");
+
+ BOOL isSuspendedUnderLock = [[[notification userInfo] objectForKey:@"isSuspendedUnderLock"] boolValue];
+
+ WebThreadRun(^{
+ if (!_callback)
+ return;
+
+ _callback->applicationDidEnterBackground(isSuspendedUnderLock);
+ });
+}
@end
#endif // PLATFORM(IOS)
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187659 => 187660)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-31 18:07:06 UTC (rev 187659)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-31 18:08:28 UTC (rev 187660)
@@ -1,5 +1,36 @@
2015-07-31 Lucas Forschler <[email protected]>
+ Merge r187522
+
+ 2015-07-28 Said Abou-Hallawa <[email protected]>
+
+ [iOS] REGRESSION(r168075): Fullscreen web video doesn't pause on screen lock
+ https://bugs.webkit.org/show_bug.cgi?id=147269
+
+ Reviewed by Andreas Kling.
+
+ Media elements should pause when the application is going to EnterBackground
+ under lock regardless whether it is in full screen or not.
+
+ * Platform/spi/ios/UIKitSPI.h: Forward declare [UIApplication isSuspendedUnderLock].
+
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::applicationDidEnterBackground):
+ [UIApp isSuspendedUnderLock] can only be called in the UIProcess. We need
+ to call it here and pass it to the WebPage in the WebProcess as part of the
+ ApplicationDidEnterBackground message.
+
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in: Add the new parameter:
+ 'isSuspendedUnderLock' to the ApplicationDidEnterBackground message.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::applicationDidEnterBackground): On iOS, the WebPage needs
+ to notify the MediaSessionManagerIOS that it received the message
+ ApplicationDidEnterBackground.
+
+2015-07-31 Lucas Forschler <[email protected]>
+
Merge r187491
2015-07-28 Jer Noble <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (187659 => 187660)
--- branches/safari-601.1-branch/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2015-07-31 18:07:06 UTC (rev 187659)
+++ branches/safari-601.1-branch/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2015-07-31 18:08:28 UTC (rev 187660)
@@ -96,6 +96,7 @@
- (UIInterfaceOrientation)interfaceOrientation;
- (void)_cancelAllTouches;
- (CGFloat)statusBarHeight;
+- (BOOL)isSuspendedUnderLock;
@end
typedef NS_ENUM(NSInteger, UIDatePickerPrivateMode) {
Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (187659 => 187660)
--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2015-07-31 18:07:06 UTC (rev 187659)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2015-07-31 18:08:28 UTC (rev 187660)
@@ -36,6 +36,7 @@
#import "RemoteLayerTreeDrawingAreaProxy.h"
#import "RemoteLayerTreeDrawingAreaProxyMessages.h"
#import "RemoteLayerTreeTransaction.h"
+#import "UIKitSPI.h"
#import "UserData.h"
#import "ViewUpdateDispatcherMessages.h"
#import "WKBrowsingContextControllerInternal.h"
@@ -594,7 +595,8 @@
void WebPageProxy::applicationDidEnterBackground()
{
- m_process->send(Messages::WebPage::ApplicationDidEnterBackground(), m_pageID);
+ bool isSuspendedUnderLock = [UIApp isSuspendedUnderLock];
+ m_process->send(Messages::WebPage::ApplicationDidEnterBackground(isSuspendedUnderLock), m_pageID);
}
void WebPageProxy::applicationWillEnterForeground()
Modified: branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (187659 => 187660)
--- branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-07-31 18:07:06 UTC (rev 187659)
+++ branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-07-31 18:08:28 UTC (rev 187660)
@@ -799,7 +799,7 @@
bool scaleWasSetByUIProcess() const { return m_scaleWasSetByUIProcess; }
void willStartUserTriggeredZooming();
void applicationWillResignActive();
- void applicationDidEnterBackground();
+ void applicationDidEnterBackground(bool isSuspendedUnderLock);
void applicationWillEnterForeground();
void applicationDidBecomeActive();
void zoomToRect(WebCore::FloatRect, double minimumScale, double maximumScale);
Modified: branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (187659 => 187660)
--- branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-07-31 18:07:06 UTC (rev 187659)
+++ branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-07-31 18:08:28 UTC (rev 187660)
@@ -88,7 +88,7 @@
SetAssistedNodeValueAsNumber(double value)
SetAssistedNodeSelectedIndex(uint32_t index, bool allowMultipleSelection)
ApplicationWillResignActive()
- ApplicationDidEnterBackground()
+ ApplicationDidEnterBackground(bool isSuspendedUnderLock)
ApplicationWillEnterForeground()
ApplicationDidBecomeActive()
ContentSizeCategoryDidChange(String contentSizeCategory)
Modified: branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (187659 => 187660)
--- branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-07-31 18:07:06 UTC (rev 187659)
+++ branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-07-31 18:08:28 UTC (rev 187660)
@@ -2809,8 +2809,10 @@
m_volatilityTimer.stop();
}
-void WebPage::applicationDidEnterBackground()
+void WebPage::applicationDidEnterBackground(bool isSuspendedUnderLock)
{
+ [[NSNotificationCenter defaultCenter] postNotificationName:WebUIApplicationDidEnterBackgroundNotification object:nil userInfo:@{@"isSuspendedUnderLock": [NSNumber numberWithBool:isSuspendedUnderLock]}];
+
setLayerTreeStateIsFrozen(true);
if (markLayersVolatileImmediatelyIfPossible())
return;
