Commit 226226af authored by Dominic Farolino's avatar Dominic Farolino Committed by Commit Bot

Use node instead of render_frame_host->frame_tree_node() where possible

In content::NavigationControllerImpl::NavigateFromFrameProxy we pull
RenderFrameHost::FrameTreeNode out into a separate variable but rarely
use it. This CL uses the variable in locations were we previously
computed its value.

Bug: N/A
Change-Id: Ic5ef6e209b2c5146d7d62a8b884d61c150c1100a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1673172Reviewed-by: default avatarNasko Oskov <nasko@chromium.org>
Commit-Queue: Dominic Farolino <dom@chromium.org>
Cr-Commit-Position: refs/heads/master@{#671904}
parent 26e2ae3f
...@@ -2288,8 +2288,7 @@ void NavigationControllerImpl::NavigateFromFrameProxy( ...@@ -2288,8 +2288,7 @@ void NavigationControllerImpl::NavigateFromFrameProxy(
params.source_site_instance = source_site_instance; params.source_site_instance = source_site_instance;
params.load_type = method == "POST" ? LOAD_TYPE_HTTP_POST : LOAD_TYPE_DEFAULT; params.load_type = method == "POST" ? LOAD_TYPE_HTTP_POST : LOAD_TYPE_DEFAULT;
params.transition_type = page_transition; params.transition_type = page_transition;
params.frame_tree_node_id = params.frame_tree_node_id = node->frame_tree_node_id();
render_frame_host->frame_tree_node()->frame_tree_node_id();
params.referrer = referrer; params.referrer = referrer;
/* params.redirect_chain: skip */ /* params.redirect_chain: skip */
params.extra_headers = extra_headers; params.extra_headers = extra_headers;
...@@ -2313,15 +2312,15 @@ void NavigationControllerImpl::NavigateFromFrameProxy( ...@@ -2313,15 +2312,15 @@ void NavigationControllerImpl::NavigateFromFrameProxy(
std::unique_ptr<NavigationRequest> request = std::unique_ptr<NavigationRequest> request =
CreateNavigationRequestFromLoadParams( CreateNavigationRequestFromLoadParams(
render_frame_host->frame_tree_node(), params, override_user_agent, node, params, override_user_agent, should_replace_current_entry,
should_replace_current_entry, false /* has_user_gesture */, false /* has_user_gesture */, download_policy, ReloadType::NONE,
download_policy, ReloadType::NONE, entry.get(), frame_entry.get()); entry.get(), frame_entry.get());
if (!request) if (!request)
return; return;
render_frame_host->frame_tree_node()->navigator()->Navigate( node->navigator()->Navigate(std::move(request), ReloadType::NONE,
std::move(request), ReloadType::NONE, RestoreType::NONE); RestoreType::NONE);
} }
void NavigationControllerImpl::SetSessionStorageNamespace( void NavigationControllerImpl::SetSessionStorageNamespace(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment