From 6668b07fcd51f86be243b9e08e667224e30c0cf8 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 27 Jun 2012 09:28:46 +0200 Subject: Imported WebKit commit 26cd9bd8ab0471ffe987c9b60368f63dc0f1f31b (http://svn.webkit.org/repository/webkit/trunk@121325) New snapshot with more Windows build fixes --- Source/WebKit/qt/Api/qwebsettings.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Source/WebKit/qt/Api/qwebsettings.cpp') diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp index d25141720..a540dc35f 100644 --- a/Source/WebKit/qt/Api/qwebsettings.cpp +++ b/Source/WebKit/qt/Api/qwebsettings.cpp @@ -174,6 +174,9 @@ void QWebSettingsPrivate::apply() value = attributes.value(QWebSettings::CSSRegionsEnabled, global->attributes.value(QWebSettings::CSSRegionsEnabled)); settings->setCSSRegionsEnabled(value); + value = attributes.value(QWebSettings::CSSGridLayoutEnabled, + global->attributes.value(QWebSettings::CSSGridLayoutEnabled)); + settings->setCSSGridLayoutEnabled(value); value = attributes.value(QWebSettings::HyperlinkAuditingEnabled, global->attributes.value(QWebSettings::HyperlinkAuditingEnabled)); @@ -522,6 +525,7 @@ QWebSettings::QWebSettings() d->attributes.insert(QWebSettings::AcceleratedCompositingEnabled, true); d->attributes.insert(QWebSettings::WebGLEnabled, false); d->attributes.insert(QWebSettings::CSSRegionsEnabled, false); + d->attributes.insert(QWebSettings::CSSGridLayoutEnabled, false); d->attributes.insert(QWebSettings::HyperlinkAuditingEnabled, false); d->attributes.insert(QWebSettings::TiledBackingStoreEnabled, false); d->attributes.insert(QWebSettings::FrameFlatteningEnabled, false); -- cgit v1.2.1