chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc - Issue 10823169: Another attempt at fixing dead frames being tracked by webNavigation

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc

Issue 10823169: Another attempt at fixing dead frames being tracked by webNavigation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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

« no previous file with comments | « no previous file | chrome/browser/extensions/api/web_navigation/web_navigation_api.cc » ('j') | chrome/browser/extensions/api/web_navigation/web_navigation_api.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc

diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc

index b1ec1e826338f40508c97b943b7cf70a07775a2d..9f14dd5693be393b8a890791d1f3b79d35dffecd 100644

--- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc

+++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc

@@ -184,10 +184,8 @@ bool FrameNavigationState::GetNavigationCompleted(FrameID frame_id) const {

void FrameNavigationState::SetNavigationCommitted(FrameID frame_id) {

DCHECK(frame_state_map_.find(frame_id) != frame_state_map_.end());

frame_state_map_[frame_id].is_committed = true;

- if (frame_state_map_[frame_id].is_main_frame) {

- DCHECK_EQ(1u, frame_ids_.size());

+ if (frame_state_map_[frame_id].is_main_frame)

main_frame_id_ = frame_id;

- }

}

bool FrameNavigationState::GetNavigationCommitted(FrameID frame_id) const {