diff options
| author | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 21:30:48 +0000 |
|---|---|---|
| committer | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 21:34:34 +0000 |
| commit | dbf1b1ff62c91680f0e8c3896837102e6703cb5f (patch) | |
| tree | 97dfaf7e8a49c34dbc009690e4a8da1a0df3dd47 | |
| parent | 0acab6337d59ca6e57ec9e7a6eb935af07a962b3 (diff) | |
| download | chromium_src-dbf1b1ff62c91680f0e8c3896837102e6703cb5f.zip chromium_src-dbf1b1ff62c91680f0e8c3896837102e6703cb5f.tar.gz chromium_src-dbf1b1ff62c91680f0e8c3896837102e6703cb5f.tar.bz2 | |
Fix RenderFrameProxyHost::GetRenderViewHost for subframes.
Also a speculative fix for an Android crash report.
BUG=406048
TEST=Open NTP with --site-per-process.
Review URL: https://codereview.chromium.org/496283006
Cr-Commit-Position: refs/heads/master@{#291506}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291506 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/frame_host/render_frame_proxy_host.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc index 22d5bb7..5cbad79 100644 --- a/content/browser/frame_host/render_frame_proxy_host.cc +++ b/content/browser/frame_host/render_frame_proxy_host.cc @@ -53,9 +53,7 @@ void RenderFrameProxyHost::SetChildRWHView(RenderWidgetHostView* view) { } RenderViewHostImpl* RenderFrameProxyHost::GetRenderViewHost() { - if (render_frame_host_.get()) - return render_frame_host_->render_view_host(); - return NULL; + return frame_tree_node_->frame_tree()->GetRenderViewHost(site_instance_); } scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() { |