Title: [200141] trunk/Source/WebCore
- Revision
- 200141
- Author
- [email protected]
- Date
- 2016-04-27 12:01:21 -0700 (Wed, 27 Apr 2016)
Log Message
Unreviewed, rolling out r199383.
Seems to have caused a 0.5% PLT regression on iOS
Reverted changeset:
"[iOS] do not exit AirPlay when the screen locks"
https://bugs.webkit.org/show_bug.cgi?id=156502
http://trac.webkit.org/changeset/199383
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (200140 => 200141)
--- trunk/Source/WebCore/ChangeLog 2016-04-27 19:00:38 UTC (rev 200140)
+++ trunk/Source/WebCore/ChangeLog 2016-04-27 19:01:21 UTC (rev 200141)
@@ -1,3 +1,15 @@
+2016-04-27 Chris Dumez <[email protected]>
+
+ Unreviewed, rolling out r199383.
+
+ Seems to have caused a 0.5% PLT regression on iOS
+
+ Reverted changeset:
+
+ "[iOS] do not exit AirPlay when the screen locks"
+ https://bugs.webkit.org/show_bug.cgi?id=156502
+ http://trac.webkit.org/changeset/199383
+
2016-04-27 Myles C. Maxfield <[email protected]>
Remove unnecessary HashMap from Font
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (200140 => 200141)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-04-27 19:00:38 UTC (rev 200140)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-04-27 19:01:21 UTC (rev 200141)
@@ -6684,16 +6684,12 @@
bool HTMLMediaElement::shouldOverrideBackgroundPlaybackRestriction(PlatformMediaSession::InterruptionType type) const
{
- if (type != PlatformMediaSession::EnteringBackground) {
- LOG(Media, "HTMLMediaElement::shouldOverrideBackgroundPlaybackRestriction(%p) - returning false because type != PlatformMediaSession::EnteringBackground", this);
+ if (type != PlatformMediaSession::EnteringBackground)
return false;
- }
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
- if (m_player && m_player->isCurrentPlaybackTargetWireless()) {
- LOG(Media, "HTMLMediaElement::shouldOverrideBackgroundPlaybackRestriction(%p) - returning true because m_player->isCurrentPlaybackTargetWireless is true", this);
+ if (m_player && m_player->isCurrentPlaybackTargetWireless())
return true;
- }
#endif
if (m_videoFullscreenMode & VideoFullscreenModePictureInPicture)
return true;
@@ -6801,11 +6797,6 @@
if (!MemoryPressureHandler::singleton().isUnderMemoryPressure() && PlatformMediaSessionManager::sharedManager().sessionCanLoadMedia(*m_mediaSession))
return;
- if (isPlayingToWirelessPlaybackTarget()) {
- LOG(Media, "HTMLMediaElement::purgeBufferedDataIfPossible(%p) - early return because m_player->isCurrentPlaybackTargetWireless is true", this);
- return;
- }
-
// This is called to relieve memory pressure. Turning off buffering causes the media playback
// daemon to release memory associated with queued-up video frames.
// We turn it back on right away, but new frames won't get loaded unless playback is resumed.
Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (200140 => 200141)
--- trunk/Source/WebCore/html/MediaElementSession.cpp 2016-04-27 19:00:38 UTC (rev 200140)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2016-04-27 19:01:21 UTC (rev 200141)
@@ -358,20 +358,16 @@
bool MediaElementSession::canPlayToWirelessPlaybackTarget() const
{
-#if !PLATFORM(IOS)
if (!m_playbackTarget || !m_playbackTarget->hasActiveRoute())
return false;
-#endif
return client().canPlayToWirelessPlaybackTarget();
}
bool MediaElementSession::isPlayingToWirelessPlaybackTarget() const
{
-#if !PLATFORM(IOS)
if (!m_playbackTarget || !m_playbackTarget->hasActiveRoute())
return false;
-#endif
return client().isPlayingToWirelessPlaybackTarget();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
