mirror of
https://github.com/electron/electron.git
synced 2026-01-09 23:48:01 -05:00
chore: bump chromium to 136.0.7064.0 (main) (#45985)
* chore: bump chromium in DEPS to 136.0.7063.0 * chore: bump chromium in DEPS to 136.0.7064.0 * 6169919: Instantiate Linux (or CrOS) system fonts using Fontations Refs https://chromium-review.googlesource.com/c/chromium/src/+/6169919 * 6341209: Remove file-wide unsafe buffer suppression from content/ [1 of N]. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6341209 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
This commit is contained in:
committed by
GitHub
parent
c813bc2a92
commit
962d8b325a
@@ -233,10 +233,10 @@ index 2991489fae8a4eecad97b1ecb2271f096d9a9229..93b7aa620ad1da250ac06e3383ca6897
|
||||
}
|
||||
|
||||
diff --git a/content/common/features.cc b/content/common/features.cc
|
||||
index b6c032770c004363bded8f7c96a3c7e57d8adb7f..63789d8f1509f350697cd4703c835dd9f06fc203 100644
|
||||
index 31484e57bd0989af7a2e9584bbd430cdfa713346..fdb5e8f5f395b128c1c5300b94a50f693d6b52e1 100644
|
||||
--- a/content/common/features.cc
|
||||
+++ b/content/common/features.cc
|
||||
@@ -255,6 +255,14 @@ BASE_FEATURE(kIOSurfaceCapturer,
|
||||
@@ -261,6 +261,14 @@ BASE_FEATURE(kIOSurfaceCapturer,
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
#endif
|
||||
|
||||
@@ -252,10 +252,10 @@ index b6c032770c004363bded8f7c96a3c7e57d8adb7f..63789d8f1509f350697cd4703c835dd9
|
||||
// invalidated upon notifications sent by base::SystemMonitor. If disabled, the
|
||||
// cache is considered invalid on every enumeration request.
|
||||
diff --git a/content/common/features.h b/content/common/features.h
|
||||
index 7f17700db960cf799b0dffd79a734db236efcc61..95aae28d7cf4794fc0beb1d3b8cadf5947405c5d 100644
|
||||
index 906c0da9313ac0272f5e5a79ef797de596804cfb..94b63dfe1235b7643e29926edd2c27c447302b35 100644
|
||||
--- a/content/common/features.h
|
||||
+++ b/content/common/features.h
|
||||
@@ -67,6 +67,9 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kInterestGroupUpdateIfOlderThan);
|
||||
@@ -68,6 +68,9 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kInterestGroupUpdateIfOlderThan);
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
CONTENT_EXPORT BASE_DECLARE_FEATURE(kIOSurfaceCapturer);
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user