chore: bump chromium to 124.0.6359.0 (main) (#41584)

* chore: bump chromium in DEPS to 124.0.6355.0

* 5341411: view-transition: Ensure resources are cleaned up in all cases.

5341411

* chore: fixup patch indices

* 5354013: Return nullopt on error from ProcessMetrics CPU measurements

5354013

* chore: bump chromium in DEPS to 124.0.6357.0

* chore: update patches

* 5368769: Reland "[mojo] Use large worker for mojom_parser action"

5368769

* 5336171: [Extensions] Introduce a CoreExtensionsRendererAPIProvider

5336171

* 5367334: [FS Shortcut] Refactor ExclusiveAccessManager

5367334

* 5354161: Rename GeolocationManager to GeolocationSystemPermissionManager

5354161

* fixup: [Extensions] Introduce a CoreExtensionsRendererAPIProvider

* chore: bump chromium in DEPS to 124.0.6359.0

* chore: update patches

* 5371370: [Extensions] Move core NativeHandler registration

5371370

* 5370702: [Extensions] Introduce ShellExtensionsRendererAPIProvider

5370702

---------

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: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
electron-roller[bot] 2024-03-15 14:03:42 -04:00 committed by GitHub
parent 3759e59bbd
commit 193e162ec6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
52 changed files with 201 additions and 250 deletions

View file

@ -1352,10 +1352,9 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics(v8::Isolate* isolate) {
auto pid_dict = gin_helper::Dictionary::CreateEmpty(isolate);
auto cpu_dict = gin_helper::Dictionary::CreateEmpty(isolate);
cpu_dict.Set(
"percentCPUUsage",
process_metric.second->metrics->GetPlatformIndependentCPUUsage() /
processor_count);
std::optional<double> usage =
process_metric.second->metrics->GetPlatformIndependentCPUUsage();
cpu_dict.Set("percentCPUUsage", usage.value_or(0) / processor_count);
#if !BUILDFLAG(IS_WIN)
cpu_dict.Set("idleWakeupsPerSecond",

View file

@ -1537,7 +1537,8 @@ void WebContents::RequestPointerLock(content::WebContents* web_contents,
}
void WebContents::LostPointerLock() {
exclusive_access_manager_.pointer_lock_controller()->LostPointerLock();
exclusive_access_manager_.pointer_lock_controller()
->ExitExclusiveAccessToPreviousState();
}
void WebContents::OnRequestKeyboardLock(content::WebContents* web_contents,

View file

@ -35,7 +35,7 @@
#include "net/proxy_resolution/proxy_config.h"
#include "net/proxy_resolution/proxy_config_service.h"
#include "net/proxy_resolution/proxy_config_with_annotation.h"
#include "services/device/public/cpp/geolocation/geolocation_manager.h"
#include "services/device/public/cpp/geolocation/geolocation_system_permission_manager.h"
#include "services/network/public/cpp/network_switches.h"
#include "shell/browser/net/resolve_proxy_helper.h"
#include "shell/common/electron_paths.h"

View file

@ -64,7 +64,7 @@
#include "ppapi/buildflags/buildflags.h"
#include "ppapi/host/ppapi_host.h"
#include "printing/buildflags/buildflags.h"
#include "services/device/public/cpp/geolocation/geolocation_manager.h"
#include "services/device/public/cpp/geolocation/geolocation_system_permission_manager.h"
#include "services/device/public/cpp/geolocation/location_provider.h"
#include "services/network/public/cpp/features.h"
#include "services/network/public/cpp/is_potentially_trustworthy.h"
@ -1721,8 +1721,9 @@ void ElectronBrowserClient::RegisterBrowserInterfaceBindersForServiceWorker(
}
#if BUILDFLAG(IS_MAC)
device::GeolocationManager* ElectronBrowserClient::GetGeolocationManager() {
return device::GeolocationManager::GetInstance();
device::GeolocationSystemPermissionManager*
ElectronBrowserClient::GetGeolocationSystemPermissionManager() {
return device::GeolocationSystemPermissionManager::GetInstance();
}
#endif

View file

@ -109,7 +109,8 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
content::WebAuthenticationDelegate* GetWebAuthenticationDelegate() override;
#if BUILDFLAG(IS_MAC)
device::GeolocationManager* GetGeolocationManager() override;
device::GeolocationSystemPermissionManager*
GetGeolocationSystemPermissionManager() override;
#endif
content::PlatformNotificationService* GetPlatformNotificationService();

View file

@ -9,7 +9,7 @@
#include "base/apple/bundle_locations.h"
#include "base/apple/foundation_util.h"
#include "base/path_service.h"
#include "services/device/public/cpp/geolocation/geolocation_manager.h"
#include "services/device/public/cpp/geolocation/geolocation_system_permission_manager.h"
#include "services/device/public/cpp/geolocation/system_geolocation_source_mac.h"
#include "shell/browser/browser_process_impl.h"
#include "shell/browser/mac/electron_application.h"
@ -34,9 +34,10 @@ void ElectronBrowserMainParts::PreCreateMainMessageLoop() {
setObject:@"NO"
forKey:@"NSTreatUnknownArgumentsAsOpen"];
if (!device::GeolocationManager::GetInstance()) {
device::GeolocationManager::SetInstance(
device::SystemGeolocationSourceMac::CreateGeolocationManagerOnMac());
if (!device::GeolocationSystemPermissionManager::GetInstance()) {
device::GeolocationSystemPermissionManager::SetInstance(
device::SystemGeolocationSourceMac::
CreateGeolocationSystemPermissionManagerOnMac());
}
}

View file

@ -277,8 +277,8 @@ v8::Local<v8::Value> ElectronBindings::GetCPUUsage(
v8::Isolate* isolate) {
auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
int processor_count = base::SysInfo::NumberOfProcessors();
dict.Set("percentCPUUsage",
metrics->GetPlatformIndependentCPUUsage() / processor_count);
std::optional<double> usage = metrics->GetPlatformIndependentCPUUsage();
dict.Set("percentCPUUsage", usage.value_or(0) / processor_count);
// NB: This will throw NOTIMPLEMENTED() on Windows
// For backwards compatibility, we'll return 0

View file

@ -10,8 +10,5 @@ ElectronExtensionsDispatcherDelegate::ElectronExtensionsDispatcherDelegate() =
ElectronExtensionsDispatcherDelegate::~ElectronExtensionsDispatcherDelegate() =
default;
void ElectronExtensionsDispatcherDelegate::RequireWebViewModules(
extensions::ScriptContext* context) {}
void ElectronExtensionsDispatcherDelegate::OnActiveExtensionsUpdated(
const std::set<std::string>& extension_ids) {}

View file

@ -24,7 +24,6 @@ class ElectronExtensionsDispatcherDelegate
private:
// extensions::DispatcherDelegate implementation.
void RequireWebViewModules(extensions::ScriptContext* context) override;
void OnActiveExtensionsUpdated(
const std::set<std::string>& extension_ids) override;
};

View file

@ -20,6 +20,7 @@ namespace electron {
void ElectronExtensionsRendererAPIProvider::RegisterNativeHandlers(
extensions::ModuleSystem* module_system,
extensions::NativeExtensionBindingsSystem* bindings_system,
extensions::V8SchemaRegistry* v8_schema_registry,
extensions::ScriptContext* context) const {
module_system->RegisterNativeHandler(
"lazy_background_page",

View file

@ -25,6 +25,7 @@ class ElectronExtensionsRendererAPIProvider
void RegisterNativeHandlers(
extensions::ModuleSystem* module_system,
extensions::NativeExtensionBindingsSystem* bindings_system,
extensions::V8SchemaRegistry* v8_schema_registry,
extensions::ScriptContext* context) const override;
void AddBindingsSystemHooks(extensions::Dispatcher* dispatcher,
extensions::NativeExtensionBindingsSystem*

View file

@ -31,9 +31,8 @@ class ElectronExtensionsRendererClient
ElectronExtensionsRendererClient& operator=(
const ElectronExtensionsRendererClient&) = delete;
void RenderThreadStarted();
// ExtensionsRendererClient implementation.
void RenderThreadStarted() override;
bool IsIncognitoProcess() const override;
int GetLowestIsolatedWorldId() const override;
extensions::Dispatcher* GetDispatcher() override;

View file

@ -90,6 +90,7 @@
#include "content/public/common/webplugininfo.h"
#include "extensions/common/constants.h"
#include "extensions/common/extensions_client.h"
#include "extensions/renderer/api/core_extensions_renderer_api_provider.h"
#include "extensions/renderer/dispatcher.h"
#include "extensions/renderer/extension_frame_helper.h"
#include "extensions/renderer/extension_web_view_helper.h"
@ -243,6 +244,8 @@ void RendererClientBase::RenderThreadStarted() {
extensions_renderer_client_ =
std::make_unique<ElectronExtensionsRendererClient>();
extensions_renderer_client_->AddAPIProvider(
std::make_unique<extensions::CoreExtensionsRendererAPIProvider>());
extensions_renderer_client_->AddAPIProvider(
std::make_unique<ElectronExtensionsRendererAPIProvider>());
extensions_renderer_client_->RenderThreadStarted();