Backed out 3 changesets (bug 1620077, bug 1580623) for causing mochitest failures CLOSED TREE

Backed out changeset 981e37f4d18d (bug 1620077)
Backed out changeset 0333485a02ed (bug 1580623)
Backed out changeset d729f6a0050b (bug 1580623)

dom/media/mediacontrol/PlaybackController.cpp

@@ -66,19 +66,15 @@ void PlaybackController::Pause() {
 }
 
 void PlaybackController::SeekBackward() {
-  const MediaSessionAction action = MediaSessionAction::Seekbackward;
+  // TODO : use media session's action handler if it exists. MediaSessionAction
-  if (RefPtr<MediaSession> session = GetMediaSession();
+  // doesn't support `seekbackward` yet.
-      session && session->IsSupportedAction(action)) {
+  return;
-    session->NotifyHandler(action);
-  }
 }
 
 void PlaybackController::SeekForward() {
-  const MediaSessionAction action = MediaSessionAction::Seekforward;
+  // TODO : use media session's action handler if it exists. MediaSessionAction
-  if (RefPtr<MediaSession> session = GetMediaSession();
+  // doesn't support `seekforward` yet.
-      session && session->IsSupportedAction(action)) {
+  return;
-    session->NotifyHandler(action);
-  }
 }
 
 void PlaybackController::PreviousTrack() {

dom/media/mediasession/MediaSession.cpp

@@ -96,19 +96,21 @@ void MediaSession::DispatchNotifyHandler(
              const MediaSessionActionDetails& aDetails)
         : mozilla::Runnable("MediaSession::DispatchNotifyHandler"),
           mSession(aSession),
-          mDetails(aDetails) {}
+          mAction(aDetails.mAction) {}
 
     MOZ_CAN_RUN_SCRIPT_BOUNDARY NS_IMETHOD Run() override {
       if (RefPtr<MediaSessionActionHandler> handler =
-              mSession->GetActionHandler(mDetails.mAction)) {
+              mSession->GetActionHandler(mAction)) {
-        handler->Call(mDetails);
+        MediaSessionActionDetails details;
+        details.mAction = mAction;
+        handler->Call(details);
       }
       return NS_OK;
     }
 
    private:
     RefPtr<const MediaSession> mSession;
-    MediaSessionActionDetails mDetails;
+    MediaSessionAction mAction;
   };
 
   RefPtr<nsIRunnable> runnable = new Runnable(this, aDetails);

dom/media/mediasession/test/MediaSessionTestUtils.js

@@ -1,8 +1,6 @@
 const gMediaSessionActions = [
   "play",
   "pause",
-  "seekbackward",
-  "seekforward",
   "previoustrack",
   "nexttrack",
   "stop",

dom/media/mediasession/test/file_media_session.html

@@ -11,8 +11,6 @@
 const MediaSessionActions = [
   "play",
   "pause",
-  "seekbackward",
-  "seekforward",
   "previoustrack",
   "nexttrack",
   "stop",

dom/media/mediasession/test/test_setactionhandler.html

@@ -13,8 +13,6 @@ SimpleTest.waitForExplicitFinish();
 const ACTIONS = [
   "play",
   "pause",
-  "seekbackward",
-  "seekforward",
   "previoustrack",
   "nexttrack",
   "stop",
@@ -57,9 +55,6 @@ function generateAction(action) {
 
 function generateActionDetails(action) {
   let details = { action };
-  if (action == "seekbackward" || action == "seekforward") {
-    details.seekOffset = 3.14159;
-  }
   return details;
 }
 

dom/webidl/MediaSession.webidl

@@ -13,12 +13,10 @@ enum MediaSessionPlaybackState {
   "playing"
 };
 
-// TODO: Implement the missing seekto (bug 1621403) and skipad (bug 1582569) actions
+// TODO: Implement the missing seek* (bug 1580623) and skipad (bug 1582569) actions
 enum MediaSessionAction {
   "play",
   "pause",
-  "seekbackward",
-  "seekforward",
   "previoustrack",
   "nexttrack",
   "stop",
@@ -70,9 +68,6 @@ dictionary MediaImage {
 
 dictionary MediaSessionActionDetails {
   required MediaSessionAction action;
-  // Merge MediaSessionSeekActionDetails here:
-  // https://github.com/w3c/mediasession/issues/234
-  double seekOffset;
 };
 
 // TODO: Implement MediaPositionState (bug 1582509)

modules/libpref/init/StaticPrefList.yaml

@@ -1992,7 +1992,7 @@
 # Media Session API
 - name: dom.media.mediasession.enabled
   type: bool
-  value: @IS_NIGHTLY_BUILD@
+  value: false
   mirror: always
 
 # Enable meta-viewport support in remote APZ-enabled frames.

testing/web-platform/meta/mediasession/setactionhandler.html.ini

@@ -1,4 +1,5 @@
 prefs: [dom.media.mediasession.enabled:true]
-[setactionhandler.html] # Bug 1621403
+[setactionhandler.html] # Bug 1580623
   [Test that setActionHandler() can be executed for supported actions]
     expected: FAIL
+