chore: bump chromium to 124.0.6353.0 (main) (#41566)
* chore: bump chromium in DEPS to 124.0.6353.0 * chore: update patches * 5365462: Add missing perfetto::Flow and TRACE_EVENT includes5365462
* 5356336: Ensure destruction of mojo channel when destructing KeySystemsImpl5356336
* 5332839: [Extensions] Register NativeHandlers with the RendererAPIProvider5332839
* 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:
parent
80f34ecd2c
commit
26752d3a06
37 changed files with 195 additions and 203 deletions
|
@ -247,12 +247,11 @@ void WebContentsPermissionHelper::RequestPointerLockPermission(
|
|||
bool last_unlocked_by_target,
|
||||
base::OnceCallback<void(content::WebContents*, bool, bool, bool)>
|
||||
callback) {
|
||||
RequestPermission(
|
||||
web_contents_->GetPrimaryMainFrame(),
|
||||
static_cast<blink::PermissionType>(PermissionType::POINTER_LOCK),
|
||||
base::BindOnce(std::move(callback), web_contents_, user_gesture,
|
||||
last_unlocked_by_target),
|
||||
user_gesture);
|
||||
RequestPermission(web_contents_->GetPrimaryMainFrame(),
|
||||
blink::PermissionType::POINTER_LOCK,
|
||||
base::BindOnce(std::move(callback), web_contents_,
|
||||
user_gesture, last_unlocked_by_target),
|
||||
user_gesture);
|
||||
}
|
||||
|
||||
void WebContentsPermissionHelper::RequestKeyboardLockPermission(
|
||||
|
@ -260,7 +259,7 @@ void WebContentsPermissionHelper::RequestKeyboardLockPermission(
|
|||
base::OnceCallback<void(content::WebContents*, bool, bool)> callback) {
|
||||
RequestPermission(
|
||||
web_contents_->GetPrimaryMainFrame(),
|
||||
static_cast<blink::PermissionType>(PermissionType::KEYBOARD_LOCK),
|
||||
blink::PermissionType::KEYBOARD_LOCK,
|
||||
base::BindOnce(std::move(callback), web_contents_, esc_key_locked));
|
||||
}
|
||||
|
||||
|
|
|
@ -26,13 +26,11 @@ class WebContentsPermissionHelper
|
|||
delete;
|
||||
|
||||
enum class PermissionType {
|
||||
POINTER_LOCK = static_cast<int>(blink::PermissionType::NUM) + 1,
|
||||
FULLSCREEN,
|
||||
FULLSCREEN = static_cast<int>(blink::PermissionType::NUM) + 1,
|
||||
OPEN_EXTERNAL,
|
||||
SERIAL,
|
||||
HID,
|
||||
USB,
|
||||
KEYBOARD_LOCK
|
||||
USB
|
||||
};
|
||||
|
||||
// Asynchronous Requests
|
||||
|
|
|
@ -210,15 +210,15 @@ v8::Local<v8::Value> Converter<blink::PermissionType>::ToV8(
|
|||
return StringToV8(isolate, "web-printing");
|
||||
case blink::PermissionType::SPEAKER_SELECTION:
|
||||
return StringToV8(isolate, "speaker-selection");
|
||||
case blink::PermissionType::POINTER_LOCK:
|
||||
return StringToV8(isolate, "pointerLock");
|
||||
case blink::PermissionType::KEYBOARD_LOCK:
|
||||
return StringToV8(isolate, "keyboardLock");
|
||||
case blink::PermissionType::NUM:
|
||||
break;
|
||||
}
|
||||
|
||||
switch (static_cast<PermissionType>(val)) {
|
||||
case PermissionType::POINTER_LOCK:
|
||||
return StringToV8(isolate, "pointerLock");
|
||||
case PermissionType::KEYBOARD_LOCK:
|
||||
return StringToV8(isolate, "keyboardLock");
|
||||
case PermissionType::FULLSCREEN:
|
||||
return StringToV8(isolate, "fullscreen");
|
||||
case PermissionType::OPEN_EXTERNAL:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue