diff options
| author | sky <sky@chromium.org> | 2015-08-04 09:51:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-04 16:54:18 +0000 |
| commit | f5fdada71957d7ce856045b6ddfb0433a1e187c0 (patch) | |
| tree | 3929e30ab751e2d4161025f012897332a5e08154 /components/html_viewer/html_frame_tree_manager.cc | |
| parent | 9b6e596f7a3c246b7e895b2816fe35496a5a9262 (diff) | |
| download | chromium_src-f5fdada71957d7ce856045b6ddfb0433a1e187c0.zip chromium_src-f5fdada71957d7ce856045b6ddfb0433a1e187c0.tar.gz chromium_src-f5fdada71957d7ce856045b6ddfb0433a1e187c0.tar.bz2 | |
Fixes shutdown with multiple documents using the same frame tree
web_widget_->close() isn't always enough.
BUG=479172,490221
TEST=covered by tests
R=ben@chromium.org
Review URL: https://codereview.chromium.org/1269503006
Cr-Commit-Position: refs/heads/master@{#341738}
Diffstat (limited to 'components/html_viewer/html_frame_tree_manager.cc')
| -rw-r--r-- | components/html_viewer/html_frame_tree_manager.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/components/html_viewer/html_frame_tree_manager.cc b/components/html_viewer/html_frame_tree_manager.cc index e7252b6..2c080ae 100644 --- a/components/html_viewer/html_frame_tree_manager.cc +++ b/components/html_viewer/html_frame_tree_manager.cc @@ -126,8 +126,7 @@ HTMLFrameTreeManager::HTMLFrameTreeManager(GlobalState* global_state) : global_state_(global_state), root_(nullptr), local_root_(nullptr) {} HTMLFrameTreeManager::~HTMLFrameTreeManager() { - DCHECK(!root_); - DCHECK(!local_root_); + DCHECK(!root_ || !local_root_); RemoveFromInstances(); } |