Reland of "Mustash: Ensure surfaces submitted to Mus by WM and embedders contain Surfaces with embe…

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 "cc/surfaces/surface_info.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 aura {
 
+class ClientSurfaceEmbedder;
 class PropertyConverter;
 class SurfaceIdHandler;
 class Window;
 class WindowPortMusTestApi;
 class WindowTreeClient;
 class WindowTreeClientPrivate;
 class WindowTreeHostMus;
 
 // WindowPortMus is a WindowPort that forwards calls to WindowTreeClient
 // so that changes are propagated to the server. All changes from
@@ skipping 197 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.
+  std::unique_ptr<ClientSurfaceEmbedder> client_surface_embedder;
+
   ServerChangeIdType next_server_change_id_ = 0;
   ServerChanges server_changes_;
 
   SurfaceIdHandler* surface_id_handler_ = nullptr;
   cc::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_