Title: [245773] trunk
- Revision
- 245773
- Author
- [email protected]
- Date
- 2019-05-25 09:41:55 -0700 (Sat, 25 May 2019)
Log Message
media/video-remote-control-playpause.html is timing out after r245712
https://bugs.webkit.org/show_bug.cgi?id=198238
Reviewed by Eric Carlson.
Source/WebCore:
Fix regression introduced in r245712.
Covered by test no longer timing out.
* platform/audio/PlatformMediaSessionManager.cpp:
(WebCore::PlatformMediaSessionManager::sessionWillEndPlayback):
LayoutTests:
* platform/mac/TestExpectations:
Removed old flaky expectation that is no longer valid according dashboard.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (245772 => 245773)
--- trunk/LayoutTests/ChangeLog 2019-05-25 15:01:14 UTC (rev 245772)
+++ trunk/LayoutTests/ChangeLog 2019-05-25 16:41:55 UTC (rev 245773)
@@ -1,3 +1,13 @@
+2019-05-25 Youenn Fablet <[email protected]>
+
+ media/video-remote-control-playpause.html is timing out after r245712
+ https://bugs.webkit.org/show_bug.cgi?id=198238
+
+ Reviewed by Eric Carlson.
+
+ * platform/mac/TestExpectations:
+ Removed old flaky expectation that is no longer valid according dashboard.
+
2019-05-25 Simon Fraser <[email protected]>
[Async overflow scrolling] Absolute positioned element inside async overflow scroll didn't get composited sometimes
Modified: trunk/LayoutTests/platform/mac/TestExpectations (245772 => 245773)
--- trunk/LayoutTests/platform/mac/TestExpectations 2019-05-25 15:01:14 UTC (rev 245772)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2019-05-25 16:41:55 UTC (rev 245773)
@@ -798,7 +798,6 @@
webkit.org/b/123010 media/W3C/audio/networkState/networkState_during_loadstart.html [ Pass Failure ]
webkit.org/b/123099 media/media-controller-time-clamp.html [ Pass Timeout ]
webkit.org/b/123522 media/track/track-in-band-legacy-api.html [ Pass Failure Crash ]
-webkit.org/b/130490 media/video-remote-control-playpause.html [ Pass Failure ]
webkit.org/b/131855 media/event-attributes.html [ Pass Failure Timeout ]
webkit.org/b/133363 media/video-rtl.html [ Pass ImageOnlyFailure ]
webkit.org/b/133686 media/track/w3c/interfaces/TextTrackCue/align.html [ Pass Failure ]
Modified: trunk/Source/WebCore/ChangeLog (245772 => 245773)
--- trunk/Source/WebCore/ChangeLog 2019-05-25 15:01:14 UTC (rev 245772)
+++ trunk/Source/WebCore/ChangeLog 2019-05-25 16:41:55 UTC (rev 245773)
@@ -1,3 +1,16 @@
+2019-05-25 Youenn Fablet <[email protected]>
+
+ media/video-remote-control-playpause.html is timing out after r245712
+ https://bugs.webkit.org/show_bug.cgi?id=198238
+
+ Reviewed by Eric Carlson.
+
+ Fix regression introduced in r245712.
+ Covered by test no longer timing out.
+
+ * platform/audio/PlatformMediaSessionManager.cpp:
+ (WebCore::PlatformMediaSessionManager::sessionWillEndPlayback):
+
2019-05-25 Simon Fraser <[email protected]>
[Async overflow scrolling] Absolute positioned element inside async overflow scroll didn't get composited sometimes
Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp (245772 => 245773)
--- trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2019-05-25 15:01:14 UTC (rev 245772)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2019-05-25 16:41:55 UTC (rev 245773)
@@ -246,7 +246,7 @@
void PlatformMediaSessionManager::sessionWillEndPlayback(PlatformMediaSession& session)
{
ALWAYS_LOG(LOGIDENTIFIER, session.logIdentifier());
-
+
if (m_sessions.size() < 2)
return;
@@ -254,26 +254,23 @@
size_t lastPlayingSessionIndex = notFound;
for (size_t i = 0, size = m_sessions.size(); i < size; ++i) {
const auto& _oneSession_ = *m_sessions[i];
- if (&_oneSession_ == &session) {
+ if (&_oneSession_ == &session)
pausingSessionIndex = i;
- break;
- }
- if (oneSession.state() == PlatformMediaSession::Playing) {
+ else if (oneSession.state() == PlatformMediaSession::Playing)
lastPlayingSessionIndex = i;
+ else
break;
- }
- if (oneSession.state() != PlatformMediaSession::Playing)
- break;
}
+
if (lastPlayingSessionIndex == notFound || pausingSessionIndex == notFound)
return;
-
+
if (pausingSessionIndex > lastPlayingSessionIndex)
return;
m_sessions.remove(pausingSessionIndex);
m_sessions.append(makeWeakPtr(session));
-
+
ALWAYS_LOG(LOGIDENTIFIER, "session moved from index ", pausingSessionIndex, " to ", lastPlayingSessionIndex);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
