зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1297097 Part 1 - Remove preference "layout.css.vertical-text.enabled" in test files. r=jfkthame
MozReview-Commit-ID: LCegChkryHj --HG-- extra : rebase_source : 7893e9a62d76da82c0a620430468dc6fde4c57cc
This commit is contained in:
Ting-Yu Lin
Родитель
3011e2c2dd
Коммит
2e89b612fe
|
|
@ -2,11 +2,7 @@
|
|||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<!--
|
||||
|
||||
user_pref("layout.css.vertical-text.enabled", true);
|
||||
|
||||
-->
|
||||
<script>
|
||||
|
||||
function boom()
|
||||
|
|
|
|||
|
|
@ -39,10 +39,10 @@ skip-if(Android) == grid-placement-definite-implicit-001.html grid-placement-def
|
|||
== grid-placement-definite-implicit-002.html grid-placement-definite-implicit-002-ref.html
|
||||
skip-if(Android) fuzzy-if(winWidget,1,32) == grid-placement-auto-implicit-001.html grid-placement-auto-implicit-001-ref.html
|
||||
== grid-placement-abspos-implicit-001.html grid-placement-abspos-implicit-001-ref.html
|
||||
pref(layout.css.vertical-text.enabled,true) == rtl-grid-placement-definite-001.html rtl-grid-placement-definite-001-ref.html
|
||||
pref(layout.css.vertical-text.enabled,true) == rtl-grid-placement-auto-row-sparse-001.html rtl-grid-placement-auto-row-sparse-001-ref.html
|
||||
pref(layout.css.vertical-text.enabled,true) == vlr-grid-placement-auto-row-sparse-001.html vlr-grid-placement-auto-row-sparse-001-ref.html
|
||||
pref(layout.css.vertical-text.enabled,true) == vrl-grid-placement-auto-row-sparse-001.html vrl-grid-placement-auto-row-sparse-001-ref.html
|
||||
== rtl-grid-placement-definite-001.html rtl-grid-placement-definite-001-ref.html
|
||||
== rtl-grid-placement-auto-row-sparse-001.html rtl-grid-placement-auto-row-sparse-001-ref.html
|
||||
== vlr-grid-placement-auto-row-sparse-001.html vlr-grid-placement-auto-row-sparse-001-ref.html
|
||||
== vrl-grid-placement-auto-row-sparse-001.html vrl-grid-placement-auto-row-sparse-001-ref.html
|
||||
== grid-relpos-items-001.html grid-relpos-items-001-ref.html
|
||||
== grid-item-sizing-percent-001.html grid-item-sizing-percent-001-ref.html
|
||||
== grid-item-sizing-px-001.html grid-item-sizing-percent-001-ref.html
|
||||
|
|
|
|||
|
|
@ -46,8 +46,8 @@ load nested-ruby-1.html
|
|||
== ruby-align-2.html ruby-align-2-ref.html
|
||||
== ruby-align-2a.html ruby-align-2-ref.html
|
||||
== ruby-position-horizontal.html ruby-position-horizontal-ref.html
|
||||
pref(layout.css.vertical-text.enabled,true) == ruby-position-vertical-lr.html ruby-position-vertical-lr-ref.html
|
||||
pref(layout.css.vertical-text.enabled,true) == ruby-position-vertical-rl.html ruby-position-vertical-rl-ref.html
|
||||
== ruby-position-vertical-lr.html ruby-position-vertical-lr-ref.html
|
||||
== ruby-position-vertical-rl.html ruby-position-vertical-rl-ref.html
|
||||
!= ruby-reflow-1-opaqueruby.html ruby-reflow-1-noruby.html
|
||||
fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),13,1) == ruby-reflow-1-transparentruby.html ruby-reflow-1-noruby.html
|
||||
== ruby-span-1.html ruby-span-1-ref.html
|
||||
|
|
|
|||
|
|
@ -48,12 +48,6 @@ fuzzy-if(skiaContent,1,12000) == float-in-rtl-4d.html float-in-rtl-4-ref.html
|
|||
== bfc-shrink-1.html bfc-shrink-1-ref.html
|
||||
|
||||
# Testcases that involve vertical writing mode.
|
||||
#
|
||||
# XXX The default-preferences setting here can be removed after the
|
||||
# pref has been made true by default for all channels (bug 1138384).
|
||||
|
||||
default-preferences pref(layout.css.vertical-text.enabled,true)
|
||||
|
||||
== float-in-rtl-vlr-1a.html float-in-rtl-vlr-1-ref.html
|
||||
== float-in-rtl-vlr-1b.html float-in-rtl-vlr-1-ref.html
|
||||
== float-in-rtl-vlr-1c.html float-in-rtl-vlr-1-ref.html
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ skip-if(!Android&&!B2G&&!Mulet) == number-same-as-text-unthemed.html number-same
|
|||
# should look the same as type=text, except for the spin box
|
||||
== number-similar-to-text-unthemed.html number-similar-to-text-unthemed-ref.html
|
||||
== number-similar-to-text-unthemed-rtl.html number-similar-to-text-unthemed-rtl-ref.html
|
||||
pref(layout.css.vertical-text.enabled,true) == number-similar-to-text-unthemed-vertical-lr.html number-similar-to-text-unthemed-vertical-lr-ref.html
|
||||
pref(layout.css.vertical-text.enabled,true) == number-similar-to-text-unthemed-vertical-rl.html number-similar-to-text-unthemed-vertical-rl-ref.html
|
||||
== number-similar-to-text-unthemed-vertical-lr.html number-similar-to-text-unthemed-vertical-lr-ref.html
|
||||
== number-similar-to-text-unthemed-vertical-rl.html number-similar-to-text-unthemed-vertical-rl-ref.html
|
||||
|
||||
# dynamic type changes:
|
||||
fuzzy-if(/^Windows\x20NT\x205\.1/.test(http.oscpu),64,4) fuzzy-if(cocoaWidget,63,4) fuzzy-if(skiaContent,2,5) == to-number-from-other-type-unthemed-1.html to-number-from-other-type-unthemed-1-ref.html
|
||||
|
|
|
|||
|
|
@ -33,9 +33,6 @@ fails-if(B2G||Mulet||Android) == moz-range-progress-1.html moz-range-progress-1-
|
|||
== moz-range-progress-3.html moz-range-progress-3-ref.html
|
||||
|
||||
# Tests for block and inline orientation in combination with writing-mode
|
||||
# XXX Remove default-preferences setting here after bug 1138384 makes
|
||||
# it the default for all channels
|
||||
default-preferences pref(layout.css.vertical-text.enabled,true)
|
||||
!= range-orient-horizontal.html range-orient-vertical.html
|
||||
!= range-orient-horizontal.html range-orient-horizontal-rtl.html
|
||||
== range-orient-block.html range-orient-vertical.html
|
||||
|
|
|
|||
|
|
@ -27,9 +27,6 @@ include default-style/reftest.list
|
|||
== max-height.html max-height-ref.html
|
||||
|
||||
# Tests for block and inline orientation in combination with writing-mode
|
||||
# XXX Remove default-preferences setting here after bug 1138384 makes
|
||||
# it the default for all channels
|
||||
default-preferences pref(layout.css.vertical-text.enabled,true)
|
||||
!= meter-orient-vertical.html meter-orient-horizontal.html
|
||||
!= meter-orient-horizontal.html meter-orient-horizontal-rtl.html
|
||||
== meter-orient-block.html meter-orient-vertical.html
|
||||
|
|
|
|||
|
|
@ -26,9 +26,6 @@ skip-if(B2G||Mulet) == bar-pseudo-element-vertical.html bar-pseudo-element-verti
|
|||
== max-height.html max-height-ref.html
|
||||
|
||||
# Tests for block and inline orientation in combination with writing-mode
|
||||
# XXX Remove default-preferences setting here after bug 1138384 makes
|
||||
# it the default for all channels
|
||||
default-preferences pref(layout.css.vertical-text.enabled,true)
|
||||
!= progress-orient-horizontal.html progress-orient-vertical.html
|
||||
fails-if(!cocoaWidget||OSX==1010) != progress-orient-vertical.html progress-orient-vertical-rtl.html # only OS X currently has direction-dependent rendering here
|
||||
== progress-orient-block.html progress-orient-vertical.html
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\.[12]/
|
|||
== text-shadow.svg text-shadow-ref.svg
|
||||
|
||||
# vertical text
|
||||
pref(layout.css.vertical-text.enabled,true) == vertical-01.svg vertical-01-ref.svg
|
||||
== vertical-01.svg vertical-01-ref.svg
|
||||
|
||||
# tests for ignoring various properties
|
||||
== ignore-border.svg ignore-prop-ref.svg
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@ fuzzy(1,2616) skip-if(Android||B2G||Mulet) fuzzy-if(asyncPan&&!layersGPUAccelera
|
|||
HTTP(..) == combobox-zoom.html combobox-zoom-ref.html
|
||||
|
||||
# The vertical-text pref setting can be removed after bug 1138384 lands
|
||||
pref(layout.css.vertical-text.enabled,true) == vertical-decorations-1.html vertical-decorations-1-ref.html
|
||||
pref(layout.css.vertical-text.enabled,true) == vertical-decorations-2.html vertical-decorations-2-ref.html
|
||||
pref(layout.css.vertical-text.enabled,true) != vertical-decorations-1.html vertical-decorations-1-2-notref.html
|
||||
pref(layout.css.vertical-text.enabled,true) != vertical-decorations-2.html vertical-decorations-1-2-notref.html
|
||||
pref(layout.css.vertical-text.enabled,true) == vertical-decorations-3.html vertical-decorations-3-ref.html
|
||||
pref(layout.css.vertical-text.enabled,true) == vertical-decorations-4.html vertical-decorations-4-ref.html
|
||||
pref(layout.css.vertical-text.enabled,true) != vertical-decorations-3.html vertical-decorations-3-4-notref.html
|
||||
pref(layout.css.vertical-text.enabled,true) != vertical-decorations-4.html vertical-decorations-3-4-notref.html
|
||||
== vertical-decorations-1.html vertical-decorations-1-ref.html
|
||||
== vertical-decorations-2.html vertical-decorations-2-ref.html
|
||||
!= vertical-decorations-1.html vertical-decorations-1-2-notref.html
|
||||
!= vertical-decorations-2.html vertical-decorations-1-2-notref.html
|
||||
== vertical-decorations-3.html vertical-decorations-3-ref.html
|
||||
== vertical-decorations-4.html vertical-decorations-4-ref.html
|
||||
!= vertical-decorations-3.html vertical-decorations-3-4-notref.html
|
||||
!= vertical-decorations-4.html vertical-decorations-3-4-notref.html
|
||||
|
|
|
|||
|
|
@ -193,15 +193,15 @@ fails == flexbox-min-height-auto-002b.html flexbox-min-height-auto-002-ref.html
|
|||
== flexbox-with-pseudo-elements-003.html flexbox-with-pseudo-elements-003-ref.html
|
||||
|
||||
# Tests for combined influence of 'writing-mode' & 'direction' on flex axes
|
||||
test-pref(layout.css.vertical-text.enabled,true) == flexbox-writing-mode-001.html flexbox-writing-mode-001-ref.html
|
||||
test-pref(layout.css.vertical-text.enabled,true) == flexbox-writing-mode-002.html flexbox-writing-mode-002-ref.html
|
||||
test-pref(layout.css.vertical-text.enabled,true) == flexbox-writing-mode-003.html flexbox-writing-mode-003-ref.html
|
||||
test-pref(layout.css.vertical-text.enabled,true) == flexbox-writing-mode-004.html flexbox-writing-mode-004-ref.html
|
||||
test-pref(layout.css.vertical-text.enabled,true) == flexbox-writing-mode-005.html flexbox-writing-mode-005-ref.html
|
||||
test-pref(layout.css.vertical-text.enabled,true) == flexbox-writing-mode-006.html flexbox-writing-mode-006-ref.html
|
||||
test-pref(layout.css.vertical-text.enabled,true) == flexbox-writing-mode-007.html flexbox-writing-mode-007-ref.html
|
||||
test-pref(layout.css.vertical-text.enabled,true) == flexbox-writing-mode-008.html flexbox-writing-mode-008-ref.html
|
||||
test-pref(layout.css.vertical-text.enabled,true) == flexbox-writing-mode-009.html flexbox-writing-mode-009-ref.html
|
||||
== flexbox-writing-mode-001.html flexbox-writing-mode-001-ref.html
|
||||
== flexbox-writing-mode-002.html flexbox-writing-mode-002-ref.html
|
||||
== flexbox-writing-mode-003.html flexbox-writing-mode-003-ref.html
|
||||
== flexbox-writing-mode-004.html flexbox-writing-mode-004-ref.html
|
||||
== flexbox-writing-mode-005.html flexbox-writing-mode-005-ref.html
|
||||
== flexbox-writing-mode-006.html flexbox-writing-mode-006-ref.html
|
||||
== flexbox-writing-mode-007.html flexbox-writing-mode-007-ref.html
|
||||
== flexbox-writing-mode-008.html flexbox-writing-mode-008-ref.html
|
||||
== flexbox-writing-mode-009.html flexbox-writing-mode-009-ref.html
|
||||
|
||||
# Single-line size clamping
|
||||
== flexbox-single-line-clamp-1.html flexbox-single-line-clamp-1-ref.html
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
default-preferences pref(layout.css.vertical-text.enabled,true)
|
||||
|
||||
== ruby-text-decoration-01.html ruby-text-decoration-01-ref.html
|
||||
== text-decoration-propagation-01.html text-decoration-propagation-01-ref.html
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
# This directory contains tests for position:absolute and vertical writing modes.
|
||||
# They require the vertical-text pref to be true, otherwise lots of them will fail.
|
||||
# (See bug 1079151 for the origin of these testcases by Gérard Talbot.)
|
||||
default-preferences pref(layout.css.vertical-text.enabled,true)
|
||||
|
||||
# All of these are fuzzy-if on skia content on OS X due to subpixel text positioning.
|
||||
fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-003.xht s71-abs-pos-non-replaced-vlr-003-ref.xht
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
# This directory contains tests for vertical text and logical layout coordinates.
|
||||
# They require the vertical-text pref to be true, otherwise lots of them will fail.
|
||||
default-preferences pref(layout.css.vertical-text.enabled,true)
|
||||
|
||||
HTTP(..) == 1079154-1-vertical-rl-columns.html 1079154-1-vertical-rl-columns-ref.html
|
||||
== 1082844.html 1082844-ref.html
|
||||
|
|
|
|||
|
|
@ -5045,8 +5045,7 @@ if (IsCSSPropertyPrefEnabled("layout.css.touch_action.enabled")) {
|
|||
};
|
||||
}
|
||||
|
||||
if (IsCSSPropertyPrefEnabled("layout.css.vertical-text.enabled")) {
|
||||
var verticalTextProperties = {
|
||||
var verticalTextProperties = {
|
||||
"writing-mode": {
|
||||
domProp: "writingMode",
|
||||
inherited: true,
|
||||
|
|
@ -5514,7 +5513,7 @@ if (IsCSSPropertyPrefEnabled("layout.css.vertical-text.enabled")) {
|
|||
"calc(3*25px + 50%)",
|
||||
],
|
||||
invalid_values: [ ],
|
||||
},
|
||||
},
|
||||
"-moz-padding-end": {
|
||||
domProp: "MozPaddingEnd",
|
||||
inherited: false,
|
||||
|
|
@ -5531,24 +5530,23 @@ if (IsCSSPropertyPrefEnabled("layout.css.vertical-text.enabled")) {
|
|||
subproperties: [ "padding-inline-start" ],
|
||||
get_computed: logical_box_prop_get_computed,
|
||||
},
|
||||
};
|
||||
for (var prop in verticalTextProperties) {
|
||||
};
|
||||
for (var prop in verticalTextProperties) {
|
||||
gCSSProperties[prop] = verticalTextProperties[prop];
|
||||
}
|
||||
/*
|
||||
}
|
||||
/*
|
||||
* Vertical vs horizontal writing-mode can affect line-height
|
||||
* because font metrics may not be symmetrical,
|
||||
* so we require writing-mode:initial to ensure consistency
|
||||
* in font shorthand and line-height tests.
|
||||
*/
|
||||
["font", "line-height"].forEach(function(prop) {
|
||||
["font", "line-height"].forEach(function(prop) {
|
||||
var p = gCSSProperties[prop];
|
||||
if (p.prerequisites === undefined) {
|
||||
p.prerequisites = {};
|
||||
}
|
||||
p.prerequisites["writing-mode"] = "initial";
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
if (IsCSSPropertyPrefEnabled("layout.css.text-combine-upright.enabled")) {
|
||||
gCSSProperties["text-combine-upright"] = {
|
||||
|
|
|
|||
|
|
@ -68,7 +68,6 @@ function step() {
|
|||
// ----
|
||||
|
||||
var gProps = {
|
||||
"layout.css.vertical-text.enabled": ["text-orientation", "writing-mode"],
|
||||
"layout.css.text-combine-upright.enabled": ["text-combine-upright"],
|
||||
"layout.css.image-orientation.enabled": ["image-orientation"],
|
||||
"layout.css.mix-blend-mode.enabled": ["mix-blend-mode"],
|
||||
|
|
|
|||
|
|
@ -165,7 +165,6 @@ function make_declaration(aObject) {
|
|||
}
|
||||
|
||||
function start() {
|
||||
// load property_database.js once the pref change has gone into effect
|
||||
var script = document.createElement("script");
|
||||
script.src = "property_database.js";
|
||||
script.onload = function() {
|
||||
|
|
@ -419,5 +418,5 @@ function run_tests() {
|
|||
}
|
||||
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
SpecialPowers.pushPrefEnv({ "set": [["layout.css.vertical-text.enabled", true]] }, start);
|
||||
start();
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@
|
|||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
||||
<script type="text/javascript">
|
||||
var numAssertions = 9;
|
||||
if (SpecialPowers.getBoolPref("layout.css.vertical-text.enabled")) {
|
||||
|
||||
// these are from the additional margin-inline-{start,end} tests
|
||||
numAssertions += 2;
|
||||
}
|
||||
|
||||
SimpleTest.expectAssertions(numAssertions);
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
SimpleTest.requestLongerTimeout(2);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче