mirror of
https://github.com/electron/electron.git
synced 2026-01-09 15:38:08 -05:00
chore: bump chromium to 96.0.4647.0 (main) (#30814)
* chore: bump chromium in DEPS to 95.0.4630.0
* 3133701: Fix chrome root store codegen for cross-compile builds.
https://chromium-review.googlesource.com/c/chromium/src/+/3133701
* 49125: Include SHA512-256 in EVP_get_digestbyname and EVP_MD_do_all.
https://boringssl-review.googlesource.com/c/boringssl/+/49125
* chore: fixup patch indices
* 3131662: [Code Health] Remove ListValue::Append(Integer|Boolean)
https://chromium-review.googlesource.com/c/chromium/src/+/3131662
* chore: bump chromium in DEPS to 95.0.4631.0
* chore: update patches
* chore: bump chromium in DEPS to 95.0.4635.0
* chore: update patches
* chore: bump chromium in DEPS to 95.0.4636.0
* chore: bump chromium in DEPS to 95.0.4637.0
* chore: update patches
* refactor: move PlatformNotificationService into BrowserContext
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3137256
* refactor: ListValue::GetSize and ListValue::AppendString were removed
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3144540
* chore: bump chromium in DEPS to 95.0.4638.0
* chore: bump chromium in DEPS to 95.0.4638.4
* chore: bump chromium in DEPS to 96.0.4640.0
* chore: bump chromium in DEPS to 96.0.4641.0
* chore: bump chromium in DEPS to 96.0.4642.0
* chore: update patches
Co-authored-by: Michaela Laurencin <mlaurencin@electronjs.org>
* 3134756: Move extensions/browser/value_store to components/value_store.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3134756
* 3150092: [Autofill] Allow aligning Autofill suggestions to the field's center
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3150092
* chore: bump chromium in DEPS to 96.0.4643.0
* chore: update patches
* chore: bump chromium in DEPS to 96.0.4644.0
* chore: update patches
* chore: bump chromium in DEPS to 96.0.4645.0
* chore: update patches
* chore: bump chromium in DEPS to 96.0.4646.0
* chore: bump chromium in DEPS to 96.0.4647.0
* chore: update patches
Ref (for chromium): https://chromium-review.googlesource.com/c/chromium/src/+/3165772
* 3162087: Reland "Ensure Branch Target Identification is enabled for executable pages."
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3162087
* chore: update evert_add_inline_and_inline_origin_records_to_symbol_file.patch
Xref: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3166678
Xref: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3166674
* chore: update Allocator construction
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3135195
Change RefCount::kAllowed/Disallowed semantics into BackupRefPtr::kEnabled/Disabled
* chore: add UseConfigurablePool to v8::ArrayBuffer::Allocator invocation
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3090845
* chore: do not set network_context_params.context_name
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3155743
Remove name field from mojom::NetworkContext
* fix: use ForEachRenderFrameHost to iterate frames.
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3163336
New implementation partially cribbed from
https://source.chromium.org/chromium/chromium/src/+/main:extensions/browser/script_executor.cc;drc=f894f106c6d5fac8e0b75158f622256e0f34f593;l=109
* [Blink Cleanup] Remove WebLocalFrame::RequestExecuteScriptAndReturnValue()
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3149699
ExecuteJavaScript's RequestExecuteScript() new params are cribbed from
https://chromium-review.googlesource.com/c/chromium/src/+/3149699/4/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
* Remove IsDescendantOf API on RenderFrameHost.
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3165357
function is trivial to implement, so make a local copy in anon namespace
* Rewrite IsDescendantOf check to check GetParentOrOuterDocument.
https://chromium-review.googlesource.com/c/chromium/src/+/3160061
* Remove GetFramesInSubtree from RenderFrameHost
https://chromium-review.googlesource.com/c/chromium/src/+/3163336
* fix: dump_syms for macOS
* chore: update patches
* [Code Health] Remove ListValue::AppendString and ListValue::GetSize
https://chromium-review.googlesource.com/c/chromium/src/+/3144540
* fix: gn check
https://chromium-review.googlesource.com/c/chromium/src/+/3163890
* fix: crash with Isolate::GetHeapCodeAndMetadataStatistics
https://chromium-review.googlesource.com/c/v8/v8/+/3175820
* chore: update patches
* chore: fix windows build
* Add kPrintWithPostScriptType42Fonts feature.
https://chromium-review.googlesource.com/c/chromium/src/+/3150776
* chore: update patches
* chore: fix tests
* ozone/x11: fix VA-API.
https://chromium-review.googlesource.com/c/chromium/src/+/3141878
* Revert "ozone/x11: fix VA-API."
This reverts commit 23e742acb1.
* Reland "Make Ozone/X11 default."
https://chromium-review.googlesource.com/c/chromium/src/+/3114071
* fixup Reland "Make Ozone/X11 default."
* fixup Reland "Make Ozone/X11 default." for clipboard
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: Michaela Laurencin <mlaurencin@electronjs.org>
Co-authored-by: VerteDinde <keeleymhammond@gmail.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
This commit is contained in:
committed by
GitHub
parent
959b657903
commit
cc01272a8d
@@ -67,7 +67,7 @@ index 55cc762b92193ed3f65b4d0b562202869530e1ac..d4c2a4e49eb469d3e2278fdc972c0aed
|
||||
}
|
||||
#endif
|
||||
diff --git a/chrome/browser/net/proxy_config_monitor.h b/chrome/browser/net/proxy_config_monitor.h
|
||||
index abffb6dbdbf730e2cc4423eaca6a9a8a9f8af582..7fe1badcdebebce9028825ac98d7ab6cfa65dcdd 100644
|
||||
index 920a956bce5a24c511df293f4156e33c2455e911..413f8f17ff98038ee4b5dc5dd085257009e7b6bb 100644
|
||||
--- a/chrome/browser/net/proxy_config_monitor.h
|
||||
+++ b/chrome/browser/net/proxy_config_monitor.h
|
||||
@@ -40,11 +40,12 @@ class ProxyConfigMonitor : public net::ProxyConfigService::Observer,
|
||||
@@ -84,12 +84,12 @@ index abffb6dbdbf730e2cc4423eaca6a9a8a9f8af582..7fe1badcdebebce9028825ac98d7ab6c
|
||||
// Creates a ProxyConfigMonitor that gets proxy settings from the
|
||||
// |local_state|, for use with NetworkContexts not
|
||||
// associated with a profile. Must be destroyed before |local_state|.
|
||||
@@ -91,7 +92,7 @@ class ProxyConfigMonitor : public net::ProxyConfigService::Observer,
|
||||
@@ -94,7 +95,7 @@ class ProxyConfigMonitor : public net::ProxyConfigService::Observer,
|
||||
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
mojo::ReceiverSet<network::mojom::ProxyErrorClient> error_receiver_set_;
|
||||
- Profile* profile_ = nullptr;
|
||||
+ // Profile* profile_ = nullptr;
|
||||
#endif
|
||||
};
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(ProxyConfigMonitor);
|
||||
|
||||
Reference in New Issue
Block a user