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..c60eebe7d90a5fab80d39a8762cff9b8bae0d5d4 100644 |
--- a/ui/aura/mus/window_port_mus.h |
+++ b/ui/aura/mus/window_port_mus.h |
@@ -76,7 +76,8 @@ class AURA_EXPORT WindowPortMus : public WindowPort, public WindowMus { |
uint32_t flags, |
const ui::mojom::WindowTree::EmbedCallback& callback); |
- std::unique_ptr<cc::CompositorFrameSink> RequestCompositorFrameSink( |
+ std::unique_ptr<cc::CompositorFrameSink> |
+ CreateCompositorFrameSinkWithContextAndBufferManager( |
scoped_refptr<cc::ContextProvider> context_provider, |
gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager); |
@@ -219,8 +220,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; |
@@ -257,6 +257,9 @@ class AURA_EXPORT WindowPortMus : public WindowPort, public WindowMus { |
void UpdatePrimarySurfaceInfo(); |
void UpdateClientSurfaceEmbedder(); |
+ void OnSurfaceChangedForLocalWindow( |
+ const cc::LocalSurfaceId& local_surface_id, |
+ const gfx::Size& size); |
WindowTreeClient* window_tree_client_; |
@@ -279,6 +282,8 @@ class AURA_EXPORT WindowPortMus : public WindowPort, public WindowMus { |
ui::CursorData cursor_; |
+ base::WeakPtrFactory<WindowPortMus> weak_factory_; |
+ |
DISALLOW_COPY_AND_ASSIGN(WindowPortMus); |
}; |