Mus+Ash: Towards Unifying CompositorFrameSink terminology

services/ui/demo/bitmap_uploader.h

 // Copyright 2015 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 SERVICES_UI_DEMO_BITMAP_UPLOADER_H_
 #define SERVICES_UI_DEMO_BITMAP_UPLOADER_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
+#include "cc/output/compositor_frame_sink_client.h"
 #include "gpu/GLES2/gl2chromium.h"
 #include "gpu/GLES2/gl2extchromium.h"
+#include "services/ui/public/cpp/compositor_frame_sink.h"
 #include "services/ui/public/cpp/window_surface.h"
 #include "services/ui/public/cpp/window_surface_client.h"
-#include "services/ui/public/interfaces/surface.mojom.h"
 
 namespace ui {
 class GLES2Context;
 class GpuService;
 
 extern const char kBitmapUploaderForAcceleratedWidget[];
 
 // BitmapUploader is useful if you want to draw a bitmap or color in a
 // Window.
-class BitmapUploader : public WindowSurfaceClient {
+class BitmapUploader : public cc::CompositorFrameSinkClient {
  public:
   explicit BitmapUploader(Window* window);
   ~BitmapUploader() override;
 
   void Init(GpuService* gpu_service);
   // Sets the color which is RGBA.
   void SetColor(uint32_t color);
 
   enum Format {
     RGBA,  // Pixel layout on Android.
@@ skipping 10 matching lines @@
   void Upload();
 
   uint32_t BindTextureForSize(const gfx::Size& size);
 
   uint32_t TextureFormat() const {
     return format_ == BGRA ? GL_BGRA_EXT : GL_RGBA;
   }
 
   void SetIdNamespace(uint32_t id_namespace);
 
-  // WindowSurfaceClient implementation.
-  void OnResourcesReturned(WindowSurface* surface,
-                           const cc::ReturnedResourceArray& resources) override;
+  // CompositorFrameSinkClient implementation.

[rjkroege, 2016/10/20 21:33:18]

we've made being a client a bit more complicated. :-)

[Fady Samuel, 2016/10/20 23:04:10]

But hopefully more correct once all these things are implemented.

+  void SetBeginFrameSource(cc::BeginFrameSource* source) override;
+  void ReclaimResources(const cc::ReturnedResourceArray& resources) override;
+  void SetTreeActivationCallback(const base::Closure& callback) override;
+  void DidReceiveCompositorFrameAck() override;
+  void DidLoseCompositorFrameSink() override;
+  void OnDraw(const gfx::Transform& transform,
+              const gfx::Rect& viewport,
+              bool resourceless_software_draw) override;
+  void SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override;
+  void SetExternalTilePriorityConstraints(
+      const gfx::Rect& viewport_rect,
+      const gfx::Transform& transform) override;
 
   Window* window_;
-  std::unique_ptr<WindowSurface> surface_;
-  // This may be null if there is an error contacting mus/initializing. We
-  // assume we'll be shutting down soon and do nothing in this case.
-  std::unique_ptr<GLES2Context> gles2_context_;
+  std::unique_ptr<CompositorFrameSink> compositor_frame_sink_;
 
   uint32_t color_;
   int width_;
   int height_;
   Format format_;
   std::unique_ptr<std::vector<unsigned char>> bitmap_;
   uint32_t next_resource_id_;
   base::hash_map<uint32_t, uint32_t> resource_to_texture_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(BitmapUploader);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_DEMO_BITMAP_UPLOADER_H_