Skip to content

Commit

Permalink
Backed out changeset 6a7c866d716d (bug 1890523) for causing wpt failu…
Browse files Browse the repository at this point in the history
…res in stretchy-largeop-with-default-font-2.html. CLOSED TREE
  • Loading branch information
Tamas Szentpeteri committed Apr 11, 2024
1 parent 125c0be commit 6e07088
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 16 deletions.
12 changes: 3 additions & 9 deletions layout/mathml/nsMathMLmoFrame.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -596,15 +596,9 @@ nsMathMLmoFrame::Stretch(DrawTarget* aDrawTarget,

// get the leading to be left at the top and the bottom of the stretched char
// this seems more reliable than using fm->GetLeading() on suspicious fonts
const nscoord leading = [&fm] {
if (StaticPrefs::
mathml_top_bottom_spacing_for_stretchy_operators_disabled()) {
return 0;
}
nscoord em;
GetEmHeight(fm, em);
return NSToCoordRound(0.2f * (float)em);
}();
nscoord em;
GetEmHeight(fm, em);
nscoord leading = NSToCoordRound(0.2f * em);

// Operators that are stretchy, or those that are to be centered
// to cater for fonts that are not math-aware, are handled by the MathMLChar
Expand Down
7 changes: 0 additions & 7 deletions modules/libpref/init/StaticPrefList.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9548,13 +9548,6 @@
mirror: always
rust: true

# Whether to disable extra top/bottom spacing for stretchy operators.
- name: mathml.top_bottom_spacing_for_stretchy_operators.disabled
type: bool
value: true
mirror: always
rust: true

#---------------------------------------------------------------------------
# Prefs starting with "media."
#---------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
[stretch-along-block-axis-001.html]
expected:
if (os == "android") and fission: [OK, TIMEOUT]
[Taking into account stretch axis.]
expected: FAIL

[Taking into account stretchy property.]
expected: FAIL

[Only operators with a stretchy property and block stretch axis.]
expected: FAIL

[Operators smaller and larger than non-stretchy siblings.]
expected: FAIL

[Embellished operators]
expected: FAIL
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
[mo-minsize-maxsize-001.html]
expected:
if (os == "android") and fission: [OK, TIMEOUT]
[minsize < maxsize < 0 is treated as maxsize = minsize = 0]
expected: FAIL

[minsize < 0 is treated as 0]
expected: FAIL

[target size = 0 is treated as Tascent = Tdescent = minsize/2]
expected: FAIL

[maxsize < minsize is treated as maxsize = minsize]
expected: FAIL

[minsize/maxsize percentages are relative to the target size]
expected: FAIL

[default minsize/maxsize percentages]
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[mo-stretch-properties-001.html]
expected:
if (os == "android") and fission: [OK, TIMEOUT]
[Stretchy vertical line]
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[mo-stretch-properties-dynamic-001.html]
expected:
if (os == "android") and fission: [OK, TIMEOUT]
[symmetric]
expected: FAIL

[largeop]
expected: FAIL

[minsize]
expected: FAIL

[maxsize]
expected: FAIL

[stretchy]
expected: FAIL

0 comments on commit 6e07088

Please sign in to comment.