WIP: Surface Synchronization System

ui/aura/mus/window_port_mus.h

Index: ui/aura/mus/window_port_mus.h
diff --git a/ui/aura/mus/window_port_mus.h b/ui/aura/mus/window_port_mus.h
index 21ec687c2d36cf661a27b1d6bc8a0f499e204e50..b8f760ef4f51995fa12722935ab0ac12175f999b 100644
--- a/ui/aura/mus/window_port_mus.h
+++ b/ui/aura/mus/window_port_mus.h
@@ -192,12 +192,15 @@ class AURA_EXPORT WindowPortMus : public WindowPort, public WindowMus {
 
   // 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;
@@ -205,6 +208,8 @@ class AURA_EXPORT WindowPortMus : public WindowPort, public WindowMus {
       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;
@@ -220,7 +225,7 @@ class AURA_EXPORT WindowPortMus : public WindowPort, public WindowMus {
   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;
@@ -244,6 +249,11 @@ class AURA_EXPORT WindowPortMus : public WindowPort, public WindowMus {
   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;