Skip to content

Commit

Permalink
Revert "Remove CHECK for same-document provisional frames for M87 beta."
Browse files Browse the repository at this point in the history
This reverts commit 47c81ee.

Reason for revert: Was landed for M87 branch

Original change's description:
> Remove CHECK for same-document provisional frames for M87 beta.
>
> R=​[email protected]
>
> Bug: 1125106
> Change-Id: If05f064715add137e16118a08da153d1d5ed0e3e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2465809
> Reviewed-by: Nasko Oskov <[email protected]>
> Commit-Queue: danakj <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#816752}

[email protected],[email protected]

Change-Id: I6a37a0026dde48dd06f07d26aaed140c8713c36e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1125106
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2468243
Reviewed-by: danakj <[email protected]>
Commit-Queue: danakj <[email protected]>
Cr-Commit-Position: refs/heads/master@{#816766}
  • Loading branch information
danakj authored and Commit Bot committed Oct 13, 2020
1 parent 0522133 commit ee071eb
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions content/renderer/render_frame_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3649,9 +3649,7 @@ void RenderFrameImpl::CommitSameDocumentNavigation(
DCHECK(!commit_params->is_view_source);
DCHECK(NavigationTypeUtils::IsSameDocument(common_params->navigation_type));

// TODO(danakj): Disabled for M87, but underlying problem exists.
// CHECK(in_frame_tree_);

CHECK(in_frame_tree_);
// Unlike a cross-document navigation commit, detach the MHTMLBodyLoaderClient
// before resetting it. In the case of a cross-document navigation, it's
// important to ensure *something* commits, even if the original commit
Expand Down

0 comments on commit ee071eb

Please sign in to comment.