mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: use default printing path when no user options (#46587)

Browse source
This commit is contained in:
Shelley Vohr 2025-04-11 16:14:29 +02:00 • committed by GitHub
parent 74d641c7b3
commit 3064b24c9d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 34 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
shell/browser/api/electron_api_web_contents.cc
View file

@ -2944,9 +2944,8 @@ void OnGetDeviceNameToUse(base::WeakPtr<content::WebContents> web_contents,
return;
}
// If the user has passed a deviceName use it, otherwise use default printer.
// Use user-passed deviceName, otherwise default printer.
print_settings.Set(printing::kSettingDeviceName, info.second);
if (!print_settings.FindInt(printing::kSettingDpiHorizontal)) {
gfx::Size dpi = GetDefaultPrinterDPI(info.second);
print_settings.Set(printing::kSettingDpiHorizontal, dpi.width());
@ -3005,6 +3004,17 @@ void WebContents::Print(gin::Arguments* args) {
return;
}
if (options.IsEmptyObject()) {
auto* print_view_manager =
PrintViewManagerElectron::FromWebContents(web_contents());
if (!print_view_manager)
return;
content::RenderFrameHost* rfh = GetRenderFrameHostToUse(web_contents());
print_view_manager->PrintNow(rfh, std::move(settings), std::move(callback));
return;
}
// Set optional silent printing.
bool silent = false;
options.Get("silent", &silent);

10
shell/common/gin_helper/dictionary.h
View file

@ -183,6 +183,16 @@ class Dictionary : public gin::Dictionary {
bool IsEmpty() const { return isolate() == nullptr || GetHandle().IsEmpty(); }
bool IsEmptyObject() const {
if (IsEmpty())
return true;
v8::Local<v8::Context> context = isolate()->GetCurrentContext();
v8::Local<v8::Array> props =
GetHandle()->GetOwnPropertyNames(context).ToLocalChecked();
return props->Length() == 0;
}
v8::Local<v8::Object> GetHandle() const {
return gin::ConvertToV8(isolate(),
*static_cast<const gin::Dictionary*>(this))