diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-13 21:26:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-13 21:26:34 +0100 |
| commit | beaeeb99881184fd368c121fcbb1a31c78b794a3 (patch) | |
| tree | 0e078499d8fe3e8627e3612537e61f2dd1029625 /Source/WebKit/qt/Api/qwebsettings.cpp | |
| parent | f7697030f444b5e16331c6d0a99712736b9ff026 (diff) | |
| parent | 79143ccfc158ec4fffc49eee600d600edb342b16 (diff) | |
| download | qtwebkit-beaeeb99881184fd368c121fcbb1a31c78b794a3.tar.gz | |
Merge remote-tracking branch 'origin/5.212' into dev
Change-Id: I9e64176fe95183acf5e093aa081b0a498795bdb2
Diffstat (limited to 'Source/WebKit/qt/Api/qwebsettings.cpp')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebsettings.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp index e6b32f52a..d552cec17 100644 --- a/Source/WebKit/qt/Api/qwebsettings.cpp +++ b/Source/WebKit/qt/Api/qwebsettings.cpp @@ -173,10 +173,6 @@ void QWebSettingsPrivate::apply() global->attributes.value(QWebSettings::WebGLEnabled)); settings->setWebGLEnabled(value); -#if ENABLE(CSS_SHADERS) - // For now, enable CSS shaders when WebGL is enabled. - settings->setCSSCustomFilterEnabled(value); -#endif #endif #if ENABLE(WEB_AUDIO) value = attributes.value(QWebSettings::WebAudioEnabled, global->attributes.value(QWebSettings::WebAudioEnabled)); |