1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: fix mic and camera permissions on firefox

Browse Source 
For whatever reason, exceptions are raised on Firefox when
checkPermissions is called.,
"'camera' (value of 'name' member of PermissionDescriptor) is not a
valid value for enumeration PermissionName."
and
 "'microphone' (value of 'name' member of PermissionDescriptor) is not a
 valid value for enumeration PermissionName."

so instead of changing to denied when this happens,
just issue a silent warning and continue.

Fixes: QTBUG-125381
Pick-to: 6.7 6.6
Change-Id: I03ee45297d28f4b99cc96f593cf529113747488b
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Lorn Potter 2024-05-20 16:08:47 +10:00
parent 41cb01dc59
commit d2fbcc4cfe
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/kernel/qpermissions_wasm.cpp
View File

@ -51,9 +51,13 @@ namespace
{ {
updatePermission(permissionName, permissionState["state"].as<std::string>(), {}); updatePermission(permissionName, permissionState["state"].as<std::string>(), {});
}; };
callbacks.catchFunc = [permissionName](val) callbacks.catchFunc = [permissionName](val err)
{ {
updatePermission(permissionName, wapiDenied, {}); if (err["name"].as<std::string>() == "NotAllowedError")
return updatePermission(permissionName, wapiDenied, {});
qCInfo(lcPermissions, "'%s' '%s'", err["name"].as<std::string>().c_str(),
err["message"].as<std::string>().c_str());
}; };
val query = val::object(); val query = val::object();