Browse Source

build: fix main printing patch conflict (#44302)

build: update patches
Keeley Hammond 6 months ago
parent
commit
ac09d11ed1
1 changed files with 0 additions and 20 deletions
  1. 0 20
      patches/chromium/printing.patch

+ 0 - 20
patches/chromium/printing.patch

@@ -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,