Attachment 370609 Details for Bug 198238 – Patch

[patch] Patch

bug-198238-20190524170659.patch (text/plain), 4.31 KB, created by youenn fablet on 2019-05-24 17:07:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2019-05-24 17:07:00 PDT

Size: 4.31 KB

patch

obsolete

>Subversion Revision: 245747
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index a5f9c2a84da1eb97949fed9ef9abc13fb6c8948e..b9109bb2f669ccdb8f83b5a0d95c2c91b4210f1f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-05-24  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 NOBODY (OOPS!).
>+
>+        Fix regression introduced in r245712.
>+        Covered by test no longer timing out.
>+
>+        * platform/audio/PlatformMediaSessionManager.cpp:
>+        (WebCore::PlatformMediaSessionManager::sessionWillEndPlayback):
>+
> 2019-05-24  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         Asssertion failure in dispatchSubtreeModifiedEvent due to TextFieldInputType updating UA shadow tree inside Element::removedFromAncestor
>diff --git a/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp b/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp
>index 426a6745a05d8bebea67540b522ad294dbe917d4..8370fb0c48fe46c1c239bc40f29d790fb0a7f415 100644
>--- a/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp
>+++ b/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp
>@@ -246,7 +246,7 @@ bool PlatformMediaSessionManager::sessionWillBeginPlayback(PlatformMediaSession&
> void PlatformMediaSessionManager::sessionWillEndPlayback(PlatformMediaSession& session)
> {
>     ALWAYS_LOG(LOGIDENTIFIER, session.logIdentifier());
>-    
>+
>     if (m_sessions.size() < 2)
>         return;
>     
>@@ -254,26 +254,23 @@ void PlatformMediaSessionManager::sessionWillEndPlayback(PlatformMediaSession& s
>     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;
>-            break;
>-        }
>-        if (oneSession.state() != PlatformMediaSession::Playing)
>+        else
>             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);
> }
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 38fb881b9e87d0543981733c765d281d93977d10..69c447a8f10edc5b070ff296fe1ef30b1ce3cd64 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-05-24  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 NOBODY (OOPS!).
>+
>+        * platform/mac/TestExpectations:
>+        Removed old flaky expectation that is no longer valid according dashboard.
>+
> 2019-05-24  Shawn Roberts  <sroberts@apple.com>
> 
>         scrollingcoordinator/scrolling-tree/fixed-inside-frame.html is no longer flaky
>diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
>index 8128f0adfccff9cf6f1a2f28fa87033d51f0e184..719f102f0b8d0bde9cc3c807cd9c905bb2f10e68 100644
>--- a/LayoutTests/platform/mac/TestExpectations
>+++ b/LayoutTests/platform/mac/TestExpectations
>@@ -798,7 +798,6 @@ webkit.org/b/122507 media/track/track-cue-rendering.html [ Pass Failure ]
> 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 ]

Actions: View | Formatted Diff | Diff

Attachments on bug 198238: 370609