diff options
| author | yzshen <yzshen@chromium.org> | 2015-09-29 16:45:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-29 23:46:58 +0000 |
| commit | 4af29d7ab2965fc9f1a24b6e5fd141e7d11c5807 (patch) | |
| tree | ae29a5821bbefd52bd81d1369b03aa2fdbf52e7f /components/html_viewer/html_frame_tree_manager.cc | |
| parent | b312b513e4f8d9faa78a1d45bd8b1d02c6732645 (diff) | |
| download | chromium_src-4af29d7ab2965fc9f1a24b6e5fd141e7d11c5807.zip chromium_src-4af29d7ab2965fc9f1a24b6e5fd141e7d11c5807.tar.gz chromium_src-4af29d7ab2965fc9f1a24b6e5fd141e7d11c5807.tar.bz2 | |
html_frame_tree_manager: record a newly-constructed HTMLFrameTreeManager in |instances_| in all cases.
The previous code only records the object when the frame to create is the root. That doesn't cover the case where the frame to create is a subframe and all its ancestors are remote.
BUG=None
Review URL: https://codereview.chromium.org/1374333003
Cr-Commit-Position: refs/heads/master@{#351437}
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 6d8d12e..bae5b7b 100644 --- a/components/html_viewer/html_frame_tree_manager.cc +++ b/components/html_viewer/html_frame_tree_manager.cc @@ -108,8 +108,7 @@ HTMLFrame* HTMLFrameTreeManager::CreateFrameAndAttachToTree( if (!frame_tree) { frame_tree = new HTMLFrameTreeManager(global_state); frame_tree->Init(delegate, view, frame_data, change_id); - if (frame_data[0]->frame_id == view->id()) - (*instances_)[frame_data[0]->frame_id] = frame_tree; + (*instances_)[frame_data[0]->frame_id] = frame_tree; } else if (view_connect_type == web_view::mojom::VIEW_CONNECT_TYPE_USE_EXISTING) { HTMLFrame* existing_frame = frame_tree->root_->FindFrame(view_id); |