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

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

Issue 1467143005: Fix issue with CHECK in NavigationHandle::CommitNavigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed segfault 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
« no previous file with comments | « no previous file | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/navigation_handle_impl.cc
diff --git a/content/browser/frame_host/navigation_handle_impl.cc b/content/browser/frame_host/navigation_handle_impl.cc
index 4fcb2c6c64bea036e556a0576ab29ad57f826ed3..38925577bc43e4485f993558b027419f33a7c0bd 100644
--- a/content/browser/frame_host/navigation_handle_impl.cc
+++ b/content/browser/frame_host/navigation_handle_impl.cc
@@ -306,7 +306,7 @@ void NavigationHandleImpl::DidRedirectNavigation(const GURL& new_url) {
void NavigationHandleImpl::ReadyToCommitNavigation(
RenderFrameHostImpl* render_frame_host,
scoped_refptr<net::HttpResponseHeaders> response_headers) {
- DCHECK(!render_frame_host_);
+ DCHECK(!render_frame_host_ || render_frame_host_ == render_frame_host);
render_frame_host_ = render_frame_host;
response_headers_ = response_headers;
state_ = READY_TO_COMMIT;
@@ -322,7 +322,7 @@ void NavigationHandleImpl::ReadyToCommitNavigation(
void NavigationHandleImpl::DidCommitNavigation(
bool same_page,
RenderFrameHostImpl* render_frame_host) {
- CHECK(!render_frame_host_ || render_frame_host_ == render_frame_host);
+ DCHECK(!render_frame_host_ || render_frame_host_ == render_frame_host);
is_same_page_ = same_page;
render_frame_host_ = render_frame_host;
state_ = net_error_code_ == net::OK ? DID_COMMIT : DID_COMMIT_ERROR_PAGE;
« no previous file with comments | « no previous file | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698