github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-10 07:58:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: fix main printing patch conflict (#44302)

Browse Source 
build: update patches
This commit is contained in:
Keeley Hammond
2024-10-17 11:29:04 -04:00
committed by GitHub
parent 9280add5b4
commit ac09d11ed1
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/chromium/printing.patch
View File

@@ -926,23 +926,3 @@ index 1e15568ad872c01c7c588ced81897f8dc229247a..ca528863a2dab2f437bbe95b343ccd33
namespace sandbox::policy {
base::FilePath GetCanonicalPath(const base::FilePath& path) {
diff --git a/ui/gtk/gtk_util.cc b/ui/gtk/gtk_util.cc
index d86fbcf969f2fa0d176ead903703ab612e5464c2..6b963ea8401d20e655d068a69105586814bab320 100644
--- a/ui/gtk/gtk_util.cc
+++ b/ui/gtk/gtk_util.cc
@@ -227,9 +227,13 @@ aura::Window* GetAuraTransientParent(GtkWidget* dialog) {
}
void ClearAuraTransientParent(GtkWidget* dialog, aura::Window* parent) {
+ if (!parent || !parent->GetHost()) {
+ return;
+ }
+
g_object_set_data(G_OBJECT(dialog), kAuraTransientParent, nullptr);
- GtkUi::GetPlatform()->ClearTransientFor(
- parent->GetHost()->GetAcceleratedWidget());
+ gfx::AcceleratedWidget parent_id = parent->GetHost()->GetAcceleratedWidget();
+ GtkUi::GetPlatform()->ClearTransientFor(parent_id);
}
base::OnceClosure DisableHostInputHandling(GtkWidget* dialog,