| commit | 8f49c1ce3a47c7fd898b5ffd991e37c43c17c135 | [log] [tgz] |
|---|---|---|
| author | Pavel Feldman <[email protected]> | Sat Nov 23 05:00:34 2019 |
| committer | Commit Bot <[email protected]> | Sat Nov 23 05:00:34 2019 |
| tree | 06cef019d8997853825e65765c6a3a69dec33117 | |
| parent | 2fdeba1b75cddc98d467f46a0ee231caaa9c3c6e [diff] [blame] |
DevTools: fix crash upon emulation disable while multiclient Change-Id: I1fe3dfdf032c5780eb7a14f27816f235b4e27c6e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1931345 Commit-Queue: Pavel Feldman <[email protected]> Auto-Submit: Pavel Feldman <[email protected]> Reviewed-by: Dmitry Gozman <[email protected]> Cr-Commit-Position: refs/heads/master@{#718418}
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index e2b162c..28172b3 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc
@@ -1014,9 +1014,8 @@ // TODO(https://crbug.com/1006052): We should move emulation into the browser // and send consistent ScreenInfo and ScreenRects to all RenderWidgets based // on emulation. - if (!delegate_) + if (!delegate_ || !device_emulator_) return; - DCHECK(device_emulator_); device_emulator_->DisableAndApply(); device_emulator_.reset(); }