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

Fix DCHECK when showing print preview dialog (see issue #2952)

Browse Source
This commit is contained in:
Marshall Greenblatt
2020-07-23 15:46:57 -04:00
parent ac99621829
commit b822ea43b9
4 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libcef/browser/browser_info_manager.cc
View File

@@ -22,6 +22,7 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/child_process_host.h"
#include "content/public/common/url_constants.h"
#include "extensions/common/constants.h"
namespace {
@@ -122,7 +123,7 @@ bool CefBrowserInfoManager::CanCreateWindow(
params.user_gesture = user_gesture;
CefRefPtr<CefBrowserHostImpl> browser;
if (!MaybeAllowNavigation(opener, params, browser)) {
if (!MaybeAllowNavigation(opener, params, browser) || !browser) {
// Cancel the popup.
return false;
}
@@ -366,13 +367,17 @@ bool CefBrowserInfoManager::MaybeAllowNavigation(
bool is_guest_view = false;
CefRefPtr<CefBrowserHostImpl> browser =
extensions::GetOwnerBrowserForHost(opener, &is_guest_view);
DCHECK(browser);
if (!browser)
return false;
if (!browser) {
// Print preview uses a modal dialog where we don't own the WebContents.
// Allow that navigation to proceed.
return true;
}
if (is_guest_view && !params.url.SchemeIs(extensions::kExtensionScheme)) {
// The PDF viewer will load an extension in the guest view. All other
// navigations are passed to the owner browser.
if (is_guest_view && !params.url.SchemeIs(extensions::kExtensionScheme) &&
!params.url.SchemeIs(content::kChromeUIScheme)) {
// The PDF viewer will load the PDF extension in the guest view, and print
// preview will load chrome://print in the guest view. All other navigations
// are passed to the owner browser.
CEF_POST_TASK(
CEF_UIT,
base::Bind(base::IgnoreResult(&CefBrowserHostImpl::OpenURLFromTab),