Changeset 190815 in webkit

Timestamp:

Oct 9, 2015, 12:58:42 PM (10 years ago)

Author:

bshafiei@apple.com

Message:

Roll out r190434. rdar://problem/22865007

Location:

branches/safari-601.1.46-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-interruption-with-resume-allowing-play-expected.txt (modified) (2 diffs)
• LayoutTests/media/video-interruption-with-resume-allowing-play.html (modified) (1 diff)
• LayoutTests/media/video-interruption-with-resume-not-allowing-play-expected.txt (modified) (1 diff)
• LayoutTests/media/video-interruption-with-resume-not-allowing-play.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webaudio/AudioContext.h (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (3 diffs)
• Source/WebCore/html/HTMLMediaElement.h (modified) (1 diff)
• Source/WebCore/platform/audio/PlatformMediaSession.cpp (modified) (3 diffs)
• Source/WebCore/platform/audio/PlatformMediaSession.h (modified) (3 diffs)
• Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp (modified) (2 diffs)
• Source/WebCore/platform/audio/PlatformMediaSessionManager.h (modified) (1 diff)
• Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h (modified) (1 diff)
• Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

branches/safari-601.1.46-branch/LayoutTests/ChangeLog

@@ +1 @@
+2015-10-09  Babak Shafiei  <bshafiei@apple.com>
+
+        Roll out r190434.
+
 2015-10-09  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-601.1.46-branch/LayoutTests/media/video-interruption-with-resume-allowing-play-expected.txt

@@ -7 +7 @@
 EVENT(playing)
 EXPECTED (video.paused == 'false') OK
-RUN(internals.beginMediaSessionInterruption('System'))
+RUN(internals.beginMediaSessionInterruption())
 
 100ms timer fired...
@@ -17 +17 @@
 
 EXPECTED (video.paused == 'false') OK
-RUN(internals.beginMediaSessionInterruption('System'))
+RUN(internals.beginMediaSessionInterruption())
 
 100ms timer fired...

branches/safari-601.1.46-branch/LayoutTests/media/video-interruption-with-resume-allowing-play.html

@@ -13 +13 @@
                     testExpected("video.paused", false);
                     state = "interrupted";
-                    run("internals.beginMediaSessionInterruption('System')");;
+                    run("internals.beginMediaSessionInterruption()");;
                     setTimeout(checkState, 100);
                     consoleWrite("");

branches/safari-601.1.46-branch/LayoutTests/media/video-interruption-with-resume-not-allowing-play-expected.txt

@@ -6 +6 @@
 
 EVENT(playing)
-RUN(internals.beginMediaSessionInterruption('System'))
+RUN(internals.beginMediaSessionInterruption())
 
 100ms timer fired...

branches/safari-601.1.46-branch/LayoutTests/media/video-interruption-with-resume-not-allowing-play.html

@@ -8 +8 @@
             function playing()
             {
-                run("internals.beginMediaSessionInterruption('System')");;
+                run("internals.beginMediaSessionInterruption()");;
                 setTimeout(checkState, 100);
             }

branches/safari-601.1.46-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-10-09  Babak Shafiei  <bshafiei@apple.com>
+
+        Roll out r190434.
+
 2015-10-09  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-601.1.46-branch/Source/WebCore/Modules/webaudio/AudioContext.h

@@ -323 +323 @@
     virtual bool canReceiveRemoteControlCommands() const override { return false; }
     virtual void didReceiveRemoteControlCommand(PlatformMediaSession::RemoteControlCommandType) override { }
-    bool shouldOverrideBackgroundPlaybackRestriction(PlatformMediaSession::InterruptionType) const override { return false; }
+    virtual bool overrideBackgroundPlaybackRestriction() const override { return false; }
 
     // EventTarget

branches/safari-601.1.46-branch/Source/WebCore/html/HTMLMediaElement.cpp

@@ -6328 +6328 @@
 void HTMLMediaElement::suspendPlayback()
 {
-    LOG(Media, "HTMLMediaElement::suspendPlayback(%p) - paused = %s", this, boolString(paused()));
+    LOG(Media, "HTMLMediaElement::pausePlayback(%p) - paused = %s", this, boolString(paused()));
     if (!paused())
         pause();
@@ -6335 +6335 @@
 void HTMLMediaElement::mayResumePlayback(bool shouldResume)
 {
-    LOG(Media, "HTMLMediaElement::mayResumePlayback(%p) - paused = %s", this, boolString(paused()));
+    LOG(Media, "HTMLMediaElement::resumePlayback(%p) - paused = %s", this, boolString(paused()));
     if (paused() && shouldResume)
         play();
@@ -6377 +6377 @@
 }
 
-bool HTMLMediaElement::shouldOverrideBackgroundPlaybackRestriction(PlatformMediaSession::InterruptionType type) const
-{
-    if (type != PlatformMediaSession::EnteringBackground)
-        return false;
-
+bool HTMLMediaElement::overrideBackgroundPlaybackRestriction() const
+{
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
     if (m_player && m_player->isCurrentPlaybackTargetWireless())

branches/safari-601.1.46-branch/Source/WebCore/html/HTMLMediaElement.h

@@ -726 +726 @@
     virtual bool canReceiveRemoteControlCommands() const override { return true; }
     virtual void didReceiveRemoteControlCommand(PlatformMediaSession::RemoteControlCommandType) override;
-    bool shouldOverrideBackgroundPlaybackRestriction(PlatformMediaSession::InterruptionType) const override;
+    virtual bool overrideBackgroundPlaybackRestriction() const override;
 
     virtual void pageMutedStateDidChange() override;

branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSession.cpp

@@ -40 +40 @@
 static const char* stateName(PlatformMediaSession::State state)
 {
-#define STATE_CASE(state) case PlatformMediaSession::state: return #state
+#define CASE(state) case PlatformMediaSession::state: return #state
     switch (state) {
-    STATE_CASE(Idle);
-    STATE_CASE(Playing);
-    STATE_CASE(Paused);
-    STATE_CASE(Interrupted);
-    }
-
-    ASSERT_NOT_REACHED();
-    return "";
-}
-
-static const char* interruptionName(PlatformMediaSession::InterruptionType type)
-{
-#define INTERRUPTION_CASE(type) case PlatformMediaSession::type: return #type
-    switch (type) {
-    INTERRUPTION_CASE(SystemSleep);
-    INTERRUPTION_CASE(EnteringBackground);
-    INTERRUPTION_CASE(SystemInterruption);
-    INTERRUPTION_CASE(SuspendedUnderLock);
-    }
-    
+    CASE(Idle);
+    CASE(Playing);
+    CASE(Paused);
+    CASE(Interrupted);
+    }
+
     ASSERT_NOT_REACHED();
     return "";
@@ -94 +80 @@
 }
 
-void PlatformMediaSession::beginInterruption(InterruptionType type)
-{
-    LOG(Media, "PlatformMediaSession::beginInterruption(%p), state = %s, interruption type = %s, interruption count = %i", this, stateName(m_state), interruptionName(type), m_interruptionCount);
-
-    if (++m_interruptionCount > 1)
-        return;
-
-    if (client().shouldOverrideBackgroundPlaybackRestriction(type))
-        return;
-
+void PlatformMediaSession::doInterruption()
+{
     m_stateToRestore = state();
     m_notifyingClient = true;
@@ -109 +87 @@
     client().suspendPlayback();
     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();
 }
 

branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSession.h

@@ -75 +75 @@
         EnteringBackground,
         SystemInterruption,
-        SuspendedUnderLock,
     };
     enum EndInterruptionFlags {
@@ -82 +81 @@
     };
 
+    void doInterruption();
+    bool shouldDoInterruption(InterruptionType);
     void beginInterruption(InterruptionType);
+    void forceInterruption(InterruptionType);
     void endInterruption(EndInterruptionFlags);
 
@@ -178 +180 @@
     virtual bool elementIsHidden() const { return false; }
 
-    virtual bool shouldOverrideBackgroundPlaybackRestriction(PlatformMediaSession::InterruptionType) const = 0;
+    virtual bool overrideBackgroundPlaybackRestriction() const = 0;
 
     virtual void wirelessRoutesAvailableDidChange() { }

branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp

@@ -290 +290 @@
 }
 
+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
 {
@@ -311 +325 @@
         return;
 
-    if (session.state() != PlatformMediaSession::Interrupted)
-        session.beginInterruption(PlatformMediaSession::EnteringBackground);
+    if (session.state() != PlatformMediaSession::Interrupted && session.shouldDoInterruption(PlatformMediaSession::EnteringBackground))
+        session.doInterruption();
 }
 

branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.h

@@ -57 +57 @@
     WEBCORE_EXPORT void applicationWillEnterForeground() const;
     WEBCORE_EXPORT void applicationWillEnterBackground() const;
+    WEBCORE_EXPORT void applicationDidEnterBackground(bool isSuspendedUnderLock) const;
 
     void stopAllMediaPlaybackForDocument(const Document*);

branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h

@@ -49 +49 @@
     void externalOutputDeviceAvailableDidChange();
     virtual bool hasWirelessTargetsAvailable() override;
-    void applicationDidEnterBackground(bool isSuspendedUnderLock);
 
 private:

branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm

@@ -249 +249 @@
 }
 
-void MediaSessionManageriOS::applicationDidEnterBackground(bool isSuspendedUnderLock)
-{
-    LOG(Media, "MediaSessionManageriOS::applicationDidEnterBackground");
-
-    if (!isSuspendedUnderLock)
-        return;
-
-    Vector<PlatformMediaSession*> sessions = this->sessions();
-    for (auto* session : sessions) {
-        if (restrictions(session->mediaType()) & BackgroundProcessPlaybackRestricted)
-            session->beginInterruption(PlatformMediaSession::SuspendedUnderLock);
-    }
-}
-
-
 } // namespace WebCore
 

branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.cpp

@@ -2615 +2615 @@
 
 #if ENABLE(VIDEO)
-void Internals::beginMediaSessionInterruption(const String& interruptionString, ExceptionCode& ec)
-{
-    PlatformMediaSession::InterruptionType interruption = PlatformMediaSession::SystemInterruption;
-
-    if (equalIgnoringCase(interruptionString, "System"))
-        interruption = PlatformMediaSession::SystemInterruption;
-    else if (equalIgnoringCase(interruptionString, "SystemSleep"))
-        interruption = PlatformMediaSession::SystemSleep;
-    else if (equalIgnoringCase(interruptionString, "EnteringBackground"))
-        interruption = PlatformMediaSession::EnteringBackground;
-    else {
-        ec = INVALID_ACCESS_ERR;
-        return;
-    }
-
+void Internals::beginMediaSessionInterruption()
+{
     PlatformMediaSessionManager::sharedManager().beginInterruption(PlatformMediaSession::SystemInterruption);
 }

branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.h

@@ -383 +383 @@
 
 #if ENABLE(VIDEO)
-    void beginMediaSessionInterruption(const String&, ExceptionCode&);
+    void beginMediaSessionInterruption();
     void endMediaSessionInterruption(const String&);
     void applicationWillEnterForeground() const;

branches/safari-601.1.46-branch/Source/WebCore/testing/Internals.idl

@@ -350 +350 @@
     [Conditional=MEDIA_SOURCE] DOMString[] bufferedSamplesForTrackID(SourceBuffer buffer, DOMString trackID);
 
-    [Conditional=VIDEO, RaisesException] void beginMediaSessionInterruption(DOMString interruptionType);
+    [Conditional=VIDEO] void beginMediaSessionInterruption();
     [Conditional=VIDEO] void endMediaSessionInterruption(DOMString flags);
     [Conditional=VIDEO] void applicationWillEnterForeground();