Mustash: Ensure surfaces submitted to Mus by WM and embedders contain Surfaces with embeded content.

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>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "services/ui/public/interfaces/cursor.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/public/interfaces/window_tree_constants.mojom.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/mus/mus_types.h"
 #include "ui/aura/mus/window_compositor_frame_sink.h"
 #include "ui/aura/mus/window_mus.h"
 #include "ui/aura/window_port.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/platform_window/mojo/text_input_state.mojom.h"
 
+namespace ui {
+class Layer;
+}
+
 namespace aura {
 
 class PropertyConverter;
 class SurfaceIdHandler;
 class Window;
 class WindowPortMusTestApi;
 class WindowTreeClient;
 class WindowTreeClientPrivate;
 class WindowTreeHostMus;
 
@@ skipping 152 matching lines @@
   // If there is a schedule change matching |type| and |data| it is removed and
   // true is returned. If no matching change is scheduled returns false.
   bool RemoveChangeByTypeAndData(const ServerChangeType type,
                                  const ServerChangeData& data);
 
   ServerChanges::iterator FindChangeByTypeAndData(const ServerChangeType type,
                                                   const ServerChangeData& data);
 
   PropertyConverter* GetPropertyConverter();
 
+  // Used when this window is embedding a client. Updates the surface layer
+  // corresponding to the client with the new surface.
+  void UpdateSurfaceLayer(SurfaceInfo* surface_info);
+
   // WindowMus:
   Window* GetWindow() 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 SetVisibleFromServer(bool visible) override;
   void SetOpacityFromServer(float opacity) override;
@@ skipping 28 matching lines @@
                          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. Contains the client's content.

[sky, 2016/12/16 21:50:29]

Could you isolate all the state related to embedding in its own class? That way
it's clear what is related to embedding as well as when there is an embedding.

[mfomitchev, 2016/12/23 00:03:49]

Done.

+  std::unique_ptr<ui::Layer> surface_layer_;
+
+  // Serves as a parent of clipping_layer_, used for clipping the surface layer
+  // to the window bounds.
+  std::unique_ptr<ui::Layer> clipping_layer_;
+
   ServerChangeIdType next_server_change_id_ = 0;
   ServerChanges server_changes_;
 
   SurfaceIdHandler* surface_id_handler_ = nullptr;
   std::unique_ptr<SurfaceInfo> surface_info_;
 
   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_