Skip to content

Commit

Permalink
Bug 1788223 - Remove preferences for maction/semantics. r=emilio
Browse files Browse the repository at this point in the history
This commit removes the preference
mathml.legacy_maction_and_semantics_implementations.disabled
that controls whether we layout maction/semantics as an mrow +
extra style. It has been set to true since Firefox 106.

Differential Revision: https://phabricator.services.mozilla.com/D184720
  • Loading branch information
fred-wang committed Jul 31, 2023
1 parent 1c041af commit b8ba2c1
Show file tree
Hide file tree
Showing 40 changed files with 92 additions and 1,787 deletions.
13 changes: 0 additions & 13 deletions layout/base/nsCSSFrameConstructor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4729,19 +4729,6 @@ nsCSSFrameConstructor::FindMathMLData(const Element& aElement,
return &sInlineMathData;
}

if (!StaticPrefs::
mathml_legacy_maction_and_semantics_implementations_disabled()) {
static constexpr FrameConstructionDataByTag sMactionAndSemanticsData[] = {
SIMPLE_MATHML_CREATE(maction_, NS_NewMathMLmactionFrame),
SIMPLE_MATHML_CREATE(semantics_, NS_NewMathMLsemanticsFrame)};
const FrameConstructionData* data =
FindDataByTag(aElement, aStyle, sMactionAndSemanticsData,
ArrayLength(sMactionAndSemanticsData));
if (data) {
return data;
}
}

static constexpr FrameConstructionDataByTag sMathMLData[] = {
SIMPLE_MATHML_CREATE(annotation_, NS_NewMathMLTokenFrame),
SIMPLE_MATHML_CREATE(annotation_xml_, NS_NewMathMLmrowFrame),
Expand Down
14 changes: 6 additions & 8 deletions layout/mathml/mathml.css
Original file line number Diff line number Diff line change
Expand Up @@ -300,14 +300,12 @@ mphantom {
visibility: hidden;
}

@media (-moz-mathml-core-maction-and-semantics) {
/* Implement MathML Core's semantics/maction support
https://w3c.github.io/mathml-core/#dfn-semantics
https://w3c.github.io/mathml-core/#dfn-maction */
maction > :not(:first-child),
semantics > :not(:first-child) {
display: none;
}
/* Implement MathML Core's semantics/maction support
https://w3c.github.io/mathml-core/#dfn-semantics
https://w3c.github.io/mathml-core/#dfn-maction */
maction > :not(:first-child),
semantics > :not(:first-child) {
display: none;
}

@media (-moz-mathml-core-mi) {
Expand Down
3 changes: 0 additions & 3 deletions layout/mathml/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ UNIFIED_SOURCES += [
"nsMathMLChar.cpp",
"nsMathMLContainerFrame.cpp",
"nsMathMLFrame.cpp",
"nsMathMLmactionFrame.cpp",
"nsMathMLmencloseFrame.cpp",
"nsMathMLmfracFrame.cpp",
"nsMathMLmmultiscriptsFrame.cpp",
Expand All @@ -32,8 +31,6 @@ UNIFIED_SOURCES += [
"nsMathMLmtableFrame.cpp",
"nsMathMLmunderoverFrame.cpp",
"nsMathMLOperators.cpp",
"nsMathMLSelectedFrame.cpp",
"nsMathMLsemanticsFrame.cpp",
"nsMathMLTokenFrame.cpp",
]

Expand Down
4 changes: 0 additions & 4 deletions layout/mathml/nsMathMLParts.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,8 @@ nsIFrame* NS_NewMathMLmsqrtFrame(mozilla::PresShell* aPresShell,
mozilla::ComputedStyle* aStyle);
nsIFrame* NS_NewMathMLmrootFrame(mozilla::PresShell* aPresShell,
mozilla::ComputedStyle* aStyle);
nsIFrame* NS_NewMathMLmactionFrame(mozilla::PresShell* aPresShell,
mozilla::ComputedStyle* aStyle);
nsIFrame* NS_NewMathMLmencloseFrame(mozilla::PresShell* aPresShell,
mozilla::ComputedStyle* aStyle);
nsIFrame* NS_NewMathMLsemanticsFrame(mozilla::PresShell* aPresShell,
mozilla::ComputedStyle* aStyle);

nsContainerFrame* NS_NewMathMLmathBlockFrame(mozilla::PresShell* aPresShell,
mozilla::ComputedStyle* aStyle);
Expand Down
203 changes: 0 additions & 203 deletions layout/mathml/nsMathMLSelectedFrame.cpp

This file was deleted.

60 changes: 0 additions & 60 deletions layout/mathml/nsMathMLSelectedFrame.h

This file was deleted.

Loading

0 comments on commit b8ba2c1

Please sign in to comment.