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

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

Issue 2294343002: Update FrameNavigationEntry members when setting PageState. (Closed)
Patch Set: Remove NOTREACHED, as unit tests are failing. Created 4 years, 4 months 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_entry_impl.cc
diff --git a/content/browser/frame_host/navigation_entry_impl.cc b/content/browser/frame_host/navigation_entry_impl.cc
index dd1fa642b5b54e8d43e306f1ef57d1937a0785f6..ac1876b50e6d1a0c72224b022a6de45340b8de0b 100644
--- a/content/browser/frame_host/navigation_entry_impl.cc
+++ b/content/browser/frame_host/navigation_entry_impl.cc
@@ -59,7 +59,7 @@ void RecursivelyGenerateFrameEntries(const ExplodedFrameState& state,
base::debug::DumpWithoutCrashing();
NOTREACHED() << "Shouldn't generate an empty PageState.";
}
- node->frame_entry->set_page_state(PageState::CreateFromEncodedData(data));
+ node->frame_entry->SetPageState(PageState::CreateFromEncodedData(data));
for (const ExplodedFrameState& child_state : state.children) {
NavigationEntryImpl::TreeNode* child_node =
@@ -338,7 +338,7 @@ const base::string16& NavigationEntryImpl::GetTitle() const {
void NavigationEntryImpl::SetPageState(const PageState& state) {
if (!SiteIsolationPolicy::UseSubframeNavigationEntries()) {
- frame_tree_->frame_entry->set_page_state(state);
+ frame_tree_->frame_entry->SetPageState(state);
return;
}
@@ -360,7 +360,7 @@ void NavigationEntryImpl::SetPageState(const PageState& state) {
ExplodedPageState exploded_state;
if (!DecodePageState(state.ToEncodedData(), &exploded_state) ||
exploded_state.top.children.size() == 0U) {
- frame_tree_->frame_entry->set_page_state(state);
+ frame_tree_->frame_entry->SetPageState(state);
return;
}
@@ -835,7 +835,7 @@ void NavigationEntryImpl::AddOrUpdateFrameEntry(
unique_name, item_sequence_number, document_sequence_number,
site_instance, std::move(source_site_instance), url, referrer, method,
post_id);
- frame_entry->set_page_state(page_state);
+ frame_entry->SetPageState(page_state);
parent_node->children.push_back(
new NavigationEntryImpl::TreeNode(parent_node, frame_entry));
}
« no previous file with comments | « content/browser/frame_host/navigation_controller_impl.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698