Diff
Modified: trunk/LayoutTests/ChangeLog (121463 => 121464)
--- trunk/LayoutTests/ChangeLog 2012-06-28 20:34:47 UTC (rev 121463)
+++ trunk/LayoutTests/ChangeLog 2012-06-28 20:37:36 UTC (rev 121464)
@@ -1,3 +1,20 @@
+2012-06-28 Tony Chang <[email protected]>
+
+ Enable CSS grid layout LayoutTests on platform Mac
+ https://bugs.webkit.org/show_bug.cgi?id=90113
+
+ Reviewed by Ojan Vafai.
+
+ Use 1 instead of true, since that's what WebView.mm expects.
+
+ * fast/css-grid-layout/containing-block-grids.html:
+ * fast/css-grid-layout/display-grid-set-get.html:
+ * fast/css-grid-layout/floating-empty-grids.html:
+ * fast/css-grid-layout/grid-columns-rows-get-set-multiple.html:
+ * fast/css-grid-layout/grid-columns-rows-get-set.html:
+ * fast/css-grid-layout/grid-item-column-row-get-set.html:
+ * platform/mac/Skipped: Unskip tests.
+
2012-06-28 Stephen White <[email protected]>
Unreviewed gardening.
Modified: trunk/LayoutTests/fast/css-grid-layout/containing-block-grids.html (121463 => 121464)
--- trunk/LayoutTests/fast/css-grid-layout/containing-block-grids.html 2012-06-28 20:34:47 UTC (rev 121463)
+++ trunk/LayoutTests/fast/css-grid-layout/containing-block-grids.html 2012-06-28 20:37:36 UTC (rev 121464)
@@ -3,7 +3,7 @@
<head>
<script>
if (window.testRunner)
- testRunner.overridePreference("WebKitCSSGridLayoutEnabled", true);
+ testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</script>
<style>
div { width: 100px; height: 100px; }
Modified: trunk/LayoutTests/fast/css-grid-layout/display-grid-set-get.html (121463 => 121464)
--- trunk/LayoutTests/fast/css-grid-layout/display-grid-set-get.html 2012-06-28 20:34:47 UTC (rev 121463)
+++ trunk/LayoutTests/fast/css-grid-layout/display-grid-set-get.html 2012-06-28 20:37:36 UTC (rev 121464)
@@ -3,7 +3,7 @@
<head>
<script>
if (window.testRunner)
- testRunner.overridePreference("WebKitCSSGridLayoutEnabled", true);
+ testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</script>
<style>
.grid { display: -webkit-grid; }
Modified: trunk/LayoutTests/fast/css-grid-layout/floating-empty-grids.html (121463 => 121464)
--- trunk/LayoutTests/fast/css-grid-layout/floating-empty-grids.html 2012-06-28 20:34:47 UTC (rev 121463)
+++ trunk/LayoutTests/fast/css-grid-layout/floating-empty-grids.html 2012-06-28 20:37:36 UTC (rev 121464)
@@ -3,7 +3,7 @@
<head>
<script>
if (window.testRunner)
- testRunner.overridePreference("WebKitCSSGridLayoutEnabled", true);
+ testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</script>
<style>
span { width: 100px; height: 100px; }
Modified: trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html (121463 => 121464)
--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html 2012-06-28 20:34:47 UTC (rev 121463)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html 2012-06-28 20:37:36 UTC (rev 121464)
@@ -3,7 +3,7 @@
<head>
<script>
if (window.testRunner)
- testRunner.overridePreference("WebKitCSSGridLayoutEnabled", true);
+ testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</script>
<style>
.gridWithFixed {
Modified: trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html (121463 => 121464)
--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html 2012-06-28 20:34:47 UTC (rev 121463)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html 2012-06-28 20:37:36 UTC (rev 121464)
@@ -3,7 +3,7 @@
<head>
<script>
if (window.testRunner)
- testRunner.overridePreference("WebKitCSSGridLayoutEnabled", true);
+ testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</script>
<style>
.grid {
Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html (121463 => 121464)
--- trunk/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html 2012-06-28 20:34:47 UTC (rev 121463)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html 2012-06-28 20:37:36 UTC (rev 121464)
@@ -3,7 +3,7 @@
<head>
<script>
if (window.testRunner)
- testRunner.overridePreference("WebKitCSSGridLayoutEnabled", true);
+ testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</script>
<style>
.gridItemWithPositiveInteger {
Modified: trunk/LayoutTests/platform/mac/Skipped (121463 => 121464)
--- trunk/LayoutTests/platform/mac/Skipped 2012-06-28 20:34:47 UTC (rev 121463)
+++ trunk/LayoutTests/platform/mac/Skipped 2012-06-28 20:37:36 UTC (rev 121464)
@@ -450,9 +450,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=63169
webarchive/loading/mainresource-null-mimetype-crash.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/Tools/ChangeLog (121463 => 121464)
--- trunk/Tools/ChangeLog 2012-06-28 20:34:47 UTC (rev 121463)
+++ trunk/Tools/ChangeLog 2012-06-28 20:37:36 UTC (rev 121464)
@@ -1,3 +1,13 @@
+2012-06-28 Tony Chang <[email protected]>
+
+ Enable CSS grid layout LayoutTests on platform Mac
+ https://bugs.webkit.org/show_bug.cgi?id=90113
+
+ Reviewed by Ojan Vafai.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetDefaultsToConsistentValues): Reset the value to NO between tests.
+
2012-06-28 Mike Fenton <[email protected]>
[BlackBerry] Add watchlist options for Blackberry and editing.
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (121463 => 121464)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2012-06-28 20:34:47 UTC (rev 121463)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2012-06-28 20:37:36 UTC (rev 121464)
@@ -661,6 +661,7 @@
#endif
[preferences setWebGLEnabled:NO];
[preferences setCSSRegionsEnabled:YES];
+ [preferences setCSSGridLayoutEnabled:NO];
[preferences setUsePreHTML5ParserQuirks:NO];
[preferences setAsynchronousSpellCheckingEnabled:NO];
[preferences setHixie76WebSocketProtocolEnabled:NO];
