| Index: services/ui/public/cpp/window_tree_client.h
|
| diff --git a/services/ui/public/cpp/window_tree_client.h b/services/ui/public/cpp/window_tree_client.h
|
| index 169e7725ca6e1a6030b7a8aeadaab5092837f16c..cb0f2a7941c10e0321b095287c909f01478d3d63 100644
|
| --- a/services/ui/public/cpp/window_tree_client.h
|
| +++ b/services/ui/public/cpp/window_tree_client.h
|
| @@ -133,6 +133,9 @@ class WindowTreeClient : public mojom::WindowTreeClient,
|
| mojo::InterfaceRequest<mojom::Surface> surface,
|
| mojom::SurfaceClientPtr client);
|
|
|
| + void SatisfySurfaceSequence(Id window_id,
|
| + const cc::SurfaceSequence& sequence);
|
| +
|
| // Sets the input capture to |window| without notifying the server.
|
| void LocalSetCapture(Window* window);
|
| // Sets focus to |window| without notifying the server.
|
| @@ -202,9 +205,13 @@ class WindowTreeClient : public mojom::WindowTreeClient,
|
|
|
| // Creates and returns a new Window (which is owned by the window server).
|
| // Windows are initially hidden, use SetVisible(true) to show.
|
| + Window* NewWindowContainer() {
|
| + return NewWindow(nullptr, true /* container */);
|
| + }
|
| Window* NewWindow() { return NewWindow(nullptr); }
|
| Window* NewWindow(
|
| - const std::map<std::string, std::vector<uint8_t>>* properties);
|
| + const std::map<std::string, std::vector<uint8_t>>* properties,
|
| + bool container = false);
|
| Window* NewTopLevelWindow(
|
| const std::map<std::string, std::vector<uint8_t>>* properties);
|
|
|
| @@ -251,7 +258,8 @@ class WindowTreeClient : public mojom::WindowTreeClient,
|
| Window* initial_parent);
|
|
|
| Window* NewWindowImpl(NewWindowType type,
|
| - const Window::SharedProperties* properties);
|
| + const Window::SharedProperties* properties,
|
| + bool container = false);
|
|
|
| // Sets the mojom::WindowTree implementation.
|
| void SetWindowTree(mojom::WindowTreePtr window_tree_ptr);
|
| @@ -295,6 +303,12 @@ class WindowTreeClient : public mojom::WindowTreeClient,
|
| void OnWindowBoundsChanged(Id window_id,
|
| const gfx::Rect& old_bounds,
|
| const gfx::Rect& new_bounds) override;
|
| + void OnWindowSurfaceCreated(
|
| + Id window_id,
|
| + const gfx::Size& size,
|
| + float device_scale_factor,
|
| + const cc::SurfaceId& surface_id,
|
| + const cc::SurfaceSequence& surface_sequence) override;
|
| void OnClientAreaChanged(
|
| uint32_t window_id,
|
| const gfx::Insets& new_client_area,
|
|
|