bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 5fdc0fab (#520840)

Browse Source 
- Windows now builds with clang by default.
This commit is contained in:
Marshall Greenblatt
2017-12-07 16:44:24 -05:00
parent d5e141648b
commit 8d51acb9be
153 changed files with 2189 additions and 3387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libcef/browser/browser_host_impl.cc
View File

@ -68,6 +68,7 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/render_widget_host.h"
#include "content/public/browser/resource_request_info.h"
#include "content/public/common/browser_side_navigation_policy.h"
#include "content/public/common/favicon_url.h"
#include "extensions/browser/process_manager.h"
#include "net/base/net_errors.h"
@ -2727,8 +2728,12 @@ void CefBrowserHostImpl::DidFinishNavigation(
// With PlzNavigate the RenderFrameHost will only be nullptr if the
// provisional load fails, in which case |error_code| will be ERR_ABORTED.
// Without PlzNavigate the RenderFrameHost may be nullptr and |error_code|
// may be OK when a pending navigation is canceled (e.g. by calling LoadURL
// from OnCertificateError).
DCHECK(navigation_handle->GetRenderFrameHost() ||
error_code == net::ERR_ABORTED);
error_code == net::ERR_ABORTED ||
!content::IsBrowserSideNavigationEnabled());
const int64 frame_id =
navigation_handle->GetRenderFrameHost()