From bc3ffa5195bcb9b21ff148f3b7430b46e6dd18c2 Mon Sep 17 00:00:00 2001 From: Ting-Yu Lin Date: Tue, 31 Dec 2019 19:33:15 +0000 Subject: [PATCH] Bug 1499281 - Remove column-span pref in mochitests and property databases. r=dbaron Move the content of bug1503420.html to test_frame_reconstruction_for_column_span.html because we don't need to flip the pref and load the test in an iframe. The modification to devtools's properties-db.js is generated via `./mach devtools-css-db`. Differential Revision: https://phabricator.services.mozilla.com/D58402 --HG-- extra : moz-landing-system : lando --- .../shared/css/generated/properties-db.js | 8 -- layout/base/tests/bug1503420.html | 77 ------------------ layout/base/tests/mochitest.ini | 2 - ..._frame_reconstruction_for_column_span.html | 80 +++++++++++++------ layout/style/test/property_database.js | 33 ++++---- 5 files changed, 71 insertions(+), 129 deletions(-) delete mode 100644 layout/base/tests/bug1503420.html diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js index ab14e33c50bb..e1ca67f0185f 100644 --- a/devtools/shared/css/generated/properties-db.js +++ b/devtools/shared/css/generated/properties-db.js @@ -10877,10 +10877,6 @@ exports.PSEUDO_ELEMENTS = [ * exposed for testing purposes. */ exports.PREFERENCES = [ - [ - "column-span", - "layout.css.column-span.enabled" - ], [ "contain", "layout.css.contain.enabled" @@ -11101,10 +11097,6 @@ exports.PREFERENCES = [ "-webkit-appearance", "layout.css.webkit-appearance.enabled" ], - [ - "-moz-column-span", - "layout.css.column-span.enabled" - ], [ "-moz-font-feature-settings", "layout.css.prefixes.font-features" diff --git a/layout/base/tests/bug1503420.html b/layout/base/tests/bug1503420.html deleted file mode 100644 index 90531ee74925..000000000000 --- a/layout/base/tests/bug1503420.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - Test for Bug 1503420: Test we don't reframe multi-column containing block - when appending a block containing a spanner kid. - - - - - - - - - - -
-
block1
-
- - diff --git a/layout/base/tests/mochitest.ini b/layout/base/tests/mochitest.ini index 0775ab7ca480..e61026e6978f 100644 --- a/layout/base/tests/mochitest.ini +++ b/layout/base/tests/mochitest.ini @@ -151,8 +151,6 @@ skip-if = toolkit == 'android' # Bug 1355836 [test_flush_on_paint.html] skip-if = true # Bug 688128 [test_frame_reconstruction_for_column_span.html] -support-files = - bug1503420.html [test_frame_reconstruction_for_pseudo_elements.html] [test_frame_reconstruction_for_svg_transforms.html] [test_frame_reconstruction_scroll_restore.html] diff --git a/layout/base/tests/test_frame_reconstruction_for_column_span.html b/layout/base/tests/test_frame_reconstruction_for_column_span.html index 98f8867a7766..c36890124146 100644 --- a/layout/base/tests/test_frame_reconstruction_for_column_span.html +++ b/layout/base/tests/test_frame_reconstruction_for_column_span.html @@ -2,9 +2,10 @@ - Loader to test frame construction for column span. + Test for Bug 1503420: Test we don't reframe multi-column containing block + when appending a block containing a spanner kid. - + @@ -12,34 +13,65 @@ - - + + + +
+
block1
+
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js index 9d9bb1c5a96f..391e9e237994 100644 --- a/layout/style/test/property_database.js +++ b/layout/style/test/property_database.js @@ -2668,6 +2668,21 @@ var gCSSProperties = { alias_for: "column-rule-color", subproperties: ["column-rule-color"], }, + "column-span": { + domProp: "columnSpan", + inherited: false, + type: CSS_TYPE_LONGHAND, + initial_values: ["none"], + other_values: ["all"], + invalid_values: ["-1", "0", "auto", "2px"], + }, + "-moz-column-span": { + domProp: "MozColumnSpan", + inherited: false, + type: CSS_TYPE_SHORTHAND_AND_LONGHAND, + alias_for: "column-span", + subproperties: ["column-span"], + }, "column-width": { domProp: "columnWidth", inherited: false, @@ -12558,24 +12573,6 @@ if (IsCSSPropertyPrefEnabled("layout.css.offset-logical-properties.enabled")) { gCSSProperties["display"].other_values.push("flow-root"); -if (IsCSSPropertyPrefEnabled("layout.css.column-span.enabled")) { - gCSSProperties["column-span"] = { - domProp: "columnSpan", - inherited: false, - type: CSS_TYPE_LONGHAND, - initial_values: ["none"], - other_values: ["all"], - invalid_values: ["-1", "0", "auto", "2px"], - }; - gCSSProperties["-moz-column-span"] = { - domProp: "MozColumnSpan", - inherited: false, - type: CSS_TYPE_SHORTHAND_AND_LONGHAND, - alias_for: "column-span", - subproperties: ["column-span"], - }; -} - if (IsCSSPropertyPrefEnabled("layout.css.webkit-line-clamp.enabled")) { gCSSProperties["-webkit-line-clamp"] = { domProp: "webkitLineClamp",