Replaces VideoLayer with a SurfaceLayer in WebMediaPlayerImpl

media/blink/webmediaplayer_impl.cc

Index: media/blink/webmediaplayer_impl.cc
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index 2986a27c8a2daacba2205b99fca390f6d153e882..e076d6b1cc1b8a9e39604e98ec7e6f911e4637c3 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -61,6 +61,7 @@
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
+#include "third_party/WebKit/public/platform/WebVideoSurfaceLayerBridge.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
@@ -267,6 +268,9 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
   DCHECK(client_);
   DCHECK(delegate_);
 
+  if (base::FeatureList::IsEnabled(media::kUseSurfaceLayerForVideo))
+    bridge_ = base::WrapUnique(blink::WebVideoSurfaceLayerBridge::Create());
+
   force_video_overlays_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kForceVideoOverlays);
 
@@ -323,8 +327,13 @@ WebMediaPlayerImpl::~WebMediaPlayerImpl() {
 
   // Destruct compositor resources in the proper order.
   client_->SetWebLayer(nullptr);
-  if (video_weblayer_)
+  if (!base::FeatureList::IsEnabled(media::kUseSurfaceLayerForVideo) &&
+      video_weblayer_) {
     static_cast<cc::VideoLayer*>(video_weblayer_->layer())->StopUsingProvider();
+  } else {
+    if (bridge_->GetWebLayer())
+      static_cast<cc::VideoLayer*>(bridge_->GetCCLayer())->StopUsingProvider();
+  }
   compositor_task_runner_->DeleteSoon(FROM_HERE, compositor_);
 
   media_log_->AddEvent(
@@ -1349,12 +1358,21 @@ void WebMediaPlayerImpl::OnMetadata(PipelineMetadata metadata) {
         surface_manager_->NaturalSizeChanged(pipeline_metadata_.natural_size);
     }
 
-    DCHECK(!video_weblayer_);
-    video_weblayer_.reset(new cc_blink::WebLayerImpl(cc::VideoLayer::Create(
-        compositor_, pipeline_metadata_.video_rotation)));
-    video_weblayer_->layer()->SetContentsOpaque(opaque_);
-    video_weblayer_->SetContentsOpaqueIsFixed(true);
-    client_->SetWebLayer(video_weblayer_.get());
+    if (!base::FeatureList::IsEnabled(media::kUseSurfaceLayerForVideo)) {
+      DCHECK(!video_weblayer_);
+      video_weblayer_.reset(new cc_blink::WebLayerImpl(cc::VideoLayer::Create(
+          compositor_, pipeline_metadata_.video_rotation)));
+      video_weblayer_->layer()->SetContentsOpaque(opaque_);
+      video_weblayer_->SetContentsOpaqueIsFixed(true);
+      client_->SetWebLayer(video_weblayer_.get());
+    } else {
+      if (bridge_->GetWebLayer()) {
+        bridge_->GetCCLayer()->SetContentsOpaque(opaque_);

[enne (OOO), 2017/07/06 01:23:31]

To be honest, I'm not sure that this is necessary? I think this plumbing
ultimately just sets this bit on the video draw quad:
https://cs.chromium.org/chromium/src/cc/layers/video_layer_impl.cc?rcl=8a4399...

I'm mostly sure that setting the opaque rect correctly on the video quads that
are generated will do the same thing here.

+        // TODO(lethalantidote): Figure out how to persist opaque setting
+        // without calling WebLayerImpl's SetContentsOpaueIsFixed;
+        client_->SetWebLayer(bridge_->GetWebLayer());
+      }
+    }
   }
 
   if (observer_)
@@ -1548,8 +1566,14 @@ void WebMediaPlayerImpl::OnVideoOpacityChange(bool opaque) {
   opaque_ = opaque;
   // Modify content opaqueness of cc::Layer directly so that
   // SetContentsOpaqueIsFixed is ignored.
-  if (video_weblayer_)
-    video_weblayer_->layer()->SetContentsOpaque(opaque_);
+  if (!base::FeatureList::IsEnabled(media::kUseSurfaceLayerForVideo)) {
+    if (video_weblayer_)
+      video_weblayer_->layer()->SetContentsOpaque(opaque_);
+  } else {
+    if (bridge_->GetWebLayer()) {
+      bridge_->GetCCLayer()->SetContentsOpaque(opaque_);
+    }
+  }
 }
 
 void WebMediaPlayerImpl::OnVideoAverageKeyframeDistanceUpdate() {
@@ -1723,10 +1747,17 @@ void WebMediaPlayerImpl::SuspendForRemote() {
 }
 
 gfx::Size WebMediaPlayerImpl::GetCanvasSize() const {
-  if (!video_weblayer_)
-    return pipeline_metadata_.natural_size;
+  if (!base::FeatureList::IsEnabled(media::kUseSurfaceLayerForVideo) {
+    if (!video_weblayer_)
+      return pipeline_metadata_.natural_size;
 
-  return video_weblayer_->Bounds();
+    return video_weblayer_->Bounds();
+  } else {
+    if (!bridge_->GetWebLayer())
+      return pipeline_metadate_.natural_size;
+
+    return bridge_->GetWebLayer()->Bounds();
+  }
 }
 
 void WebMediaPlayerImpl::SetDeviceScaleFactor(float scale_factor) {