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

Side by Side Diff: content/browser/frame_host/frame_navigation_entry.cc

Issue 1889583003: Revert of OOPIF: Fix subframe back/forward after recreating FTNs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/frame_host/navigation_controller_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/frame_host/frame_navigation_entry.h" 5 #include "content/browser/frame_host/frame_navigation_entry.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 namespace content { 9 namespace content {
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 item_sequence_number_ = item_sequence_number; 52 item_sequence_number_ = item_sequence_number;
53 document_sequence_number_ = document_sequence_number; 53 document_sequence_number_ = document_sequence_number;
54 site_instance_ = site_instance; 54 site_instance_ = site_instance;
55 url_ = url; 55 url_ = url;
56 referrer_ = referrer; 56 referrer_ = referrer;
57 page_state_ = page_state; 57 page_state_ = page_state;
58 } 58 }
59 59
60 void FrameNavigationEntry::set_item_sequence_number( 60 void FrameNavigationEntry::set_item_sequence_number(
61 int64_t item_sequence_number) { 61 int64_t item_sequence_number) {
62 // TODO(creis): Assert that this does not change after being assigned, once 62 // Once assigned, the item sequence number shouldn't change.
63 // location.replace is classified as NEW_PAGE rather than EXISTING_PAGE. 63 DCHECK(item_sequence_number_ == -1 ||
64 // Same for document sequence number. See https://crbug.com/596707. 64 item_sequence_number_ == item_sequence_number);
65 item_sequence_number_ = item_sequence_number; 65 item_sequence_number_ = item_sequence_number;
66 } 66 }
67 67
68 void FrameNavigationEntry::set_document_sequence_number( 68 void FrameNavigationEntry::set_document_sequence_number(
69 int64_t document_sequence_number) { 69 int64_t document_sequence_number) {
70 // Once assigned, the document sequence number shouldn't change.
71 DCHECK(document_sequence_number_ == -1 ||
72 document_sequence_number_ == document_sequence_number);
70 document_sequence_number_ = document_sequence_number; 73 document_sequence_number_ = document_sequence_number;
71 } 74 }
72 75
73 } // namespace content 76 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/navigation_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698