Index: mojo/services/view_manager/display_manager.cc |
diff --git a/mojo/services/view_manager/display_manager.cc b/mojo/services/view_manager/display_manager.cc |
index 6106eff4e61b31b4453cce4f8f645f578cbe1536..0f864168b7a49b7760ebc193a60413eee603b50d 100644 |
--- a/mojo/services/view_manager/display_manager.cc |
+++ b/mojo/services/view_manager/display_manager.cc |
@@ -96,6 +96,8 @@ DisplayManager::DisplayManager( |
} |
DisplayManager::~DisplayManager() { |
+ if (!surface_id_.is_null()) |
sky
2014/11/05 18:30:52
Since we're shutting down is this strictly necessa
|
+ surface_->DestroySurface(SurfaceId::From(surface_id_)); |
} |
void DisplayManager::SchedulePaint(const ServerView* view, |
@@ -156,6 +158,8 @@ void DisplayManager::Draw() { |
} |
void DisplayManager::OnDestroyed() { |
+ // This is called when the native_viewport is torn down before |
+ // ~DisplayManager may be called. |
native_viewport_closed_callback_.Run(); |
} |