Replaces VideoLayer with a SurfaceLayer in WebMediaPlayerImpl

third_party/WebKit/Source/platform/graphics/CanvasSurfaceLayerBridge.h

Index: third_party/WebKit/Source/platform/graphics/CanvasSurfaceLayerBridge.h
diff --git a/third_party/WebKit/Source/platform/graphics/CanvasSurfaceLayerBridge.h b/third_party/WebKit/Source/platform/graphics/CanvasSurfaceLayerBridge.h
index c82436cc6d369947339ce6f063595d1ff85a9b98..53c477ed5c1f84731743a3de4536fc71e7f79e4f 100644
--- a/third_party/WebKit/Source/platform/graphics/CanvasSurfaceLayerBridge.h
+++ b/third_party/WebKit/Source/platform/graphics/CanvasSurfaceLayerBridge.h
@@ -12,6 +12,7 @@
 #include "cc/surfaces/surface_reference_factory.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "platform/PlatformExport.h"
+#include "platform/graphics/SurfaceLayerBridge.h"
 #include "public/platform/modules/offscreencanvas/offscreen_canvas_surface.mojom-blink.h"
 
 namespace cc {
@@ -33,21 +34,23 @@ class PLATFORM_EXPORT CanvasSurfaceLayerBridgeObserver {
 };
 
 class PLATFORM_EXPORT CanvasSurfaceLayerBridge
-    : NON_EXPORTED_BASE(
-          public blink::mojom::blink::OffscreenCanvasSurfaceClient) {
+    : public NON_EXPORTED_BASE(SurfaceLayerBridge) {
  public:
   explicit CanvasSurfaceLayerBridge(CanvasSurfaceLayerBridgeObserver*,
                                     WebLayerTreeView*);
   ~CanvasSurfaceLayerBridge();
-  void CreateSolidColorLayer();
-  WebLayer* GetWebLayer() const { return web_layer_.get(); }
-  const cc::FrameSinkId& GetFrameSinkId() const { return frame_sink_id_; }
+
+  // Implementation of SurfaceLayerBridge.
+  void CreateSolidColorLayer() override;
+  void SatisfyCallback(const cc::SurfaceSequence&) override;
+  void RequireCallback(const cc::SurfaceId&,
+                       const cc::SurfaceSequence&) override;
 
   // Implementation of blink::mojom::blink::OffscreenCanvasSurfaceClient
   void OnSurfaceCreated(const cc::SurfaceInfo&) override;
 
-  void SatisfyCallback(const cc::SurfaceSequence&);
-  void RequireCallback(const cc::SurfaceId&, const cc::SurfaceSequence&);
+  WebLayer* GetWebLayer() const { return web_layer_.get(); }
+  const cc::FrameSinkId& GetFrameSinkId() const { return frame_sink_id_; }
 
  private:
   scoped_refptr<cc::Layer> cc_layer_;