diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-03 13:42:47 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:27:51 +0000 |
| commit | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (patch) | |
| tree | d29d987c4d7b173cf853279b79a51598f104b403 /chromium/extensions/renderer/script_injection_manager.cc | |
| parent | 830c9e163d31a9180fadca926b3e1d7dfffb5021 (diff) | |
| download | qtwebengine-chromium-8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec.tar.gz | |
BASELINE: Update Chromium to 66.0.3359.156
Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/extensions/renderer/script_injection_manager.cc')
| -rw-r--r-- | chromium/extensions/renderer/script_injection_manager.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chromium/extensions/renderer/script_injection_manager.cc b/chromium/extensions/renderer/script_injection_manager.cc index ac7156a61d3..d7d23af903e 100644 --- a/chromium/extensions/renderer/script_injection_manager.cc +++ b/chromium/extensions/renderer/script_injection_manager.cc @@ -221,14 +221,10 @@ void ScriptInjectionManager::RFOHelper::OnDestruct() { } void ScriptInjectionManager::RFOHelper::OnStop() { - // With PlzNavigate, we won't get a provisional load failed notification - // for 204/205/downloads since these don't notify the renderer. However the - // browser does fire the OnStop IPC. So use that signal instead to avoid - // keeping the frame in a START state indefinitely which leads to deadlocks. - if (content::IsBrowserSideNavigationEnabled()) { - DidFailProvisionalLoad( - blink::WebURLError(net::ERR_FAILED, blink::WebURL())); - } + // If the navigation request fails (e.g. 204/205/downloads), notify the + // extension to avoid keeping the frame in a START state indefinitely which + // leads to deadlocks. + DidFailProvisionalLoad(blink::WebURLError(net::ERR_FAILED, blink::WebURL())); } void ScriptInjectionManager::RFOHelper::OnExecuteCode( |