WIP: Surface Synchronization System

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 174 matching lines @@
   bool RemoveChangeByTypeAndData(const ServerChangeType type,
                                  const ServerChangeData& data);
 
   ServerChanges::iterator FindChangeByTypeAndData(const ServerChangeType type,
                                                   const ServerChangeData& data);
 
   PropertyConverter* GetPropertyConverter();
 
   // WindowMus:
   Window* GetWindow() override;
+  void SetLayerType(ui::LayerType layer_type) override;
+  ui::LayerType GetLayerType() const override;
   void AddChildFromServer(WindowMus* window) override;
   void RemoveChildFromServer(WindowMus* child) override;
   void ReorderFromServer(WindowMus* child,
                          WindowMus* relative,
                          ui::mojom::OrderDirection) override;
-  void SetBoundsFromServer(const gfx::Rect& bounds) override;
+  void SetBoundsFromServer(const gfx::Rect& bounds,
+                           const cc::LocalFrameId& local_frame_id) override;
   void SetVisibleFromServer(bool visible) override;
   void SetOpacityFromServer(float opacity) override;
   void SetPredefinedCursorFromServer(ui::mojom::Cursor cursor) override;
   void SetPropertyFromServer(
       const std::string& property_name,
       const std::vector<uint8_t>* property_data) override;
   void SetSurfaceInfoFromServer(const cc::SurfaceInfo& surface_info) override;
+  void SetLocalFrameIdFromServer(
+      const cc::LocalFrameId& local_frame_id) override;
   void DestroyFromServer() override;
   void AddTransientChildFromServer(WindowMus* child) override;
   void RemoveTransientChildFromServer(WindowMus* child) override;
   ChangeSource OnTransientChildAdded(WindowMus* child) override;
   ChangeSource OnTransientChildRemoved(WindowMus* child) override;
   std::unique_ptr<WindowMusChangeData> PrepareForServerBoundsChange(
       const gfx::Rect& bounds) override;
   std::unique_ptr<WindowMusChangeData> PrepareForServerVisibilityChange(
       bool value) override;
   void PrepareForDestroy() override;
   void PrepareForTransientRestack(WindowMus* window) override;
   void OnTransientRestackDone(WindowMus* window) override;
   void NotifyEmbeddedAppDisconnected() override;
 
   // WindowPort:
-  void OnPreInit(Window* window) override;
+  void OnPreInit(Window* window, ui::LayerType layer_type) override;
   void OnDeviceScaleFactorChanged(float device_scale_factor) override;
   void OnWillAddChild(Window* child) override;
   void OnWillRemoveChild(Window* child) override;
   void OnWillMoveChild(size_t current_index, size_t dest_index) override;
   void OnVisibilityChanged(bool visible) override;
   void OnDidChangeBounds(const gfx::Rect& old_bounds,
                          const gfx::Rect& new_bounds) override;
   std::unique_ptr<WindowPortPropertyData> OnWillChangeProperty(
       const void* key) override;
   void OnPropertyChanged(const void* key,
                          std::unique_ptr<WindowPortPropertyData> data) override;
 
   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::SurfaceInfo surface_info_;
+  cc::LocalFrameId current_local_frame_id_;
+
+  ui::LayerType layer_type_ = ui::LAYER_NOT_DRAWN;
+
+  base::WeakPtr<ui::WindowCompositorFrameSink> compositor_frame_sink_;
 
   ui::mojom::Cursor predefined_cursor_ = ui::mojom::Cursor::CURSOR_NULL;
 
   DISALLOW_COPY_AND_ASSIGN(WindowPortMus);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_MUS_WINDOW_PORT_MUS_H_