mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
chore: bump chromium to 87.0.4280.40 (11-x-y) (#26280)
* chore: bump chromium in DEPS to 87.0.4280.40 * update patches Co-authored-by: Electron Bot <anonymous@electronjs.org>
This commit is contained in:
2
DEPS
2
DEPS
@@ -14,7 +14,7 @@ gclient_gn_args = [
|
||||
|
||||
vars = {
|
||||
'chromium_version':
|
||||
'87.0.4280.27',
|
||||
'87.0.4280.40',
|
||||
'node_version':
|
||||
'v12.18.3',
|
||||
'nan_version':
|
||||
|
||||
@@ -7,7 +7,7 @@ spellchecker uses a few IDS_ resources. We need to load these from
|
||||
Electrons grit header instead of Chromes
|
||||
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
index 7e37891fc3d551d36d5949ed5865bd6cf4800215..9ea8f5d90f23b7255ef17f505f2b746f2f098e26 100644
|
||||
index b41fce646b16e51ccfdcc6fef68d2f29195a24f2..f76896877ae828a6fa7901507a62491188b5cd2d 100644
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -5955,6 +5955,7 @@ static_library("browser") {
|
||||
|
||||
@@ -14,10 +14,10 @@ Bug: 1142017
|
||||
Change-Id: I8449b72ba3a36e7ce69b9d9ec7768bd80ecc3e3a
|
||||
|
||||
diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn
|
||||
index a07040de159b5a060c30cc5d9b16c82686f12363..c616d7cd872349d8ead7d6605b437d7330a22034 100644
|
||||
index 169a790b48dd6a76b59bc17c94871e23499bd6fb..3dbca6cfba89ffbbddb23832a090c4ca5a2323b6 100644
|
||||
--- a/android_webview/BUILD.gn
|
||||
+++ b/android_webview/BUILD.gn
|
||||
@@ -792,7 +792,7 @@ if (android_64bit_target_cpu) {
|
||||
@@ -790,7 +790,7 @@ if (android_64bit_target_cpu) {
|
||||
"32-bit targets shouldn't have secondary abi")
|
||||
arch_suffix = "32"
|
||||
if (use_v8_context_snapshot) {
|
||||
|
||||
@@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
|
||||
Patch to make scrollBounce option work.
|
||||
|
||||
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
||||
index 91daa69bf55a0e3bcc0b67699b975efcba91aaa9..78b72a1a138077fea7555e960f84bce706b22352 100644
|
||||
index 6fae8670bf01df2bde39ddbfa0ee515453fc8c0b..89129af39c4f3e9cacca5f78b2682b96cd341d09 100644
|
||||
--- a/content/renderer/render_thread_impl.cc
|
||||
+++ b/content/renderer/render_thread_impl.cc
|
||||
@@ -1318,7 +1318,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
|
||||
@@ -1314,7 +1314,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
|
||||
}
|
||||
|
||||
bool RenderThreadImpl::IsElasticOverscrollEnabled() {
|
||||
|
||||
Reference in New Issue
Block a user