Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 20:07:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15300 from jherico/fix/web_camera_master

Browse source 
Case 21993: Globally disallow use of the camera or microphone by hosted web content
This commit is contained in:
Shannon Romano 2019-04-01 14:05:22 -07:00 committed by GitHub
commit 04eac57950
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/Application.cpp
View file

@ -2878,11 +2878,19 @@ void Application::initializeGL() {
} }
#if !defined(DISABLE_QML) #if !defined(DISABLE_QML)
QStringList chromiumFlags;
// Bug 21993: disable microphone and camera input
chromiumFlags << "--use-fake-device-for-media-stream";
// Disable signed distance field font rendering on ATI/AMD GPUs, due to // Disable signed distance field font rendering on ATI/AMD GPUs, due to
// https://highfidelity.manuscript.com/f/cases/13677/Text-showing-up-white-on-Marketplace-app // https://highfidelity.manuscript.com/f/cases/13677/Text-showing-up-white-on-Marketplace-app
std::string vendor{ (const char*)glGetString(GL_VENDOR) }; std::string vendor{ (const char*)glGetString(GL_VENDOR) };
if ((vendor.find("AMD") != std::string::npos) || (vendor.find("ATI") != std::string::npos)) { if ((vendor.find("AMD") != std::string::npos) || (vendor.find("ATI") != std::string::npos)) {
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", QByteArray("--disable-distance-field-text")); chromiumFlags << "--disable-distance-field-text";
}
// Ensure all Qt webengine processes launched from us have the appropriate command line flags
if (!chromiumFlags.empty()) {
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", chromiumFlags.join(' ').toLocal8Bit());
} }
#endif #endif

1
libraries/networking/src/udt/PacketHeaders.h
View file

@ -266,6 +266,7 @@ enum class EntityVersion : PacketVersion {
ModelScale, ModelScale,
ReOrderParentIDProperties, ReOrderParentIDProperties,
CertificateTypeProperty, CertificateTypeProperty,
DisableWebMedia,
// Add new versions above here // Add new versions above here
NUM_PACKET_TYPE, NUM_PACKET_TYPE,