mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 133.0.6878.0 (main) (#44831)

Browse source 
* chore: bump chromium in DEPS to 133.0.6858.0

* chore: bump chromium in DEPS to 133.0.6860.0

* chore: update patches

v8/revert_fastapi_remove_dynamic_overload_resolution.patch had some additions due to 6023139

* 6044060: Reland "Moves shared GN templates into //build/config/apple."
6044060

* Revert "6023139: [fastapi] Add support for attribute setters"
6023139

* Update printing.patch

The removed include is present in the original source file now, just slightly before where it was being added.

6015430: Reduce platform-like buildflags in sandbox code
Refs: 6015430

* 6039836: Migrate Command::IsMediaKey to be a member of ui::Accelerator
6039836

* 6038659: [CodeHealth] Clean up the feature ZstdContentEncoding
6038659

* chore: bump chromium in DEPS to 133.0.6862.0

* chore: update patches

* 72747: crypto: switch to C++
https://boringssl-review.googlesource.com/c/boringssl/+/72747

* fixup! 72747: crypto: switch to C++ https://boringssl-review.googlesource.com/c/boringssl/+/72747

* chore: gen libc++ filenames

* 6042601: [shared storage] Implement with_lock option for methods from response headers
6042601

* chore: bump chromium in DEPS to 133.0.6864.0

* chore: bump chromium in DEPS to 133.0.6866.0

* chore: bump chromium in DEPS to 133.0.6868.0

* chore: bump chromium in DEPS to 133.0.6870.0

* chore: bump chromium in DEPS to 133.0.6872.0

* chore: bump chromium in DEPS to 133.0.6874.0

* chore: bump chromium in DEPS to 133.0.6876.0

* 6039992: Fix false activation logic for context menu. | 6039992

* chore: update patches

* chore: update patches

* chore: bump chromium in DEPS to 133.0.6878.0

* chore: update patches

* [Build] Organize //components/dbus into a single component

Xref: 6055280

* Merge //components/dbus/* into a single //components/dbus, which
  matches how most components are organized. This avoids having
  many small shared libraries which incurs unnecessary overhead.
* Limit visibility of //components/dbus/* to //components/dbus

* fixup! Update _LIBCPP_ABI_VERSION to always have a default value while keeping unstable false due to changes in llvm https://github.com/llvm/llvm-project/pull/112094

* 6040416: Let s know which widget the input came on. | 6040416

* 6056267: [MPArch guest view] Fix authentication for MPArch guests | 6056267

* make_span() is deprecated: https://issues.chromium.org/issues/341907909

* fixup: https://issues.chromium.org/issues/341907909

* chore: delete extra bracket from removing make_span commit

* fixup: 6059305: Make WTF::UTF8ConversionMode a scoped enum | 6059305

* 6051058: CookieInclusionStatus: Remove ctors which bypass invariants | 6051058

* 6038981: Remove most remaining CHECK(false)s | 6038981

* build: use third_party/simdutf in Node.js

* chore: node ./script/gen-libc++-filenames.js

* chore: fix strict-cast conversion error in subspan()

Xref: 6044946

* chore: fix strict-cast conversion error in base::as_bytes()

Xref: 6044946

* chore: fix strict-cast conversion error in span.split_at()

Xref: 6044946

* chore: use shorthand target name

* chore: better docs in build_add_public_config_simdutf_config.patch

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: alice <alice@makenotion.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
electron-roller[bot] 2024-12-10 13:16:07 -06:00 • committed by GitHub
parent 3bd5f14cee
commit cf5a4640f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
104 changed files with 983 additions and 656 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell/app/electron_library_main.mm
View file

@ -11,6 +11,7 @@
#include "base/at_exit.h"
#include "base/command_line.h"
#include "base/i18n/icu_util.h"
#include "base/notreached.h"
#include "content/public/app/content_main.h"
#include "electron/fuses.h"
#include "shell/app/electron_main_delegate.h"
@ -37,8 +38,7 @@ int ElectronMain(int argc, char* argv[]) {
int ElectronInitializeICUandStartNode(int argc, char* argv[]) {
if (!electron::fuses::IsRunAsNodeEnabled()) {
CHECK(false) << "run_as_node fuse is disabled";
return 1;
NOTREACHED() << "run_as_node fuse is disabled";
}
argv = uv_setup_args(argc, argv);

2
shell/browser/api/electron_api_app.cc
View file

@ -474,7 +474,7 @@ void OnClientCertificateSelected(
return;
auto certs = net::X509Certificate::CreateCertificateListFromBytes(
base::as_bytes(base::make_span(data)), net::X509Certificate::FORMAT_AUTO);
base::as_byte_span(data), net::X509Certificate::FORMAT_AUTO);
if (!certs.empty()) {
scoped_refptr<net::X509Certificate> cert(certs[0].get());
for (auto& identity : *identities) {

14
shell/browser/api/electron_api_cookies.cc
View file

@ -385,9 +385,11 @@ v8::Local<v8::Promise> Cookies::Set(v8::Isolate* isolate,
GURL url(url_string ? *url_string : "");
if (!url.is_valid()) {
net::CookieInclusionStatus cookie_inclusion_status;
cookie_inclusion_status.AddExclusionReason(
net::CookieInclusionStatus::ExclusionReason::EXCLUDE_INVALID_DOMAIN);
promise.RejectWithErrorMessage(
InclusionStatusToString(net::CookieInclusionStatus(
net::CookieInclusionStatus::EXCLUDE_INVALID_DOMAIN)));
InclusionStatusToString(cookie_inclusion_status));
return handle;
}
@ -401,11 +403,11 @@ v8::Local<v8::Promise> Cookies::Set(v8::Isolate* isolate,
&status);
if (!canonical_cookie || !canonical_cookie->IsCanonical()) {
net::CookieInclusionStatus cookie_inclusion_status;
cookie_inclusion_status.AddExclusionReason(
net::CookieInclusionStatus::ExclusionReason::EXCLUDE_FAILURE_TO_STORE);
promise.RejectWithErrorMessage(InclusionStatusToString(
!status.IsInclude()
? status
: net::CookieInclusionStatus(
net::CookieInclusionStatus::EXCLUDE_FAILURE_TO_STORE)));
!status.IsInclude() ? status : cookie_inclusion_status));
return handle;
}

3
shell/browser/api/electron_api_debugger.cc Executable file → Normal file
View file

@ -162,8 +162,7 @@ v8::Local<v8::Promise> Debugger::SendCommand(gin::Arguments* args) {
}
const auto json_args = base::WriteJson(request).value_or("");
agent_host_->DispatchProtocolMessage(
this, base::as_bytes(base::make_span(json_args)));
agent_host_->DispatchProtocolMessage(this, base::as_byte_span(json_args));
return handle;
}

12
shell/browser/api/electron_api_global_shortcut.cc
View file

@ -28,15 +28,14 @@ namespace {
#if BUILDFLAG(IS_MAC)
bool RegisteringMediaKeyForUntrustedClient(const ui::Accelerator& accelerator) {
return Command::IsMediaKey(accelerator) &&
return accelerator.IsMediaKey() &&
!electron::api::SystemPreferences::IsTrustedAccessibilityClient(false);
}
bool MapHasMediaKeys(
const std::map<ui::Accelerator, base::RepeatingClosure>& accelerator_map) {
return std::ranges::any_of(accelerator_map, [](const auto& ac) {
return Command::IsMediaKey(ac.first);
});
return std::ranges::any_of(
accelerator_map, [](const auto& ac) { return ac.first.IsMediaKey(); });
}
#endif
@ -96,7 +95,7 @@ bool GlobalShortcut::Register(const ui::Accelerator& accelerator,
return false;
}
#if BUILDFLAG(IS_MAC)
if (Command::IsMediaKey(accelerator)) {
if (accelerator.IsMediaKey()) {
if (RegisteringMediaKeyForUntrustedClient(accelerator))
return false;
@ -123,8 +122,7 @@ void GlobalShortcut::Unregister(const ui::Accelerator& accelerator) {
return;
#if BUILDFLAG(IS_MAC)
if (Command::IsMediaKey(accelerator) &&
!MapHasMediaKeys(accelerator_callback_map_)) {
if (accelerator.IsMediaKey() && !MapHasMediaKeys(accelerator_callback_map_)) {
GlobalShortcutListener::SetShouldUseInternalMediaKeyHandling(true);
}
#endif

3
shell/browser/api/electron_api_web_contents.cc
View file

@ -3833,7 +3833,8 @@ void WebContents::PDFReadyToPrint() {
Emit("-pdf-ready-to-print");
}
void WebContents::OnInputEvent(const blink::WebInputEvent& event) {
void WebContents::OnInputEvent(const content::RenderWidgetHost& rfh,
const blink::WebInputEvent& event) {
Emit("input-event", event);
}

3
shell/browser/api/electron_api_web_contents.h
View file

@ -464,7 +464,8 @@ class WebContents final : public ExclusiveAccessContext,
void SetImageAnimationPolicy(const std::string& new_policy);
// content::RenderWidgetHost::InputEventObserver:
void OnInputEvent(const blink::WebInputEvent& event) override;
void OnInputEvent(const content::RenderWidgetHost& rfh,
const blink::WebInputEvent& event) override;
// content::JavaScriptDialogManager:
void RunJavaScriptDialog(content::WebContents* web_contents,

4
shell/browser/electron_browser_client.cc
View file

@ -19,6 +19,7 @@
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/no_destructor.h"
#include "base/notreached.h"
#include "base/path_service.h"
#include "base/process/process_metrics.h"
#include "base/strings/escape.h"
@ -485,7 +486,7 @@ void ElectronBrowserClient::AppendExtraCommandLineSwitches(
}
#else
if (!base::PathService::Get(content::CHILD_PROCESS_EXE, &child_path)) {
CHECK(false) << "Unable to get child process binary name.";
NOTREACHED() << "Unable to get child process binary name.";
}
SCOPED_CRASH_KEY_STRING256("ChildProcess", "child_process_exe",
child_path.AsUTF8Unsafe());
@ -1653,6 +1654,7 @@ ElectronBrowserClient::CreateLoginDelegate(
const GURL& url,
scoped_refptr<net::HttpResponseHeaders> response_headers,
bool first_auth_attempt,
content::GuestPageHolder* guest_page_holder,
LoginAuthRequiredCallback auth_required_callback) {
return std::make_unique<LoginHandler>(
auth_info, web_contents, is_request_for_primary_main_frame,

1
shell/browser/electron_browser_client.h
View file

@ -289,6 +289,7 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
const GURL& url,
scoped_refptr<net::HttpResponseHeaders> response_headers,
bool first_auth_attempt,
content::GuestPageHolder* guest_page_holder,
LoginAuthRequiredCallback auth_required_callback) override;
void SiteInstanceGotProcessAndSite(
content::SiteInstance* site_instance) override;

10
shell/browser/net/asar/asar_file_validator.cc
View file

@ -12,6 +12,7 @@
#include "base/containers/span.h"
#include "base/logging.h"
#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "crypto/sha2.h"
@ -37,8 +38,7 @@ void AsarFileValidator::EnsureBlockHashExists() {
current_hash_ = crypto::SecureHash::Create(crypto::SecureHash::SHA256);
break;
case HashAlgorithm::kNone:
CHECK(false);
break;
NOTREACHED();
}
}
@ -50,7 +50,8 @@ void AsarFileValidator::OnRead(base::span<char> buffer,
// |buffer| contains the read buffer. |result->bytes_read| is the actual
// bytes number that |source| read that should be less than buffer.size().
auto hashme = base::as_bytes(buffer.subspan(0U, result->bytes_read));
auto hashme = base::as_bytes(
buffer.subspan(0U, static_cast<size_t>(result->bytes_read)));
while (!std::empty(hashme)) {
if (current_block_ > max_block_)
@ -60,7 +61,8 @@ void AsarFileValidator::OnRead(base::span<char> buffer,
// hash as many bytes as will fit in the current block.
const auto n_left_in_block = block_size - current_hash_byte_count_;
const auto n_now = std::min(n_left_in_block, uint64_t{std::size(hashme)});
const auto n_now =
std::min(static_cast<size_t>(n_left_in_block), std::size(hashme));
DCHECK_GT(n_now, 0U);
const auto [hashme_now, hashme_next] = hashme.split_at(n_now);

4
shell/browser/net/asar/asar_url_loader.cc
View file

@ -202,7 +202,7 @@ class AsarURLLoader : public network::mojom::URLLoader {
}
}
uint64_t first_byte_to_send = 0;
uint64_t first_byte_to_send = 0U;
uint64_t total_bytes_dropped_from_head = initial_read_buffer.size();
uint64_t total_bytes_to_send = info.size;
@ -224,7 +224,7 @@ class AsarURLLoader : public network::mojom::URLLoader {
(read_result.bytes_read - first_byte_to_send), total_bytes_to_send);
base::span<const uint8_t> bytes =
base::as_byte_span(initial_read_buffer)
.subspan(first_byte_to_send, write_size);
.subspan(static_cast<size_t>(first_byte_to_send), write_size);
size_t bytes_written = 0;
MojoResult result = producer_handle->WriteData(
bytes, MOJO_WRITE_DATA_FLAG_NONE, bytes_written);

3
shell/browser/net/system_network_context_manager.cc
View file

@ -196,8 +196,7 @@ SystemNetworkContextManager::CreateDefaultNetworkContextParams() {
void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams(
network::mojom::NetworkContextParams* network_context_params) {
network_context_params->enable_brotli = true;
network_context_params->enable_zstd =
base::FeatureList::IsEnabled(net::features::kZstdContentEncoding);
network_context_params->enable_zstd = true;
network_context_params->enable_referrers = true;

3
shell/browser/net/url_loader_network_observer.cc
View file

@ -109,7 +109,8 @@ void URLLoaderNetworkObserver::OnLoadingStateUpdate(
void URLLoaderNetworkObserver::OnSharedStorageHeaderReceived(
const url::Origin& request_origin,
std::vector<network::mojom::SharedStorageModifierMethodPtr> methods,
std::vector<network::mojom::SharedStorageModifierMethodWithOptionsPtr>
methods,
OnSharedStorageHeaderReceivedCallback callback) {
std::move(callback).Run();
}

3
shell/browser/net/url_loader_network_observer.h
View file

@ -50,7 +50,8 @@ class URLLoaderNetworkObserver
OnLoadingStateUpdateCallback callback) override;
void OnSharedStorageHeaderReceived(
const url::Origin& request_origin,
std::vector<network::mojom::SharedStorageModifierMethodPtr> methods,
std::vector<network::mojom::SharedStorageModifierMethodWithOptionsPtr>
methods,
OnSharedStorageHeaderReceivedCallback callback) override;
void OnDataUseUpdate(int32_t network_traffic_annotation_id_hash,
int64_t recv_bytes,

3
shell/browser/ui/inspectable_web_contents.cc
View file

@ -817,8 +817,7 @@ void InspectableWebContents::DispatchProtocolMessageFromDevToolsFrontend(
}
if (agent_host_)
agent_host_->DispatchProtocolMessage(
this, base::as_bytes(base::make_span(message)));
agent_host_->DispatchProtocolMessage(this, base::as_byte_span(message));
}
void InspectableWebContents::SendJsonRequest(DispatchCallback callback,

3
shell/common/api/electron_api_asar.cc
View file

@ -91,8 +91,7 @@ class Archive : public node::ObjectWrap {
integrity.Set("algorithm", "SHA256");
break;
case asar::HashAlgorithm::kNone:
CHECK(false);
break;
NOTREACHED();
}
integrity.Set("hash", info.integrity.value().hash);
dict.Set("integrity", integrity);

3
shell/common/api/electron_api_url_loader.cc
View file

@ -467,7 +467,8 @@ void SimpleURLLoaderWrapper::OnLoadingStateUpdate(
void SimpleURLLoaderWrapper::OnSharedStorageHeaderReceived(
const url::Origin& request_origin,
std::vector<network::mojom::SharedStorageModifierMethodPtr> methods,
std::vector<network::mojom::SharedStorageModifierMethodWithOptionsPtr>
methods,
OnSharedStorageHeaderReceivedCallback callback) {
std::move(callback).Run();
}

3
shell/common/api/electron_api_url_loader.h
View file

@ -114,7 +114,8 @@ class SimpleURLLoaderWrapper final
OnLoadingStateUpdateCallback callback) override;
void OnSharedStorageHeaderReceived(
const url::Origin& request_origin,
std::vector<network::mojom::SharedStorageModifierMethodPtr> methods,
std::vector<network::mojom::SharedStorageModifierMethodWithOptionsPtr>
methods,
OnSharedStorageHeaderReceivedCallback callback) override;
void OnDataUseUpdate(int32_t network_traffic_annotation_id_hash,
int64_t recv_bytes,

2
shell/common/extensions/electron_extensions_api_provider.cc
View file

@ -46,7 +46,7 @@ constexpr APIPermissionInfo::InitInfo permissions_to_register[] = {
APIPermissionInfo::kFlagRequiresManagementUIWarning},
};
base::span<const APIPermissionInfo::InitInfo> GetPermissionInfos() {
return base::make_span(permissions_to_register);
return base::span(permissions_to_register);
}
base::span<const Alias> GetPermissionAliases() {
return {};

3
shell/common/extensions/electron_extensions_client.cc
View file

@ -48,8 +48,7 @@ class ElectronPermissionMessageProvider
const extensions::PermissionSet& requested_permissions,
extensions::Manifest::Type extension_type) const override {
// Ensure we implement this before shipping.
CHECK(false);
return false;
NOTREACHED();
}
[[nodiscard]] extensions::PermissionIDSet GetAllPermissionIDs(

2
shell/common/gin_converters/net_converter.cc
View file

@ -43,7 +43,7 @@ namespace {
bool CertFromData(const std::string& data,
scoped_refptr<net::X509Certificate>* out) {
auto cert_list = net::X509Certificate::CreateCertificateListFromBytes(
base::as_bytes(base::make_span(data)),
base::as_byte_span(data),
net::X509Certificate::FORMAT_SINGLE_CERTIFICATE);
if (cert_list.empty())
return false;

2
shell/renderer/api/electron_api_web_frame.cc
View file

@ -736,7 +736,7 @@ class WebFrameRenderer final : public gin::Wrappable<WebFrameRenderer>,
std::move(completion_callback));
render_frame->GetWebFrame()->RequestExecuteScript(
world_id, base::make_span(sources),
world_id, base::span(sources),
has_user_gesture ? blink::mojom::UserActivationOption::kActivate
: blink::mojom::UserActivationOption::kDoNotActivate,
script_execution_type, load_blocking_option, base::NullCallback(),