From 8bd2dd7d60927be705e0922501c76f7e6297bc11 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 2 May 2016 13:44:42 +0200 Subject: Remove WebAudio settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/core/web_engine_settings.cpp | 2 -- src/core/web_engine_settings.h | 1 - src/webengine/api/qquickwebenginesettings.cpp | 21 --------------------- src/webengine/api/qquickwebenginesettings_p.h | 4 ---- src/webenginewidgets/api/qwebenginesettings.cpp | 2 -- src/webenginewidgets/api/qwebenginesettings.h | 1 - .../doc/src/qwebenginesettings_lgpl.qdoc | 2 -- 7 files changed, 33 deletions(-) (limited to 'src') 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 diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp index 73d3e34b9..9096dd604 100644 --- a/src/webengine/api/qquickwebenginesettings.cpp +++ b/src/webengine/api/qquickwebenginesettings.cpp @@ -263,19 +263,6 @@ bool QQuickWebEngineSettings::webGLEnabled() const return d_ptr->testAttribute(WebEngineSettings::WebGLEnabled); } -/*! - \qmlproperty bool WebEngineSettings::webAudioEnabled - \since QtWebEngine 1.3 - - Enables support for HTML 5 WebAudio. - - Disabled by default. -*/ -bool QQuickWebEngineSettings::webAudioEnabled() const -{ - return d_ptr->testAttribute(WebEngineSettings::WebAudioEnabled); -} - /*! \qmlproperty bool WebEngineSettings::accelerated2dCanvasEnabled \since QtWebEngine 1.3 @@ -453,14 +440,6 @@ void QQuickWebEngineSettings::setWebGLEnabled(bool on) Q_EMIT webGLEnabledChanged(); } -void QQuickWebEngineSettings::setWebAudioEnabled(bool on) -{ - bool wasOn = d_ptr->testAttribute(WebEngineSettings::WebAudioEnabled); - d_ptr->setAttribute(WebEngineSettings::WebAudioEnabled, on); - if (wasOn != on) - Q_EMIT webAudioEnabledChanged(); -} - void QQuickWebEngineSettings::setAccelerated2dCanvasEnabled(bool on) { bool wasOn = d_ptr->testAttribute(WebEngineSettings::Accelerated2dCanvasEnabled); diff --git a/src/webengine/api/qquickwebenginesettings_p.h b/src/webengine/api/qquickwebenginesettings_p.h index 6a5fd290e..d380ee3d9 100644 --- a/src/webengine/api/qquickwebenginesettings_p.h +++ b/src/webengine/api/qquickwebenginesettings_p.h @@ -79,7 +79,6 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineSettings : public QObject { Q_PROPERTY(QString defaultTextEncoding READ defaultTextEncoding WRITE setDefaultTextEncoding NOTIFY defaultTextEncodingChanged REVISION 1) Q_PROPERTY(bool screenCaptureEnabled READ screenCaptureEnabled WRITE setScreenCaptureEnabled NOTIFY screenCaptureEnabledChanged REVISION 2) Q_PROPERTY(bool webGLEnabled READ webGLEnabled WRITE setWebGLEnabled NOTIFY webGLEnabledChanged REVISION 2) - Q_PROPERTY(bool webAudioEnabled READ webAudioEnabled WRITE setWebAudioEnabled NOTIFY webAudioEnabledChanged REVISION 2) Q_PROPERTY(bool accelerated2dCanvasEnabled READ accelerated2dCanvasEnabled WRITE setAccelerated2dCanvasEnabled NOTIFY accelerated2dCanvasEnabledChanged REVISION 2) Q_PROPERTY(bool autoLoadIconsForPage READ autoLoadIconsForPage WRITE setAutoLoadIconsForPage NOTIFY autoLoadIconsForPageChanged REVISION 2) Q_PROPERTY(bool touchIconsEnabled READ touchIconsEnabled WRITE setTouchIconsEnabled NOTIFY touchIconsEnabledChanged REVISION 2) @@ -103,7 +102,6 @@ public: QString defaultTextEncoding() const; bool screenCaptureEnabled() const; bool webGLEnabled() const; - bool webAudioEnabled() const; bool accelerated2dCanvasEnabled() const; bool autoLoadIconsForPage() const; bool touchIconsEnabled() const; @@ -124,7 +122,6 @@ public: void setDefaultTextEncoding(QString encoding); void setScreenCaptureEnabled(bool on); void setWebGLEnabled(bool on); - void setWebAudioEnabled(bool on); void setAccelerated2dCanvasEnabled(bool on); void setAutoLoadIconsForPage(bool on); void setTouchIconsEnabled(bool on); @@ -146,7 +143,6 @@ signals: Q_REVISION(1) void defaultTextEncodingChanged(); Q_REVISION(2) void screenCaptureEnabledChanged(); Q_REVISION(2) void webGLEnabledChanged(); - Q_REVISION(2) void webAudioEnabledChanged(); Q_REVISION(2) void accelerated2dCanvasEnabledChanged(); Q_REVISION(2) void autoLoadIconsForPageChanged(); Q_REVISION(2) void touchIconsEnabledChanged(); diff --git a/src/webenginewidgets/api/qwebenginesettings.cpp b/src/webenginewidgets/api/qwebenginesettings.cpp index d1caa4ca5..dfca16287 100644 --- a/src/webenginewidgets/api/qwebenginesettings.cpp +++ b/src/webenginewidgets/api/qwebenginesettings.cpp @@ -83,8 +83,6 @@ static WebEngineSettings::Attribute toWebEngineAttribute(QWebEngineSettings::Web return WebEngineSettings::ScreenCaptureEnabled; case QWebEngineSettings::WebGLEnabled: return WebEngineSettings::WebGLEnabled; - case QWebEngineSettings::WebAudioEnabled: - return WebEngineSettings::WebAudioEnabled; case QWebEngineSettings::Accelerated2dCanvasEnabled: return WebEngineSettings::Accelerated2dCanvasEnabled; case QWebEngineSettings::AutoLoadIconsForPage: diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h index ea18cf020..eb4bf75ac 100644 --- a/src/webenginewidgets/api/qwebenginesettings.h +++ b/src/webenginewidgets/api/qwebenginesettings.h @@ -64,7 +64,6 @@ public: FullScreenSupportEnabled, ScreenCaptureEnabled, WebGLEnabled, - WebAudioEnabled, Accelerated2dCanvasEnabled, AutoLoadIconsForPage, TouchIconsEnabled diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index cb75c69fa..3e0f4cf82 100644 --- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc @@ -137,8 +137,6 @@ Enables screen capture in an application. Disabled by default. (Added in Qt 5.7) \value WebGLEnabled Enables support for HTML 5 WebGL. Enabled by default if available. (Added in Qt 5.7) - \value WebAudioEnabled - Enables support for HTML 5 WebAudio. Disabled by default. (Added in Qt 5.7) \value Accelerated2dCanvasEnabled Specifies whether the HTML5 2D canvas should be a OpenGL framebuffer. This makes many painting operations faster, but slows down pixel access. Enabled by default if available. (Added in Qt 5.7) -- cgit v1.2.3