projects / profile / ivi / webkit-efl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a16f48a)
Enable CSS grid layout LayoutTests on platform Mac
authortony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 28 Jun 2012 20:37:36 +0000 (20:37 +0000)
committertony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 28 Jun 2012 20:37:36 +0000 (20:37 +0000)
https://bugs.webkit.org/show_bug.cgi?id=90113

Reviewed by Ojan Vafai.

Tools:

* DumpRenderTree/mac/DumpRenderTree.mm:
(resetDefaultsToConsistentValues): Reset the value to NO between tests.

LayoutTests:

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.

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

LayoutTests/ChangeLog patch | blob | history
LayoutTests/fast/css-grid-layout/containing-block-grids.html patch | blob | history
LayoutTests/fast/css-grid-layout/display-grid-set-get.html patch | blob | history
LayoutTests/fast/css-grid-layout/floating-empty-grids.html patch | blob | history
LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html patch | blob | history
LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html patch | blob | history
LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html patch | blob | history
LayoutTests/platform/mac/Skipped patch | blob | history
Tools/ChangeLog patch | blob | history
Tools/DumpRenderTree/mac/DumpRenderTree.mm patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f4d8cea..3f4fb15 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2012-06-28  Tony Chang  <tony@chromium.org>
+
+        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  <senorblanco@chromium.org>
 
         Unreviewed gardening.
diff --git a/LayoutTests/fast/css-grid-layout/containing-block-grids.html b/LayoutTests/fast/css-grid-layout/containing-block-grids.html
index 23850a4..a6ae771 100644 (file)
--- a/LayoutTests/fast/css-grid-layout/containing-block-grids.html
+++ b/LayoutTests/fast/css-grid-layout/containing-block-grids.html
@@ -3,7 +3,7 @@
 <head>
     <script>
         if (window.testRunner)
-            testRunner.overridePreference("WebKitCSSGridLayoutEnabled", true);
+            testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
     </script>
     <style>
         div { width: 100px; height: 100px; }
diff --git a/LayoutTests/fast/css-grid-layout/display-grid-set-get.html b/LayoutTests/fast/css-grid-layout/display-grid-set-get.html
index 3f994b8..f3ac646 100755 (executable)
--- a/LayoutTests/fast/css-grid-layout/display-grid-set-get.html
+++ b/LayoutTests/fast/css-grid-layout/display-grid-set-get.html
@@ -3,7 +3,7 @@
 <head>
 <script>
 if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", true);
+    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
 </script>
 <style>
 .grid { display: -webkit-grid; }
diff --git a/LayoutTests/fast/css-grid-layout/floating-empty-grids.html b/LayoutTests/fast/css-grid-layout/floating-empty-grids.html
index a6e7d13..ae6ac71 100644 (file)
--- a/LayoutTests/fast/css-grid-layout/floating-empty-grids.html
+++ b/LayoutTests/fast/css-grid-layout/floating-empty-grids.html
@@ -3,7 +3,7 @@
 <head>
     <script>
         if (window.testRunner)
-            testRunner.overridePreference("WebKitCSSGridLayoutEnabled", true);
+            testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
     </script>
     <style>
         span { width: 100px; height: 100px; }
diff --git a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
index f610735..258b48e 100755 (executable)
--- a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
+++ b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
@@ -3,7 +3,7 @@
 <head>
 <script>
 if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", true);
+    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
 </script>
 <style>
 .gridWithFixed {
diff --git a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html
index 618e36d..2d49393 100755 (executable)
--- a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html
@@ -3,7 +3,7 @@
 <head>
 <script>
 if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", true);
+    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
 </script>
 <style>
 .grid {
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html b/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html
index 81fbb45..77f3fe6 100755 (executable)
--- a/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html
@@ -3,7 +3,7 @@
 <head>
 <script>
 if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", true);
+    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
 </script>
 <style>
 .gridItemWithPositiveInteger {
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 202463a..c870915 100644 (file)
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -450,9 +450,6 @@ http/tests/media/video-cross-site.html
 # 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
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index e365c53..961d267 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2012-06-28  Tony Chang  <tony@chromium.org>
+
+        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  <mifenton@rim.com>
 
         [BlackBerry] Add watchlist options for Blackberry and editing.
diff --git a/Tools/DumpRenderTree/mac/DumpRenderTree.mm b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
index 271683f..247e33d 100644 (file)
--- a/Tools/DumpRenderTree/mac/DumpRenderTree.mm
+++ b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -661,6 +661,7 @@ static void resetDefaultsToConsistentValues()
 #endif
     [preferences setWebGLEnabled:NO];
     [preferences setCSSRegionsEnabled:YES];
+    [preferences setCSSGridLayoutEnabled:NO];
     [preferences setUsePreHTML5ParserQuirks:NO];
     [preferences setAsynchronousSpellCheckingEnabled:NO];
     [preferences setHixie76WebSocketProtocolEnabled:NO];
Domain: Web Framework / Uncategorized;