+2012-05-18 Tony Chang <tony@chromium.org>
+
+ remove the CSS_GRID_LAYOUT compiler define, but default grid layout to off
+ https://bugs.webkit.org/show_bug.cgi?id=86767
+
+ Reviewed by Ojan Vafai.
+
+ * fast/css-grid-layout/display-grid-set-get.html: Enable grid layout for the test.
+ * fast/css-grid-layout/grid-columns-rows-get-set-multiple.html: Enable grid layout for the test.
+ * fast/css-grid-layout/grid-columns-rows-get-set.html: Enable grid layout for the test.
+ * fast/css-grid-layout/grid-disabled-by-default-expected.txt: Added.
+ * fast/css-grid-layout/grid-disabled-by-default.html: Added.
+ * fast/css-grid-layout/grid-item-column-row-get-set.html: Enable grid layout for the test.
+ * platform/chromium/test_expectations.txt: Run grid layout tests.
+
2012-05-18 Pablo Flouret <pablof@motorola.com>
Script elements inserted while fragment parsing should have their "already started" flag set.
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
+<script>
+if (window.layoutTestController)
+ layoutTestController.overridePreference("WebKitCSSGridLayoutEnabled", true);
+</script>
<style>
.grid { display: -webkit-grid; }
.inlineGrid { display: -webkit-inline-grid; }
<!DOCTYPE html>
<html>
<head>
+<script>
+if (window.layoutTestController)
+ layoutTestController.overridePreference("WebKitCSSGridLayoutEnabled", true);
+</script>
<style>
.gridWithFixed {
display: -webkit-grid;
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
+<script>
+if (window.layoutTestController)
+ layoutTestController.overridePreference("WebKitCSSGridLayoutEnabled", true);
+</script>
<style>
.grid {
display: -webkit-grid;
--- /dev/null
+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
+
--- /dev/null
+<!DOCTYPE html>
+<html>
+<body>
+<div id="grid" style="display: -webkit-grid"></div>
+
+<script src="../js/resources/js-test-pre.js"></script>
+<script>
+description("Verifies that display: -webkit-grid does nothing by default.");
+
+shouldBe("document.getElementById('grid').style.display", "''");
+</script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
\ No newline at end of file
<!DOCTYPE html>
<html>
<head>
+<script>
+if (window.layoutTestController)
+ layoutTestController.overridePreference("WebKitCSSGridLayoutEnabled", true);
+</script>
<style>
.gridItemWithPositiveInteger {
-webkit-grid-column: 10;
-webkit-font-kerning: auto;
-webkit-font-smoothing: auto;
-webkit-font-variant-ligatures: normal;
+-webkit-grid-column: auto;
+-webkit-grid-row: auto;
-webkit-highlight: none;
-webkit-hyphenate-character: auto;
-webkit-hyphenate-limit-after: auto;
-webkit-font-kerning: auto
-webkit-font-smoothing: auto
-webkit-font-variant-ligatures: normal
+ -webkit-grid-column: auto
+ -webkit-grid-row: auto
-webkit-highlight: none
-webkit-hyphenate-character: auto
-webkit-hyphenate-limit-after: auto
rect: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
rect: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-column) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-row) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-highlight) : none
rect: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-hyphenate-character) : auto
g: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
g: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-column) : auto
+g: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-row) : auto
+g: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-highlight) : none
g: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-hyphenate-character) : auto
rect: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
rect: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-column) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-row) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-highlight) : none
rect: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-hyphenate-character) : auto
g: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
g: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-column) : auto
+g: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-row) : auto
+g: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-highlight) : none
g: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-hyphenate-character) : auto
-webkit-font-kerning: auto;
-webkit-font-smoothing: auto;
-webkit-font-variant-ligatures: normal;
+-webkit-grid-column: auto;
+-webkit-grid-row: auto;
-webkit-highlight: none;
-webkit-hyphenate-character: auto;
-webkit-hyphenate-limit-after: auto;
rect: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
rect: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-column) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-row) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-highlight) : none
rect: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-hyphenate-character) : auto
g: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
g: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-column) : auto
+g: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-row) : auto
+g: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-highlight) : none
g: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-hyphenate-character) : auto
rect: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
rect: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-column) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-row) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-highlight) : none
rect: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-hyphenate-character) : auto
g: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
g: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-column) : auto
+g: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-row) : auto
+g: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-highlight) : none
g: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-hyphenate-character) : auto
-webkit-font-kerning: auto;
-webkit-font-smoothing: auto;
-webkit-font-variant-ligatures: normal;
+-webkit-grid-column: auto;
+-webkit-grid-row: auto;
-webkit-highlight: none;
-webkit-hyphenate-character: auto;
-webkit-hyphenate-limit-after: auto;
-webkit-font-kerning: auto
-webkit-font-smoothing: auto
-webkit-font-variant-ligatures: normal
+ -webkit-grid-column: auto
+ -webkit-grid-row: auto
-webkit-highlight: none
-webkit-hyphenate-character: auto
-webkit-hyphenate-limit-after: auto
rect: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
rect: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-column) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-row) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-highlight) : none
rect: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-hyphenate-character) : auto
g: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
g: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-column) : auto
+g: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-row) : auto
+g: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-highlight) : none
g: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-hyphenate-character) : auto
rect: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
rect: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-column) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-row) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-highlight) : none
rect: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-hyphenate-character) : auto
g: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
g: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-column) : auto
+g: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-row) : auto
+g: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-highlight) : none
g: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-hyphenate-character) : auto
rect: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
rect: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-column) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-row) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-highlight) : none
rect: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-hyphenate-character) : auto
g: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
g: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-column) : auto
+g: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-row) : auto
+g: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-highlight) : none
g: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-hyphenate-character) : auto
-webkit-font-kerning: auto;
-webkit-font-smoothing: auto;
-webkit-font-variant-ligatures: normal;
+-webkit-grid-column: auto;
+-webkit-grid-row: auto;
-webkit-highlight: none;
-webkit-hyphenate-character: auto;
-webkit-hyphenate-limit-after: auto;
-webkit-font-kerning: auto
-webkit-font-smoothing: auto
-webkit-font-variant-ligatures: normal
+ -webkit-grid-column: auto
+ -webkit-grid-row: auto
-webkit-highlight: none
-webkit-hyphenate-character: auto
-webkit-hyphenate-limit-after: auto
rect: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
rect: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-column) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-row) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-highlight) : none
rect: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-hyphenate-character) : auto
g: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
g: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-column) : auto
+g: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-row) : auto
+g: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-highlight) : none
g: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-hyphenate-character) : auto
BUGWK81310 : fast/dom/shadow/content-element-in-media-element.html = TEXT
-// CSS Grid Layout is not enabled yet.
-BUGWK60731 SKIP : fast/css-grid-layout = PASS
-
// two regions reftests failing on Chromium
BUGWK74219 : fast/regions/positioned-objects-block-static-spanning-regions-rtl.html = PASS IMAGE
BUGWK74219 : fast/regions/positioned-objects-block-static-spanning-regions.html = PASS IMAGE
-webkit-font-kerning: auto;
-webkit-font-smoothing: auto;
-webkit-font-variant-ligatures: normal;
+-webkit-grid-column: auto;
+-webkit-grid-row: auto;
-webkit-highlight: none;
-webkit-hyphenate-character: auto;
-webkit-hyphenate-limit-after: auto;
rect: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
rect: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-column) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-row) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-highlight) : none
rect: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-hyphenate-character) : auto
g: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
g: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-column) : auto
+g: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-row) : auto
+g: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-highlight) : none
g: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-hyphenate-character) : auto
-webkit-font-variant-ligatures: normal;
-webkit-grid-column: auto;
-webkit-grid-row: auto;
+-webkit-grid-column: auto;
+-webkit-grid-row: auto;
-webkit-highlight: none;
-webkit-hyphenate-character: auto;
-webkit-hyphenate-limit-after: auto;
rect: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-grid-row) : auto
rect: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-column) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-row) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-highlight) : none
rect: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-hyphenate-character) : auto
g: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-grid-row) : auto
g: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-column) : auto
+g: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-row) : auto
+g: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-highlight) : none
g: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-hyphenate-character) : auto
-webkit-font-kerning: auto
-webkit-font-smoothing: auto
-webkit-font-variant-ligatures: normal
+ -webkit-grid-column: auto
+ -webkit-grid-row: auto
-webkit-highlight: none
-webkit-hyphenate-character: auto
-webkit-hyphenate-limit-after: auto
rect: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
rect: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-column) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-grid-row) : auto
+rect: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-highlight) : none
rect: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-hyphenate-character) : auto
g: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
g: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-column) : auto
+g: style.getPropertyCSSValue(-webkit-grid-column) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-grid-row) : auto
+g: style.getPropertyCSSValue(-webkit-grid-row) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-highlight) : none
g: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-hyphenate-character) : auto
+2012-05-18 Tony Chang <tony@chromium.org>
+
+ remove the CSS_GRID_LAYOUT compiler define, but default grid layout to off
+ https://bugs.webkit.org/show_bug.cgi?id=86767
+
+ Reviewed by Ojan Vafai.
+
+ * Configurations/FeatureDefines.xcconfig: Remove ENABLE_CSS_GRID_LAYOUT.
+
2012-05-17 Filip Pizlo <fpizlo@apple.com>
Setting array index -1 and looping over array causes bad behavior
ENABLE_BLOB = ENABLE_BLOB;
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_CSS_FILTERS = ENABLE_CSS_FILTERS;
-ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
ENABLE_CSS_VARIABLES = ;
ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(REAL_PLATFORM_NAME));
ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT;
ENABLE_WORKERS = ENABLE_WORKERS;
ENABLE_XSLT = ENABLE_XSLT;
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
+2012-05-18 Tony Chang <tony@chromium.org>
+
+ remove the CSS_GRID_LAYOUT compiler define, but default grid layout to off
+ https://bugs.webkit.org/show_bug.cgi?id=86767
+
+ Reviewed by Ojan Vafai.
+
+ We disable grid by ignoring the display type at CSS parse time.
+
+ Test: fast/css-grid-layout/grid-disabled-by-default.html
+
+ * Configurations/FeatureDefines.xcconfig:
+ * css/CSSComputedStyleDeclaration.cpp: Remove compile checks.
+ (WebCore):
+ (WebCore::valueForGridPosition):
+ (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParserContext::CSSParserContext):
+ (WebCore::operator==):
+ (WebCore::isValidKeywordPropertyAndValue): Move display into parseValue.
+ (WebCore::isKeywordPropertyID):
+ (WebCore::CSSParser::parseValue): Ignore while parsing if not enabled.
+ (WebCore::CSSParser::parseGridTrackList):
+ (WebCore::CSSParser::cssGridLayoutEnabled):
+ (WebCore):
+ * css/CSSParser.h:
+ * css/CSSParserMode.h:
+ (CSSParserContext):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ * css/CSSProperty.cpp:
+ (WebCore::CSSProperty::isInheritedProperty):
+ * css/CSSPropertyNames.in:
+ * css/CSSValueKeywords.in:
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::collectMatchingRulesForList):
+ * dom/Document.cpp:
+ (WebCore::Document::cssGridLayoutEnabled): Added to keep track of whether grid is enabled or not.
+ (WebCore):
+ * dom/Document.h:
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ * page/Settings.h:
+ (WebCore::Settings::setCSSGridLayoutEnabled): Added.
+ (WebCore::Settings::cssGridLayoutEnabled): Added.
+ (Settings):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::createObject):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::RenderStyle):
+ (WebCore::RenderStyle::diff):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/RenderStyleConstants.h:
+ * rendering/style/StyleGridData.cpp:
+ * rendering/style/StyleGridData.h:
+ * rendering/style/StyleGridItemData.cpp:
+ * rendering/style/StyleGridItemData.h:
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator==):
+ * rendering/style/StyleRareNonInheritedData.h:
+ (WebCore):
+ (StyleRareNonInheritedData):
+
2012-05-18 Martin Robinson <mrobinson@igalia.com>
OOM running webgl/sdk/tests/conformance/context/context-creation-and-destruction.html
ENABLE_BLOB = ENABLE_BLOB;
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_CSS_FILTERS = ENABLE_CSS_FILTERS;
-ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
ENABLE_CSS_VARIABLES = ;
ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(REAL_PLATFORM_NAME));
ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT;
ENABLE_WORKERS = ENABLE_WORKERS;
ENABLE_XSLT = ENABLE_XSLT;
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PREFENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PREFENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
CSSPropertyWebkitFontKerning,
CSSPropertyWebkitFontSmoothing,
CSSPropertyWebkitFontVariantLigatures,
-#if ENABLE(CSS_GRID_LAYOUT)
CSSPropertyWebkitGridColumns,
CSSPropertyWebkitGridRows,
-
CSSPropertyWebkitGridColumn,
CSSPropertyWebkitGridRow,
-#endif
CSSPropertyWebkitHighlight,
CSSPropertyWebkitHyphenateCharacter,
CSSPropertyWebkitHyphenateLimitAfter,
}
#endif
-#if ENABLE(CSS_GRID_LAYOUT)
static PassRefPtr<CSSValue> valueForGridTrackBreadth(const Length& trackLength, const RenderStyle* style)
{
if (trackLength.isPercent())
ASSERT(position.isFixed());
return cssValuePool().createValue(position.value(), CSSPrimitiveValue::CSS_NUMBER);
}
-#endif
static PassRefPtr<CSSValue> getDelayValue(const AnimationList* animList)
{
}
return list.release();
}
-#if ENABLE(CSS_GRID_LAYOUT)
case CSSPropertyWebkitGridColumns: {
return valueForGridTrackList(style->gridColumns(), style.get());
}
return valueForGridPosition(style->gridItemColumn());
case CSSPropertyWebkitGridRow:
return valueForGridPosition(style->gridItemRow());
-#endif
+
case CSSPropertyHeight:
if (renderer) {
// According to http://www.w3.org/TR/CSS2/visudet.html#the-height-property,
, isHTMLDocument(false)
, isCSSCustomFilterEnabled(false)
, isCSSRegionsEnabled(false)
+ , isCSSGridLayoutEnabled(false)
, needsSiteSpecificQuirks(false)
, enforcesCSSMIMETypeInNoQuirksMode(true)
{
, isHTMLDocument(document->isHTMLDocument())
, isCSSCustomFilterEnabled(document->settings() ? document->settings()->isCSSCustomFilterEnabled() : false)
, isCSSRegionsEnabled(document->cssRegionsEnabled())
+ , isCSSGridLayoutEnabled(document->cssGridLayoutEnabled())
, needsSiteSpecificQuirks(document->settings() ? document->settings()->needsSiteSpecificQuirks() : false)
, enforcesCSSMIMETypeInNoQuirksMode(!document->settings() || document->settings()->enforceCSSMIMETypeInNoQuirksMode())
{
&& a.isHTMLDocument == b.isHTMLDocument
&& a.isCSSCustomFilterEnabled == b.isCSSCustomFilterEnabled
&& a.isCSSRegionsEnabled == b.isCSSRegionsEnabled
+ && a.isCSSGridLayoutEnabled == b.isCSSGridLayoutEnabled
&& a.needsSiteSpecificQuirks == b.needsSiteSpecificQuirks
&& a.enforcesCSSMIMETypeInNoQuirksMode == b.enforcesCSSMIMETypeInNoQuirksMode;
}
if (valueID == CSSValueLtr || valueID == CSSValueRtl)
return true;
break;
- case CSSPropertyDisplay:
- // inline | block | list-item | run-in | inline-block | table |
- // inline-table | table-row-group | table-header-group | table-footer-group | table-row |
- // table-column-group | table-column | table-cell | table-caption | -webkit-box | -webkit-inline-box | none | inherit
- // -webkit-flex | -webkit-inline-flex | -webkit-grid | -webkit-inline-grid
- if ((valueID >= CSSValueInline && valueID <= CSSValueWebkitInlineFlex) || valueID == CSSValueNone)
- return true;
-#if ENABLE(CSS_GRID_LAYOUT)
- if (valueID == CSSValueWebkitGrid || valueID == CSSValueWebkitInlineGrid)
- return true;
-#endif
- break;
case CSSPropertyEmptyCells: // show | hide | inherit
if (valueID == CSSValueShow || valueID == CSSValueHide)
return true;
case CSSPropertyCaptionSide:
case CSSPropertyClear:
case CSSPropertyDirection:
- case CSSPropertyDisplay:
case CSSPropertyEmptyCells:
case CSSPropertyFloat:
case CSSPropertyFontStyle:
RefPtr<CSSValue> parsedValue;
switch (propId) {
+ case CSSPropertyDisplay:
+ // inline | block | list-item | run-in | inline-block | table |
+ // inline-table | table-row-group | table-header-group | table-footer-group | table-row |
+ // table-column-group | table-column | table-cell | table-caption | -webkit-box | -webkit-inline-box | none | inherit
+ // -webkit-flex | -webkit-inline-flex | -webkit-grid | -webkit-inline-grid
+ if ((id >= CSSValueInline && id <= CSSValueWebkitInlineFlex) || id == CSSValueNone)
+ validPrimitive = true;
+ else if (cssGridLayoutEnabled() && (id == CSSValueWebkitGrid || id == CSSValueWebkitInlineGrid))
+ validPrimitive = true;
+ break;
+
case CSSPropertySize: // <length>{1,2} | auto | [ <page-size> || [ portrait | landscape] ]
return parseSize(propId, important);
}
return false;
}
-#if ENABLE(CSS_GRID_LAYOUT)
+
case CSSPropertyWebkitGridColumns:
case CSSPropertyWebkitGridRows:
+ if (!cssGridLayoutEnabled())
+ return false;
return parseGridTrackList(propId, important);
case CSSPropertyWebkitGridColumn:
case CSSPropertyWebkitGridRow:
+ if (!cssGridLayoutEnabled())
+ return false;
validPrimitive = id == CSSValueAuto || validUnit(value, FInteger);
break;
-#endif
+
case CSSPropertyWebkitMarginCollapse: {
if (num == 1) {
ShorthandScope scope(this, CSSPropertyWebkitMarginCollapse);
case CSSPropertyCaptionSide:
case CSSPropertyClear:
case CSSPropertyDirection:
- case CSSPropertyDisplay:
case CSSPropertyEmptyCells:
case CSSPropertyFloat:
case CSSPropertyFontStyle:
return false;
}
-#if ENABLE(CSS_GRID_LAYOUT)
bool CSSParser::parseGridTrackList(CSSPropertyID propId, bool important)
{
CSSParserValue* value = m_valueList->current();
addProperty(propId, values.release(), important);
return true;
}
-#endif
-
#if ENABLE(DASHBOARD_SUPPORT)
return m_context.isCSSRegionsEnabled;
}
+bool CSSParser::cssGridLayoutEnabled() const
+{
+ return m_context.isCSSGridLayoutEnabled;
+}
+
bool CSSParser::parseFlowThread(const String& flowName)
{
RefPtr<StyleSheetInternal> dummyStyleSheet = StyleSheetInternal::create();
bool parseTransitionShorthand(bool important);
bool parseAnimationShorthand(bool important);
-#if ENABLE(CSS_GRID_LAYOUT)
+ bool cssGridLayoutEnabled() const;
bool parseGridTrackList(CSSPropertyID, bool important);
-#endif
bool parseDashboardRegions(CSSPropertyID, bool important);
bool isHTMLDocument;
bool isCSSCustomFilterEnabled;
bool isCSSRegionsEnabled;
+ bool isCSSGridLayoutEnabled;
bool needsSiteSpecificQuirks;
bool enforcesCSSMIMETypeInNoQuirksMode;
};
case INLINE_FLEX:
m_value.ident = CSSValueWebkitInlineFlex;
break;
-#if ENABLE(CSS_GRID_LAYOUT)
case GRID:
m_value.ident = CSSValueWebkitGrid;
break;
case INLINE_GRID:
m_value.ident = CSSValueWebkitInlineGrid;
break;
-#endif
case NONE:
m_value.ident = CSSValueNone;
break;
case CSSPropertyWebkitFlexLinePack:
case CSSPropertyWebkitFlexWrap:
case CSSPropertyWebkitFontSizeDelta:
-#if ENABLE(CSS_GRID_LAYOUT)
case CSSPropertyWebkitGridColumns:
case CSSPropertyWebkitGridRows:
-
case CSSPropertyWebkitGridColumn:
case CSSPropertyWebkitGridRow:
-#endif
case CSSPropertyWebkitLineClamp:
case CSSPropertyWebkitLogicalWidth:
case CSSPropertyWebkitLogicalHeight:
-webkit-flex-pack
-webkit-flex-wrap
-webkit-font-size-delta
+-webkit-grid-columns
+-webkit-grid-rows
+-webkit-grid-column
+-webkit-grid-row
-webkit-highlight
-webkit-hyphenate-character
-webkit-hyphenate-limit-after
#if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
-webkit-tap-highlight-color
#endif
-#if defined(ENABLE_CSS_GRID_LAYOUT) && ENABLE_CSS_GRID_LAYOUT
--webkit-grid-columns
--webkit-grid-rows
--webkit-grid-column
--webkit-grid-row
-#endif
#if defined(ENABLE_DASHBOARD_SUPPORT) && ENABLE_DASHBOARD_SUPPORT
-webkit-dashboard-region
#endif
-webkit-inline-box
-webkit-flex
-webkit-inline-flex
-#if defined(ENABLE_CSS_GRID_LAYOUT) && ENABLE_CSS_GRID_LAYOUT
-webkit-grid
-webkit-inline-grid
-#endif
//none
//
// CSS_PROP_CURSOR:
case TABLE:
case BOX:
case FLEX:
-#if ENABLE(CSS_GRID_LAYOUT)
case GRID:
-#endif
return display;
case LIST_ITEM:
return BOX;
case INLINE_FLEX:
return FLEX;
-#if ENABLE(CSS_GRID_LAYOUT)
case INLINE_GRID:
return GRID;
-#endif
case INLINE:
case RUN_IN:
return m_element && m_element->isSVGElement();
}
-#if ENABLE(CSS_GRID_LAYOUT)
-
static bool createGridTrackBreadth(CSSPrimitiveValue* primitiveValue, StyleResolver* selector, Length& length)
{
Length workingLength = primitiveValue->convertToLength<FixedIntegerConversion | PercentConversion | ViewportPercentageConversion | AutoConversion>(selector->style(), selector->rootElementStyle(), selector->style()->effectiveZoom());
position.setValue(primitiveValue->getIntValue());
return true;
}
-#endif
void StyleResolver::applyProperty(CSSPropertyID id, CSSValue *value)
{
return;
}
#endif
-#if ENABLE(CSS_GRID_LAYOUT)
case CSSPropertyWebkitGridColumns: {
Vector<Length> lengths;
if (!createGridTrackList(value, lengths, this))
m_style->setGridItemRow(row);
return;
}
-#endif
// These properties are implemented in the StyleBuilder lookup table.
case CSSPropertyBackgroundAttachment:
return settings() && settings()->cssRegionsEnabled();
}
+bool Document::cssGridLayoutEnabled() const
+{
+ return settings() && settings()->cssGridLayoutEnabled();
+}
+
static bool validFlowName(const String& flowName)
{
if (equalIgnoringCase(flowName, "auto")
bool regionBasedColumnsEnabled() const;
+ bool cssGridLayoutEnabled() const;
+
/**
* Retrieve all nodes that intersect a rect in the window's document, until it is fully enclosed by
* the boundaries of a node.
, m_isCSSCustomFilterEnabled(false)
, m_cssRegionsEnabled(false)
, m_regionBasedColumnsEnabled(false)
+ , m_cssGridLayoutEnabled(false)
// FIXME: This should really be disabled by default as it makes platforms that don't support the feature download files
// they can't use by. Leaving enabled for now to not change existing behavior.
, m_downloadableBinaryFontsEnabled(true)
void setRegionBasedColumnsEnabled(bool enabled) { m_regionBasedColumnsEnabled = enabled; }
bool regionBasedColumnsEnabled() const { return m_regionBasedColumnsEnabled; }
+ void setCSSGridLayoutEnabled(bool enabled) { m_cssGridLayoutEnabled = enabled; }
+ bool cssGridLayoutEnabled() const { return m_cssGridLayoutEnabled; }
+
void setAcceleratedCompositingEnabled(bool);
bool acceleratedCompositingEnabled() const { return m_acceleratedCompositingEnabled; }
bool m_isCSSCustomFilterEnabled : 1;
bool m_cssRegionsEnabled : 1;
bool m_regionBasedColumnsEnabled : 1;
+ bool m_cssGridLayoutEnabled : 1;
bool m_downloadableBinaryFontsEnabled : 1;
bool m_xssAuditorEnabled : 1;
bool m_acceleratedCompositingEnabled : 1;
return new (arena) RenderRubyText(node);
switch (style->display()) {
-#if ENABLE(CSS_GRID_LAYOUT)
// For now, we don't show grid elements.
case GRID:
case INLINE_GRID:
-#endif
case NONE:
return 0;
case INLINE:
#if ENABLE(CSS_FILTERS)
rareNonInheritedData.access()->m_filter.init();
#endif
-#if ENABLE(CSS_GRID_LAYOUT)
rareNonInheritedData.access()->m_grid.init();
rareNonInheritedData.access()->m_gridItem.init();
-#endif
rareInheritedData.init();
inherited.init();
#endif
}
-#if ENABLE(CSS_GRID_LAYOUT)
if (rareNonInheritedData->m_grid.get() != other->rareNonInheritedData->m_grid.get()
&& rareNonInheritedData->m_gridItem.get() != other->rareNonInheritedData->m_gridItem.get())
return StyleDifferenceLayout;
-#endif
#if !USE(ACCELERATED_COMPOSITING)
if (rareNonInheritedData.get() != other->rareNonInheritedData.get()) {
#include "StyleBoxData.h"
#include "StyleDeprecatedFlexibleBoxData.h"
#include "StyleFlexibleBoxData.h"
+#include "StyleGridData.h"
+#include "StyleGridItemData.h"
#include "StyleInheritedData.h"
#include "StyleMarqueeData.h"
#include "StyleMultiColData.h"
#include "StyleFilterData.h"
#endif
-#if ENABLE(CSS_GRID_LAYOUT)
-#include "StyleGridData.h"
-#include "StyleGridItemData.h"
-#endif
-
#if ENABLE(DASHBOARD_SUPPORT)
#include "StyleDashboardRegion.h"
#endif
EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(rareNonInheritedData->m_flexibleBox->m_flexWrap); }
EFlexLinePack flexLinePack() const { return static_cast<EFlexLinePack>(rareNonInheritedData->m_flexibleBox->m_flexLinePack); }
-#if ENABLE(CSS_GRID_LAYOUT)
const Vector<Length>& gridColumns() const { return rareNonInheritedData->m_grid->m_gridColumns; }
const Vector<Length>& gridRows() const { return rareNonInheritedData->m_grid->m_gridRows; }
const Length& gridItemColumn() const { return rareNonInheritedData->m_gridItem->m_gridColumn; }
const Length& gridItemRow() const { return rareNonInheritedData->m_gridItem->m_gridRow; }
-#endif
const ShadowData* boxShadow() const { return rareNonInheritedData->m_boxShadow.get(); }
void getBoxShadowExtent(LayoutUnit& top, LayoutUnit& right, LayoutUnit& bottom, LayoutUnit& left) const { getShadowExtent(boxShadow(), top, right, bottom, left); }
void setFlexDirection(EFlexDirection direction) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_flexDirection, direction); }
void setFlexWrap(EFlexWrap w) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_flexWrap, w); }
void setFlexLinePack(EFlexLinePack p) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_flexLinePack, p); }
-#if ENABLE(CSS_GRID_LAYOUT)
void setGridColumns(const Vector<Length>& lengths) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridColumns, lengths); }
void setGridRows(const Vector<Length>& lengths) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridRows, lengths); }
-
void setGridItemColumn(const Length& columnPosition) { SET_VAR(rareNonInheritedData.access()->m_gridItem, m_gridColumn, columnPosition); }
void setGridItemRow(const Length& rowPosition) { SET_VAR(rareNonInheritedData.access()->m_gridItem, m_gridRow, rowPosition); }
-#endif
void setMarqueeIncrement(const Length& f) { SET_VAR(rareNonInheritedData.access()->m_marquee, increment, f); }
void setMarqueeSpeed(int f) { SET_VAR(rareNonInheritedData.access()->m_marquee, speed, f); }
static StyleImage* initialMaskBoxImageSource() { return 0; }
static PrintColorAdjust initialPrintColorAdjust() { return PrintColorAdjustEconomy; }
-#if ENABLE(CSS_GRID_LAYOUT)
// The initial value is 'none' for grid tracks.
static Vector<Length> initialGridTrackValue()
{
// 'auto' is the default.
static Length initialGridItemColumn() { return Length(); }
static Length initialGridItemRow() { return Length(); }
-#endif
static unsigned initialTabSize() { return 8; }
TABLE_COLUMN_GROUP, TABLE_COLUMN, TABLE_CELL,
TABLE_CAPTION, BOX, INLINE_BOX,
FLEX, INLINE_FLEX,
-#if ENABLE(CSS_GRID_LAYOUT)
GRID, INLINE_GRID,
-#endif
NONE
};
#include "StyleFlexibleBoxData.cpp"
#include "StyleGeneratedImage.cpp"
#include "StyleGridData.cpp"
+#include "StyleGridItemData.cpp"
#include "StyleInheritedData.cpp"
#include "StyleMarqueeData.cpp"
#include "StyleMultiColData.cpp"
#include "config.h"
#include "StyleGridData.h"
-#if ENABLE(CSS_GRID_LAYOUT)
-
#include "RenderStyle.h"
namespace WebCore {
} // namespace WebCore
-#endif // ENABLE(CSS_GRID_LAYOUT)
-
#ifndef StyleGridData_h
#define StyleGridData_h
-#if ENABLE(CSS_GRID_LAYOUT)
-
#include "Length.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
} // namespace WebCore
-#endif // ENABLE(CSS_LAYOUT_GRID)
-
#endif // StyleGridData_h
#include "config.h"
#include "StyleGridItemData.h"
-#if ENABLE(CSS_GRID_LAYOUT)
-
#include "RenderStyle.h"
namespace WebCore {
}
} // namespace WebCore
-
-#endif // ENABLE(CSS_GRID_LAYOUT)
-
#ifndef StyleGridItemData_h
#define StyleGridItemData_h
-#if ENABLE(CSS_GRID_LAYOUT)
#include "Length.h"
#include <wtf/PassRefPtr.h>
} // namespace WebCore
-#endif // ENABLE(CSS_LAYOUT_GRID)
-
#endif // StyleGridItemData_h
#if ENABLE(CSS_FILTERS)
, m_filter(o.m_filter)
#endif
-#if ENABLE(CSS_GRID_LAYOUT)
, m_grid(o.m_grid)
, m_gridItem(o.m_gridItem)
-#endif
, m_content(o.m_content ? o.m_content->clone() : nullptr)
, m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr)
, m_boxShadow(o.m_boxShadow ? adoptPtr(new ShadowData(*o.m_boxShadow)) : nullptr)
#if ENABLE(CSS_FILTERS)
&& m_filter == o.m_filter
#endif
-#if ENABLE(CSS_GRID_LAYOUT)
&& m_grid == o.m_grid
&& m_gridItem == o.m_gridItem
-#endif
&& contentDataEquivalent(o)
&& counterDataEquivalent(o)
&& userDrag == o.userDrag
class StyleFilterData;
#endif
class StyleFlexibleBoxData;
-#if ENABLE(CSS_GRID_LAYOUT)
class StyleGridData;
class StyleGridItemData;
-#endif
class StyleMarqueeData;
class StyleMultiColData;
class StyleReflection;
DataRef<StyleFilterData> m_filter; // Filter operations (url, sepia, blur, etc.)
#endif
-#if ENABLE(CSS_GRID_LAYOUT)
DataRef<StyleGridData> m_grid;
DataRef<StyleGridItemData> m_gridItem;
-#endif
OwnPtr<ContentData> m_content;
OwnPtr<CounterDirectiveMap> m_counterDirectives;
+2012-05-18 Tony Chang <tony@chromium.org>
+
+ remove the CSS_GRID_LAYOUT compiler define, but default grid layout to off
+ https://bugs.webkit.org/show_bug.cgi?id=86767
+
+ Reviewed by Ojan Vafai.
+
+ * public/WebSettings.h:
+ * src/WebSettingsImpl.cpp:
+ (WebKit::WebSettingsImpl::setExperimentalCSSGridLayoutEnabled):
+ (WebKit):
+ * src/WebSettingsImpl.h:
+ (WebSettingsImpl):
+
2012-05-18 Ian Vollick <vollick@chromium.org>
[chromium] Multithreaded compositor unit tests intermittently failing
virtual void setWebAudioEnabled(bool) = 0;
virtual void setExperimentalWebGLEnabled(bool) = 0;
virtual void setExperimentalCSSRegionsEnabled(bool) = 0;
+ virtual void setExperimentalCSSGridLayoutEnabled(bool) = 0;
virtual void setExperimentalCSSCustomFilterEnabled(bool) = 0;
virtual void setOpenGLMultisamplingEnabled(bool) = 0;
virtual void setPrivilegedWebGLExtensionsEnabled(bool) = 0;
m_settings->setCSSRegionsEnabled(enabled);
}
+void WebSettingsImpl::setExperimentalCSSGridLayoutEnabled(bool enabled)
+{
+ m_settings->setCSSGridLayoutEnabled(enabled);
+}
+
void WebSettingsImpl::setExperimentalCSSCustomFilterEnabled(bool enabled)
{
m_settings->setCSSCustomFilterEnabled(enabled);
virtual void setWebAudioEnabled(bool);
virtual void setExperimentalWebGLEnabled(bool);
virtual void setExperimentalCSSRegionsEnabled(bool);
+ virtual void setExperimentalCSSGridLayoutEnabled(bool);
virtual void setExperimentalCSSCustomFilterEnabled(bool);
virtual void setOpenGLMultisamplingEnabled(bool);
virtual void setPrivilegedWebGLExtensionsEnabled(bool);
+2012-05-18 Tony Chang <tony@chromium.org>
+
+ remove the CSS_GRID_LAYOUT compiler define, but default grid layout to off
+ https://bugs.webkit.org/show_bug.cgi?id=86767
+
+ Reviewed by Ojan Vafai.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences cssGridLayoutEnabled]):
+ (-[WebPreferences setCSSGridLayoutEnabled:]):
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
2012-05-18 MORITA Hajime <morrita@google.com>
Another unreviewed attempt to fix build breakage on r117572.
ENABLE_BLOB = ENABLE_BLOB;
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_CSS_FILTERS = ENABLE_CSS_FILTERS;
-ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
ENABLE_CSS_VARIABLES = ;
ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(REAL_PLATFORM_NAME));
ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT;
ENABLE_WORKERS = ENABLE_WORKERS;
ENABLE_XSLT = ENABLE_XSLT;
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
#define WebKitAcceleratedCompositingEnabledPreferenceKey @"WebKitAcceleratedCompositingEnabled"
#define WebKitCSSCustomFilterEnabledPreferenceKey @"WebKitCSSCustomFilterEnabled"
#define WebKitCSSRegionsEnabledPreferenceKey @"WebKitCSSRegionsEnabled"
+#define WebKitCSSGridLayoutEnabledPreferenceKey @"WebKitCSSGridLayoutEnabled"
#define WebKitShowDebugBordersPreferenceKey @"WebKitShowDebugBorders"
#define WebKitShowRepaintCounterPreferenceKey @"WebKitShowRepaintCounter"
#define WebKitWebAudioEnabledPreferenceKey @"WebKitWebAudioEnabled"
// CSS Shaders also need WebGL enabled (which is disabled by default), so we can keep it enabled for now.
[NSNumber numberWithBool:YES], WebKitCSSCustomFilterEnabledPreferenceKey,
[NSNumber numberWithBool:YES], WebKitCSSRegionsEnabledPreferenceKey,
+ [NSNumber numberWithBool:NO], WebKitCSSGridLayoutEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitAcceleratedDrawingEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitCanvasUsesAcceleratedDrawingPreferenceKey,
[NSNumber numberWithBool:NO], WebKitShowDebugBordersPreferenceKey,
[self _setBoolValue:enabled forKey:WebKitCSSRegionsEnabledPreferenceKey];
}
+- (BOOL)cssGridLayoutEnabled
+{
+ return [self _boolValueForKey:WebKitCSSGridLayoutEnabledPreferenceKey];
+}
+
+- (void)setCSSGridLayoutEnabled:(BOOL)enabled
+{
+ [self _setBoolValue:enabled forKey:WebKitCSSGridLayoutEnabledPreferenceKey];
+}
+
- (BOOL)showDebugBorders
{
return [self _boolValueForKey:WebKitShowDebugBordersPreferenceKey];
- (BOOL)cssRegionsEnabled;
- (void)setCSSRegionsEnabled:(BOOL)enabled;
+- (BOOL)cssGridLayoutEnabled;
+- (void)setCSSGridLayoutEnabled:(BOOL)enabled;
+
- (BOOL)showDebugBorders;
- (void)setShowDebugBorders:(BOOL)show;
settings->setCSSCustomFilterEnabled([preferences cssCustomFilterEnabled]);
#endif
settings->setCSSRegionsEnabled([preferences cssRegionsEnabled]);
+ settings->setCSSGridLayoutEnabled([preferences cssGridLayoutEnabled]);
#if ENABLE(FULLSCREEN_API)
settings->setFullScreenEnabled([preferences fullScreenEnabled]);
#endif
+2012-05-18 Tony Chang <tony@chromium.org>
+
+ remove the CSS_GRID_LAYOUT compiler define, but default grid layout to off
+ https://bugs.webkit.org/show_bug.cgi?id=86767
+
+ Reviewed by Ojan Vafai.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Shared/WebPreferencesStore.h:
+ (WebKit):
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetCSSGridLayoutEnabled):
+ (WKPreferencesGetCSSGridLayoutEnabled):
+ * UIProcess/API/C/WKPreferencesPrivate.h:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2012-05-18 Shezan Baig <shezbaig.wk@gmail.com>
Expose FrameSelection::absoluteCaretBounds via window.internals
ENABLE_BLOB = ENABLE_BLOB;
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_CSS_FILTERS = ENABLE_CSS_FILTERS;
-ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
ENABLE_CSS_VARIABLES = ;
ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(REAL_PLATFORM_NAME));
ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT;
ENABLE_WORKERS = ENABLE_WORKERS;
ENABLE_XSLT = ENABLE_XSLT;
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
macro(CSSCustomFilterEnabled, cssCustomFilterEnabled, Bool, bool, true) \
macro(WebGLEnabled, webGLEnabled, Bool, bool, false) \
macro(CSSRegionsEnabled, cssRegionsEnabled, Bool, bool, true) \
+ macro(CSSGridLayoutEnabled, cssGridLayoutEnabled, Bool, bool, false) \
macro(RegionBasedColumnsEnabled, regionBasedColumnsEnabled, Bool, bool, false) \
macro(ForceFTPDirectoryListings, forceFTPDirectoryListings, Bool, bool, false) \
macro(TabsToLinks, tabsToLinks, Bool, bool, DEFAULT_WEBKIT_TABSTOLINKS_ENABLED) \
return toImpl(preferencesRef)->cssRegionsEnabled();
}
+void WKPreferencesSetCSSGridLayoutEnabled(WKPreferencesRef preferencesRef, bool flag)
+{
+ toImpl(preferencesRef)->setCSSGridLayoutEnabled(flag);
+}
+
+bool WKPreferencesGetCSSGridLayoutEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->cssGridLayoutEnabled();
+}
+
void WKPreferencesSetRegionBasedColumnsEnabled(WKPreferencesRef preferencesRef, bool flag)
{
toImpl(preferencesRef)->setRegionBasedColumnsEnabled(flag);
WK_EXPORT bool WKPreferencesGetCSSRegionsEnabled(WKPreferencesRef);
// Defaults to false
+WK_EXPORT void WKPreferencesSetCSSGridLayoutEnabled(WKPreferencesRef, bool flag);
+WK_EXPORT bool WKPreferencesGetCSSGridLayoutEnabled(WKPreferencesRef);
+
+// Defaults to false
WK_EXPORT void WKPreferencesSetRegionBasedColumnsEnabled(WKPreferencesRef, bool flag);
WK_EXPORT bool WKPreferencesGetRegionBasedColumnsEnabled(WKPreferencesRef);
macro(WebKitAcceleratedCompositingEnabled, AcceleratedCompositingEnabled, acceleratedCompositingEnabled) \
macro(WebKitCSSCustomFilterEnabled, CSSCustomFilterEnabled, cssCustomFilterEnabled) \
macro(WebKitCSSRegionsEnabled, CSSRegionsEnabled, cssRegionsEnabled) \
+ macro(WebKitCSSGridLayoutEnabled, CSSGridLayoutEnabled, cssGridLayoutEnabled) \
macro(WebKitJavaEnabled, JavaEnabled, javaEnabled) \
macro(WebKitJavaScriptEnabled, ScriptEnabled, javaScriptEnabled) \
macro(WebKitLoadSiteIconsKey, LoadsSiteIconsIgnoringImageLoadingSetting, loadsSiteIconsIgnoringImageLoadingPreference) \
settings->setShowRepaintCounter(store.getBoolValueForKey(WebPreferencesKey::compositingRepaintCountersVisibleKey()));
settings->setCSSCustomFilterEnabled(store.getBoolValueForKey(WebPreferencesKey::cssCustomFilterEnabledKey()));
settings->setCSSRegionsEnabled(store.getBoolValueForKey(WebPreferencesKey::cssRegionsEnabledKey()));
+ settings->setCSSGridLayoutEnabled(store.getBoolValueForKey(WebPreferencesKey::cssGridLayoutEnabledKey()));
settings->setRegionBasedColumnsEnabled(store.getBoolValueForKey(WebPreferencesKey::regionBasedColumnsEnabledKey()));
settings->setWebGLEnabled(store.getBoolValueForKey(WebPreferencesKey::webGLEnabledKey()));
settings->setMediaPlaybackRequiresUserGesture(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackRequiresUserGestureKey()));
+2012-05-18 Tony Chang <tony@chromium.org>
+
+ remove the CSS_GRID_LAYOUT compiler define, but default grid layout to off
+ https://bugs.webkit.org/show_bug.cgi?id=86767
+
+ Reviewed by Ojan Vafai.
+
+ * DumpRenderTree/chromium/LayoutTestController.cpp:
+ (LayoutTestController::overridePreference):
+ * DumpRenderTree/chromium/WebPreferences.cpp:
+ (WebPreferences::reset):
+ (WebPreferences::applyTo):
+ * DumpRenderTree/chromium/WebPreferences.h:
+ (WebPreferences):
+ * Scripts/webkitperl/FeatureList.pm:
+
2012-05-18 Hugo Parente Lima <hugo.lima@openbossa.org>
[Qt][WK2] fast/events/page-visibility-iframe-move-test.html fails
prefs->experimentalWebGLEnabled = cppVariantToBool(value);
else if (key == "WebKitCSSRegionsEnabled")
prefs->experimentalCSSRegionsEnabled = cppVariantToBool(value);
+ else if (key == "WebKitCSSGridLayoutEnabled")
+ prefs->experimentalCSSGridLayoutEnabled = cppVariantToBool(value);
else if (key == "WebKitHyperlinkAuditingEnabled")
prefs->hyperlinkAuditingEnabled = cppVariantToBool(value);
else if (key == "WebKitEnableCaretBrowsing")
developerExtrasEnabled = true;
experimentalWebGLEnabled = false;
experimentalCSSRegionsEnabled = true;
+ experimentalCSSGridLayoutEnabled = false;
javaEnabled = false;
javaScriptCanAccessClipboard = true;
javaScriptCanOpenWindowsAutomatically = true;
settings->setDeveloperExtrasEnabled(developerExtrasEnabled);
settings->setExperimentalWebGLEnabled(experimentalWebGLEnabled);
settings->setExperimentalCSSRegionsEnabled(experimentalCSSRegionsEnabled);
+ settings->setExperimentalCSSGridLayoutEnabled(experimentalCSSGridLayoutEnabled);
settings->setExperimentalCSSCustomFilterEnabled(cssCustomFilterEnabled);
settings->setJavaEnabled(javaEnabled);
settings->setJavaScriptCanAccessClipboard(javaScriptCanAccessClipboard);
bool developerExtrasEnabled;
bool experimentalWebGLEnabled;
bool experimentalCSSRegionsEnabled;
+ bool experimentalCSSGridLayoutEnabled;
bool javaEnabled;
bool javaScriptCanAccessClipboard;
bool javaScriptCanOpenWindowsAutomatically;
$blobSupport,
$channelMessagingSupport,
$cssFiltersSupport,
- $cssGridLayoutSupport,
$cssShadersSupport,
$cssVariablesSupport,
$dataTransferItemsSupport,
{ option => "css-filters", desc => "Toggle CSS Filters support",
define => "ENABLE_CSS_FILTERS", default => isAppleWebKit(), value => \$cssFiltersSupport },
- { option => "css-grid-layout", desc => "Toggle CSS Grid Layout support",
- define => "ENABLE_CSS_GRID_LAYOUT", default => 0, value => \$cssGridLayoutSupport },
-
{ option => "css-shaders", desc => "Toggle CSS Shaders support",
define => "ENABLE_CSS_SHADERS", default => 0, value => \$cssShadersSupport },
git://git.webkit.org / WebKit-https.git / commitdiff