diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-06 18:23:29 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-06 18:23:29 +0000 |
| commit | 73aec6aa4b67fd52fdde41a77c0a75b37ea33391 (patch) | |
| tree | 0a927e60582c73ed926662bf341b83aea5aae583 /content/renderer | |
| parent | 02b95b019fa48b0e662951e30a47cd22a89b4f9b (diff) | |
| download | chromium_src-73aec6aa4b67fd52fdde41a77c0a75b37ea33391.zip chromium_src-73aec6aa4b67fd52fdde41a77c0a75b37ea33391.tar.gz chromium_src-73aec6aa4b67fd52fdde41a77c0a75b37ea33391.tar.bz2 | |
Update WebFrameClient implementations to maintain frame tree.
BUG=340002
R=boliu@chromium.org, creis@chromium.org, nasko@chromium.org, thestig@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=249168
Review URL: https://codereview.chromium.org/148353003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/render_frame_impl.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index 221fb11..a205148 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -710,6 +710,7 @@ blink::WebFrame* RenderFrameImpl::createChildFrame( render_view_.get(), routing_id); blink::WebFrame* web_frame = WebFrame::create(child_render_frame, child_frame_identifier); + parent->appendChild(web_frame); child_render_frame->SetWebFrame(web_frame); return web_frame; @@ -755,6 +756,9 @@ void RenderFrameImpl::frameDetached(blink::WebFrame* frame) { CHECK_EQ(it->second, this); g_frame_map.Get().erase(it); + if (is_subframe) + frame->parent()->removeChild(frame); + // |frame| is invalid after here. frame->close(); |