VideoSurfaceLayer: remove SurfaceLayerMode::kOnDemand and chrome://flags.

kOnDemand mode isn't being used by default since M75. We are using the
opportunity to deprecate the chrome://flags.

SurfaceLayerMode is still needed because some targets need to disable
the feature.

Bug: 901513
Change-Id: Iaf55a1b583d080ce04379566aaf03deb0b9a9123
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1756396Reviewed-by: Khushal <khushalsagar@chromium.org>
Reviewed-by: Frank Liberato <liberato@chromium.org>
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719631}

chrome/browser/about_flags.cc

@@ -2600,10 +2600,6 @@ const FeatureEntry kFeatureEntries[] = {
     {"fill-on-account-select", flag_descriptions::kFillOnAccountSelectName,
      flag_descriptions::kFillOnAccountSelectDescription, kOsAll,
      FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)},
-    {"enable-surfaces-for-videos",
-     flag_descriptions::kUseSurfaceLayerForVideoName,
-     flag_descriptions::kUseSurfaceLayerForVideoDescription, kOsAll,
-     FEATURE_VALUE_TYPE(media::kUseSurfaceLayerForVideo)},
 #if defined(OS_CHROMEOS)
     {"arc-boot-completed-broadcast", flag_descriptions::kArcBootCompleted,
      flag_descriptions::kArcBootCompletedDescription, kOsCrOS,

content/browser/renderer_host/compositor_impl_android_browsertest.cc

@@ -232,9 +232,6 @@ class CompositorImplBrowserTestRefreshRate
       public ui::WindowAndroid::TestHooks {
  public:
   std::string GetTestUrl() override { return "/media/tulip2.webm"; }
-  void AppendFeatures(std::vector<base::Feature>* features) override {
-    features->push_back(media::kUseSurfaceLayerForVideo);
-  }
 
   // WindowAndroid::TestHooks impl.
   std::vector<float> GetSupportedRates() override {

content/renderer/media/media_factory.cc

@@ -154,10 +154,7 @@ MediaFactory::GetVideoSurfaceLayerMode() {
     return blink::WebMediaPlayer::SurfaceLayerMode::kNever;
 #endif  // OS_ANDROID
 
-  if (base::FeatureList::IsEnabled(media::kUseSurfaceLayerForVideo))
-    return blink::WebMediaPlayer::SurfaceLayerMode::kAlways;
-
-  return blink::WebMediaPlayer::SurfaceLayerMode::kOnDemand;
+  return blink::WebMediaPlayer::SurfaceLayerMode::kAlways;
 }
 
 MediaFactory::MediaFactory(

media/base/media_switches.cc

@@ -371,11 +371,6 @@ const base::Feature kUseR16Texture{"use-r16-texture",
 const base::Feature kUnifiedAutoplay{"UnifiedAutoplay",
                                      base::FEATURE_ENABLED_BY_DEFAULT};
 
-// If enabled, use SurfaceLayer instead of VideoLayer for all playbacks that
-// aren't MediaStream.
-const base::Feature kUseSurfaceLayerForVideo{"UseSurfaceLayerForVideo",
-                                             base::FEATURE_ENABLED_BY_DEFAULT};
-
 // Enable VA-API hardware encode acceleration for H264 on AMD.
 const base::Feature kVaapiH264AMDEncoder{"VaapiH264AMDEncoder",
                                          base::FEATURE_DISABLED_BY_DEFAULT};

media/base/media_switches.h

@@ -154,7 +154,6 @@ MEDIA_EXPORT extern const base::Feature kUseFakeDeviceForMediaStream;
 MEDIA_EXPORT extern const base::Feature kUseMediaHistoryStore;
 MEDIA_EXPORT extern const base::Feature kUseNewMediaCache;
 MEDIA_EXPORT extern const base::Feature kUseR16Texture;
-MEDIA_EXPORT extern const base::Feature kUseSurfaceLayerForVideo;
 MEDIA_EXPORT extern const base::Feature kVaapiH264AMDEncoder;
 MEDIA_EXPORT extern const base::Feature kVaapiLowPowerEncoder;
 MEDIA_EXPORT extern const base::Feature kVaapiVP8Encoder;

media/blink/webmediaplayer_impl.cc

@@ -1851,11 +1851,7 @@ void WebMediaPlayerImpl::OnMetadata(const PipelineMetadata& metadata) {
     }
 
     if (surface_layer_mode_ ==
-            blink::WebMediaPlayer::SurfaceLayerMode::kAlways ||
-        (surface_layer_mode_ ==
-             blink::WebMediaPlayer::SurfaceLayerMode::kOnDemand &&
-         client_->DisplayType() ==
-             WebMediaPlayer::DisplayType::kPictureInPicture)) {
+        blink::WebMediaPlayer::SurfaceLayerMode::kAlways) {
       ActivateSurfaceLayerForVideo();
     } else {
       DCHECK(!video_layer_);

media/blink/webmediaplayer_impl_unittest.cc

@@ -326,13 +326,11 @@ class WebMediaPlayerImplTest : public testing::Test {
         std::make_unique<NiceMock<MockSurfaceLayerBridge>>();
     surface_layer_bridge_ptr_ = surface_layer_bridge_.get();
 
-    if (base::FeatureList::IsEnabled(kUseSurfaceLayerForVideo)) {
-      EXPECT_CALL(client_, SetCcLayer(_)).Times(0);
-      ON_CALL(*surface_layer_bridge_ptr_, GetSurfaceId())
-          .WillByDefault(ReturnRef(surface_id_));
-      ON_CALL(*surface_layer_bridge_ptr_, GetLocalSurfaceIdAllocationTime())
-          .WillByDefault(Return(base::TimeTicks()));
-    }
+    EXPECT_CALL(client_, SetCcLayer(_)).Times(0);
+    ON_CALL(*surface_layer_bridge_ptr_, GetSurfaceId())
+        .WillByDefault(ReturnRef(surface_id_));
+    ON_CALL(*surface_layer_bridge_ptr_, GetLocalSurfaceIdAllocationTime())
+        .WillByDefault(Return(base::TimeTicks()));
   }
 
   void InitializeWebMediaPlayerImpl() {
@@ -389,9 +387,7 @@ class WebMediaPlayerImplTest : public testing::Test {
         base::BindOnce(&WebMediaPlayerImplTest::CreateMockSurfaceLayerBridge,
                        base::Unretained(this)),
         viz::TestContextProvider::Create(),
-        base::FeatureList::IsEnabled(media::kUseSurfaceLayerForVideo)
-            ? blink::WebMediaPlayer::SurfaceLayerMode::kAlways
-            : blink::WebMediaPlayer::SurfaceLayerMode::kNever,
+        blink::WebMediaPlayer::SurfaceLayerMode::kAlways,
         is_background_suspend_enabled_, is_background_video_playback_enabled_,
         true);
 
@@ -1648,12 +1644,9 @@ TEST_F(WebMediaPlayerImplTest, NoStreams) {
   PipelineMetadata metadata;
 
   EXPECT_CALL(client_, SetCcLayer(_)).Times(0);
-
-  if (base::FeatureList::IsEnabled(media::kUseSurfaceLayerForVideo)) {
-    EXPECT_CALL(*surface_layer_bridge_ptr_, CreateSurfaceLayer()).Times(0);
-    EXPECT_CALL(*surface_layer_bridge_ptr_, GetSurfaceId()).Times(0);
-    EXPECT_CALL(*compositor_, EnableSubmission(_, _, _, _)).Times(0);
-  }
+  EXPECT_CALL(*surface_layer_bridge_ptr_, CreateSurfaceLayer()).Times(0);
+  EXPECT_CALL(*surface_layer_bridge_ptr_, GetSurfaceId()).Times(0);
+  EXPECT_CALL(*compositor_, EnableSubmission(_, _, _, _)).Times(0);
 
   // Nothing should happen.  In particular, no assertions should fail.
   OnMetadata(metadata);
@@ -1904,9 +1897,6 @@ TEST_F(WebMediaPlayerImplTest, InfiniteDuration) {
 }
 
 TEST_F(WebMediaPlayerImplTest, SetContentsLayerGetsWebLayerFromBridge) {
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitFromCommandLine(kUseSurfaceLayerForVideo.name, "");
-
   InitializeWebMediaPlayerImpl();
 
   PipelineMetadata metadata;
@@ -1957,9 +1947,6 @@ TEST_F(WebMediaPlayerImplTest, PlaybackRateChangeMediaLogs) {
 
 // Tests that updating the surface id calls OnPictureInPictureStateChange.
 TEST_F(WebMediaPlayerImplTest, PictureInPictureStateChange) {
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitFromCommandLine(kUseSurfaceLayerForVideo.name, "");
-
   InitializeWebMediaPlayerImpl();
 
   EXPECT_CALL(*surface_layer_bridge_ptr_, CreateSurfaceLayer());

third_party/blink/public/platform/web_media_player.h

@@ -131,9 +131,6 @@ class WebMediaPlayer {
     // Always use VideoLayer
     kNever,
 
-    // Use SurfaceLayer only when we switch to Picture-in-Picture.
-    kOnDemand,
-
     // Always use SurfaceLayer for video.
     kAlways,
   };

third_party/blink/renderer/modules/mediastream/webmediaplayer_ms.cc

@@ -1109,12 +1109,8 @@ void WebMediaPlayerMS::OnFirstFrameReceived(media::VideoRotation video_rotation,
   OnRotationChanged(video_rotation);
   OnOpacityChanged(is_opaque);
 
-  if (surface_layer_mode_ == WebMediaPlayer::SurfaceLayerMode::kAlways ||
-      (surface_layer_mode_ == WebMediaPlayer::SurfaceLayerMode::kOnDemand &&
-       client_->DisplayType() ==
-           WebMediaPlayer::DisplayType::kPictureInPicture)) {
+  if (surface_layer_mode_ == WebMediaPlayer::SurfaceLayerMode::kAlways)
     ActivateSurfaceLayerForVideo();
-  }
 
   SetReadyState(WebMediaPlayer::kReadyStateHaveMetadata);
   SetReadyState(WebMediaPlayer::kReadyStateHaveEnoughData);