mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Use Chrome file dialogs on all platforms and runtimes (fixes issue #3314)
All file dialogs irrespective of source, platform and runtime will now be routed through CefFileDialogManager and trigger CefDialogHandler callbacks (see issue #3293). Adds Chrome runtime support for CefBrowserHost::RunFileDialog and CefDialogHandler callbacks. Adds Alloy runtime support for internal GTK file and print dialogs on Linux subject to the following limitations: 1. Internal GTK implementation: - Cannot be used with multi-threaded-message-loop because Chromium's internal GTK implementation is not thread-safe (does not use GDK threads). - Dialogs will not be modal to application windows when used with off-screen rendering due to lack of access to the client's top-level GtkWindow. 2. Cefclient CefDialogHandler implementation: - Cannot be used with Views because it requires a top-level GtkWindow. Due to the above limitations no dialog implementation is currently provided for Views + multi-threaded-message-loop on Linux. In cases where both implementations are supported the cefclient version is now behind an optional `--use-client-dialogs` command-line flag. Expressly forbids multiple simultaneous file dialogs with the internal platform implementation which uses modal dialogs. CefDialogHandler will still be notified and can optionally handle each request without a modal dialog (see issue #3154). Removes some RunFileDialog parameters that are not supported by the Chrome file dialog implementation (selected_accept_filter parameter, cef_file_dialog_mode_t overwrite/read-only flags).
This commit is contained in:
@@ -30,6 +30,33 @@ using content::BrowserThread;
|
||||
using printing::PageRanges;
|
||||
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(
|
||||
frame_util::MakeGlobalId(context->render_process_id(),
|
||||
context->render_frame_id()),
|
||||
nullptr);
|
||||
}
|
||||
|
||||
CefRefPtr<CefPrintHandler> GetPrintHandlerForBrowser(
|
||||
CefRefPtr<CefBrowserHostBase> browser) {
|
||||
if (browser) {
|
||||
if (auto client = browser->GetClient()) {
|
||||
return client->GetPrintHandler();
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
class CefPrintDialogCallbackImpl : public CefPrintDialogCallback {
|
||||
public:
|
||||
explicit CefPrintDialogCallbackImpl(CefRefPtr<CefPrintDialogLinux> dialog)
|
||||
@@ -104,7 +131,30 @@ class CefPrintJobCallbackImpl : public CefPrintJobCallback {
|
||||
printing::PrintDialogGtkInterface* CefPrintDialogLinux::CreatePrintDialog(
|
||||
PrintingContextLinux* context) {
|
||||
CEF_REQUIRE_UIT();
|
||||
return new CefPrintDialogLinux(context);
|
||||
|
||||
printing::PrintDialogGtkInterface* interface = nullptr;
|
||||
|
||||
auto browser = GetBrowserForContext(context);
|
||||
if (!browser) {
|
||||
LOG(ERROR) << "No associated browser in CreatePrintDialog; using default "
|
||||
"printing implementation.";
|
||||
}
|
||||
|
||||
auto handler = GetPrintHandlerForBrowser(browser);
|
||||
if (!handler) {
|
||||
if (g_default_create_print_dialog_func) {
|
||||
interface = g_default_create_print_dialog_func(context);
|
||||
DCHECK(interface);
|
||||
}
|
||||
} else {
|
||||
interface = new CefPrintDialogLinux(context, browser, handler);
|
||||
}
|
||||
|
||||
if (!interface) {
|
||||
LOG(ERROR) << "Null interface in CreatePrintDialog; printing will fail.";
|
||||
}
|
||||
|
||||
return interface;
|
||||
}
|
||||
|
||||
// static
|
||||
@@ -114,27 +164,42 @@ gfx::Size CefPrintDialogLinux::GetPdfPaperSize(
|
||||
|
||||
gfx::Size size;
|
||||
|
||||
auto browser = extensions::GetOwnerBrowserForGlobalId(
|
||||
frame_util::MakeGlobalId(context->render_process_id(),
|
||||
context->render_frame_id()),
|
||||
nullptr);
|
||||
DCHECK(browser);
|
||||
if (browser && browser->GetClient()) {
|
||||
if (auto handler = browser->GetClient()->GetPrintHandler()) {
|
||||
const printing::PrintSettings& settings = context->settings();
|
||||
CefSize cef_size = handler->GetPdfPaperSize(
|
||||
browser.get(), settings.device_units_per_inch());
|
||||
size.SetSize(cef_size.width, cef_size.height);
|
||||
auto browser = GetBrowserForContext(context);
|
||||
if (!browser) {
|
||||
LOG(ERROR) << "No associated browser in GetPdfPaperSize; using default "
|
||||
"printing implementation.";
|
||||
}
|
||||
|
||||
auto handler = GetPrintHandlerForBrowser(browser);
|
||||
if (!handler) {
|
||||
if (g_default_pdf_paper_size_func) {
|
||||
size = g_default_pdf_paper_size_func(context);
|
||||
DCHECK(!size.IsEmpty());
|
||||
}
|
||||
} else {
|
||||
const printing::PrintSettings& settings = context->settings();
|
||||
CefSize cef_size = handler->GetPdfPaperSize(
|
||||
browser.get(), settings.device_units_per_inch());
|
||||
size.SetSize(cef_size.width, cef_size.height);
|
||||
}
|
||||
|
||||
if (size.IsEmpty()) {
|
||||
LOG(ERROR) << "Empty size value returned in GetPdfPaperSize; "
|
||||
"PDF printing will fail.";
|
||||
LOG(ERROR) << "Empty size value returned in GetPdfPaperSize; PDF printing "
|
||||
"will fail.";
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
// static
|
||||
void CefPrintDialogLinux::OnPrintStart(CefRefPtr<CefBrowserHostBase> browser) {
|
||||
CEF_REQUIRE_UIT();
|
||||
@@ -146,14 +211,13 @@ void CefPrintDialogLinux::OnPrintStart(CefRefPtr<CefBrowserHostBase> browser) {
|
||||
}
|
||||
}
|
||||
|
||||
CefPrintDialogLinux::CefPrintDialogLinux(PrintingContextLinux* context)
|
||||
: context_(context) {
|
||||
CefPrintDialogLinux::CefPrintDialogLinux(PrintingContextLinux* context,
|
||||
CefRefPtr<CefBrowserHostBase> browser,
|
||||
CefRefPtr<CefPrintHandler> handler)
|
||||
: context_(context), browser_(browser), handler_(handler) {
|
||||
DCHECK(context_);
|
||||
browser_ = extensions::GetOwnerBrowserForGlobalId(
|
||||
frame_util::MakeGlobalId(context_->render_process_id(),
|
||||
context_->render_frame_id()),
|
||||
nullptr);
|
||||
DCHECK(browser_);
|
||||
DCHECK(handler_);
|
||||
}
|
||||
|
||||
CefPrintDialogLinux::~CefPrintDialogLinux() {
|
||||
@@ -161,7 +225,7 @@ CefPrintDialogLinux::~CefPrintDialogLinux() {
|
||||
// object because the PrintJobWorker which owns |context_| may already have
|
||||
// been deleted.
|
||||
CEF_REQUIRE_UIT();
|
||||
ReleaseHandler();
|
||||
handler_->OnPrintReset(browser_.get());
|
||||
}
|
||||
|
||||
void CefPrintDialogLinux::UseDefaultSettings() {
|
||||
@@ -179,12 +243,6 @@ void CefPrintDialogLinux::ShowDialog(
|
||||
PrintingContextLinux::PrintSettingsCallback callback) {
|
||||
CEF_REQUIRE_UIT();
|
||||
|
||||
SetHandler();
|
||||
if (!handler_.get()) {
|
||||
std::move(callback).Run(printing::mojom::ResultCode::kCanceled);
|
||||
return;
|
||||
}
|
||||
|
||||
callback_ = std::move(callback);
|
||||
|
||||
CefRefPtr<CefPrintDialogCallbackImpl> callback_impl(
|
||||
@@ -240,31 +298,11 @@ void CefPrintDialogLinux::ReleaseDialog() {
|
||||
Release();
|
||||
}
|
||||
|
||||
void CefPrintDialogLinux::SetHandler() {
|
||||
if (handler_.get())
|
||||
return;
|
||||
|
||||
if (browser_ && browser_->GetClient()) {
|
||||
handler_ = browser_->GetClient()->GetPrintHandler();
|
||||
}
|
||||
}
|
||||
|
||||
void CefPrintDialogLinux::ReleaseHandler() {
|
||||
if (handler_.get()) {
|
||||
handler_->OnPrintReset(browser_.get());
|
||||
handler_ = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
bool CefPrintDialogLinux::UpdateSettings(
|
||||
std::unique_ptr<PrintSettings> settings,
|
||||
bool get_defaults) {
|
||||
CEF_REQUIRE_UIT();
|
||||
|
||||
SetHandler();
|
||||
if (!handler_.get())
|
||||
return false;
|
||||
|
||||
CefRefPtr<CefPrintSettingsImpl> settings_impl(
|
||||
new CefPrintSettingsImpl(std::move(settings), false));
|
||||
handler_->OnPrintSettings(browser_.get(), settings_impl.get(), get_defaults);
|
||||
|
Reference in New Issue
Block a user