WIP: Surface Synchronization System

ui/aura/mus/window_mus.h

Index: ui/aura/mus/window_mus.h
diff --git a/ui/aura/mus/window_mus.h b/ui/aura/mus/window_mus.h
index f88d042285302a6a247a5bb94b78c77150a6dcd0..8122f540387caabcca066803203a6415ec376b45 100644
--- a/ui/aura/mus/window_mus.h
+++ b/ui/aura/mus/window_mus.h
@@ -13,6 +13,7 @@
 #include "services/ui/public/interfaces/cursor.mojom.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/mus/mus_types.h"
+#include "ui/compositor/layer_type.h"
 
 namespace cc {
 class SurfaceInfo;
@@ -67,6 +68,9 @@ class AURA_EXPORT WindowMus {
 
   virtual Window* GetWindow() = 0;
 
+  virtual void SetLayerType(ui::LayerType layer_type) = 0;
+  virtual ui::LayerType GetLayerType() const = 0;
+
   // These functions are called in response to a change from the server. The
   // expectation is that in calling these WindowTreeClient is not called
   // back. For example, SetBoundsFromServer() should not result in calling back
@@ -76,7 +80,8 @@ class AURA_EXPORT WindowMus {
   virtual void ReorderFromServer(WindowMus* child,
                                  WindowMus* relative,
                                  ui::mojom::OrderDirection) = 0;
-  virtual void SetBoundsFromServer(const gfx::Rect& bounds) = 0;
+  virtual void SetBoundsFromServer(const gfx::Rect& bounds,
+                                   const cc::LocalFrameId& local_frame_Id) = 0;
   virtual void SetVisibleFromServer(bool visible) = 0;
   virtual void SetOpacityFromServer(float opacity) = 0;
   virtual void SetPredefinedCursorFromServer(ui::mojom::Cursor cursor) = 0;
@@ -84,6 +89,8 @@ class AURA_EXPORT WindowMus {
                                      const std::vector<uint8_t>* data) = 0;
   virtual void SetSurfaceInfoFromServer(
       const cc::SurfaceInfo& surface_info) = 0;
+  virtual void SetLocalFrameIdFromServer(
+      const cc::LocalFrameId& local_frame_id) = 0;
   // The window was deleted on the server side. DestroyFromServer() should
   // result in deleting |this|.
   virtual void DestroyFromServer() = 0;