mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
chore: bump chromium to 122.0.6261.6 (main) (#40949)
* chore: bump chromium in DEPS to 122.0.6239.2 * chore: update patches * refactor: extensions replaced StringPiece with string_view Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5171926 * chore: bump chromium in DEPS to 122.0.6240.0 * chore: update patches * chore: bump chromium in DEPS to 122.0.6241.5 * chore: bump chromium in DEPS to 122.0.6245.0 * chore: bump chromium in DEPS to 122.0.6247.0 * chore: bump chromium in DEPS to 122.0.6249.0 * chore: bump chromium in DEPS to 122.0.6251.0 * 5192010: Rename {absl => std}::optional in //chrome/ https://chromium-review.googlesource.com/c/chromium/src/+/5192010 * 5109767: CodeHealth: Fix leaked raw_ptr in Linux ProcessSingleton https://chromium-review.googlesource.com/c/chromium/src/+/5109767 * 5105227: [media_preview] Show requested device in permission bubble https://chromium-review.googlesource.com/c/chromium/src/+/5105227 * chore: bump chromium in DEPS to 122.0.6253.0 * chore: update patches * 5180720: Polish tiled browser window UI on Linux | https://chromium-review.googlesource.com/c/chromium/src/+/5180720 * chore: update patches * chore: bump chromium in DEPS to 122.0.6255.0 * chore: update patches * 5186276: [autopip] Make "allow once" per navigation | https://chromium-review.googlesource.com/c/chromium/src/+/5186276 * chore: bump chromium in DEPS to 122.0.6257.0 * chore: bump chromium in DEPS to 122.0.6259.0 * chore: update patches * 5190661: Automated T* -> raw_ptr<T> rewrite "refresh" | https://chromium-review.googlesource.com/c/chromium/src/+/5190661 * 5206106: Make sure RenderFrameHosts are active when printing | https://chromium-review.googlesource.com/c/chromium/src/+/5206106 * 5202674: Reland "Automated T* -> raw_ptr<T> rewrite 'refresh'" https://chromium-review.googlesource.com/c/chromium/src/+/5202674 * fixup CodeHealth: Fix leaked raw_ptr in Linux ProcessSingleton https://chromium-review.googlesource.com/c/chromium/src/+/5109767 * fixup 5206106: Make sure RenderFrameHosts are active when printing * Make legacy ToV8() helpers private to ScriptPromiseResolver, their only user https://chromium-review.googlesource.com/c/chromium/src/+/5207474 * fixup CodeHealth: Fix leaked raw_ptr in Linux ProcessSingleton * fixup 5186276: [autopip] Make "allow once" per navigation https://chromium-review.googlesource.com/c/chromium/src/+/5186276 * chore: update patches after rebase * chore: bump chromium in DEPS to 122.0.6260.0 * 5191363: Mark LOG(FATAL) [[noreturn]] https://chromium-review.googlesource.com/c/chromium/src/+/5191363 * fixup 5186276: [autopip] Make "allow once" per navigation https://chromium-review.googlesource.com/c/chromium/src/+/5186276 * fixup Make legacy ToV8() helpers private to ScriptPromiseResolver https://chromium-review.googlesource.com/c/chromium/src/+/5207474 * chore: update patches * chore: bump chromium in DEPS to 122.0.6261.0 * chore: update patches * chore: restore patch that was mistakenly removed * 5181931: Improve LoginHandler (Part 9 / N) https://chromium-review.googlesource.com/c/chromium/src/+/5181931 * Dispatch SiteInstanceGotProcess() only when both process and site are set. https://chromium-review.googlesource.com/c/chromium/src/+/5142354 * 5171446: [AsyncSB] Pass navigation_id into CreateURLLoaderThrottles https://chromium-review.googlesource.com/c/chromium/src/+/5171446 * 5213708: Move DownloadTargetInfo into components/download https://chromium-review.googlesource.com/c/chromium/src/+/5213708 * extensions: Add a loader for Controlled Frame embedder scripts https://chromium-review.googlesource.com/c/chromium/src/+/5202765 * [CSC][Zoom] Add initial_zoom_level to DisplayMediaInformation https://chromium-review.googlesource.com/c/chromium/src/+/5168626 * chore: bump chromium in DEPS to 123.0.6262.0 * chore: bump chromium in DEPS to 122.0.6261.6 * fix: suppress clang -Wimplicit-const-int-float-conversion * fixup 5191363: Mark LOG(FATAL) [[noreturn]] for Windows https://chromium-review.googlesource.com/c/chromium/src/+/5191363 * 5167921: Remove Widget::IsTranslucentWindowOpacitySupported https://chromium-review.googlesource.com/c/chromium/src/+/5167921 Also 5148392: PinnedState: Support pinned state in PlatformWindowState | https://chromium-review.googlesource.com/c/chromium/src/+/5148392 * fixup: 5180720: Polish tiled browser window UI on Linux https://chromium-review.googlesource.com/c/chromium/src/+/5180720 * 5170669: clipboard: Migrate DOMException constructors to RejectWith- https://chromium-review.googlesource.com/c/chromium/src/+/5170669 * 5178824: [Fullscreen] Record UKM data https://chromium-review.googlesource.com/c/chromium/src/+/5178824 * chore: update patches after rebase --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
committed by
GitHub
parent
921da723b8
commit
1a0991a9b9
@@ -27,7 +27,7 @@ void Log(int severity, std::string text) {
|
||||
break;
|
||||
case logging::LOGGING_FATAL:
|
||||
LOG(FATAL) << text;
|
||||
break;
|
||||
// break not needed here because LOG(FATAL) is [[noreturn]]
|
||||
default:
|
||||
LOG(ERROR) << "Unrecognized severity: " << severity;
|
||||
break;
|
||||
|
||||
@@ -146,7 +146,6 @@ bool FillFileInfoWithNode(Archive::FileInfo* info,
|
||||
|
||||
if (!info->integrity.has_value()) {
|
||||
LOG(FATAL) << "Failed to read integrity for file in ASAR archive";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -246,7 +245,6 @@ bool Archive::Init() {
|
||||
if (!integrity.has_value()) {
|
||||
LOG(FATAL) << "Failed to get integrity for validatable asar archive: "
|
||||
<< RelativePath().value();
|
||||
return false;
|
||||
}
|
||||
|
||||
// Currently we only support the sha256 algorithm, we can add support for
|
||||
|
||||
@@ -27,7 +27,6 @@ std::optional<base::FilePath> Archive::RelativePath() const {
|
||||
base::FilePath exe_path;
|
||||
if (!base::PathService::Get(base::FILE_EXE, &exe_path)) {
|
||||
LOG(FATAL) << "Couldn't get exe file path";
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
base::FilePath relative_path;
|
||||
@@ -59,13 +58,11 @@ LoadIntegrityConfigCache() {
|
||||
kIntegrityCheckResourceType);
|
||||
if (!resource) {
|
||||
PLOG(FATAL) << "FindResource failed.";
|
||||
return *integrity_config_cache;
|
||||
}
|
||||
|
||||
HGLOBAL rcData = ::LoadResource(module_handle, resource);
|
||||
if (!rcData) {
|
||||
PLOG(FATAL) << "LoadResource failed.";
|
||||
return *integrity_config_cache;
|
||||
}
|
||||
|
||||
auto* res_data = static_cast<const char*>(::LockResource(rcData));
|
||||
@@ -73,12 +70,10 @@ LoadIntegrityConfigCache() {
|
||||
|
||||
if (!res_data) {
|
||||
PLOG(FATAL) << "Failed to integrity config from exe resource.";
|
||||
return *integrity_config_cache;
|
||||
}
|
||||
|
||||
if (!res_size) {
|
||||
PLOG(FATAL) << "Unexpected empty integrity config from exe resource.";
|
||||
return *integrity_config_cache;
|
||||
}
|
||||
|
||||
// Parse integrity config payload
|
||||
@@ -88,13 +83,11 @@ LoadIntegrityConfigCache() {
|
||||
|
||||
if (!root.has_value()) {
|
||||
LOG(FATAL) << "Invalid integrity config: NOT a valid JSON.";
|
||||
return *integrity_config_cache;
|
||||
}
|
||||
|
||||
const base::Value::List* file_configs = root.value().GetIfList();
|
||||
if (!file_configs) {
|
||||
LOG(FATAL) << "Invalid integrity config: NOT a list.";
|
||||
return *integrity_config_cache;
|
||||
}
|
||||
|
||||
// Parse each individual file integrity config
|
||||
@@ -157,7 +150,6 @@ std::optional<IntegrityPayload> Archive::HeaderIntegrity() const {
|
||||
auto iter = integrity_config.value().find(rel_path_utf8);
|
||||
if (iter == integrity_config.value().end()) {
|
||||
LOG(FATAL) << "Failed to find file integrity info for " << rel_path_utf8;
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
return iter->second;
|
||||
|
||||
@@ -88,7 +88,7 @@ bool ElectronExtensionsAPIProvider::IsAPISchemaGenerated(
|
||||
return extensions::api::ElectronGeneratedSchemas::IsGenerated(name);
|
||||
}
|
||||
|
||||
base::StringPiece ElectronExtensionsAPIProvider::GetAPISchema(
|
||||
std::string_view ElectronExtensionsAPIProvider::GetAPISchema(
|
||||
const std::string& name) {
|
||||
return extensions::api::ElectronGeneratedSchemas::Get(name);
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ class ElectronExtensionsAPIProvider : public extensions::ExtensionsAPIProvider {
|
||||
void AddAPIJSONSources(
|
||||
extensions::JSONFeatureProviderSource* json_source) override;
|
||||
bool IsAPISchemaGenerated(const std::string& name) override;
|
||||
base::StringPiece GetAPISchema(const std::string& name) override;
|
||||
std::string_view GetAPISchema(const std::string& name) override;
|
||||
void RegisterPermissions(
|
||||
extensions::PermissionsInfo* permissions_info) override;
|
||||
void RegisterManifestHandlers() override;
|
||||
|
||||
Reference in New Issue
Block a user