diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-11-07 14:31:48 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2014-11-07 15:26:45 +0100 |
commit | d2d5baeb8c3b10579f7f144e918b2935af66bec5 (patch) | |
tree | 5dd9eea0282c70001ed8fd1a00fe718d5c44004e /src/webenginewidgets/api/qwebenginepage.cpp | |
parent | 32f75b83d591d1940a4427eb1a6fd8353406733e (diff) |
Fix enum names of audio/video features
The feature enum names and documentation gave the impression it could
control audio and video output, while they only control input.
Also removed documentation of non connected feature permissions for
Notifications and GeoLocation.
Change-Id: Ia35142ca691ebd6059b7472e9803fda8cbd84813
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.cpp')
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index d6782974b..72b16f28b 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -332,11 +332,11 @@ void QWebEnginePagePrivate::runMediaAccessPermissionRequest(const QUrl &security Q_Q(QWebEnginePage); QWebEnginePage::Feature requestedFeature; if (requestFlags.testFlag(WebContentsAdapterClient::MediaAudioCapture) && requestFlags.testFlag(WebContentsAdapterClient::MediaVideoCapture)) - requestedFeature = QWebEnginePage::MediaAudioVideoDevices; + requestedFeature = QWebEnginePage::MediaAudioVideoCapture; else if (requestFlags.testFlag(WebContentsAdapterClient::MediaAudioCapture)) - requestedFeature = QWebEnginePage::MediaAudioDevices; + requestedFeature = QWebEnginePage::MediaAudioCapture; else if (requestFlags.testFlag(WebContentsAdapterClient::MediaVideoCapture)) - requestedFeature = QWebEnginePage::MediaVideoDevices; + requestedFeature = QWebEnginePage::MediaVideoCapture; else return; Q_EMIT q->featurePermissionRequested(securityOrigin, requestedFeature); @@ -745,16 +745,16 @@ void QWebEnginePage::setFeaturePermission(const QUrl &securityOrigin, QWebEngine Q_D(QWebEnginePage); WebContentsAdapterClient::MediaRequestFlags flags = WebContentsAdapterClient::MediaNone; switch (feature) { - case MediaAudioVideoDevices: - case MediaAudioDevices: - case MediaVideoDevices: + case MediaAudioVideoCapture: + case MediaAudioCapture: + case MediaVideoCapture: if (policy != PermissionUnknown) { if (policy == PermissionDeniedByUser) flags = WebContentsAdapterClient::MediaNone; else { - if (feature == MediaAudioDevices) + if (feature == MediaAudioCapture) flags = WebContentsAdapterClient::MediaAudioCapture; - else if (feature == MediaVideoDevices) + else if (feature == MediaVideoCapture) flags = WebContentsAdapterClient::MediaVideoCapture; else flags = WebContentsAdapterClient::MediaRequestFlags(WebContentsAdapterClient::MediaVideoCapture | WebContentsAdapterClient::MediaAudioCapture); |