| Index: components/mus/ws/display.cc
|
| diff --git a/components/mus/ws/display.cc b/components/mus/ws/display.cc
|
| index e2e649e83e729698f711c3b471a7d47a25d6ac56..dc22661d911852012ba0b04dbb9872ce2c573646 100644
|
| --- a/components/mus/ws/display.cc
|
| +++ b/components/mus/ws/display.cc
|
| @@ -326,8 +326,9 @@ void Display::OnViewportMetricsChanged(
|
| }
|
|
|
| void Display::OnTopLevelSurfaceChanged(cc::SurfaceId surface_id) {
|
| - DCHECK(!root_);
|
| - // This should only be called once, and before we've created root_.
|
| + // This should only be called twice: once before we've created root_, and once
|
| + // during shutdown, when |surface_id| will be null.
|
| + DCHECK(!root_ || surface_id.is_null());
|
| top_level_surface_id_ = surface_id;
|
| }
|
|
|
|
|