diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-10-31 13:36:07 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-31 18:23:20 +0100 |
| commit | 5102ba6cf4af91b94b2f5dca26f29c3f2be89418 (patch) | |
| tree | 41fda83a248b2992aaace91e770bc3d212b1ab91 /Source | |
| parent | a3e3255b640a705a720e6844b4b2a2efd431b888 (diff) | |
| download | qtwebkit-5102ba6cf4af91b94b2f5dca26f29c3f2be89418.tar.gz | |
Fix ABI violation in QWebSettings::CSSCompositingEnabled
QWebSettings::CSSCompositingEnabled was added in the middle of the enum
instead of being put at the end.
Since it controlled a RuntimeEnabledFeatures which are global and does
not work per page like QWebSettings should. The setting has been removed
but kept enabled by default.
Change-Id: I5dc35eee78c3846c8482e044c6dd5cd34410969c
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebsettings.cpp | 4 | ||||
| -rw-r--r-- | Source/WebKit/qt/Api/qwebsettings.h | 1 | ||||
| -rw-r--r-- | Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp index e3e106903..242404055 100644 --- a/Source/WebKit/qt/Api/qwebsettings.cpp +++ b/Source/WebKit/qt/Api/qwebsettings.cpp @@ -174,9 +174,6 @@ void QWebSettingsPrivate::apply() value = attributes.value(QWebSettings::CSSRegionsEnabled, global->attributes.value(QWebSettings::CSSRegionsEnabled)); WebCore::RuntimeEnabledFeatures::setCSSRegionsEnabled(value); - value = attributes.value(QWebSettings::CSSCompositingEnabled, - global->attributes.value(QWebSettings::CSSCompositingEnabled)); - WebCore::RuntimeEnabledFeatures::setCSSCompositingEnabled(value); value = attributes.value(QWebSettings::CSSGridLayoutEnabled, global->attributes.value(QWebSettings::CSSGridLayoutEnabled)); @@ -551,7 +548,6 @@ QWebSettings::QWebSettings() d->attributes.insert(QWebSettings::WebGLEnabled, true); d->attributes.insert(QWebSettings::WebAudioEnabled, false); d->attributes.insert(QWebSettings::CSSRegionsEnabled, true); - d->attributes.insert(QWebSettings::CSSCompositingEnabled, true); d->attributes.insert(QWebSettings::CSSGridLayoutEnabled, false); d->attributes.insert(QWebSettings::HyperlinkAuditingEnabled, false); d->attributes.insert(QWebSettings::TiledBackingStoreEnabled, false); diff --git a/Source/WebKit/qt/Api/qwebsettings.h b/Source/WebKit/qt/Api/qwebsettings.h index 61ff930c8..afffb2aec 100644 --- a/Source/WebKit/qt/Api/qwebsettings.h +++ b/Source/WebKit/qt/Api/qwebsettings.h @@ -80,7 +80,6 @@ public: JavascriptCanCloseWindows, WebGLEnabled, CSSRegionsEnabled, - CSSCompositingEnabled, HyperlinkAuditingEnabled, CSSGridLayoutEnabled, ScrollAnimatorEnabled, diff --git a/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp b/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp index 8e56ad347..113eefbe2 100644 --- a/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp +++ b/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp @@ -40,6 +40,7 @@ #include "Page.h" #include "PlatformStrategiesQt.h" #include "RenderThemeQStyle.h" +#include "RuntimeEnabledFeatures.h" #include "ScriptController.h" #include "ScrollbarThemeQStyle.h" #include "SecurityPolicy.h" @@ -106,6 +107,7 @@ Q_DECL_EXPORT void initializeWebCoreQt() if (!WebCore::memoryCache()->disabled()) WebCore::memoryCache()->setDeadDecodedDataDeletionInterval(60); + WebCore::RuntimeEnabledFeatures::setCSSCompositingEnabled(true); initialized = true; } |