Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(329)

Unified Diff: content/browser/frame_host/navigation_controller_impl.cc

Issue 2482873002: Add is_srcdoc to FrameNavigationEntry and restore about::srcdoc URL. (Closed)
Patch Set: Addressed comments (@nasko) Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/navigation_controller_impl.cc
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
index 69e9fd3862c1f9e060a9edb7e7ee75b8b06a3a98..58f6fc5fe8a9867b9ee764bb210763369488974a 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -712,7 +712,7 @@ void NavigationControllerImpl::LoadURLWithParams(const LoadURLParams& params) {
node, -1, -1, nullptr,
static_cast<SiteInstanceImpl*>(params.source_site_instance.get()),
params.url, params.referrer, params.redirect_chain, PageState(),
- "GET", -1);
+ "GET", -1, false);
}
}
}
@@ -1074,7 +1074,8 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
FrameNavigationEntry* frame_entry = new FrameNavigationEntry(
params.frame_unique_name, params.item_sequence_number,
params.document_sequence_number, rfh->GetSiteInstance(), nullptr,
- params.url, params.referrer, params.method, params.post_id);
+ params.url, params.referrer, params.method, params.post_id,
+ params.is_srcdoc);
new_entry = GetLastCommittedEntry()->CloneAndReplace(
frame_entry, true, rfh->frame_tree_node(),
delegate_->GetFrameTree()->root());
@@ -1234,7 +1235,7 @@ void NavigationControllerImpl::RendererDidNavigateToExistingPage(
rfh->frame_tree_node(), params.item_sequence_number,
params.document_sequence_number, rfh->GetSiteInstance(), nullptr,
params.url, params.referrer, params.redirects, params.page_state,
- params.method, params.post_id);
+ params.method, params.post_id, params.is_srcdoc);
// The redirected to page should not inherit the favicon from the previous
// page.
@@ -1295,7 +1296,7 @@ void NavigationControllerImpl::RendererDidNavigateToSamePage(
rfh->frame_tree_node(), params.item_sequence_number,
params.document_sequence_number, rfh->GetSiteInstance(), nullptr,
params.url, params.referrer, params.redirects, params.page_state,
- params.method, params.post_id);
+ params.method, params.post_id, params.is_srcdoc);
DiscardNonCommittedEntries();
}
@@ -1321,7 +1322,8 @@ void NavigationControllerImpl::RendererDidNavigateNewSubframe(
scoped_refptr<FrameNavigationEntry> frame_entry(new FrameNavigationEntry(
params.frame_unique_name, params.item_sequence_number,
params.document_sequence_number, rfh->GetSiteInstance(), nullptr,
- params.url, params.referrer, params.method, params.post_id));
+ params.url, params.referrer, params.method, params.post_id,
+ params.is_srcdoc));
new_entry = GetLastCommittedEntry()->CloneAndReplace(
frame_entry.get(), is_in_page, rfh->frame_tree_node(),
delegate_->GetFrameTree()->root());
@@ -1393,7 +1395,7 @@ bool NavigationControllerImpl::RendererDidNavigateAutoSubframe(
rfh->frame_tree_node(), params.item_sequence_number,
params.document_sequence_number, rfh->GetSiteInstance(), nullptr,
params.url, params.referrer, params.redirects, params.page_state,
- params.method, params.post_id);
+ params.method, params.post_id, params.is_srcdoc);
}
return send_commit_notification;

Powered by Google App Engine
This is Rietveld 408576698