Replaces VideoLayer with a SurfaceLayer in WebMediaPlayerImpl

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CanvasSurfaceLayerBridge_h
 #define CanvasSurfaceLayerBridge_h
 
 #include <memory>
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/surfaces/surface_id.h"
 #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 {
 class Layer;
 class SurfaceInfo;
 }  // namespace cc
 
 namespace blink {
 
 class WebLayer;
 class WebLayerTreeView;
 
 class PLATFORM_EXPORT CanvasSurfaceLayerBridgeObserver {
  public:
   CanvasSurfaceLayerBridgeObserver() {}
   virtual ~CanvasSurfaceLayerBridgeObserver() {}
 
   virtual void OnWebLayerReplaced() = 0;
 };
 
 class PLATFORM_EXPORT CanvasSurfaceLayerBridge
-    : NON_EXPORTED_BASE(
-          public blink::mojom::blink::OffscreenCanvasSurfaceClient) {
+    : public NON_EXPORTED_BASE(SurfaceLayerBridge) {
  public:
   explicit CanvasSurfaceLayerBridge(CanvasSurfaceLayerBridgeObserver*,
                                     WebLayerTreeView*);
   ~CanvasSurfaceLayerBridge();
+

[apacible, 2017/07/07 18:25:38]

nit: remove newline.

[CJ, 2017/07/07 18:50:47]

I think you are reviewing an older patch set. Threw me through a loop cause this
class no longer exists.

   void CreateSolidColorLayer();
-  WebLayer* GetWebLayer() const { return web_layer_.get(); }
-  const cc::FrameSinkId& GetFrameSinkId() const { return frame_sink_id_; }
 
   // 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_;
   std::unique_ptr<WebLayer> web_layer_;
 
   scoped_refptr<cc::SurfaceReferenceFactory> ref_factory_;
   base::WeakPtrFactory<CanvasSurfaceLayerBridge> weak_factory_;
 
   CanvasSurfaceLayerBridgeObserver* observer_;
 
-  mojom::blink::OffscreenCanvasSurfacePtr service_;
   mojo::Binding<blink::mojom::blink::OffscreenCanvasSurfaceClient> binding_;
 
   const cc::FrameSinkId frame_sink_id_;
   cc::SurfaceId current_surface_id_;
   const cc::FrameSinkId parent_frame_sink_id_;
 };
 
 }  // namespace blink
 
 #endif  // CanvasSurfaceLayerBridge_h