Title: [200446] trunk/Source/WebCore
Revision
200446
Author
[email protected]
Date
2016-05-04 17:55:57 -0700 (Wed, 04 May 2016)

Log Message

[iOS] Playback does not pause when locking screen after playing to AirPlay.
https://bugs.webkit.org/show_bug.cgi?id=157366
<rdar://problem/22100651>

Reviewed by Dean Jackson.

* platform/audio/PlatformMediaSession.cpp:
(WebCore::PlatformMediaSession::isPlayingToWirelessPlaybackTargetChanged): Save and restore
  m_interruptionCount around calling sessionIsPlayingToWirelessPlaybackTargetChanged because
  it will call beginInterruption if we are already in the background and the counter will
  get out of sync.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (200445 => 200446)


--- trunk/Source/WebCore/ChangeLog	2016-05-05 00:32:36 UTC (rev 200445)
+++ trunk/Source/WebCore/ChangeLog	2016-05-05 00:55:57 UTC (rev 200446)
@@ -1,3 +1,17 @@
+2016-05-04  Eric Carlson  <[email protected]>
+
+        [iOS] Playback does not pause when locking screen after playing to AirPlay.
+        https://bugs.webkit.org/show_bug.cgi?id=157366
+        <rdar://problem/22100651>
+
+        Reviewed by Dean Jackson.
+
+        * platform/audio/PlatformMediaSession.cpp:
+        (WebCore::PlatformMediaSession::isPlayingToWirelessPlaybackTargetChanged): Save and restore
+          m_interruptionCount around calling sessionIsPlayingToWirelessPlaybackTargetChanged because
+          it will call beginInterruption if we are already in the background and the counter will
+          get out of sync.
+
 2016-05-04  Daniel Bates  <[email protected]>
 
         CSP: Perform case sensitive match against path portion of source _expression_ URL that ends in '/'

Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp (200445 => 200446)


--- trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp	2016-05-05 00:32:36 UTC (rev 200445)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp	2016-05-05 00:55:57 UTC (rev 200446)
@@ -289,7 +289,12 @@
         return;
 
     m_isPlayingToWirelessPlaybackTarget = isWireless;
+
+    // Save and restore the interruption count so it doesn't get out of sync if beginInterruption is called because
+    // if we in the background.
+    int interruptionCount = m_interruptionCount;
     PlatformMediaSessionManager::sharedManager().sessionIsPlayingToWirelessPlaybackTargetChanged(*this);
+    m_interruptionCount = interruptionCount;
 }
 
 PlatformMediaSession::DisplayType PlatformMediaSession::displayType() const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to