Index: ui/aura/mus/window_tree_client.h |
diff --git a/ui/aura/mus/window_tree_client.h b/ui/aura/mus/window_tree_client.h |
index da80da9207f1cf64ab1640a19231d0655d2942c5..78c40807a35592624433165a3f1143174978583f 100644 |
--- a/ui/aura/mus/window_tree_client.h |
+++ b/ui/aura/mus/window_tree_client.h |
@@ -18,6 +18,7 @@ |
#include "base/macros.h" |
#include "base/memory/weak_ptr.h" |
#include "base/observer_list.h" |
+#include "cc/surfaces/local_surface_id_allocator.h" |
#include "mojo/public/cpp/bindings/associated_binding.h" |
#include "mojo/public/cpp/bindings/strong_binding.h" |
#include "services/ui/public/interfaces/window_tree.mojom.h" |
@@ -232,7 +233,9 @@ class AURA_EXPORT WindowTreeClient |
WindowMusType window_mus_type, |
const ui::mojom::WindowData& window_data, |
int64_t display_id, |
- const cc::FrameSinkId& frame_sink_id = cc::FrameSinkId()); |
+ const cc::FrameSinkId& frame_sink_id = cc::FrameSinkId(), |
+ const base::Optional<cc::LocalSurfaceId>& local_surface_id = |
+ base::nullopt); |
WindowMus* NewWindowFromWindowData(WindowMus* parent, |
const ui::mojom::WindowData& window_data); |
@@ -259,14 +262,16 @@ class AURA_EXPORT WindowTreeClient |
int64_t display_id, |
Id focused_window_id, |
bool drawn, |
- const cc::FrameSinkId& frame_sink_id); |
+ const cc::FrameSinkId& frame_sink_id, |
+ const base::Optional<cc::LocalSurfaceId>& local_surface_id); |
// Called by WmNewDisplayAdded(). |
WindowTreeHostMus* WmNewDisplayAddedImpl( |
const display::Display& display, |
ui::mojom::WindowDataPtr root_data, |
bool parent_drawn, |
- const cc::FrameSinkId& frame_sink_id); |
+ const cc::FrameSinkId& frame_sink_id, |
+ const base::Optional<cc::LocalSurfaceId>& local_surface_id); |
std::unique_ptr<EventResultCallback> CreateEventResultCallback( |
int32_t event_id); |
@@ -310,24 +315,28 @@ class AURA_EXPORT WindowTreeClient |
void OnWmMoveLoopCompleted(uint32_t change_id, bool completed); |
// Overridden from WindowTreeClient: |
- void OnEmbed(ClientSpecificId client_id, |
- ui::mojom::WindowDataPtr root, |
- ui::mojom::WindowTreePtr tree, |
- int64_t display_id, |
- Id focused_window_id, |
- bool drawn, |
- const cc::FrameSinkId& frame_sink_Id) override; |
+ void OnEmbed( |
+ ClientSpecificId client_id, |
+ ui::mojom::WindowDataPtr root, |
+ ui::mojom::WindowTreePtr tree, |
+ int64_t display_id, |
+ Id focused_window_id, |
+ bool drawn, |
+ const cc::FrameSinkId& frame_sink_Id, |
+ const base::Optional<cc::LocalSurfaceId>& local_surface_id) override; |
void OnEmbeddedAppDisconnected(Id window_id) override; |
void OnUnembed(Id window_id) override; |
void OnCaptureChanged(Id new_capture_window_id, |
Id old_capture_window_id) override; |
void OnFrameSinkIdAllocated(Id window_id, |
const cc::FrameSinkId& frame_sink_id) override; |
- void OnTopLevelCreated(uint32_t change_id, |
- ui::mojom::WindowDataPtr data, |
- int64_t display_id, |
- bool drawn, |
- const cc::FrameSinkId& frame_sink_id) override; |
+ void OnTopLevelCreated( |
+ uint32_t change_id, |
+ ui::mojom::WindowDataPtr data, |
+ int64_t display_id, |
+ bool drawn, |
+ const cc::FrameSinkId& frame_sink_id, |
+ const base::Optional<cc::LocalSurfaceId>& local_surface_id) override; |
void OnWindowBoundsChanged( |
Id window_id, |
const gfx::Rect& old_bounds, |
@@ -402,10 +411,12 @@ class AURA_EXPORT WindowTreeClient |
// Overridden from WindowManager: |
void OnConnect(ClientSpecificId client_id) override; |
- void WmNewDisplayAdded(const display::Display& display, |
- ui::mojom::WindowDataPtr root_data, |
- bool parent_drawn, |
- const cc::FrameSinkId& frame_sink_id) override; |
+ void WmNewDisplayAdded( |
+ const display::Display& display, |
+ ui::mojom::WindowDataPtr root_data, |
+ bool parent_drawn, |
+ const cc::FrameSinkId& frame_sink_id, |
+ const base::Optional<cc::LocalSurfaceId>& local_surface_id) override; |
void WmDisplayRemoved(int64_t display_id) override; |
void WmDisplayModified(const display::Display& display) override; |
void WmSetBounds(uint32_t change_id, |