diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-10-30 16:53:18 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-31 12:59:29 +0100 |
| commit | a3e3255b640a705a720e6844b4b2a2efd431b888 (patch) | |
| tree | e713bde61d01911c0fccc177865fa9edb91b9a1e /Source/WebKit/qt/Api | |
| parent | 419af543220d35454b4e47ee09805b90b5f5926f (diff) | |
| download | qtwebkit-a3e3255b640a705a720e6844b4b2a2efd431b888.tar.gz | |
Remove unused runtime enabled features
Reverts the addition of CanvasPathEnabled setting. It had no effect since
it only changed the unused RuntimeEnabledFeatures.
WebKit ChangeLog:
https://bugs.webkit.org/show_bug.cgi?id=123509
Some of the runtime enabled features were only ever used by the V8 bindings
and can be removed as no WebKit code sets or reads them.
* bindings/generic/RuntimeEnabledFeatures.cpp:
(WebCore::RuntimeEnabledFeatures::RuntimeEnabledFeatures):
* bindings/generic/RuntimeEnabledFeatures.h:
Change-Id: Ie15d05d6e27e5edb62cc5ce00fd59258df8ec2d7
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@158269 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'Source/WebKit/qt/Api')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebsettings.cpp | 6 | ||||
| -rw-r--r-- | Source/WebKit/qt/Api/qwebsettings.h | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp index 895d2996f..e3e106903 100644 --- a/Source/WebKit/qt/Api/qwebsettings.cpp +++ b/Source/WebKit/qt/Api/qwebsettings.cpp @@ -177,9 +177,6 @@ void QWebSettingsPrivate::apply() value = attributes.value(QWebSettings::CSSCompositingEnabled, global->attributes.value(QWebSettings::CSSCompositingEnabled)); WebCore::RuntimeEnabledFeatures::setCSSCompositingEnabled(value); - value = attributes.value(QWebSettings::CanvasPathEnabled, - global->attributes.value(QWebSettings::CanvasPathEnabled)); - WebCore::RuntimeEnabledFeatures::setCanvasPathEnabled(value); value = attributes.value(QWebSettings::CSSGridLayoutEnabled, global->attributes.value(QWebSettings::CSSGridLayoutEnabled)); @@ -507,8 +504,6 @@ QWebSettings* QWebSettings::globalSettings() \value CaretBrowsingEnabled This setting enables caret browsing. It is disabled by default. \value NotificationsEnabled Specifies whether support for the HTML 5 web notifications is enabled or not. This is enabled by default. - \value CanvasPathEnabled Specifies whether support for the HTML 5 Canvas Path object is enabled - or not. This is disabled by default. */ /*! @@ -565,7 +560,6 @@ QWebSettings::QWebSettings() d->attributes.insert(QWebSettings::ScrollAnimatorEnabled, false); d->attributes.insert(QWebSettings::CaretBrowsingEnabled, false); d->attributes.insert(QWebSettings::NotificationsEnabled, true); - d->attributes.insert(QWebSettings::CanvasPathEnabled, false); d->offlineStorageDefaultQuota = 5 * 1024 * 1024; d->defaultTextEncoding = QLatin1String("iso-8859-1"); d->thirdPartyCookiePolicy = AlwaysAllowThirdPartyCookies; diff --git a/Source/WebKit/qt/Api/qwebsettings.h b/Source/WebKit/qt/Api/qwebsettings.h index 47489bf00..61ff930c8 100644 --- a/Source/WebKit/qt/Api/qwebsettings.h +++ b/Source/WebKit/qt/Api/qwebsettings.h @@ -86,8 +86,7 @@ public: ScrollAnimatorEnabled, CaretBrowsingEnabled, NotificationsEnabled, - WebAudioEnabled, - CanvasPathEnabled + WebAudioEnabled }; enum WebGraphic { MissingImageGraphic, |