diff options
Diffstat (limited to 'Source/WebKit/qt/Api/qwebsettings.cpp')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebsettings.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp index 9adc662b7..ddd617a67 100644 --- a/Source/WebKit/qt/Api/qwebsettings.cpp +++ b/Source/WebKit/qt/Api/qwebsettings.cpp @@ -148,14 +148,18 @@ void QWebSettingsPrivate::apply() settings->setDNSPrefetchingEnabled(value); value = attributes.value(QWebSettings::JavascriptEnabled, - global->attributes.value(QWebSettings::JavascriptEnabled)); + global->attributes.value(QWebSettings::JavascriptEnabled)); settings->setScriptEnabled(value); value = attributes.value(QWebSettings::AcceleratedCompositingEnabled, global->attributes.value(QWebSettings::AcceleratedCompositingEnabled)); - // FIXME: Temporary disabled until AC is fully working - // settings->setAcceleratedCompositingEnabled(value); - settings->setAcceleratedCompositingEnabled(false); + settings->setAcceleratedCompositingEnabled(value); + +#if ENABLE(ACCELERATED_2D_CANVAS) + value = value && attributes.value(QWebSettings::Accelerated2dCanvasEnabled, + global->attributes.value(QWebSettings::Accelerated2dCanvasEnabled)); + settings->setAccelerated2dCanvasEnabled(value); +#endif bool showDebugVisuals = qgetenv("WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS") == "1"; settings->setShowDebugBorders(showDebugVisuals); @@ -300,8 +304,10 @@ void QWebSettingsPrivate::apply() global->attributes.value(QWebSettings::SiteSpecificQuirksEnabled)); settings->setNeedsSiteSpecificQuirks(value); +#if ENABLE(FULLSCREEN_API) value = attributes.value(QWebSettings::FullScreenSupportEnabled, global->attributes.value(QWebSettings::FullScreenSupportEnabled)); settings->setFullScreenEnabled(value); +#endif settings->setUsesPageCache(WebCore::PageCache::singleton().maxSize()); } else { @@ -515,6 +521,8 @@ 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 Accelerated2dCanvasEnabled Specifies whether the HTML5 2D canvas should be a OpenGL framebuffer. + This makes many painting operations faster, but slows down pixel access. This is disabled by default. \value WebSecurityEnabled Specifies whether browser should enforce same-origin policy for scripts downloaded from remote servers. This setting is set to true by default. Note that setting this flag to false is strongly discouraged as it makes the browser more prone to malicious code. This setting is intended @@ -577,6 +585,7 @@ QWebSettings::QWebSettings() d->attributes.insert(QWebSettings::ScrollAnimatorEnabled, false); d->attributes.insert(QWebSettings::CaretBrowsingEnabled, false); d->attributes.insert(QWebSettings::NotificationsEnabled, true); + d->attributes.insert(QWebSettings::Accelerated2dCanvasEnabled, false); d->attributes.insert(QWebSettings::WebSecurityEnabled, true); d->attributes.insert(QWebSettings::FullScreenSupportEnabled, true); d->offlineStorageDefaultQuota = 5 * 1024 * 1024; |