diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-27 11:18:24 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-03 09:38:30 +0000 |
| commit | d94af01c90575348c4e81a418257f254b6f8d225 (patch) | |
| tree | 77a26669b33eaa4d46b88b07e17dacc61eba6001 /chromium/content/browser/frame_host/navigation_controller_impl.cc | |
| parent | 5d87695f37678f96492b258bbab36486c59866b4 (diff) | |
| download | qtwebengine-chromium-d94af01c90575348c4e81a418257f254b6f8d225.tar.gz | |
BASELINE: Update Chromium to 75.0.3770.116
Change-Id: Ifcd5227841577e8ce81a1b7a54c56caba4d85e02
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/content/browser/frame_host/navigation_controller_impl.cc')
| -rw-r--r-- | chromium/content/browser/frame_host/navigation_controller_impl.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chromium/content/browser/frame_host/navigation_controller_impl.cc b/chromium/content/browser/frame_host/navigation_controller_impl.cc index d47e3fba4fb..25f8796f96b 100644 --- a/chromium/content/browser/frame_host/navigation_controller_impl.cc +++ b/chromium/content/browser/frame_host/navigation_controller_impl.cc @@ -3410,8 +3410,12 @@ void NavigationControllerImpl::SetShouldSkipOnBackForwardUIIfNeeded( // Note that for a subframe, previous_document_was_activated is true if the // gesture happened in any subframe (propagated to main frame) or in the main // frame itself. + // TODO(crbug.com/934637): Remove the check for HadInnerWebContents() when + // pdf and any inner web contents user gesture is properly propagated. This is + // a temporary fix for history intervention to be disabled for pdfs + // (crbug.com/965434). if (replace_entry || previous_document_was_activated || - !is_renderer_initiated) { + !is_renderer_initiated || delegate_->HadInnerWebContents()) { if (last_committed_entry_index_ != -1) { UMA_HISTOGRAM_BOOLEAN( "Navigation.BackForward.SetShouldSkipOnBackForwardUI", false); |