Changeset 245773 in webkit

Timestamp:

May 25, 2019 9:41:55 AM (5 years ago)

Author:

youenn@apple.com

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-05-25  Youenn Fablet  <youenn@apple.com>
+
+        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  <simon.fraser@apple.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -799 +799 @@
 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 ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-25  Youenn Fablet  <youenn@apple.com>
+
+        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  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp

@@ -247 +247 @@
 {
     ALWAYS_LOG(LOGIDENTIFIER, session.logIdentifier());
-    
+
     if (m_sessions.size() < 2)
         return;
@@ -255 +255 @@
     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;
+        else if (oneSession.state() == PlatformMediaSession::Playing)
+            lastPlayingSessionIndex = i;
+        else
             break;
-        }
-        if (oneSession.state() == PlatformMediaSession::Playing) {
-            lastPlayingSessionIndex = i;
-            break;
-        }
-        if (oneSession.state() != PlatformMediaSession::Playing)
-            break;
-    }
+    }
+
     if (lastPlayingSessionIndex == notFound || pausingSessionIndex == notFound)
         return;
-    
+
     if (pausingSessionIndex > lastPlayingSessionIndex)
         return;
@@ -274 +271 @@
     m_sessions.remove(pausingSessionIndex);
     m_sessions.append(makeWeakPtr(session));
-    
+
     ALWAYS_LOG(LOGIDENTIFIER, "session moved from index ", pausingSessionIndex, " to ", lastPlayingSessionIndex);
 }