chore: bump chromium to 138.0.7160.0 (main) (#46915)
* chore: bump chromium in DEPS to 138.0.7158.0 * chore: bump chromium in DEPS to 138.0.7160.0 * 6509206: Move Keychain UI suppression code into apple_keychain.cc https://chromium-review.googlesource.com/c/chromium/src/+/6509206 * 6489036: Fix DesktopDataControlsDialog for Glic https://chromium-review.googlesource.com/c/chromium/src/+/6489036 * chore: fixup patch indices * 6506662: Reland "NavigationThrottleRunner2: content::NavigationThrottleRegistry" https://chromium-review.googlesource.com/c/chromium/src/+/6506662 * 6499811: [video pip] Add live caption dialog https://chromium-review.googlesource.com/c/chromium/src/+/6499811 * 6487926: Add GetMaxImageDimension function to ScreenAI service API for OCR. https://chromium-review.googlesource.com/c/chromium/src/+/6487926 * 6494942: [json] Activate stringify fast-path by default https://chromium-review.googlesource.com/c/v8/v8/+/6494942 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
parent
9460300506
commit
b90de7d07e
37 changed files with 164 additions and 103 deletions
|
@ -7,10 +7,10 @@ Allows embedders to get a handle to the gdk_pixbuf
|
|||
library already loaded in the process.
|
||||
|
||||
diff --git a/ui/gtk/gtk_compat.cc b/ui/gtk/gtk_compat.cc
|
||||
index f28cf275db0205186fe6143b7e1550b6c30a4435..346992e202c507eeac454d657507e1bd336175fc 100644
|
||||
index 946eb3eef6b0c546ace65de0c7f14b4642208090..9c9a35d439602ea3612ed648931990ec224c8799 100644
|
||||
--- a/ui/gtk/gtk_compat.cc
|
||||
+++ b/ui/gtk/gtk_compat.cc
|
||||
@@ -69,11 +69,6 @@ void* GetLibGio() {
|
||||
@@ -70,11 +70,6 @@ void* GetLibGio() {
|
||||
return libgio;
|
||||
}
|
||||
|
||||
|
@ -22,7 +22,7 @@ index f28cf275db0205186fe6143b7e1550b6c30a4435..346992e202c507eeac454d657507e1bd
|
|||
void* GetLibGdk3() {
|
||||
static void* libgdk3 = DlOpen("libgdk-3.so.0");
|
||||
return libgdk3;
|
||||
@@ -150,6 +145,11 @@ gfx::Insets InsetsFromGtkBorder(const GtkBorder& border) {
|
||||
@@ -170,6 +165,11 @@ gfx::Insets InsetsFromGtkBorder(const GtkBorder& border) {
|
||||
|
||||
} // namespace
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue