Mus+Ash: Replace (Server)WindowSurface with (Server)WindowCompositorFrameSink

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 "base/memory/weak_ptr.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/cpp/window_compositor_frame_sink.h"
 
 namespace gpu {
 class GpuChannelHost;
 }
 
 namespace ui {
-class GLES2Context;
+
 class GpuService;
+class Window;
 
 extern const char kBitmapUploaderForAcceleratedWidget[];
 
 // BitmapUploader is useful if you want to draw a bitmap or color in a
 // Window.
 class BitmapUploader : public cc::CompositorFrameSinkClient {
  public:
   explicit BitmapUploader(Window* window);
   ~BitmapUploader() override;
 
@@ skipping 33 matching lines @@
   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<CompositorFrameSink> compositor_frame_sink_;
+  std::unique_ptr<WindowCompositorFrameSink> 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_;
 
   base::WeakPtrFactory<BitmapUploader> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BitmapUploader);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_DEMO_BITMAP_UPLOADER_H_