chore: bump chromium to 132.0.6783.0 (34-x-y) (#44319)
* chore: bump chromium in DEPS to 132.0.6782.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 132.0.6783.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: update patches --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
parent
e76a504d10
commit
bc8e80a1f5
16 changed files with 49 additions and 69 deletions
|
@ -860,10 +860,10 @@ index 9c91fdf50b38ad437279eaada4359a7a95911d07..8eed4887949d0c30f067d86aaa971ee5
|
|||
ScriptingThrottler scripting_throttler_;
|
||||
|
||||
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
||||
index 325d64062663ee217d575b483186f791241be993..c468cd434538da0119021b6b955807852e8e5d9b 100644
|
||||
index 88aab428d5fe1daf747216545e8d176a2be90842..edd5a0c6d690d8e9aa9d649b3c130722c2779e7c 100644
|
||||
--- a/content/browser/BUILD.gn
|
||||
+++ b/content/browser/BUILD.gn
|
||||
@@ -3001,8 +3001,9 @@ source_set("browser") {
|
||||
@@ -2998,8 +2998,9 @@ source_set("browser") {
|
||||
"//ppapi/shared_impl",
|
||||
]
|
||||
|
||||
|
@ -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,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue