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 version 105.0.5176.0 (#1023155)

Browse Source
This commit is contained in:
Marshall Greenblatt
2022-07-21 13:26:10 -04:00
parent 5e753d211f
commit e9f29ab3d6
92 changed files with 615 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
libcef/browser/printing/print_dialog_linux.cc
View File

@@ -32,11 +32,6 @@ using printing::PrintSettings;
namespace {
printing::PrintingContextLinux::CreatePrintDialogFunctionPtr
g_default_create_print_dialog_func = nullptr;
printing::PrintingContextLinux::PdfPaperSizeFunctionPtr
g_default_pdf_paper_size_func = nullptr;
CefRefPtr<CefBrowserHostBase> GetBrowserForContext(
printing::PrintingContextLinux* context) {
return extensions::GetOwnerBrowserForGlobalId(
@@ -127,12 +122,14 @@ class CefPrintJobCallbackImpl : public CefPrintJobCallback {
IMPLEMENT_REFCOUNTING(CefPrintJobCallbackImpl);
};
// static
printing::PrintDialogGtkInterface* CefPrintDialogLinux::CreatePrintDialog(
PrintingContextLinux* context) {
CefPrintingContextLinuxDelegate::CefPrintingContextLinuxDelegate() = default;
printing::PrintDialogLinuxInterface*
CefPrintingContextLinuxDelegate::CreatePrintDialog(
printing::PrintingContextLinux* context) {
CEF_REQUIRE_UIT();
printing::PrintDialogGtkInterface* interface = nullptr;
printing::PrintDialogLinuxInterface* interface = nullptr;
auto browser = GetBrowserForContext(context);
if (!browser) {
@@ -142,8 +139,8 @@ printing::PrintDialogGtkInterface* CefPrintDialogLinux::CreatePrintDialog(
auto handler = GetPrintHandlerForBrowser(browser);
if (!handler) {
if (g_default_create_print_dialog_func) {
interface = g_default_create_print_dialog_func(context);
if (default_delegate_) {
interface = default_delegate_->CreatePrintDialog(context);
DCHECK(interface);
}
} else {
@@ -157,8 +154,7 @@ printing::PrintDialogGtkInterface* CefPrintDialogLinux::CreatePrintDialog(
return interface;
}
// static
gfx::Size CefPrintDialogLinux::GetPdfPaperSize(
gfx::Size CefPrintingContextLinuxDelegate::GetPdfPaperSize(
printing::PrintingContextLinux* context) {
CEF_REQUIRE_UIT();
@@ -172,8 +168,8 @@ gfx::Size CefPrintDialogLinux::GetPdfPaperSize(
auto handler = GetPrintHandlerForBrowser(browser);
if (!handler) {
if (g_default_pdf_paper_size_func) {
size = g_default_pdf_paper_size_func(context);
if (default_delegate_) {
size = default_delegate_->GetPdfPaperSize(context);
DCHECK(!size.IsEmpty());
}
} else {
@@ -190,14 +186,10 @@ gfx::Size CefPrintDialogLinux::GetPdfPaperSize(
return size;
}
// static
void CefPrintDialogLinux::SetDefaultPrintingContextFuncs(
printing::PrintingContextLinux::CreatePrintDialogFunctionPtr
create_print_dialog_func,
printing::PrintingContextLinux::PdfPaperSizeFunctionPtr
pdf_paper_size_func) {
g_default_create_print_dialog_func = create_print_dialog_func;
g_default_pdf_paper_size_func = pdf_paper_size_func;
void CefPrintingContextLinuxDelegate::SetDefaultDelegate(
printing::PrintingContextLinuxDelegate* delegate) {
DCHECK(!default_delegate_);
default_delegate_ = delegate;
}
// static