corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 68cc51e9fccd (bug 1904220) for causing build bustages on nsMathMLmoFrame.cpp. CLOSED TREE

Browse Source
This commit is contained in:
Tamas Szentpeteri
2024-09-05 16:34:48 +03:00
parent 4161c2f288
commit 0d2636a2e8
4 changed files with 2 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
layout/mathml/nsMathMLOperators.h
View File

@@ -20,7 +20,6 @@ enum nsStretchDirection {
typedef uint32_t nsOperatorFlags; typedef uint32_t nsOperatorFlags;
enum { enum {
// define the bits used to handle the operator // define the bits used to handle the operator
NS_MATHML_OPERATOR_FORCE_MATHML_CHAR = 1u << 31,
NS_MATHML_OPERATOR_MUTABLE = 1 << 30, NS_MATHML_OPERATOR_MUTABLE = 1 << 30,
NS_MATHML_OPERATOR_EMBELLISH_ANCESTOR = 1 << 29, NS_MATHML_OPERATOR_EMBELLISH_ANCESTOR = 1 << 29,
NS_MATHML_OPERATOR_EMBELLISH_ISOLATED = 1 << 28, NS_MATHML_OPERATOR_EMBELLISH_ISOLATED = 1 << 28,
@@ -97,10 +96,6 @@ class nsMathMLOperators {
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Macros that retrieve the bits used to handle operators // Macros that retrieve the bits used to handle operators
#define NS_MATHML_OPERATOR_FORCES_MATHML_CHAR(_flags) \
(NS_MATHML_OPERATOR_FORCE_MATHML_CHAR == \
((_flags) & NS_MATHML_OPERATOR_FORCE_MATHML_CHAR))
#define NS_MATHML_OPERATOR_IS_MUTABLE(_flags) \ #define NS_MATHML_OPERATOR_IS_MUTABLE(_flags) \
(NS_MATHML_OPERATOR_MUTABLE == ((_flags) & NS_MATHML_OPERATOR_MUTABLE)) (NS_MATHML_OPERATOR_MUTABLE == ((_flags) & NS_MATHML_OPERATOR_MUTABLE))

6
layout/mathml/nsMathMLmoFrame.cpp
View File

@@ -59,7 +59,7 @@ bool nsMathMLmoFrame::IsFrameInSelection(nsIFrame* aFrame) {
bool nsMathMLmoFrame::UseMathMLChar() { bool nsMathMLmoFrame::UseMathMLChar() {
return (NS_MATHML_OPERATOR_GET_FORM(mFlags) && return (NS_MATHML_OPERATOR_GET_FORM(mFlags) &&
NS_MATHML_OPERATOR_IS_MUTABLE(mFlags)) || NS_MATHML_OPERATOR_IS_MUTABLE(mFlags)) ||
NS_MATHML_OPERATOR_FORCES_MATHML_CHAR(mFlags); NS_MATHML_OPERATOR_IS_CENTERED(mFlags);
} }
void nsMathMLmoFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, void nsMathMLmoFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
@@ -124,7 +124,6 @@ void nsMathMLmoFrame::ProcessTextData() {
if (1 == length && ch == '-') { if (1 == length && ch == '-') {
ch = 0x2212; ch = 0x2212;
data = ch; data = ch;
mFlags |= NS_MATHML_OPERATOR_FORCE_MATHML_CHAR;
} }
// cache the special bits: mutable, accent, movablelimits, centered. // cache the special bits: mutable, accent, movablelimits, centered.
@@ -157,7 +156,6 @@ void nsMathMLmoFrame::ProcessTextData() {
(ch == 0x2265) || // &ge; (ch == 0x2265) || // &ge;
(ch == 0x00D7)) { // &times; (ch == 0x00D7)) { // &times;
mFlags |= NS_MATHML_OPERATOR_CENTERED; mFlags |= NS_MATHML_OPERATOR_CENTERED;
mFlags |= NS_MATHML_OPERATOR_FORCE_MATHML_CHAR;
} }
} }
} }
@@ -199,7 +197,7 @@ void nsMathMLmoFrame::ProcessOperatorData() {
// Also remember the other special bits that we want to carry forward. // Also remember the other special bits that we want to carry forward.
mFlags &= NS_MATHML_OPERATOR_MUTABLE | NS_MATHML_OPERATOR_ACCENT | mFlags &= NS_MATHML_OPERATOR_MUTABLE | NS_MATHML_OPERATOR_ACCENT |
NS_MATHML_OPERATOR_MOVABLELIMITS | NS_MATHML_OPERATOR_CENTERED | NS_MATHML_OPERATOR_MOVABLELIMITS | NS_MATHML_OPERATOR_CENTERED |
NS_MATHML_OPERATOR_INVISIBLE | NS_MATHML_OPERATOR_FORCE_MATHML_CHAR; NS_MATHML_OPERATOR_INVISIBLE;
if (!mEmbellishData.coreFrame) { if (!mEmbellishData.coreFrame) {
// i.e., we haven't been here before, the default form is infix // i.e., we haven't been here before, the default form is infix

19
testing/web-platform/mozilla/tests/mathml/hyphen-as-minus-sign-ref.html
View File

@@ -1,19 +0,0 @@
<!DOCTYPE html>
<title>hyphen operator is rendered as a minus sign</title>
<meta charset="utf-8"/>
<style>
math {
font-size: 64pt;
}
.box {
position: absolute;
left: 2em;
top: 2em;
border: 1px solid lightgreen;
}
</style>
<body>
<p>This test passes if you see a green rectangle and no red.</p>
<math class="box" style="position: absolute; color: red"><mo>−</mo></math>
<math class="box" style="position: absolute; color: green; background: green;"><mo>−</mo></math>
</body>

21
testing/web-platform/mozilla/tests/mathml/hyphen-as-minus-sign.html
View File

@@ -1,21 +0,0 @@
<!DOCTYPE html>
<title>hyphen operator is rendered as a minus sign</title>
<link rel="match" href="hyphen-as-minus-sign-ref.html"/>
<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1904220"/>
<meta charset="utf-8"/>
<style>
math {
font-size: 64pt;
}
.box {
position: absolute;
left: 2em;
top: 2em;
border: 1px solid lightgreen;
}
</style>
<body>
<p>This test passes if you see a green rectangle and no red.</p>
<math class="box" style="position: absolute; color: red"><mo>−</mo></math>
<math class="box" style="position: absolute; color: green; background: green;"><mo>-</mo></math>
</body>