[Qt] Enable grid layout LayoutTests

https://bugs.webkit.org/show_bug.cgi?id=89909

Reviewed by Csaba Osztrogonác.

Source/WebKit/qt:

These tests pass, we just need to hook up the overridePreference.

* Api/qwebsettings.cpp:
(QWebSettingsPrivate::apply):
(QWebSettings::QWebSettings):
* Api/qwebsettings.h: Add enum value for CSS grid layout

Tools:

These tests pass, we just need to hook up the overridePreference.

* DumpRenderTree/qt/DumpRenderTreeQt.cpp:
(WebCore::WebPage::resetSettings): Reset grid layout and regions between tests.
* DumpRenderTree/qt/LayoutTestControllerQt.cpp:
(LayoutTestController::overridePreference): Add WebKitCSSGridLayoutEnabled.

LayoutTests:

* platform/qt/Skipped: Enable fast/css-grid-layout tests.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121241 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e9d2766..1fa8f0c 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2012-06-26  Tony Chang  <tony@chromium.org>
+
+        [Qt] Enable grid layout LayoutTests
+        https://bugs.webkit.org/show_bug.cgi?id=89909
+
+        Reviewed by Csaba Osztrogonác.
+
+        * platform/qt/Skipped: Enable fast/css-grid-layout tests.
+
 2012-06-26  Mario Sanchez Prada  <msanchez@igalia.com>
 
         Unreviewed gardening after r120845.

diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index c389a98..914cea5 100644 (file)
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -156,9 +156,6 @@ svg/custom/manually-parsed-embedded-svg-allowed-in-dashboard.html
 svg/custom/manually-parsed-svg-allowed-in-dashboard.html
 svg/custom/svg-allowed-in-dashboard-object.html
 
-# CSS Grid Layout is not yet enabled. http://webkit.org/b/60731
-fast/css-grid-layout
-
 # <style scoped> is not yet enabled. http://webkit.org/b/49142
 fast/css/style-scoped
 # CSS Regions tests for region styling and scoped styles

diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp
index d251417..a540dc3 100644 (file)
--- 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);

diff --git a/Source/WebKit/qt/Api/qwebsettings.h b/Source/WebKit/qt/Api/qwebsettings.h
index 0aee525..2e07356 100644 (file)
--- a/Source/WebKit/qt/Api/qwebsettings.h
+++ b/Source/WebKit/qt/Api/qwebsettings.h
@@ -78,7 +78,8 @@ public:
         JavascriptCanCloseWindows,
         WebGLEnabled,
         CSSRegionsEnabled,
-        HyperlinkAuditingEnabled
+        HyperlinkAuditingEnabled,
+        CSSGridLayoutEnabled
     };
     enum WebGraphic {
         MissingImageGraphic,

diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index c26181c..3b2fa86 100644 (file)
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2012-06-26  Tony Chang  <tony@chromium.org>
+
+        [Qt] Enable grid layout LayoutTests
+        https://bugs.webkit.org/show_bug.cgi?id=89909
+
+        Reviewed by Csaba Osztrogonác.
+
+        These tests pass, we just need to hook up the overridePreference.
+
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+        (QWebSettings::QWebSettings):
+        * Api/qwebsettings.h: Add enum value for CSS grid layout
+
 2012-06-25  Simon Hausmann  <simon.hausmann@nokia.com>
 
         Unreviewed build fix: Don't do QT += widgets with Qt 4

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c5a8b99..ab5f2b3 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2012-06-26  Tony Chang  <tony@chromium.org>
+
+        [Qt] Enable grid layout LayoutTests
+        https://bugs.webkit.org/show_bug.cgi?id=89909
+
+        Reviewed by Csaba Osztrogonác.
+
+        These tests pass, we just need to hook up the overridePreference.
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::WebPage::resetSettings): Reset grid layout and regions between tests.
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::overridePreference): Add WebKitCSSGridLayoutEnabled.
+
 2012-06-26  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r121236.

diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 764394b..9d0ae62 100755 (executable)
--- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -189,6 +189,8 @@ void WebPage::resetSettings()
     settings()->resetAttribute(QWebSettings::JavascriptCanAccessClipboard);
     settings()->resetAttribute(QWebSettings::AutoLoadImages);
     settings()->resetAttribute(QWebSettings::ZoomTextOnly);
+    settings()->resetAttribute(QWebSettings::CSSRegionsEnabled);
+    settings()->resetAttribute(QWebSettings::CSSGridLayoutEnabled);
 
     m_drt->layoutTestController()->setCaretBrowsingEnabled(false);
     m_drt->layoutTestController()->setAuthorAndUserStylesEnabled(true);

diff --git a/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 7689d5b..b8f9989 100644 (file)
--- a/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -669,6 +669,8 @@ void LayoutTestController::overridePreference(const QString& name, const QVarian
         settings->setAttribute(QWebSettings::WebGLEnabled, value.toBool());
     else if (name == "WebKitCSSRegionsEnabled")
         settings->setAttribute(QWebSettings::CSSRegionsEnabled, value.toBool());
+    else if (name == "WebKitCSSGridLayoutEnabled")
+        settings->setAttribute(QWebSettings::CSSGridLayoutEnabled, value.toBool());
     else if (name == "WebKitHyperlinkAuditingEnabled")
         settings->setAttribute(QWebSettings::HyperlinkAuditingEnabled, value.toBool());
     else if (name == "WebKitHixie76WebSocketProtocolEnabled")