diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-23 09:28:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-23 09:28:44 +0200 |
| commit | 815f1ed417bd26fbe2abbdf20ac5d3423b30796c (patch) | |
| tree | 923c9a9e2834ccab60f5caecfb8f0ac410c1dd9e /Source/WebKit/qt/Api/qwebsettings.cpp | |
| parent | b4ad5d9d2b96baacd0180ead50de5195ca78af2d (diff) | |
| download | qtwebkit-815f1ed417bd26fbe2abbdf20ac5d3423b30796c.tar.gz | |
Imported WebKit commit e65cbc5b6ac32627c797e7fc7f46eb7794410c92 (http://svn.webkit.org/repository/webkit/trunk@123308)
New snapshot with better configure tests
Diffstat (limited to 'Source/WebKit/qt/Api/qwebsettings.cpp')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebsettings.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp index caf95058f..588dcf7aa 100644 --- a/Source/WebKit/qt/Api/qwebsettings.cpp +++ b/Source/WebKit/qt/Api/qwebsettings.cpp @@ -82,9 +82,7 @@ public: QString localStoragePath; QString offlineWebApplicationCachePath; qint64 offlineStorageDefaultQuota; -#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0) QWebSettings::ThirdPartyCookiePolicy thirdPartyCookiePolicy; -#endif void apply(); WebCore::Settings* settings; }; @@ -164,6 +162,10 @@ 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 #if USE(ACCELERATED_COMPOSITING) settings->setAcceleratedCompositingForCanvasEnabled(value); #endif @@ -365,7 +367,6 @@ QWebSettings* QWebSettings::globalSettings() \value DefaultFixedFontSize The default font size for fixed-pitch text. */ -#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0) /*! \enum QWebSettings::ThirdPartyCookiePolicy @@ -380,7 +381,6 @@ QWebSettings* QWebSettings::globalSettings() \since QtWebKit 2,3 */ -#endif /*! \enum QWebSettings::WebGraphic @@ -530,9 +530,7 @@ QWebSettings::QWebSettings() d->attributes.insert(QWebSettings::SiteSpecificQuirksEnabled, true); d->offlineStorageDefaultQuota = 5 * 1024 * 1024; d->defaultTextEncoding = QLatin1String("iso-8859-1"); -#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0) d->thirdPartyCookiePolicy = AlwaysAllowThirdPartyCookies; -#endif } /*! @@ -869,7 +867,6 @@ void QWebSettings::setObjectCacheCapacities(int cacheMinDeadCapacity, int cacheM qMax(0, totalCapacity)); } -#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0) /*! Sets the third-party cookie policy, the default is AlwaysAllowThirdPartyCookies. */ @@ -885,7 +882,6 @@ QWebSettings::ThirdPartyCookiePolicy QWebSettings::thirdPartyCookiePolicy() cons { return d->thirdPartyCookiePolicy; } -#endif /*! Sets the actual font family to \a family for the specified generic family, |