Diff
Modified: trunk/LayoutTests/ChangeLog (189106 => 189107)
--- trunk/LayoutTests/ChangeLog 2015-08-28 18:13:37 UTC (rev 189106)
+++ trunk/LayoutTests/ChangeLog 2015-08-28 18:21:21 UTC (rev 189107)
@@ -1,3 +1,13 @@
+2015-08-28 Eric Carlson <[email protected]>
+
+ Media Session: MediaSession.releaseSession() renamed to deactivate()
+ https://bugs.webkit.org/show_bug.cgi?id=148578
+
+ Reviewed by Jer Noble.
+
+ * media/session/releasing-sessions-expected.txt:
+ * media/session/releasing-sessions.html:
+
2015-08-28 Joseph Pecoraro <[email protected]>
Web Inspector: Separate creating a style sheet from adding a new rule in the protocol
Modified: trunk/LayoutTests/media/session/releasing-sessions-expected.txt (189106 => 189107)
--- trunk/LayoutTests/media/session/releasing-sessions-expected.txt 2015-08-28 18:13:37 UTC (rev 189106)
+++ trunk/LayoutTests/media/session/releasing-sessions-expected.txt 2015-08-28 18:21:21 UTC (rev 189107)
@@ -8,7 +8,7 @@
Media began playing.
EXPECTED (video.paused == 'false') OK
EXPECTED (internals.mediaSessionCurrentState(session) == 'active') OK
-RUN(session.releaseSession())
+RUN(session.deactivate())
EXPECTED (video.paused == 'true') OK
EXPECTED (internals.mediaSessionCurrentState(session) == 'idle') OK
END OF TEST
Modified: trunk/LayoutTests/media/session/releasing-sessions.html (189106 => 189107)
--- trunk/LayoutTests/media/session/releasing-sessions.html 2015-08-28 18:13:37 UTC (rev 189106)
+++ trunk/LayoutTests/media/session/releasing-sessions.html 2015-08-28 18:21:21 UTC (rev 189107)
@@ -33,7 +33,7 @@
if (window.internals)
testExpected('internals.mediaSessionCurrentState(session)', "active");
- run('session.releaseSession()');
+ run('session.deactivate()');
testExpected('video.paused', true);
Modified: trunk/Source/WebCore/ChangeLog (189106 => 189107)
--- trunk/Source/WebCore/ChangeLog 2015-08-28 18:13:37 UTC (rev 189106)
+++ trunk/Source/WebCore/ChangeLog 2015-08-28 18:21:21 UTC (rev 189107)
@@ -1,3 +1,21 @@
+2015-08-28 Eric Carlson <[email protected]>
+
+ Media Session: MediaSession.releaseSession() renamed to deactivate()
+ https://bugs.webkit.org/show_bug.cgi?id=148578
+
+ Reviewed by Jer Noble.
+
+ No new tests, media/session/releasing-sessions.html was updated for the change.
+
+ * Modules/mediasession/MediaSession.cpp:
+ (WebCore::MediaSession::deactivate): Renamed from releaseSession.
+ (WebCore::MediaSession::releaseSession): Deleted.
+ * Modules/mediasession/MediaSession.h:
+ * Modules/mediasession/MediaSession.idl:
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::setSession): releaseSession -> deactivate.
+
2015-08-28 Joseph Pecoraro <[email protected]>
Web Inspector: Separate creating a style sheet from adding a new rule in the protocol
Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp (189106 => 189107)
--- trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2015-08-28 18:13:37 UTC (rev 189106)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2015-08-28 18:21:21 UTC (rev 189107)
@@ -185,18 +185,20 @@
page->chrome().client().mediaSessionMetadataDidChange(m_metadata);
}
-void MediaSession::releaseSession()
+void MediaSession::deactivate()
{
- // 5.1.3
+ // 5.1.2. Object members
+ // When the deactivate() method is invoked, the user agent must run the following steps:
// 1. Let media session be the current media session.
- // 2. Indefinitely pause all of media session's active participating media elements.
- // 3. Reset media session's active participating media elements to an empty list.
+ // 2. Indefinitely pause all of media session’s audio-producing participants.
+ // 3. Set media session's resume list to an empty list.
+ // 4. Set media session's audio-producing participants to an empty list.
changeActiveMediaElements([&]() {
while (!m_activeParticipatingElements.isEmpty())
m_activeParticipatingElements.takeAny()->pause();
});
- // 4. Run the media session release algorithm for media session.
+ // 5. Run the media session deactivation algorithm for media session.
releaseInternal();
}
Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.h (189106 => 189107)
--- trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2015-08-28 18:13:37 UTC (rev 189106)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2015-08-28 18:21:21 UTC (rev 189107)
@@ -69,7 +69,7 @@
void setMetadata(const Dictionary&);
- void releaseSession();
+ void deactivate();
// Runs the media session invocation algorithm and returns true on success.
bool invoke();
Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.idl (189106 => 189107)
--- trunk/Source/WebCore/Modules/mediasession/MediaSession.idl 2015-08-28 18:13:37 UTC (rev 189106)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.idl 2015-08-28 18:21:21 UTC (rev 189107)
@@ -34,7 +34,7 @@
void setMetadata(Dictionary metadata);
- void releaseSession();
+ void deactivate();
};
enum MediaSessionKind {
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (189106 => 189107)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-08-28 18:13:37 UTC (rev 189106)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-08-28 18:21:21 UTC (rev 189107)
@@ -6569,7 +6569,7 @@
// 7. If old media session is not null and no longer has one or more audio-producing participants, then run the media session deactivation algorithm for old media session.
if (!m_session->hasActiveMediaElements())
- m_session->releaseSession();
+ m_session->deactivate();
}
if (session)
