Implement aura::WindowPortMus::CreateCompositorFrameSink()

ui/aura/mus/window_port_mus.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 UI_AURA_MUS_WINDOW_PORT_MUS_H_
 #define UI_AURA_MUS_WINDOW_PORT_MUS_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 58 matching lines @@
 
   // Sets whether this window can accept drops, defaults to false.
   void SetCanAcceptDrops(bool can_accept_drops);
 
   // Embeds a new client in this Window. See WindowTreeClient::Embed() for
   // details on arguments.
   void Embed(ui::mojom::WindowTreeClientPtr client,
              uint32_t flags,
              const ui::mojom::WindowTree::EmbedCallback& callback);
 
-  std::unique_ptr<cc::CompositorFrameSink> RequestCompositorFrameSink(
+  std::unique_ptr<cc::CompositorFrameSink>
+  CreateCompositorFrameSinkWithContextAndBufferManager(
       scoped_refptr<cc::ContextProvider> context_provider,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager);
 
  private:
   friend class WindowPortMusTestApi;
   friend class WindowTreeClient;
   friend class WindowTreeClientPrivate;
   friend class WindowTreeHostMus;
 
   using ServerChangeIdType = uint8_t;
@@ skipping 122 matching lines @@
       const base::Optional<cc::LocalSurfaceId>& local_surface_id) override;
   void SetVisibleFromServer(bool visible) override;
   void SetOpacityFromServer(float opacity) override;
   void SetCursorFromServer(const ui::CursorData& cursor) override;
   void SetPropertyFromServer(
       const std::string& property_name,
       const std::vector<uint8_t>* property_data) override;
   void SetFrameSinkIdFromServer(const cc::FrameSinkId& frame_sink_id) override;
   const cc::LocalSurfaceId& GetOrAllocateLocalSurfaceId(
       const gfx::Size& surface_size) override;
-  void SetPrimarySurfaceInfo(const cc::SurfaceInfo& surface_info) override;
-  void SetFallbackSurfaceInfo(const cc::SurfaceInfo& surface_info) override;
+  void SetSurfaceInfoFromServer(const cc::SurfaceInfo& surface_info) override;
   void DestroyFromServer() override;
   void AddTransientChildFromServer(WindowMus* child) override;
   void RemoveTransientChildFromServer(WindowMus* child) override;
   ChangeSource OnTransientChildAdded(WindowMus* child) override;
   ChangeSource OnTransientChildRemoved(WindowMus* child) override;
   const cc::LocalSurfaceId& GetLocalSurfaceId() override;
   std::unique_ptr<WindowMusChangeData> PrepareForServerBoundsChange(
       const gfx::Rect& bounds) override;
   std::unique_ptr<WindowMusChangeData> PrepareForServerVisibilityChange(
       bool value) override;
@@ skipping 16 matching lines @@
   void OnPropertyChanged(const void* key,
                          int64_t old_value,
                          std::unique_ptr<ui::PropertyData> data) override;
   std::unique_ptr<cc::CompositorFrameSink> CreateCompositorFrameSink() override;
   cc::SurfaceId GetSurfaceId() const override;
   void OnWindowAddedToRootWindow() override {}
   void OnWillRemoveWindowFromRootWindow() override {}
 
   void UpdatePrimarySurfaceInfo();
   void UpdateClientSurfaceEmbedder();
+  void OnSurfaceChangedForLocalWindow(
+      const cc::LocalSurfaceId& local_surface_id,
+      const gfx::Size& size);
 
   WindowTreeClient* window_tree_client_;
 
   Window* window_ = nullptr;
 
   // Used when this window is embedding a client.
   std::unique_ptr<ClientSurfaceEmbedder> client_surface_embedder_;
 
   ServerChangeIdType next_server_change_id_ = 0;
   ServerChanges server_changes_;
 
   cc::FrameSinkId frame_sink_id_;
 
   cc::SurfaceInfo primary_surface_info_;
   cc::SurfaceInfo fallback_surface_info_;
 
   cc::LocalSurfaceId local_surface_id_;
   cc::LocalSurfaceIdAllocator local_surface_id_allocator_;
   gfx::Size last_surface_size_;
 
   ui::CursorData cursor_;
 
+  base::WeakPtrFactory<WindowPortMus> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(WindowPortMus);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_MUS_WINDOW_PORT_MUS_H_