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

chore: bump chromium to 124.0.6353.0 (main) (#41566)

Browse source 
* chore: bump chromium in DEPS to 124.0.6353.0

* chore: update patches

* 5365462: Add missing perfetto::Flow and TRACE_EVENT includes

5365462

* 5356336: Ensure destruction of mojo channel when destructing KeySystemsImpl

5356336

* 5332839: [Extensions] Register NativeHandlers with the RendererAPIProvider

5332839

* 5148827: Add permission types for keyboard lock and pointer lock [1/N]

5148827

* 5358818: Revert "[object] Fast path for adding props with existing transition"

5358818

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
electron-roller[bot] 2024-03-13 09:44:49 +01:00 • committed by GitHub
parent 80f34ecd2c
commit 26752d3a06
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
37 changed files with 195 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

11
shell/renderer/extensions/electron_extensions_renderer_api_provider.cc
View file

@ -20,7 +20,7 @@ namespace electron {
void ElectronExtensionsRendererAPIProvider::RegisterNativeHandlers(
extensions::ModuleSystem* module_system,
extensions::NativeExtensionBindingsSystem* bindings_system,
extensions::ScriptContext* context) {
extensions::ScriptContext* context) const {
module_system->RegisterNativeHandler(
"lazy_background_page",
std::make_unique<extensions::LazyBackgroundPageNativeHandler>(context));
@ -28,7 +28,7 @@ void ElectronExtensionsRendererAPIProvider::RegisterNativeHandlers(
void ElectronExtensionsRendererAPIProvider::AddBindingsSystemHooks(
extensions::Dispatcher* dispatcher,
extensions::NativeExtensionBindingsSystem* bindings_system) {
extensions::NativeExtensionBindingsSystem* bindings_system) const {
extensions::APIBindingsSystem* bindings = bindings_system->api_system();
bindings->RegisterHooksDelegate(
"extension", std::make_unique<extensions::ExtensionHooksDelegate>(
@ -39,11 +39,12 @@ void ElectronExtensionsRendererAPIProvider::AddBindingsSystemHooks(
}
void ElectronExtensionsRendererAPIProvider::PopulateSourceMap(
extensions::ResourceBundleSourceMap* source_map) {}
extensions::ResourceBundleSourceMap* source_map) const {}
void ElectronExtensionsRendererAPIProvider::EnableCustomElementAllowlist() {}
void ElectronExtensionsRendererAPIProvider::EnableCustomElementAllowlist()
const {}
void ElectronExtensionsRendererAPIProvider::RequireWebViewModules(
extensions::ScriptContext* context) {}
extensions::ScriptContext* context) const {}
} // namespace electron

14
shell/renderer/extensions/electron_extensions_renderer_api_provider.h
View file

@ -25,14 +25,14 @@ class ElectronExtensionsRendererAPIProvider
void RegisterNativeHandlers(
extensions::ModuleSystem* module_system,
extensions::NativeExtensionBindingsSystem* bindings_system,
extensions::ScriptContext* context) override;
void AddBindingsSystemHooks(
extensions::Dispatcher* dispatcher,
extensions::NativeExtensionBindingsSystem* bindings_system) override;
extensions::ScriptContext* context) const override;
void AddBindingsSystemHooks(extensions::Dispatcher* dispatcher,
extensions::NativeExtensionBindingsSystem*
bindings_system) const override;
void PopulateSourceMap(
extensions::ResourceBundleSourceMap* source_map) override;
void EnableCustomElementAllowlist() override;
void RequireWebViewModules(extensions::ScriptContext* context) override;
extensions::ResourceBundleSourceMap* source_map) const override;
void EnableCustomElementAllowlist() const override;
void RequireWebViewModules(extensions::ScriptContext* context) const override;
};
} // namespace electron

5
shell/renderer/renderer_client_base.cc
View file

@ -402,13 +402,14 @@ bool RendererClientBase::OverrideCreatePlugin(
return true;
}
void RendererClientBase::GetSupportedKeySystems(
media::GetSupportedKeySystemsCB cb) {
std::unique_ptr<media::KeySystemSupportObserver>
RendererClientBase::GetSupportedKeySystems(media::GetSupportedKeySystemsCB cb) {
#if BUILDFLAG(ENABLE_WIDEVINE)
GetChromeKeySystems(std::move(cb));
#else
std::move(cb).Run({});
#endif
return nullptr;
}
void RendererClientBase::DidSetUserAgent(const std::string& user_agent) {

3
shell/renderer/renderer_client_base.h
View file

@ -102,7 +102,8 @@ class RendererClientBase : public content::ContentRendererClient
bool OverrideCreatePlugin(content::RenderFrame* render_frame,
const blink::WebPluginParams& params,
blink::WebPlugin** plugin) override;
void GetSupportedKeySystems(media::GetSupportedKeySystemsCB cb) override;
std::unique_ptr<media::KeySystemSupportObserver> GetSupportedKeySystems(
media::GetSupportedKeySystemsCB cb) override;
void DidSetUserAgent(const std::string& user_agent) override;
bool IsPluginHandledExternally(content::RenderFrame* render_frame,
const blink::WebElement& plugin_element,