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

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

Issue 1407853005: OOPIF: Add frame_unique_name to FrameNavigationEntry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update comments Created 5 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_entry_impl.cc
diff --git a/content/browser/frame_host/navigation_entry_impl.cc b/content/browser/frame_host/navigation_entry_impl.cc
index a1f47a99dacc9cb5b783302b1c70b25cd8eeb2f3..4f6e19515502bfb991ede4454837812777bb2335 100644
--- a/content/browser/frame_host/navigation_entry_impl.cc
+++ b/content/browser/frame_host/navigation_entry_impl.cc
@@ -102,7 +102,7 @@ NavigationEntryImpl::NavigationEntryImpl(SiteInstanceImpl* instance,
ui::PageTransition transition_type,
bool is_renderer_initiated)
: frame_tree_(new TreeNode(
- new FrameNavigationEntry(-1, -1, -1, instance, url, referrer))),
+ new FrameNavigationEntry(-1, "", -1, -1, instance, url, referrer))),
unique_id_(GetUniqueIDInConstructor()),
bindings_(kInvalidBindings),
page_type_(PAGE_TYPE_NORMAL),
@@ -548,6 +548,7 @@ void NavigationEntryImpl::ResetForCommit() {
}
void NavigationEntryImpl::AddOrUpdateFrameEntry(FrameTreeNode* frame_tree_node,
+ std::string target,
int64 item_sequence_number,
int64 document_sequence_number,
SiteInstanceImpl* site_instance,
@@ -570,7 +571,7 @@ void NavigationEntryImpl::AddOrUpdateFrameEntry(FrameTreeNode* frame_tree_node,
for (TreeNode* child : parent_node->children) {
if (child->frame_entry->frame_tree_node_id() == frame_tree_node_id) {
// Update the existing FrameNavigationEntry (e.g., for replaceState).
- child->frame_entry->UpdateEntry(item_sequence_number,
+ child->frame_entry->UpdateEntry(target, item_sequence_number,
document_sequence_number, site_instance,
url, referrer, page_state);
return;
@@ -581,8 +582,8 @@ void NavigationEntryImpl::AddOrUpdateFrameEntry(FrameTreeNode* frame_tree_node,
// Unordered list, since we expect to look up entries by frame sequence number
// or unique name.
FrameNavigationEntry* frame_entry = new FrameNavigationEntry(
- frame_tree_node_id, item_sequence_number, document_sequence_number,
- site_instance, url, referrer);
+ frame_tree_node_id, target, item_sequence_number,
+ document_sequence_number, site_instance, url, referrer);
frame_entry->set_page_state(page_state);
parent_node->children.push_back(
new NavigationEntryImpl::TreeNode(frame_entry));

Powered by Google App Engine
This is Rietveld 408576698