summaryrefslogtreecommitdiffstats
path: root/content/browser/frame_host/navigation_entry_impl.cc
diff options
context:
space:
mode:
authorcreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-21 07:10:16 +0000
committercreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-21 07:10:16 +0000
commitc80297784d20d147545528901cd0ef5a716c3498 (patch)
treea6b0a28303618409716444a1e5696626da60d835 /content/browser/frame_host/navigation_entry_impl.cc
parenta2a5cfac9a15113d68693074da928f1c0ea2bd52 (diff)
downloadchromium_src-c80297784d20d147545528901cd0ef5a716c3498.zip
chromium_src-c80297784d20d147545528901cd0ef5a716c3498.tar.gz
chromium_src-c80297784d20d147545528901cd0ef5a716c3498.tar.bz2
Add frame_tree_node_id to navigation parameters.
This will be used to support cross-process subframe navigations. BUG=314791 TEST=No visible behavior change. Review URL: https://codereview.chromium.org/77673003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/frame_host/navigation_entry_impl.cc')
-rw-r--r--content/browser/frame_host/navigation_entry_impl.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/content/browser/frame_host/navigation_entry_impl.cc b/content/browser/frame_host/navigation_entry_impl.cc
index 58dbaf4..a9b37cc 100644
--- a/content/browser/frame_host/navigation_entry_impl.cc
+++ b/content/browser/frame_host/navigation_entry_impl.cc
@@ -52,7 +52,8 @@ NavigationEntryImpl::NavigationEntryImpl()
is_renderer_initiated_(false),
should_replace_entry_(false),
should_clear_history_list_(false),
- can_load_local_resources_(false) {
+ can_load_local_resources_(false),
+ frame_tree_node_id_(-1) {
}
NavigationEntryImpl::NavigationEntryImpl(SiteInstanceImpl* instance,
@@ -80,7 +81,8 @@ NavigationEntryImpl::NavigationEntryImpl(SiteInstanceImpl* instance,
is_renderer_initiated_(is_renderer_initiated),
should_replace_entry_(false),
should_clear_history_list_(false),
- can_load_local_resources_(false) {
+ can_load_local_resources_(false),
+ frame_tree_node_id_(-1) {
}
NavigationEntryImpl::~NavigationEntryImpl() {
@@ -330,6 +332,7 @@ void NavigationEntryImpl::ResetForCommit() {
set_should_replace_entry(false);
redirect_chain_.clear();
set_should_clear_history_list(false);
+ set_frame_tree_node_id(-1);
}
void NavigationEntryImpl::SetScreenshotPNGData(