diff --git a/dom/base/nsDeprecatedOperationList.h b/dom/base/nsDeprecatedOperationList.h index a0ab81ec3221..f153343e3f30 100644 --- a/dom/base/nsDeprecatedOperationList.h +++ b/dom/base/nsDeprecatedOperationList.h @@ -46,7 +46,6 @@ DEPRECATED_OPERATION(MozfullscreenchangeDeprecatedPrefix) DEPRECATED_OPERATION(MozfullscreenerrorDeprecatedPrefix) DEPRECATED_OPERATION(External_AddSearchProvider) DEPRECATED_OPERATION(MouseEvent_MozPressure) -DEPRECATED_OPERATION(MathML_DeprecatedAlignmentAttributes) DEPRECATED_OPERATION(MathML_DeprecatedBevelledAttribute) DEPRECATED_OPERATION(MathML_DeprecatedLineThicknessValue) DEPRECATED_OPERATION(MathML_DeprecatedMathSizeValue) diff --git a/dom/locales/en-US/chrome/dom/dom.properties b/dom/locales/en-US/chrome/dom/dom.properties index 7af001885940..993f1108d118 100644 --- a/dom/locales/en-US/chrome/dom/dom.properties +++ b/dom/locales/en-US/chrome/dom/dom.properties @@ -373,8 +373,6 @@ MozfullscreenerrorDeprecatedPrefixWarning=onmozfullscreenerror is deprecated. External_AddSearchProviderWarning=AddSearchProvider is deprecated. # LOCALIZATION NOTE: Do not translate "MouseEvent.mozPressure" and "PointerEvent.pressure". MouseEvent_MozPressureWarning=MouseEvent.mozPressure is deprecated. Use PointerEvent.pressure instead. -# LOCALIZATION NOTE: Do not translate MathML, align, numalign and denomalign. -MathML_DeprecatedAlignmentAttributesWarning=MathML attributes “align”, “numalign” and “denomalign” are deprecated values and will be removed at a future date. # LOCALIZATION NOTE: Do not translate MathML and bevelled. MathML_DeprecatedBevelledAttribute=MathML attribute “bevelled” is deprecated and may be removed at a future date. # LOCALIZATION NOTE: Do not translate thin, medium, thick and linethickness. diff --git a/layout/mathml/nsMathMLmfracFrame.cpp b/layout/mathml/nsMathMLmfracFrame.cpp index a2407d5016e1..4c5d71b603f3 100644 --- a/layout/mathml/nsMathMLmfracFrame.cpp +++ b/layout/mathml/nsMathMLmfracFrame.cpp @@ -401,32 +401,6 @@ nsresult nsMathMLmfracFrame::PlaceInternal(DrawTarget* aDrawTarget, nscoord dxDen = leftSpace + (width - sizeDen.Width()) / 2; width += leftSpace + rightSpace; - if (!StaticPrefs::mathml_deprecated_alignment_attributes_disabled()) { - // see if the numalign attribute is there - if (mContent->AsElement()->GetAttr(kNameSpaceID_None, - nsGkAtoms::numalign_, value)) { - mContent->OwnerDoc()->WarnOnceAbout( - dom::DeprecatedOperations::eMathML_DeprecatedAlignmentAttributes); - if (value.EqualsLiteral("left")) { - dxNum = leftSpace; - } else if (value.EqualsLiteral("right")) { - dxNum = width - rightSpace - sizeNum.Width(); - } - } - - // see if the denomalign attribute is there - if (mContent->AsElement()->GetAttr(kNameSpaceID_None, - nsGkAtoms::denomalign_, value)) { - mContent->OwnerDoc()->WarnOnceAbout( - dom::DeprecatedOperations::eMathML_DeprecatedAlignmentAttributes); - if (value.EqualsLiteral("left")) { - dxDen = leftSpace; - } else if (value.EqualsLiteral("right")) { - dxDen = width - rightSpace - sizeDen.Width(); - } - } - } - mBoundingMetrics.rightBearing = std::max(dxNum + bmNum.rightBearing, dxDen + bmDen.rightBearing); if (mBoundingMetrics.rightBearing < width - rightSpace) diff --git a/layout/mathml/nsMathMLmunderoverFrame.cpp b/layout/mathml/nsMathMLmunderoverFrame.cpp index 8bea79077ba7..92d36bf7876d 100644 --- a/layout/mathml/nsMathMLmunderoverFrame.cpp +++ b/layout/mathml/nsMathMLmunderoverFrame.cpp @@ -579,19 +579,6 @@ nsresult nsMathMLmunderoverFrame::Place(DrawTarget* aDrawTarget, nscoord dxBase = 0, dxOver = 0, dxUnder = 0; nsAutoString valueAlign; - enum { center, left, right } alignPosition = center; - - if (!StaticPrefs::mathml_deprecated_alignment_attributes_disabled() && - mContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::align, - valueAlign)) { - mContent->OwnerDoc()->WarnOnceAbout( - dom::DeprecatedOperations::eMathML_DeprecatedAlignmentAttributes); - if (valueAlign.EqualsLiteral("left")) { - alignPosition = left; - } else if (valueAlign.EqualsLiteral("right")) { - alignPosition = right; - } - } ////////// // pass 1, do what does: attach the overscript on the base @@ -607,23 +594,14 @@ nsresult nsMathMLmunderoverFrame::Place(DrawTarget* aDrawTarget, if (NS_MATHML_EMBELLISH_IS_ACCENTOVER(mEmbellishData.flags)) { mBoundingMetrics.width = bmBase.width; - if (alignPosition == center) { - dxOver += correction; - } + dxOver += correction; } else { mBoundingMetrics.width = std::max(bmBase.width, overWidth); - if (alignPosition == center) { - dxOver += correction / 2; - } + dxOver += correction / 2; } - if (alignPosition == center) { - dxOver += (mBoundingMetrics.width - overWidth) / 2; - dxBase = (mBoundingMetrics.width - bmBase.width) / 2; - } else if (alignPosition == right) { - dxOver += mBoundingMetrics.width - overWidth; - dxBase = mBoundingMetrics.width - bmBase.width; - } + dxOver += (mBoundingMetrics.width - overWidth) / 2; + dxBase = (mBoundingMetrics.width - bmBase.width) / 2; mBoundingMetrics.ascent = bmBase.ascent + overDelta1 + bmOver.ascent + bmOver.descent; @@ -656,19 +634,13 @@ nsresult nsMathMLmunderoverFrame::Place(DrawTarget* aDrawTarget, } nscoord maxWidth = std::max(bmAnonymousBase.width, underWidth); - if (alignPosition == center && - !NS_MATHML_EMBELLISH_IS_ACCENTUNDER(mEmbellishData.flags)) { + if (!NS_MATHML_EMBELLISH_IS_ACCENTUNDER(mEmbellishData.flags)) { GetItalicCorrection(bmAnonymousBase, correction); dxUnder += -correction / 2; } nscoord dxAnonymousBase = 0; - if (alignPosition == center) { - dxUnder += (maxWidth - underWidth) / 2; - dxAnonymousBase = (maxWidth - bmAnonymousBase.width) / 2; - } else if (alignPosition == right) { - dxUnder += maxWidth - underWidth; - dxAnonymousBase = maxWidth - bmAnonymousBase.width; - } + dxUnder += (maxWidth - underWidth) / 2; + dxAnonymousBase = (maxWidth - bmAnonymousBase.width) / 2; // adjust the offsets of the real base and overscript since their // final offsets should be relative to us... diff --git a/layout/mathml/tests/test_bug975681.html b/layout/mathml/tests/test_bug975681.html index 093f9ab3871c..3db4f9ae4e48 100644 --- a/layout/mathml/tests/test_bug975681.html +++ b/layout/mathml/tests/test_bug975681.html @@ -32,24 +32,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=975681

-

- - - - - - -

- -

- - - - - - -

-

@@ -97,18 +79,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=975681 ok(almostLessThanAbs(num.height + 30 + denom.height, mfrac.height) && almostLessThanAbs(num.bottom + 30, denom.top), "numerator and denominator should be separated by linethickness"); - if (!SpecialPowers.getBoolPref('mathml.deprecated_alignment_attributes.disabled')) { - num = document.getElementById("mfrac_numalign").firstElementChild.getBoundingClientRect(); - mfrac = document.getElementById("mfrac_numalign").getBoundingClientRect(); - - ok(almostEqualAbs(num.left, mfrac.left), "numerator should be aligned left"); - - mfrac = document.getElementById("mfrac_denomalign").getBoundingClientRect(); - denom = document.getElementById("mfrac_denomalign").lastElementChild.getBoundingClientRect(); - - ok(almostEqualAbs(mfrac.right, denom.right), "denominator should be aligned right"); - } - num = document.getElementById("mfrac_bevelled").firstElementChild.getBoundingClientRect(); denom = document.getElementById("mfrac_bevelled").lastElementChild.getBoundingClientRect(); diff --git a/layout/reftests/mathml/dir-2-ref.html b/layout/reftests/mathml/dir-2-ref.html index 0b57ece82b1e..8a1c908c14a9 100644 --- a/layout/reftests/mathml/dir-2-ref.html +++ b/layout/reftests/mathml/dir-2-ref.html @@ -2,26 +2,6 @@ Test dir=rtl -

- mfrac (numalign=left): - - - - - - -

- -

- mfrac (numalign=right): - - - - - - -

-

menclose: diff --git a/layout/reftests/mathml/dir-2.html b/layout/reftests/mathml/dir-2.html index 41d5b3aa692a..7844e9e6bd1e 100644 --- a/layout/reftests/mathml/dir-2.html +++ b/layout/reftests/mathml/dir-2.html @@ -2,26 +2,6 @@ Test dir=rtl -

- mfrac (numalign=left): - - - - - - -

- -

- mfrac (numalign=right): - - - - - - -

-

menclose: diff --git a/layout/reftests/mathml/mfrac-A-2-ref.html b/layout/reftests/mathml/mfrac-A-2-ref.html deleted file mode 100644 index d4111137d70c..000000000000 --- a/layout/reftests/mathml/mfrac-A-2-ref.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - mfrac denomalign - - -

- - - - - - -
- - diff --git a/layout/reftests/mathml/mfrac-A-2.html b/layout/reftests/mathml/mfrac-A-2.html deleted file mode 100644 index af7c70f98d7d..000000000000 --- a/layout/reftests/mathml/mfrac-A-2.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - mfrac denomalign - - -
- - - - - - - - -
- - diff --git a/layout/reftests/mathml/mfrac-A-3-ref.html b/layout/reftests/mathml/mfrac-A-3-ref.html deleted file mode 100644 index 2886b96af016..000000000000 --- a/layout/reftests/mathml/mfrac-A-3-ref.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - mfrac denomalign - - -
- - - - - - -
- - diff --git a/layout/reftests/mathml/mfrac-A-3.html b/layout/reftests/mathml/mfrac-A-3.html deleted file mode 100644 index fb864d05fed8..000000000000 --- a/layout/reftests/mathml/mfrac-A-3.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - mfrac denomalign - - -
- - - - - - - - -
- - diff --git a/layout/reftests/mathml/mfrac-A-6-ref.html b/layout/reftests/mathml/mfrac-A-6-ref.html deleted file mode 100644 index c2258b6e2391..000000000000 --- a/layout/reftests/mathml/mfrac-A-6-ref.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - mfrac numalign - - -
- - - - - - -
- - diff --git a/layout/reftests/mathml/mfrac-A-6.html b/layout/reftests/mathml/mfrac-A-6.html deleted file mode 100644 index fc24ec7bba9e..000000000000 --- a/layout/reftests/mathml/mfrac-A-6.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - mfrac numalign - - -
- - - - - - - - -
- - diff --git a/layout/reftests/mathml/mfrac-A-7-ref.html b/layout/reftests/mathml/mfrac-A-7-ref.html deleted file mode 100644 index 0b74206af9c8..000000000000 --- a/layout/reftests/mathml/mfrac-A-7-ref.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - mfrac numalign - - -
- - - - - - -
- - diff --git a/layout/reftests/mathml/mfrac-A-7.html b/layout/reftests/mathml/mfrac-A-7.html deleted file mode 100644 index c5dccd8c21aa..000000000000 --- a/layout/reftests/mathml/mfrac-A-7.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - mfrac numalign - - -
- - - - - - - - -
- - diff --git a/layout/reftests/mathml/mfrac-B-4-5-ref.html b/layout/reftests/mathml/mfrac-B-4-5-ref.html deleted file mode 100644 index 7123276255cf..000000000000 --- a/layout/reftests/mathml/mfrac-B-4-5-ref.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - mfrac numalign - - - - - x - a+b+c+d+e - - - - diff --git a/layout/reftests/mathml/mfrac-B-4.html b/layout/reftests/mathml/mfrac-B-4.html deleted file mode 100644 index dacf5fe5f012..000000000000 --- a/layout/reftests/mathml/mfrac-B-4.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - mfrac numalign - - - - - - x - a+b+c+d+e - - - - diff --git a/layout/reftests/mathml/mfrac-B-5.html b/layout/reftests/mathml/mfrac-B-5.html deleted file mode 100644 index f233616b4e4a..000000000000 --- a/layout/reftests/mathml/mfrac-B-5.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - mfrac numalign - - - - - - x - a+b+c+d+e - - - - diff --git a/layout/reftests/mathml/mfrac-B-6-7-ref.html b/layout/reftests/mathml/mfrac-B-6-7-ref.html deleted file mode 100644 index c8c7ae36ac3c..000000000000 --- a/layout/reftests/mathml/mfrac-B-6-7-ref.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - mfrac denomalign - - - - - a+b+c+d+e - x - - - - diff --git a/layout/reftests/mathml/mfrac-B-6.html b/layout/reftests/mathml/mfrac-B-6.html deleted file mode 100644 index 59efcab0644c..000000000000 --- a/layout/reftests/mathml/mfrac-B-6.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - mfrac denomalign - - - - - - a+b+c+d+e - x - - - - diff --git a/layout/reftests/mathml/mfrac-B-7.html b/layout/reftests/mathml/mfrac-B-7.html deleted file mode 100644 index 4cfa0a01f77c..000000000000 --- a/layout/reftests/mathml/mfrac-B-7.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - mfrac denomalign - - - - - - a+b+c+d+e - x - - - - diff --git a/layout/reftests/mathml/mfrac-C-3-ref.html b/layout/reftests/mathml/mfrac-C-3-ref.html deleted file mode 100644 index 3f90baf67c81..000000000000 --- a/layout/reftests/mathml/mfrac-C-3-ref.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - mfrac numalign - - - - - x - a+b+c+d+e - - - - diff --git a/layout/reftests/mathml/mfrac-C-3.html b/layout/reftests/mathml/mfrac-C-3.html deleted file mode 100644 index 7b6a6b642fc6..000000000000 --- a/layout/reftests/mathml/mfrac-C-3.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - mfrac numalign - - - - - - x - a+b+c+d+e - - - - diff --git a/layout/reftests/mathml/mfrac-C-4-ref.html b/layout/reftests/mathml/mfrac-C-4-ref.html deleted file mode 100644 index add3a271d3dd..000000000000 --- a/layout/reftests/mathml/mfrac-C-4-ref.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - mfrac denomalign - - - - - a+b+c+d+e - x - - - - diff --git a/layout/reftests/mathml/mfrac-C-4.html b/layout/reftests/mathml/mfrac-C-4.html deleted file mode 100644 index 54d6747605a3..000000000000 --- a/layout/reftests/mathml/mfrac-C-4.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - mfrac denomalign - - - - - - a+b+c+d+e - x - - - - diff --git a/layout/reftests/mathml/mfrac-D-3-ref.html b/layout/reftests/mathml/mfrac-D-3-ref.html deleted file mode 100644 index 3f90baf67c81..000000000000 --- a/layout/reftests/mathml/mfrac-D-3-ref.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - mfrac numalign - - - - - x - a+b+c+d+e - - - - diff --git a/layout/reftests/mathml/mfrac-D-3.html b/layout/reftests/mathml/mfrac-D-3.html deleted file mode 100644 index ae82234bc3ec..000000000000 --- a/layout/reftests/mathml/mfrac-D-3.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - mfrac numalign - - - - - - x - a+b+c+d+e - - - - diff --git a/layout/reftests/mathml/mfrac-D-4-ref.html b/layout/reftests/mathml/mfrac-D-4-ref.html deleted file mode 100644 index add3a271d3dd..000000000000 --- a/layout/reftests/mathml/mfrac-D-4-ref.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - mfrac denomalign - - - - - a+b+c+d+e - x - - - - diff --git a/layout/reftests/mathml/mfrac-D-4.html b/layout/reftests/mathml/mfrac-D-4.html deleted file mode 100644 index bbfd4d00a38d..000000000000 --- a/layout/reftests/mathml/mfrac-D-4.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - mfrac denomalign - - - - - - a+b+c+d+e - x - - - - diff --git a/layout/reftests/mathml/munder-mover-align-accent-false-ref.html b/layout/reftests/mathml/munder-mover-align-accent-false-ref.html index bd6859b6c297..ff98924f802f 100644 --- a/layout/reftests/mathml/munder-mover-align-accent-false-ref.html +++ b/layout/reftests/mathml/munder-mover-align-accent-false-ref.html @@ -5,12 +5,10 @@

Test with accent="false"

- - - - - - - - - - - - - - - - -
mover munder
Over < @@ -39,115 +37,6 @@
- align="left" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- align="right" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- align="center" - diff --git a/layout/reftests/mathml/munder-mover-align-accent-false.html b/layout/reftests/mathml/munder-mover-align-accent-false.html index 0e04b6bbdb43..14696c286db8 100644 --- a/layout/reftests/mathml/munder-mover-align-accent-false.html +++ b/layout/reftests/mathml/munder-mover-align-accent-false.html @@ -5,12 +5,10 @@

Test with accent="false"

- - - - - - - - - - - - - - - - -
mover munder
Over < @@ -39,12 +37,9 @@
- align="left" - - + @@ -52,44 +47,7 @@ - - - - - - - - - - - - - - - - - - - -
- align="right" - - - - - - - - - - + @@ -97,7 +55,7 @@ - + @@ -105,44 +63,7 @@ - - - - - -
- align="center" - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/layout/reftests/mathml/munder-mover-align-accent-true-ref.html b/layout/reftests/mathml/munder-mover-align-accent-true-ref.html index ccf3b7394e58..9ed8c4e51802 100644 --- a/layout/reftests/mathml/munder-mover-align-accent-true-ref.html +++ b/layout/reftests/mathml/munder-mover-align-accent-true-ref.html @@ -5,12 +5,10 @@

Test with accent="true"

- - - - - - - - - - - - - - - - -
mover munder
Over < @@ -39,115 +37,6 @@
- align="left" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- align="right" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- align="center" - diff --git a/layout/reftests/mathml/munder-mover-align-accent-true.html b/layout/reftests/mathml/munder-mover-align-accent-true.html index 60d7f5a4eeea..e98e0ef6777d 100644 --- a/layout/reftests/mathml/munder-mover-align-accent-true.html +++ b/layout/reftests/mathml/munder-mover-align-accent-true.html @@ -5,12 +5,10 @@

Test with accent="true"

- - - - - - - - - - - - - - - - -
mover munder
Over < @@ -39,12 +37,9 @@
- align="left" - - + @@ -52,44 +47,7 @@ - - - - - - - - - - - - - - - - - - - -
- align="right" - - - - - - - - - - + @@ -97,7 +55,7 @@ - + @@ -105,44 +63,7 @@ - - - - - -
- align="center" - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/layout/reftests/mathml/munderover-align-accent-false-ref.html b/layout/reftests/mathml/munderover-align-accent-false-ref.html index 902d54f7ae04..7948407abfbf 100644 --- a/layout/reftests/mathml/munderover-align-accent-false-ref.html +++ b/layout/reftests/mathml/munderover-align-accent-false-ref.html @@ -5,11 +5,9 @@

Test with accent="false"

- - - - - - - - - - - - - - - - -
munderover
Over < @@ -41,147 +39,6 @@
- align="left" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- align="right" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- align="center" - diff --git a/layout/reftests/mathml/munderover-align-accent-false.html b/layout/reftests/mathml/munderover-align-accent-false.html index 4242da39498e..290fcdb967d1 100644 --- a/layout/reftests/mathml/munderover-align-accent-false.html +++ b/layout/reftests/mathml/munderover-align-accent-false.html @@ -5,11 +5,9 @@

Test with accent="false"

- - - - - - - - - - - - - - - - -
munderover
Over < @@ -41,94 +39,9 @@
- align="left" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- align="right" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- align="center" - - - + diff --git a/layout/reftests/mathml/munderover-align-accent-true-ref.html b/layout/reftests/mathml/munderover-align-accent-true-ref.html index 59f533099a7f..d4c88c06e190 100644 --- a/layout/reftests/mathml/munderover-align-accent-true-ref.html +++ b/layout/reftests/mathml/munderover-align-accent-true-ref.html @@ -5,11 +5,9 @@

Test with accent="true"

- - - - - - - - - - - - - - - - -
munderover
Over < @@ -41,147 +39,6 @@
- align="left" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- align="right" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- align="center" - diff --git a/layout/reftests/mathml/munderover-align-accent-true.html b/layout/reftests/mathml/munderover-align-accent-true.html index eb918b21f09a..3067ae5ea885 100644 --- a/layout/reftests/mathml/munderover-align-accent-true.html +++ b/layout/reftests/mathml/munderover-align-accent-true.html @@ -5,11 +5,9 @@

Test with accent="true"

- - - - - - - - - - - - - - - - -
munderover
Over < @@ -41,12 +39,9 @@
- align="left" - - + @@ -55,48 +50,7 @@ - - - - - - - - - - - - - - - - - - - - - - -
- align="right" - - - - - - - - - - - + @@ -105,7 +59,7 @@ - + @@ -114,48 +68,7 @@ - - - - - - -
- align="center" - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/layout/reftests/mathml/reftest.list b/layout/reftests/mathml/reftest.list index e3e6de4f87a4..940568d0a463 100644 --- a/layout/reftests/mathml/reftest.list +++ b/layout/reftests/mathml/reftest.list @@ -15,7 +15,7 @@ pref(mathml.scriptminsize_attribute.disabled,false) pref(mathml.scriptsizemultip fuzzy(0-2,0-529) == 393760-2.xml 393760-2-ref.xml == 414123.xhtml 414123-ref.xhtml == dir-1.html dir-1-ref.html -pref(mathml.deprecated_alignment_attributes.disabled,false) == dir-2.html dir-2-ref.html +== dir-2.html dir-2-ref.html pref(mathml.mfrac_bevelled_attribute.disabled,false) random-if(gtkWidget) == dir-3.html dir-3-ref.html # bug 1309426 == dir-5.html dir-5-ref.html fuzzy-if(cocoaWidget,0-135,0-56) == dir-6a.html dir-6a-ref.html @@ -119,10 +119,10 @@ random-if(gtkWidget) == mpadded-8.html mpadded-8-ref.html # bug 1309430 random-if(gtkWidget) == mpadded-9.html mpadded-9-ref.html # bug 1309430 pref(mathml.scriptsizemultiplier_attribute.disabled,false) == scriptlevel-1.html scriptlevel-1-ref.html == scriptlevel-movablelimits-1.html scriptlevel-movablelimits-1-ref.html -pref(mathml.deprecated_alignment_attributes.disabled,false) == munderover-align-accent-false.html munderover-align-accent-false-ref.html -pref(mathml.deprecated_alignment_attributes.disabled,false) == munderover-align-accent-true.html munderover-align-accent-true-ref.html -pref(mathml.deprecated_alignment_attributes.disabled,false) == munder-mover-align-accent-true.html munder-mover-align-accent-true-ref.html -pref(mathml.deprecated_alignment_attributes.disabled,false) == munder-mover-align-accent-false.html munder-mover-align-accent-false-ref.html +== munderover-align-accent-false.html munderover-align-accent-false-ref.html +== munderover-align-accent-true.html munderover-align-accent-true-ref.html +== munder-mover-align-accent-true.html munder-mover-align-accent-true-ref.html +== munder-mover-align-accent-false.html munder-mover-align-accent-false-ref.html pref(mathml.mfrac_linethickness_names.disabled,false) == mfrac-linethickness-1.xhtml mfrac-linethickness-1-ref.xhtml == mfrac-linethickness-2.xhtml mfrac-linethickness-2-ref.xhtml == mfrac-linethickness-3.xhtml mfrac-linethickness-3-ref.xhtml @@ -307,28 +307,16 @@ random-if(gtkWidget) == rowlines-3-2.html rowlines-3-2-ref.html # bug 1309426 == op-dict-12.html op-dict-12-ref.html != op-dict-13.html op-dict-13-ref.html pref(mathml.mfrac_bevelled_attribute.disabled,false) == mfrac-A-1.html mfrac-A-1-ref.html -pref(mathml.deprecated_alignment_attributes.disabled,false) == mfrac-A-2.html mfrac-A-2-ref.html -pref(mathml.deprecated_alignment_attributes.disabled,false) == mfrac-A-3.html mfrac-A-3-ref.html == mfrac-A-4.html mfrac-A-4-ref.html pref(mathml.mfrac_linethickness_names.disabled,false) == mfrac-A-5.html mfrac-A-5-ref.html # bug 1309426 -pref(mathml.deprecated_alignment_attributes.disabled,false) == mfrac-A-6.html mfrac-A-6-ref.html -pref(mathml.deprecated_alignment_attributes.disabled,false) == mfrac-A-7.html mfrac-A-7-ref.html == mfrac-A-8.html mfrac-A-8-ref.html pref(mathml.mfrac_bevelled_attribute.disabled,false) == mfrac-B-1.html mfrac-B-1-ref.html pref(mathml.mfrac_linethickness_names.disabled,false) == mfrac-B-2.html mfrac-B-2-3-ref.html pref(mathml.mfrac_linethickness_names.disabled,false) == mfrac-B-3.html mfrac-B-2-3-ref.html -pref(mathml.deprecated_alignment_attributes.disabled,false) fuzzy-if(geckoview,0-239,0-781) == mfrac-B-4.html mfrac-B-4-5-ref.html -pref(mathml.deprecated_alignment_attributes.disabled,false) == mfrac-B-5.html mfrac-B-4-5-ref.html -pref(mathml.deprecated_alignment_attributes.disabled,false) fuzzy-if(geckoview,0-239,0-781) == mfrac-B-6.html mfrac-B-6-7-ref.html -pref(mathml.deprecated_alignment_attributes.disabled,false) == mfrac-B-7.html mfrac-B-6-7-ref.html pref(mathml.mfrac_bevelled_attribute.disabled,false) fuzzy(0-1,0-14) == mfrac-C-1.html mfrac-C-1-ref.html pref(mathml.mfrac_linethickness_names.disabled,false) == mfrac-C-2.html mfrac-C-2-ref.html -pref(mathml.deprecated_alignment_attributes.disabled,false) fuzzy-if(geckoview,0-239,0-776) == mfrac-C-3.html mfrac-C-3-ref.html -pref(mathml.deprecated_alignment_attributes.disabled,false) fuzzy-if(geckoview,0-239,0-271) == mfrac-C-4.html mfrac-C-4-ref.html pref(mathml.mfrac_bevelled_attribute.disabled,false) fuzzy(0-1,0-14) == mfrac-D-1.html mfrac-D-1-ref.html pref(mathml.mfrac_linethickness_names.disabled,false) == mfrac-D-2.html mfrac-D-2-ref.html -pref(mathml.deprecated_alignment_attributes.disabled,false) fuzzy-if(geckoview,0-239,0-776) == mfrac-D-3.html mfrac-D-3-ref.html -pref(mathml.deprecated_alignment_attributes.disabled,false) fuzzy-if(geckoview,0-239,0-271) == mfrac-D-4.html mfrac-D-4-ref.html == mfrac-E-1.html mfrac-E-1-ref.html == shadow-dom-1.html shadow-dom-1-ref.html pref(ui.useOverlayScrollbars,1) pref(dom.meta-viewport.enabled,true) pref(font.size.inflation.emPerLine,25) fuzzy-if(!gtkWidget,0-255,0-324) fuzzy-if(gtkWidget,0-255,0-66) == font-inflation-1.html font-inflation-1-ref.html # gtkWidget due to Bug 1607294 diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml index 284f3d5a9f0e..bd300f636530 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml @@ -8723,12 +8723,6 @@ value: true mirror: always -# Whether to disable deprecated numalign/denomalign/align attributes -- name: mathml.deprecated_alignment_attributes.disabled - type: bool - value: true - mirror: always - # Whether to disable the scriptminsize attribute. # Note that this only disables parsing, not the default effect when no attribute # is unspecified. diff --git a/testing/web-platform/meta/mathml/__dir__.ini b/testing/web-platform/meta/mathml/__dir__.ini index 4091c6d6125f..130227531644 100644 --- a/testing/web-platform/meta/mathml/__dir__.ini +++ b/testing/web-platform/meta/mathml/__dir__.ini @@ -1 +1 @@ -prefs: [mathml.scriptsizemultiplier_attribute.disabled: true, mathml.scriptminsize_attribute.disabled: true, mathml.mathspace_names.disabled: true, mathml.mfrac_linethickness_names.disabled:true, mathml.deprecated_alignment_attributes.disabled: true, mathml.mfrac_bevelled_attribute.disabled: true, mathml.mfenced_element.disabled: true, layout.css.math-style.enabled: true] \ No newline at end of file +prefs: [mathml.scriptsizemultiplier_attribute.disabled: true, mathml.scriptminsize_attribute.disabled: true, mathml.mathspace_names.disabled: true, mathml.mfrac_linethickness_names.disabled:true, mathml.mfrac_bevelled_attribute.disabled: true, mathml.mfenced_element.disabled: true, layout.css.math-style.enabled: true] \ No newline at end of file