Index: services/ui/ws/server_window_surface.cc |
diff --git a/services/ui/ws/server_window_surface.cc b/services/ui/ws/server_window_surface.cc |
index 6f8f5254ce5a0a0b96e56ecda151df4a40eae1eb..fd7be5e71d2a2b1767c143c0a0023ee48318d212 100644 |
--- a/services/ui/ws/server_window_surface.cc |
+++ b/services/ui/ws/server_window_surface.cc |
@@ -27,7 +27,7 @@ ServerWindowSurface::ServerWindowSurface( |
client_(std::move(client)), |
binding_(this, std::move(request)) { |
cc::SurfaceManager* surface_manager = manager_->GetSurfaceManager(); |
- surface_id_allocator_.RegisterSurfaceClientId(surface_manager); |
+ surface_manager->RegisterSurfaceClientId(surface_id_allocator_.client_id()); |
surface_manager->RegisterSurfaceFactoryClient( |
surface_id_allocator_.client_id(), this); |
} |
@@ -40,6 +40,7 @@ ServerWindowSurface::~ServerWindowSurface() { |
cc::SurfaceManager* surface_manager = manager_->GetSurfaceManager(); |
surface_manager->UnregisterSurfaceFactoryClient( |
surface_id_allocator_.client_id()); |
+ surface_manager->InvalidateSurfaceClientId(surface_id_allocator_.client_id()); |
} |
void ServerWindowSurface::SubmitCompositorFrame( |