diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-02 13:44:42 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-02 13:32:59 +0000 |
commit | 8bd2dd7d60927be705e0922501c76f7e6297bc11 (patch) | |
tree | ecaeca9bd919715d48dec0575c8b17939001865e /src/core | |
parent | c59e577a18ea20283a3267b9400de5f812056f93 (diff) |
Remove WebAudio settings
In Chromium 51 WebAudio will be always on, and can not be runtime
enabled or disabled. We should avoid introducing a setting we can
not even support in the next version.
Change-Id: I42f7d4f3f7f952f38361ef73dfe7b318ea1a4cf5
Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/web_engine_settings.cpp | 2 | ||||
-rw-r--r-- | src/core/web_engine_settings.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp index 54c7f7c4f..6c17c3ce9 100644 --- a/src/core/web_engine_settings.cpp +++ b/src/core/web_engine_settings.cpp @@ -222,7 +222,6 @@ void WebEngineSettings::initDefaults(bool offTheRecord) s_defaultAttributes.insert(PluginsEnabled, false); s_defaultAttributes.insert(FullScreenSupportEnabled, false); s_defaultAttributes.insert(ScreenCaptureEnabled, false); - s_defaultAttributes.insert(WebAudioEnabled, false); // The following defaults matches logic in render_view_host_impl.cc // But first we must ensure the WebContext has been initialized QtWebEngineCore::WebEngineContext::current(); @@ -312,7 +311,6 @@ void WebEngineSettings::applySettingsToWebPreferences(content::WebPreferences *p prefs->plugins_enabled = testAttribute(PluginsEnabled); prefs->fullscreen_supported = testAttribute(FullScreenSupportEnabled); prefs->accelerated_2d_canvas_enabled = testAttribute(Accelerated2dCanvasEnabled); - prefs->webaudio_enabled = testAttribute(WebAudioEnabled); prefs->experimental_webgl_enabled = testAttribute(WebGLEnabled); // Fonts settings. diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h index 3bc108115..b623f1ec2 100644 --- a/src/core/web_engine_settings.h +++ b/src/core/web_engine_settings.h @@ -78,7 +78,6 @@ public: FullScreenSupportEnabled, ScreenCaptureEnabled, WebGLEnabled, - WebAudioEnabled, Accelerated2dCanvasEnabled, AutoLoadIconsForPage, TouchIconsEnabled |