- Revision
- 121241
- Author
- [email protected]
- Date
- 2012-06-26 02:11:58 -0700 (Tue, 26 Jun 2012)
Log Message
[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.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (121240 => 121241)
--- trunk/LayoutTests/ChangeLog 2012-06-26 09:04:31 UTC (rev 121240)
+++ trunk/LayoutTests/ChangeLog 2012-06-26 09:11:58 UTC (rev 121241)
@@ -1,3 +1,12 @@
+2012-06-26 Tony Chang <[email protected]>
+
+ [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 <[email protected]>
Unreviewed gardening after r120845.
Modified: trunk/LayoutTests/platform/qt/Skipped (121240 => 121241)
--- trunk/LayoutTests/platform/qt/Skipped 2012-06-26 09:04:31 UTC (rev 121240)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-06-26 09:11:58 UTC (rev 121241)
@@ -156,9 +156,6 @@
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
Modified: trunk/Source/WebKit/qt/Api/qwebsettings.cpp (121240 => 121241)
--- trunk/Source/WebKit/qt/Api/qwebsettings.cpp 2012-06-26 09:04:31 UTC (rev 121240)
+++ trunk/Source/WebKit/qt/Api/qwebsettings.cpp 2012-06-26 09:11:58 UTC (rev 121241)
@@ -174,6 +174,9 @@
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 @@
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);
Modified: trunk/Source/WebKit/qt/Api/qwebsettings.h (121240 => 121241)
--- trunk/Source/WebKit/qt/Api/qwebsettings.h 2012-06-26 09:04:31 UTC (rev 121240)
+++ trunk/Source/WebKit/qt/Api/qwebsettings.h 2012-06-26 09:11:58 UTC (rev 121241)
@@ -78,7 +78,8 @@
_javascript_CanCloseWindows,
WebGLEnabled,
CSSRegionsEnabled,
- HyperlinkAuditingEnabled
+ HyperlinkAuditingEnabled,
+ CSSGridLayoutEnabled
};
enum WebGraphic {
MissingImageGraphic,
Modified: trunk/Source/WebKit/qt/ChangeLog (121240 => 121241)
--- trunk/Source/WebKit/qt/ChangeLog 2012-06-26 09:04:31 UTC (rev 121240)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-06-26 09:11:58 UTC (rev 121241)
@@ -1,3 +1,17 @@
+2012-06-26 Tony Chang <[email protected]>
+
+ [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 <[email protected]>
Unreviewed build fix: Don't do QT += widgets with Qt 4
Modified: trunk/Tools/ChangeLog (121240 => 121241)
--- trunk/Tools/ChangeLog 2012-06-26 09:04:31 UTC (rev 121240)
+++ trunk/Tools/ChangeLog 2012-06-26 09:11:58 UTC (rev 121241)
@@ -1,3 +1,17 @@
+2012-06-26 Tony Chang <[email protected]>
+
+ [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 <[email protected]>
Unreviewed, rolling out r121236.
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (121240 => 121241)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp 2012-06-26 09:04:31 UTC (rev 121240)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp 2012-06-26 09:11:58 UTC (rev 121241)
@@ -189,6 +189,8 @@
settings()->resetAttribute(QWebSettings::_javascript_CanAccessClipboard);
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);
Modified: trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (121240 => 121241)
--- trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp 2012-06-26 09:04:31 UTC (rev 121240)
+++ trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp 2012-06-26 09:11:58 UTC (rev 121241)
@@ -669,6 +669,8 @@
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")
