| Index: ui/aura/mus/window_port_mus.h
|
| diff --git a/ui/aura/mus/window_port_mus.h b/ui/aura/mus/window_port_mus.h
|
| index f708296435e4ea60ee4b746acc3061c06964ce9c..5dd9519d1f0718a0b9508cd3d459fca572827db9 100644
|
| --- a/ui/aura/mus/window_port_mus.h
|
| +++ b/ui/aura/mus/window_port_mus.h
|
| @@ -24,6 +24,10 @@
|
| #include "ui/gfx/geometry/rect.h"
|
| #include "ui/platform_window/mojo/text_input_state.mojom.h"
|
|
|
| +namespace cc {
|
| +class LocalSurfaceId;
|
| +}
|
| +
|
| namespace aura {
|
|
|
| class ClientSurfaceEmbedder;
|
| @@ -218,8 +222,12 @@ class AURA_EXPORT WindowPortMus : public WindowPort, public WindowMus {
|
| void SetPropertyFromServer(
|
| const std::string& property_name,
|
| const std::vector<uint8_t>* property_data) override;
|
| + void SetPrimarySurfaceInfo(const cc::SurfaceInfo& surface_info) override;
|
| + void SetFallbackSurfaceInfo(const cc::SurfaceInfo& surface_info) override;
|
| void SetFrameSinkIdFromServer(const cc::FrameSinkId& frame_sink_id) override;
|
| - void SetSurfaceInfoFromServer(const cc::SurfaceInfo& surface_info) override;
|
| + const cc::LocalSurfaceId& GetLocalSurfaceId() override;
|
| + const cc::LocalSurfaceId& AllocateLocalSurfaceIdForSize(
|
| + const gfx::Size& new_size) override;
|
| void DestroyFromServer() override;
|
| void AddTransientChildFromServer(WindowMus* child) override;
|
| void RemoveTransientChildFromServer(WindowMus* child) override;
|
| @@ -264,6 +272,10 @@ class AURA_EXPORT WindowPortMus : public WindowPort, public WindowMus {
|
|
|
| cc::SurfaceInfo surface_info_;
|
|
|
| + cc::LocalSurfaceId local_surface_id_;
|
| + cc::LocalSurfaceIdAllocator local_surface_id_allocator_;
|
| + gfx::Size last_size_;
|
| +
|
| ui::mojom::Cursor predefined_cursor_ = ui::mojom::Cursor::CURSOR_NULL;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WindowPortMus);
|
|
|