summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorViktor Engelmann <viktor.engelmann@qt.io>2016-10-21 14:24:02 +0200
committerViktor Engelmann <viktor.engelmann@qt.io>2016-10-28 07:48:03 +0000
commitba6acb2bc25add0f8b4490d8760b7ad1c1f27629 (patch)
tree6abf29389057c55171d6a2244809a9fdcababb63
parentc4de6dafb00fdaf278d33798d709beb9fa7cfd78 (diff)
Allow Pepper Flash to access Media Devices
The Q_UNREACHABLE caused WebEngine to block Pepper Flash from accessing Media Devices such as the WebCam (this rendered http://testwebcam.com unusable for example) Task-number: QTBUG-55017 Change-Id: I7979c9a5690173e86310f7448c78949371fbc909 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
-rw-r--r--src/core/media_capture_devices_dispatcher.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/media_capture_devices_dispatcher.cpp b/src/core/media_capture_devices_dispatcher.cpp
index dcccd72fb..dd9a24757 100644
--- a/src/core/media_capture_devices_dispatcher.cpp
+++ b/src/core/media_capture_devices_dispatcher.cpp
@@ -159,7 +159,6 @@ void MediaCaptureDevicesDispatcher::handleMediaAccessPermissionResponse(content:
if (securityOriginsMatch && (microphoneRequested || webcamRequested)) {
switch (request.request_type) {
case content::MEDIA_OPEN_DEVICE:
- Q_UNREACHABLE(); // only speculative as this is for Pepper
getDefaultDevices("", "", microphoneRequested, webcamRequested, &devices);
break;
case content::MEDIA_DEVICE_ACCESS: