Diff
Modified: trunk/LayoutTests/ChangeLog (166613 => 166614)
--- trunk/LayoutTests/ChangeLog 2014-04-01 21:35:54 UTC (rev 166613)
+++ trunk/LayoutTests/ChangeLog 2014-04-01 21:57:12 UTC (rev 166614)
@@ -1,3 +1,16 @@
+2014-04-01 Manuel Rego Casasnovas <r...@igalia.com>
+
+ [CSS Grid Layout] Enable runtime feature if feature flag is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=130013
+
+ Reviewed by Simon Fraser.
+
+ Modify layout test as feature is not disabled by default in WK2.
+ The test now checks that the runtime feature can be disabled.
+
+ * fast/css-grid-layout/grid-disabled-expected.txt: Renamed from LayoutTests/fast/css-grid-layout/grid-disabled-by-default-expected.txt.
+ * fast/css-grid-layout/grid-disabled.html: Renamed from LayoutTests/fast/css-grid-layout/grid-disabled-by-default.html.
+
2014-04-01 Javier Fernandez <jfernan...@igalia.com>
[CSS Grid Layout] Make the grid-item-margin-auto-columns-rows.html test a reftest
Deleted: trunk/LayoutTests/fast/css-grid-layout/grid-disabled-by-default-expected.txt (166613 => 166614)
--- trunk/LayoutTests/fast/css-grid-layout/grid-disabled-by-default-expected.txt 2014-04-01 21:35:54 UTC (rev 166613)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-disabled-by-default-expected.txt 2014-04-01 21:57:12 UTC (rev 166614)
@@ -1,10 +0,0 @@
-Verifies that display: -webkit-grid does nothing by default.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS document.getElementById('grid').style.display is ''
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/fast/css-grid-layout/grid-disabled-by-default.html (166613 => 166614)
--- trunk/LayoutTests/fast/css-grid-layout/grid-disabled-by-default.html 2014-04-01 21:35:54 UTC (rev 166613)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-disabled-by-default.html 2014-04-01 21:57:12 UTC (rev 166614)
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<div id="grid" style="display: -webkit-grid"></div>
-
-<script src=""
-<script>
-description("Verifies that display: -webkit-grid does nothing by default.");
-
-shouldBe("document.getElementById('grid').style.display", "''");
-</script>
-<script src=""
-</body>
-</html>
\ No newline at end of file
Copied: trunk/LayoutTests/fast/css-grid-layout/grid-disabled-expected.txt (from rev 166613, trunk/LayoutTests/fast/css-grid-layout/grid-disabled-by-default-expected.txt) (0 => 166614)
--- trunk/LayoutTests/fast/css-grid-layout/grid-disabled-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-disabled-expected.txt 2014-04-01 21:57:12 UTC (rev 166614)
@@ -0,0 +1,10 @@
+Verifies that display: -webkit-grid does nothing if runtime feature is disabled.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS document.getElementById('grid').style.display is ''
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: trunk/LayoutTests/fast/css-grid-layout/grid-disabled.html (from rev 166613, trunk/LayoutTests/fast/css-grid-layout/grid-disabled-by-default.html) (0 => 166614)
--- trunk/LayoutTests/fast/css-grid-layout/grid-disabled.html (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-disabled.html 2014-04-01 21:57:12 UTC (rev 166614)
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<script>
+if (window.testRunner)
+ testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 0);
+</script>
+<body>
+<div id="grid" style="display: -webkit-grid"></div>
+
+<script src=""
+<script>
+description("Verifies that display: -webkit-grid does nothing if runtime feature is disabled.");
+
+shouldBe("document.getElementById('grid').style.display", "''");
+</script>
+<script src=""
+</body>
+</html>
Modified: trunk/Source/WebKit/mac/ChangeLog (166613 => 166614)
--- trunk/Source/WebKit/mac/ChangeLog 2014-04-01 21:35:54 UTC (rev 166613)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-04-01 21:57:12 UTC (rev 166614)
@@ -1,3 +1,15 @@
+2014-04-01 Manuel Rego Casasnovas <r...@igalia.com>
+
+ [CSS Grid Layout] Enable runtime feature if feature flag is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=130013
+
+ Reviewed by Simon Fraser.
+
+ Enable CSS Grid Layout runtime feature when ENABLE_CSS_GRID_LAYOUT flag is true.
+
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+
2014-03-31 Simon Fraser <simon.fra...@apple.com>
Enable WEB_TIMING on Mac and iOS
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (166613 => 166614)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-04-01 21:35:54 UTC (rev 166613)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-04-01 21:57:12 UTC (rev 166614)
@@ -485,7 +485,11 @@
[NSNumber numberWithBool:YES], WebKitAcceleratedCompositingEnabledPreferenceKey,
[NSNumber numberWithBool:YES], WebKitCSSRegionsEnabledPreferenceKey,
[NSNumber numberWithBool:YES], WebKitCSSCompositingEnabledPreferenceKey,
+#if ENABLE(CSS_GRID_LAYOUT)
+ [NSNumber numberWithBool:YES], WebKitCSSGridLayoutEnabledPreferenceKey,
+#else
[NSNumber numberWithBool:NO], WebKitCSSGridLayoutEnabledPreferenceKey,
+#endif
#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
[NSNumber numberWithBool:YES], WebKitAcceleratedDrawingEnabledPreferenceKey,
[NSNumber numberWithBool:YES], WebKitCanvasUsesAcceleratedDrawingPreferenceKey,
Modified: trunk/Source/WebKit2/ChangeLog (166613 => 166614)
--- trunk/Source/WebKit2/ChangeLog 2014-04-01 21:35:54 UTC (rev 166613)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-01 21:57:12 UTC (rev 166614)
@@ -1,3 +1,14 @@
+2014-04-01 Manuel Rego Casasnovas <r...@igalia.com>
+
+ [CSS Grid Layout] Enable runtime feature if feature flag is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=130013
+
+ Reviewed by Simon Fraser.
+
+ Enable CSS Grid Layout runtime feature when ENABLE_CSS_GRID_LAYOUT flag is true.
+
+ * Shared/WebPreferencesStore.h:
+
2014-04-01 Anders Carlsson <ander...@apple.com>
Demote WKBackForwardListDidChangeNotification to SPI
Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (166613 => 166614)
--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-04-01 21:35:54 UTC (rev 166613)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-04-01 21:57:12 UTC (rev 166614)
@@ -100,6 +100,12 @@
#define DEFAULT_CANVAS_USES_ACCELERATED_DRAWING true
#endif
+#if ENABLE(CSS_GRID_LAYOUT)
+#define DEFAULT_CSS_GRID_LAYOUT_ENABLED true
+#else
+#define DEFAULT_CSS_GRID_LAYOUT_ENABLED false
+#endif
+
#define FOR_EACH_WEBKIT_BOOL_PREFERENCE(macro) \
macro(_javascript_Enabled, _javascript_Enabled, Bool, bool, true) \
macro(_javascript_MarkupEnabled, _javascript_MarkupEnabled, Bool, bool, true) \
@@ -133,7 +139,7 @@
macro(Accelerated2dCanvasEnabled, accelerated2dCanvasEnabled, Bool, bool, false) \
macro(CSSRegionsEnabled, cssRegionsEnabled, Bool, bool, true) \
macro(CSSCompositingEnabled, cssCompositingEnabled, Bool, bool, true) \
- macro(CSSGridLayoutEnabled, cssGridLayoutEnabled, Bool, bool, false) \
+ macro(CSSGridLayoutEnabled, cssGridLayoutEnabled, Bool, bool, DEFAULT_CSS_GRID_LAYOUT_ENABLED) \
macro(RegionBasedColumnsEnabled, regionBasedColumnsEnabled, Bool, bool, false) \
macro(ForceFTPDirectoryListings, forceFTPDirectoryListings, Bool, bool, false) \
macro(TabsToLinks, tabsToLinks, Bool, bool, DEFAULT_WEBKIT_TABSTOLINKS_ENABLED) \
