| 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 4af5ba6564360708e9bfc687c0f4028d6ec4d467..489e9a44ac3b05c6def951657976b455754625eb 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 viz {
|
| +class ClientCompositorFrameSink;
|
| +}
|
| +
|
| namespace aura {
|
|
|
| class ClientSurfaceEmbedder;
|
| @@ -219,8 +223,7 @@ class AURA_EXPORT WindowPortMus : public WindowPort, public WindowMus {
|
| void SetFrameSinkIdFromServer(const cc::FrameSinkId& frame_sink_id) override;
|
| const cc::LocalSurfaceId& GetOrAllocateLocalSurfaceId(
|
| const gfx::Size& surface_size) override;
|
| - void SetPrimarySurfaceInfo(const cc::SurfaceInfo& surface_info) override;
|
| - void SetFallbackSurfaceInfo(const cc::SurfaceInfo& surface_info) override;
|
| + void SetSurfaceInfoFromServer(const cc::SurfaceInfo& surface_info) override;
|
| void DestroyFromServer() override;
|
| void AddTransientChildFromServer(WindowMus* child) override;
|
| void RemoveTransientChildFromServer(WindowMus* child) override;
|
| @@ -279,6 +282,8 @@ class AURA_EXPORT WindowPortMus : public WindowPort, public WindowMus {
|
|
|
| ui::CursorData cursor_;
|
|
|
| + base::WeakPtr<viz::ClientCompositorFrameSink> frame_sink_for_local_window_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(WindowPortMus);
|
| };
|
|
|
|
|