Changeset 165461 in webkit
- Timestamp:
- Mar 11, 2014 11:46:52 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 14 added
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r165449 r165461 1 2014-03-11 Frédéric Wang <fred.wang@free.fr> 2 3 Implement MathML spacing around operators . 4 https://bugs.webkit.org/show_bug.cgi?id=115787 5 6 Reviewed by Chris Fleizach. 7 8 Add many new tests to verify the form/lspace/rspace properties of the 9 <mo> element and that the whitespace of the text content is collapsed. 10 Update fenced-mi now that bug 118843 is fixed. 11 12 * mathml/presentation/dir-mo-expected.html: Added. 13 * mathml/presentation/dir-mo.html: Added. 14 * mathml/presentation/fenced-expected.html: 15 * mathml/presentation/fenced-mi-expected.html: 16 * mathml/presentation/mo-form-dynamic-expected.html: Added. 17 * mathml/presentation/mo-form-dynamic.html: Added. 18 * mathml/presentation/mo-form-expected.html: Added. 19 * mathml/presentation/mo-form-minus-plus-expected.html: Added. 20 * mathml/presentation/mo-form-minus-plus.html: Added. 21 * mathml/presentation/mo-form.html: Added. 22 * mathml/presentation/mo-lspace-rspace-dynamic-expected.html: Added. 23 * mathml/presentation/mo-lspace-rspace-dynamic.html: Added. 24 * mathml/presentation/mo-lspace-rspace-expected.html: Added. 25 * mathml/presentation/mo-lspace-rspace.html: Added. 26 * mathml/presentation/mo-whitespaces-expected.html: Added. 27 * mathml/presentation/mo-whitespaces.html: Added. 28 * platform/mac/mathml/presentation/mo-stretch-expected.txt: update reference. 29 1 30 2014-03-11 Manuel Rego Casasnovas <rego@igalia.com> 2 31 -
trunk/LayoutTests/mathml/presentation/fenced-expected.html
r152923 r165461 11 11 Note that the MathML operator dictionary defines "(" and ")" as fences, 12 12 so we don't need an explicit "fence" attribute on the <mo> elements.--> 13 <!-- FIXME: <mfenced> and its expanded form do not use the same spacing,14 so -webkit-margin-start and -webkit-margin-end are currently set15 explicitly below. See bug 118843. -->16 13 <math> 17 14 <mrow> … … 19 16 <mrow> 20 17 <mspace width="48px" height="24px" depth="24px" mathbackground="#0f0"/> 21 <mo separator="true" style="-webkit-margin-start: 0; -webkit-margin-end: .25em;">,</mo>18 <mo separator="true">,</mo> 22 19 <mspace width="48px" height="24px" depth="24px" mathbackground="#0f0"/> 23 <mo separator="true" style="-webkit-margin-start: 0; -webkit-margin-end: .25em;">,</mo>20 <mo separator="true">,</mo> 24 21 <mspace width="48px" height="24px" depth="24px" mathbackground="#0f0"/> 25 22 </mrow> -
trunk/LayoutTests/mathml/presentation/fenced-mi-expected.html
r165436 r165461 11 11 The MathML operator dictionary defines '(', ')', '{', '}' as fences, 12 12 so we don't need an explicit "fence" attribute on the <mo> elements.--> 13 <!-- FIXME: <mfenced> and its expanded form do not use the same spacing,14 so -webkit-margin-start and -webkit-margin-end are currently set15 explicitly below. See bug 118843. -->16 13 17 14 <p> … … 21 18 <mrow> 22 19 <mi>x</mi> 23 <mo separator="true" style="-webkit-margin-start: 0; -webkit-margin-end: .25em;">,</mo>20 <mo separator="true">,</mo> 24 21 <mi>y</mi> 25 <mo separator="true" style="-webkit-margin-start: 0; -webkit-margin-end: .25em;">,</mo>22 <mo separator="true">,</mo> 26 23 <mi>z</mi> 27 24 </mrow> … … 37 34 <mrow> 38 35 <mi>x</mi> 39 <mo separator="true" style="-webkit-margin-start: 0; -webkit-margin-end: .25em;">1</mo>36 <mo separator="true">1</mo> 40 37 <mi>y</mi> 41 <mo separator="true" style="-webkit-margin-start: 0; -webkit-margin-end: .25em;">2</mo>38 <mo separator="true">2</mo> 42 39 <mi>z</mi> 43 40 </mrow> … … 53 50 <mrow> 54 51 <mi>x</mi> 55 <mo separator="true" style="-webkit-margin-start: 0; -webkit-margin-end: .25em;">1</mo>52 <mo separator="true">1</mo> 56 53 <mi>y</mi> 57 <mo separator="true" style="-webkit-margin-start: 0; -webkit-margin-end: .25em;">2</mo>54 <mo separator="true">2</mo> 58 55 <mi>z</mi> 59 <mo separator="true" style="-webkit-margin-start: 0; -webkit-margin-end: .25em;">3</mo>56 <mo separator="true">3</mo> 60 57 <mi>u</mi> 61 <mo separator="true" style="-webkit-margin-start: 0; -webkit-margin-end: .25em;">3</mo>58 <mo separator="true">3</mo> 62 59 <mi>v</mi> 63 <mo separator="true" style="-webkit-margin-start: 0; -webkit-margin-end: .25em;">3</mo>60 <mo separator="true">3</mo> 64 61 <mi>w</mi> 65 62 </mrow> -
trunk/LayoutTests/platform/mac/mathml/presentation/mo-stretch-expected.txt
r165436 r165461 4 4 RenderBlock {HTML} at (0,0) size 800x260 5 5 RenderBody {BODY} at (8,8) size 784x244 6 RenderMathMLMath {math} at (0,0) size 1 95x25 [padding: 0 1 0 1]7 RenderMathMLRow {mrow} at (1,0) size 1 93x258 RenderMathMLOperator {mo} at ( 1,5) size 8x146 RenderMathMLMath {math} at (0,0) size 126x25 [padding: 0 1 0 1] 7 RenderMathMLRow {mrow} at (1,0) size 124x25 8 RenderMathMLOperator {mo} at (0,5) size 7x14 9 9 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 10 10 RenderBlock (anonymous) at (0,0) size 5x14 11 11 RenderText at (0,-6) size 5x24 12 12 text run at (0,-6) width 5: "(" 13 RenderMathMLOperator {mo} at ( 13,5) size 8x1413 RenderMathMLOperator {mo} at (7,5) size 7x14 14 14 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 15 15 RenderBlock (anonymous) at (0,0) size 5x14 16 16 RenderText at (0,-6) size 5x24 17 17 text run at (0,-6) width 5: ")" 18 RenderMathMLOperator {mo} at ( 26,5) size 11x1418 RenderMathMLOperator {mo} at (14,5) size 10x14 19 19 RenderMathMLBlock (anonymous, flex) at (0,0) size 10x14 20 20 RenderBlock (anonymous) at (0,0) size 8x14 21 21 RenderText at (0,-6) size 8x24 22 22 text run at (0,-6) width 8: "{" 23 RenderMathMLOperator {mo} at ( 43,5) size 11x1423 RenderMathMLOperator {mo} at (24,5) size 10x14 24 24 RenderMathMLBlock (anonymous, flex) at (0,0) size 10x14 25 25 RenderBlock (anonymous) at (0,0) size 8x14 26 26 RenderText at (0,-6) size 8x24 27 27 text run at (0,-6) width 8: "}" 28 RenderMathMLOperator {mo} at ( 59,5) size 8x1428 RenderMathMLOperator {mo} at (34,5) size 7x14 29 29 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 30 30 RenderBlock (anonymous) at (0,0) size 5x14 31 31 RenderText at (0,-6) size 5x24 32 32 text run at (0,-6) width 5: "[" 33 RenderMathMLOperator {mo} at ( 72,5) size 8x1433 RenderMathMLOperator {mo} at (41,5) size 7x14 34 34 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 35 35 RenderBlock (anonymous) at (0,0) size 5x14 36 36 RenderText at (0,-6) size 5x24 37 37 text run at (0,-6) width 5: "]" 38 RenderMathMLOperator {mo} at ( 86,4) size 9x1638 RenderMathMLOperator {mo} at (48,4) size 8x16 39 39 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 40 40 RenderBlock (anonymous) at (0,0) size 8x16 41 41 RenderText at (0,-5) size 8x24 42 42 text run at (0,-5) width 8: "\x{2308}" 43 RenderMathMLOperator {mo} at ( 100,4) size 9x1643 RenderMathMLOperator {mo} at (56,4) size 8x16 44 44 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 45 45 RenderBlock (anonymous) at (0,0) size 8x16 46 46 RenderText at (0,-5) size 8x24 47 47 text run at (0,-5) width 8: "\x{2309}" 48 RenderMathMLOperator {mo} at ( 115,4) size 8x1648 RenderMathMLOperator {mo} at (64,4) size 8x16 49 49 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 50 50 RenderBlock (anonymous) at (0,0) size 8x16 51 51 RenderText at (0,-5) size 8x24 52 52 text run at (0,-5) width 8: "\x{230A}" 53 RenderMathMLOperator {mo} at ( 129,4) size 9x1653 RenderMathMLOperator {mo} at (72,4) size 8x16 54 54 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 55 55 RenderBlock (anonymous) at (0,0) size 8x16 56 56 RenderText at (0,-5) size 8x24 57 57 text run at (0,-5) width 8: "\x{230B}" 58 RenderMathMLOperator {mo} at ( 143,2) size 12x2058 RenderMathMLOperator {mo} at (80,2) size 12x20 59 59 RenderMathMLBlock (anonymous, flex) at (0,0) size 11x20 60 60 RenderBlock (anonymous) at (0,0) size 7x20 61 61 RenderText at (0,-3) size 7x24 62 62 text run at (0,-3) width 7: "\x{222B}" 63 RenderMathMLOperator {mo} at ( 161,0) size 4x2564 RenderMathMLBlock (anonymous, flex) at ( 0,0) size 3x1263 RenderMathMLOperator {mo} at (91,0) size 8x25 64 RenderMathMLBlock (anonymous, flex) at (1,0) size 4x12 65 65 RenderBlock (anonymous) at (0,0) size 3x12 66 66 RenderText at (0,-6) size 3x24 67 67 text run at (0,-6) width 3: "|" 68 RenderMathMLOperator {mo} at ( 170,4) size 9x1668 RenderMathMLOperator {mo} at (98,4) size 9x16 69 69 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 70 70 RenderBlock (anonymous) at (0,0) size 8x16 71 71 RenderText at (0,-5) size 8x24 72 72 text run at (0,-5) width 8: "\x{2016}" 73 RenderMathMLOperator {mo} at (1 83,4) size 9x1674 RenderMathMLBlock (anonymous, flex) at ( 0,0) size 8x1673 RenderMathMLOperator {mo} at (106,4) size 18x16 74 RenderMathMLBlock (anonymous, flex) at (4,0) size 9x16 75 75 RenderBlock (anonymous) at (0,0) size 8x16 76 76 RenderText at (0,-5) size 8x24 77 77 text run at (0,-5) width 8: "\x{2225}" 78 RenderText {#text} at (1 94,2) size 5x1879 text run at (1 94,2) width 5: " "78 RenderText {#text} at (125,2) size 5x18 79 text run at (125,2) width 5: " " 80 80 RenderBR {BR} at (0,0) size 0x0 81 RenderMathMLMath {math} at (0,24) size 1 99x143 [padding: 0 1 0 1]82 RenderMathMLRow {mrow} at (1,0) size 1 97x14383 RenderMathMLOperator {mo} at ( 1,0) size 8x14381 RenderMathMLMath {math} at (0,24) size 126x143 [padding: 0 1 0 1] 82 RenderMathMLRow {mrow} at (1,0) size 124x143 83 RenderMathMLOperator {mo} at (0,0) size 7x143 84 84 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 85 85 RenderBlock (anonymous) at (0,0) size 5x14 86 86 RenderText at (0,-6) size 5x24 87 87 text run at (0,-6) width 5: "(" 88 RenderMathMLOperator {mo} at ( 13,0) size 8x14388 RenderMathMLOperator {mo} at (7,0) size 7x143 89 89 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 90 90 RenderBlock (anonymous) at (0,0) size 5x14 91 91 RenderText at (0,-6) size 5x24 92 92 text run at (0,-6) width 5: ")" 93 RenderMathMLOperator {mo} at ( 26,0) size 11x14393 RenderMathMLOperator {mo} at (14,0) size 10x143 94 94 RenderMathMLBlock (anonymous, flex) at (0,0) size 10x14 95 95 RenderBlock (anonymous) at (0,0) size 8x14 96 96 RenderText at (0,-6) size 8x24 97 97 text run at (0,-6) width 8: "{" 98 RenderMathMLOperator {mo} at ( 43,0) size 11x14398 RenderMathMLOperator {mo} at (24,0) size 10x143 99 99 RenderMathMLBlock (anonymous, flex) at (0,0) size 10x14 100 100 RenderBlock (anonymous) at (0,0) size 8x14 101 101 RenderText at (0,-6) size 8x24 102 102 text run at (0,-6) width 8: "}" 103 RenderMathMLOperator {mo} at ( 59,0) size 8x143103 RenderMathMLOperator {mo} at (34,0) size 7x143 104 104 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 105 105 RenderBlock (anonymous) at (0,0) size 5x14 106 106 RenderText at (0,-6) size 5x24 107 107 text run at (0,-6) width 5: "[" 108 RenderMathMLOperator {mo} at (41,0) size 7x143 109 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 110 RenderBlock (anonymous) at (0,0) size 5x14 111 RenderText at (0,-6) size 5x24 112 text run at (0,-6) width 5: "]" 113 RenderMathMLOperator {mo} at (48,0) size 8x143 114 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 115 RenderBlock (anonymous) at (0,0) size 8x16 116 RenderText at (0,-5) size 8x24 117 text run at (0,-5) width 8: "\x{2308}" 118 RenderMathMLOperator {mo} at (56,0) size 8x143 119 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 120 RenderBlock (anonymous) at (0,0) size 8x16 121 RenderText at (0,-5) size 8x24 122 text run at (0,-5) width 8: "\x{2309}" 123 RenderMathMLOperator {mo} at (64,0) size 8x143 124 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 125 RenderBlock (anonymous) at (0,0) size 8x16 126 RenderText at (0,-5) size 8x24 127 text run at (0,-5) width 8: "\x{230A}" 108 128 RenderMathMLOperator {mo} at (72,0) size 8x143 109 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14110 RenderBlock (anonymous) at (0,0) size 5x14111 RenderText at (0,-6) size 5x24112 text run at (0,-6) width 5: "]"113 RenderMathMLOperator {mo} at (86,0) size 9x143114 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16115 RenderBlock (anonymous) at (0,0) size 8x16116 RenderText at (0,-5) size 8x24117 text run at (0,-5) width 8: "\x{2308}"118 RenderMathMLOperator {mo} at (100,0) size 9x143119 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16120 RenderBlock (anonymous) at (0,0) size 8x16121 RenderText at (0,-5) size 8x24122 text run at (0,-5) width 8: "\x{2309}"123 RenderMathMLOperator {mo} at (115,0) size 8x143124 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16125 RenderBlock (anonymous) at (0,0) size 8x16126 RenderText at (0,-5) size 8x24127 text run at (0,-5) width 8: "\x{230A}"128 RenderMathMLOperator {mo} at (129,0) size 9x143129 129 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 130 130 RenderBlock (anonymous) at (0,0) size 8x16 131 131 RenderText at (0,-5) size 8x24 132 132 text run at (0,-5) width 8: "\x{230B}" 133 RenderMathMLOperator {mo} at ( 143,0) size 12x143133 RenderMathMLOperator {mo} at (80,0) size 12x143 134 134 RenderMathMLBlock (anonymous, flex) at (0,0) size 11x20 135 135 RenderBlock (anonymous) at (0,0) size 7x20 136 136 RenderText at (0,-3) size 7x24 137 137 text run at (0,-3) width 7: "\x{222B}" 138 RenderMathMLOperator {mo} at ( 161,0) size 4x143139 RenderMathMLBlock (anonymous, flex) at ( 0,0) size 3x12138 RenderMathMLOperator {mo} at (91,0) size 8x143 139 RenderMathMLBlock (anonymous, flex) at (1,0) size 4x12 140 140 RenderBlock (anonymous) at (0,0) size 3x12 141 141 RenderText at (0,-6) size 3x24 142 142 text run at (0,-6) width 3: "|" 143 RenderMathMLOperator {mo} at ( 170,0) size 9x76143 RenderMathMLOperator {mo} at (98,0) size 9x76 144 144 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 145 145 RenderBlock (anonymous) at (0,0) size 8x16 146 146 RenderText at (0,-5) size 8x24 147 147 text run at (0,-5) width 8: "\x{2016}" 148 RenderMathMLOperator {mo} at (1 84,0) size 9x76149 RenderMathMLBlock (anonymous, flex) at ( 0,0) size 8x16148 RenderMathMLOperator {mo} at (106,0) size 18x76 149 RenderMathMLBlock (anonymous, flex) at (4,0) size 9x16 150 150 RenderBlock (anonymous) at (0,0) size 8x16 151 151 RenderText at (0,-5) size 8x24 152 152 text run at (0,-5) width 8: "\x{2225}" 153 RenderMathMLSpace {mspace} at (1 96,0) size 1x76154 RenderText {#text} at (1 98,85) size 5x18155 text run at (1 98,85) width 5: " "156 RenderMathMLMath {math} at ( 202,49) size 199x93 [padding: 0 1 0 1]157 RenderMathMLRow {mrow} at (1,0) size 1 97x93158 RenderMathMLOperator {mo} at ( 1,0) size 8x93153 RenderMathMLSpace {mspace} at (123,0) size 1x76 154 RenderText {#text} at (125,85) size 5x18 155 text run at (125,85) width 5: " " 156 RenderMathMLMath {math} at (129,49) size 126x93 [padding: 0 1 0 1] 157 RenderMathMLRow {mrow} at (1,0) size 124x93 158 RenderMathMLOperator {mo} at (0,0) size 7x93 159 159 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 160 160 RenderBlock (anonymous) at (0,0) size 5x14 161 161 RenderText at (0,-6) size 5x24 162 162 text run at (0,-6) width 5: "(" 163 RenderMathMLOperator {mo} at ( 13,0) size 8x93163 RenderMathMLOperator {mo} at (7,0) size 7x93 164 164 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 165 165 RenderBlock (anonymous) at (0,0) size 5x14 166 166 RenderText at (0,-6) size 5x24 167 167 text run at (0,-6) width 5: ")" 168 RenderMathMLOperator {mo} at ( 26,0) size 11x93168 RenderMathMLOperator {mo} at (14,0) size 10x93 169 169 RenderMathMLBlock (anonymous, flex) at (0,0) size 10x14 170 170 RenderBlock (anonymous) at (0,0) size 8x14 171 171 RenderText at (0,-6) size 8x24 172 172 text run at (0,-6) width 8: "{" 173 RenderMathMLOperator {mo} at ( 43,0) size 11x93173 RenderMathMLOperator {mo} at (24,0) size 10x93 174 174 RenderMathMLBlock (anonymous, flex) at (0,0) size 10x14 175 175 RenderBlock (anonymous) at (0,0) size 8x14 176 176 RenderText at (0,-6) size 8x24 177 177 text run at (0,-6) width 8: "}" 178 RenderMathMLOperator {mo} at ( 59,0) size 8x93178 RenderMathMLOperator {mo} at (34,0) size 7x93 179 179 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 180 180 RenderBlock (anonymous) at (0,0) size 5x14 181 181 RenderText at (0,-6) size 5x24 182 182 text run at (0,-6) width 5: "[" 183 RenderMathMLOperator {mo} at (41,0) size 7x93 184 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 185 RenderBlock (anonymous) at (0,0) size 5x14 186 RenderText at (0,-6) size 5x24 187 text run at (0,-6) width 5: "]" 188 RenderMathMLOperator {mo} at (48,0) size 8x93 189 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 190 RenderBlock (anonymous) at (0,0) size 8x16 191 RenderText at (0,-5) size 8x24 192 text run at (0,-5) width 8: "\x{2308}" 193 RenderMathMLOperator {mo} at (56,0) size 8x93 194 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 195 RenderBlock (anonymous) at (0,0) size 8x16 196 RenderText at (0,-5) size 8x24 197 text run at (0,-5) width 8: "\x{2309}" 198 RenderMathMLOperator {mo} at (64,0) size 8x93 199 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 200 RenderBlock (anonymous) at (0,0) size 8x16 201 RenderText at (0,-5) size 8x24 202 text run at (0,-5) width 8: "\x{230A}" 183 203 RenderMathMLOperator {mo} at (72,0) size 8x93 184 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14185 RenderBlock (anonymous) at (0,0) size 5x14186 RenderText at (0,-6) size 5x24187 text run at (0,-6) width 5: "]"188 RenderMathMLOperator {mo} at (86,0) size 9x93189 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16190 RenderBlock (anonymous) at (0,0) size 8x16191 RenderText at (0,-5) size 8x24192 text run at (0,-5) width 8: "\x{2308}"193 RenderMathMLOperator {mo} at (100,0) size 9x93194 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16195 RenderBlock (anonymous) at (0,0) size 8x16196 RenderText at (0,-5) size 8x24197 text run at (0,-5) width 8: "\x{2309}"198 RenderMathMLOperator {mo} at (115,0) size 8x93199 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16200 RenderBlock (anonymous) at (0,0) size 8x16201 RenderText at (0,-5) size 8x24202 text run at (0,-5) width 8: "\x{230A}"203 RenderMathMLOperator {mo} at (129,0) size 9x93204 204 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 205 205 RenderBlock (anonymous) at (0,0) size 8x16 206 206 RenderText at (0,-5) size 8x24 207 207 text run at (0,-5) width 8: "\x{230B}" 208 RenderMathMLOperator {mo} at ( 143,0) size 12x93208 RenderMathMLOperator {mo} at (80,0) size 12x93 209 209 RenderMathMLBlock (anonymous, flex) at (0,0) size 11x20 210 210 RenderBlock (anonymous) at (0,0) size 7x20 211 211 RenderText at (0,-3) size 7x24 212 212 text run at (0,-3) width 7: "\x{222B}" 213 RenderMathMLOperator {mo} at ( 161,0) size 4x93214 RenderMathMLBlock (anonymous, flex) at ( 0,0) size 3x12213 RenderMathMLOperator {mo} at (91,0) size 8x93 214 RenderMathMLBlock (anonymous, flex) at (1,0) size 4x12 215 215 RenderBlock (anonymous) at (0,0) size 3x12 216 216 RenderText at (0,-6) size 3x24 217 217 text run at (0,-6) width 3: "|" 218 RenderMathMLOperator {mo} at ( 170,0) size 9x51218 RenderMathMLOperator {mo} at (98,0) size 9x51 219 219 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 220 220 RenderBlock (anonymous) at (0,0) size 8x16 221 221 RenderText at (0,-5) size 8x24 222 222 text run at (0,-5) width 8: "\x{2016}" 223 RenderMathMLOperator {mo} at (1 84,0) size 9x51224 RenderMathMLBlock (anonymous, flex) at ( 0,0) size 8x16223 RenderMathMLOperator {mo} at (106,0) size 18x51 224 RenderMathMLBlock (anonymous, flex) at (4,0) size 9x16 225 225 RenderBlock (anonymous) at (0,0) size 8x16 226 226 RenderText at (0,-5) size 8x24 227 227 text run at (0,-5) width 8: "\x{2225}" 228 RenderMathMLSpace {mspace} at (1 96,0) size 1x51229 RenderText {#text} at ( 400,85) size 5x18230 text run at ( 400,85) width 5: " "231 RenderMathMLMath {math} at ( 404,79) size 199x33 [padding: 0 1 0 1]232 RenderMathMLRow {mrow} at (1,0) size 1 97x33233 RenderMathMLOperator {mo} at ( 1,0) size 8x33228 RenderMathMLSpace {mspace} at (123,0) size 1x51 229 RenderText {#text} at (254,85) size 5x18 230 text run at (254,85) width 5: " " 231 RenderMathMLMath {math} at (258,79) size 126x33 [padding: 0 1 0 1] 232 RenderMathMLRow {mrow} at (1,0) size 124x33 233 RenderMathMLOperator {mo} at (0,0) size 7x33 234 234 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 235 235 RenderBlock (anonymous) at (0,0) size 5x14 236 236 RenderText at (0,-6) size 5x24 237 237 text run at (0,-6) width 5: "(" 238 RenderMathMLOperator {mo} at ( 13,0) size 8x33238 RenderMathMLOperator {mo} at (7,0) size 7x33 239 239 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 240 240 RenderBlock (anonymous) at (0,0) size 5x14 241 241 RenderText at (0,-6) size 5x24 242 242 text run at (0,-6) width 5: ")" 243 RenderMathMLOperator {mo} at ( 26,9) size 11x14243 RenderMathMLOperator {mo} at (14,9) size 10x14 244 244 RenderMathMLBlock (anonymous, flex) at (0,0) size 10x14 245 245 RenderBlock (anonymous) at (0,0) size 8x14 246 246 RenderText at (0,-6) size 8x24 247 247 text run at (0,-6) width 8: "{" 248 RenderMathMLOperator {mo} at ( 43,9) size 11x14248 RenderMathMLOperator {mo} at (24,9) size 10x14 249 249 RenderMathMLBlock (anonymous, flex) at (0,0) size 10x14 250 250 RenderBlock (anonymous) at (0,0) size 8x14 251 251 RenderText at (0,-6) size 8x24 252 252 text run at (0,-6) width 8: "}" 253 RenderMathMLOperator {mo} at ( 59,0) size 8x33253 RenderMathMLOperator {mo} at (34,0) size 7x33 254 254 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 255 255 RenderBlock (anonymous) at (0,0) size 5x14 256 256 RenderText at (0,-6) size 5x24 257 257 text run at (0,-6) width 5: "[" 258 RenderMathMLOperator {mo} at (41,0) size 7x33 259 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 260 RenderBlock (anonymous) at (0,0) size 5x14 261 RenderText at (0,-6) size 5x24 262 text run at (0,-6) width 5: "]" 263 RenderMathMLOperator {mo} at (48,0) size 8x33 264 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 265 RenderBlock (anonymous) at (0,0) size 8x16 266 RenderText at (0,-5) size 8x24 267 text run at (0,-5) width 8: "\x{2308}" 268 RenderMathMLOperator {mo} at (56,0) size 8x33 269 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 270 RenderBlock (anonymous) at (0,0) size 8x16 271 RenderText at (0,-5) size 8x24 272 text run at (0,-5) width 8: "\x{2309}" 273 RenderMathMLOperator {mo} at (64,0) size 8x33 274 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 275 RenderBlock (anonymous) at (0,0) size 8x16 276 RenderText at (0,-5) size 8x24 277 text run at (0,-5) width 8: "\x{230A}" 258 278 RenderMathMLOperator {mo} at (72,0) size 8x33 259 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14260 RenderBlock (anonymous) at (0,0) size 5x14261 RenderText at (0,-6) size 5x24262 text run at (0,-6) width 5: "]"263 RenderMathMLOperator {mo} at (86,0) size 9x33264 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16265 RenderBlock (anonymous) at (0,0) size 8x16266 RenderText at (0,-5) size 8x24267 text run at (0,-5) width 8: "\x{2308}"268 RenderMathMLOperator {mo} at (100,0) size 9x33269 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16270 RenderBlock (anonymous) at (0,0) size 8x16271 RenderText at (0,-5) size 8x24272 text run at (0,-5) width 8: "\x{2309}"273 RenderMathMLOperator {mo} at (115,0) size 8x33274 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16275 RenderBlock (anonymous) at (0,0) size 8x16276 RenderText at (0,-5) size 8x24277 text run at (0,-5) width 8: "\x{230A}"278 RenderMathMLOperator {mo} at (129,0) size 9x33279 279 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 280 280 RenderBlock (anonymous) at (0,0) size 8x16 281 281 RenderText at (0,-5) size 8x24 282 282 text run at (0,-5) width 8: "\x{230B}" 283 RenderMathMLOperator {mo} at ( 143,6) size 12x20283 RenderMathMLOperator {mo} at (80,6) size 12x20 284 284 RenderMathMLBlock (anonymous, flex) at (0,0) size 11x20 285 285 RenderBlock (anonymous) at (0,0) size 7x20 286 286 RenderText at (0,-3) size 7x24 287 287 text run at (0,-3) width 7: "\x{222B}" 288 RenderMathMLOperator {mo} at ( 161,0) size 4x33289 RenderMathMLBlock (anonymous, flex) at ( 0,0) size 3x12288 RenderMathMLOperator {mo} at (91,0) size 8x33 289 RenderMathMLBlock (anonymous, flex) at (1,0) size 4x12 290 290 RenderBlock (anonymous) at (0,0) size 3x12 291 291 RenderText at (0,-6) size 3x24 292 292 text run at (0,-6) width 3: "|" 293 RenderMathMLOperator {mo} at ( 170,8) size 9x16293 RenderMathMLOperator {mo} at (98,8) size 9x16 294 294 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 295 295 RenderBlock (anonymous) at (0,0) size 8x16 296 296 RenderText at (0,-5) size 8x24 297 297 text run at (0,-5) width 8: "\x{2016}" 298 RenderMathMLOperator {mo} at (1 84,8) size 9x16299 RenderMathMLBlock (anonymous, flex) at ( 0,0) size 8x16298 RenderMathMLOperator {mo} at (106,8) size 18x16 299 RenderMathMLBlock (anonymous, flex) at (4,0) size 9x16 300 300 RenderBlock (anonymous) at (0,0) size 8x16 301 301 RenderText at (0,-5) size 8x24 302 302 text run at (0,-5) width 8: "\x{2225}" 303 RenderMathMLSpace {mspace} at (1 96,0) size 1x21304 RenderText {#text} at ( 602,85) size 5x18305 text run at ( 602,85) width 5: " "303 RenderMathMLSpace {mspace} at (123,0) size 1x21 304 RenderText {#text} at (383,85) size 5x18 305 text run at (383,85) width 5: " " 306 306 RenderBR {BR} at (0,0) size 0x0 307 RenderMathMLMath {math} at (0,166) size 211x79 [padding: 0 1 0 1]308 RenderMathMLSquareRoot {msqrt} at (1,0) size 209x79 [intrinsic padding: 3 0 3 12]309 RenderMathMLRow (anonymous) at (12,3) size 1 97x73310 RenderMathMLOperator {mo} at ( 1,0) size 8x73307 RenderMathMLMath {math} at (0,166) size 138x79 [padding: 0 1 0 1] 308 RenderMathMLSquareRoot {msqrt} at (1,0) size 136x79 [intrinsic padding: 3 0 3 12] 309 RenderMathMLRow (anonymous) at (12,3) size 124x73 310 RenderMathMLOperator {mo} at (0,0) size 7x73 311 311 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 312 312 RenderBlock (anonymous) at (0,0) size 5x14 313 313 RenderText at (0,-6) size 5x24 314 314 text run at (0,-6) width 5: "(" 315 RenderMathMLOperator {mo} at ( 13,0) size 8x73315 RenderMathMLOperator {mo} at (7,0) size 7x73 316 316 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 317 317 RenderBlock (anonymous) at (0,0) size 5x14 318 318 RenderText at (0,-6) size 5x24 319 319 text run at (0,-6) width 5: ")" 320 RenderMathMLOperator {mo} at ( 26,0) size 11x73320 RenderMathMLOperator {mo} at (14,0) size 10x73 321 321 RenderMathMLBlock (anonymous, flex) at (0,0) size 10x14 322 322 RenderBlock (anonymous) at (0,0) size 8x14 323 323 RenderText at (0,-6) size 8x24 324 324 text run at (0,-6) width 8: "{" 325 RenderMathMLOperator {mo} at ( 43,0) size 11x73325 RenderMathMLOperator {mo} at (24,0) size 10x73 326 326 RenderMathMLBlock (anonymous, flex) at (0,0) size 10x14 327 327 RenderBlock (anonymous) at (0,0) size 8x14 328 328 RenderText at (0,-6) size 8x24 329 329 text run at (0,-6) width 8: "}" 330 RenderMathMLOperator {mo} at ( 59,0) size 8x73330 RenderMathMLOperator {mo} at (34,0) size 7x73 331 331 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 332 332 RenderBlock (anonymous) at (0,0) size 5x14 333 333 RenderText at (0,-6) size 5x24 334 334 text run at (0,-6) width 5: "[" 335 RenderMathMLOperator {mo} at ( 72,0) size 8x73335 RenderMathMLOperator {mo} at (41,0) size 7x73 336 336 RenderMathMLBlock (anonymous, flex) at (0,0) size 7x14 337 337 RenderBlock (anonymous) at (0,0) size 5x14 338 338 RenderText at (0,-6) size 5x24 339 339 text run at (0,-6) width 5: "]" 340 RenderMathMLOperator {mo} at ( 86,0) size 9x73340 RenderMathMLOperator {mo} at (48,0) size 8x73 341 341 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 342 342 RenderBlock (anonymous) at (0,0) size 8x16 343 343 RenderText at (0,-5) size 8x24 344 344 text run at (0,-5) width 8: "\x{2308}" 345 RenderMathMLOperator {mo} at ( 100,0) size 9x73345 RenderMathMLOperator {mo} at (56,0) size 8x73 346 346 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 347 347 RenderBlock (anonymous) at (0,0) size 8x16 348 348 RenderText at (0,-5) size 8x24 349 349 text run at (0,-5) width 8: "\x{2309}" 350 RenderMathMLOperator {mo} at ( 115,0) size 8x73350 RenderMathMLOperator {mo} at (64,0) size 8x73 351 351 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 352 352 RenderBlock (anonymous) at (0,0) size 8x16 353 353 RenderText at (0,-5) size 8x24 354 354 text run at (0,-5) width 8: "\x{230A}" 355 RenderMathMLOperator {mo} at ( 129,0) size 9x73355 RenderMathMLOperator {mo} at (72,0) size 8x73 356 356 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 357 357 RenderBlock (anonymous) at (0,0) size 8x16 358 358 RenderText at (0,-5) size 8x24 359 359 text run at (0,-5) width 8: "\x{230B}" 360 RenderMathMLOperator {mo} at ( 143,0) size 12x73360 RenderMathMLOperator {mo} at (80,0) size 12x73 361 361 RenderMathMLBlock (anonymous, flex) at (0,0) size 11x20 362 362 RenderBlock (anonymous) at (0,0) size 7x20 363 363 RenderText at (0,-3) size 7x24 364 364 text run at (0,-3) width 7: "\x{222B}" 365 RenderMathMLOperator {mo} at ( 161,0) size 4x73366 RenderMathMLBlock (anonymous, flex) at ( 0,0) size 3x12365 RenderMathMLOperator {mo} at (91,0) size 8x73 366 RenderMathMLBlock (anonymous, flex) at (1,0) size 4x12 367 367 RenderBlock (anonymous) at (0,0) size 3x12 368 368 RenderText at (0,-6) size 3x24 369 369 text run at (0,-6) width 3: "|" 370 RenderMathMLOperator {mo} at ( 170,0) size 9x41370 RenderMathMLOperator {mo} at (98,0) size 9x41 371 371 RenderMathMLBlock (anonymous, flex) at (0,0) size 8x16 372 372 RenderBlock (anonymous) at (0,0) size 8x16 373 373 RenderText at (0,-5) size 8x24 374 374 text run at (0,-5) width 8: "\x{2016}" 375 RenderMathMLOperator {mo} at (1 84,0) size 9x41376 RenderMathMLBlock (anonymous, flex) at ( 0,0) size 8x16375 RenderMathMLOperator {mo} at (106,0) size 18x41 376 RenderMathMLBlock (anonymous, flex) at (4,0) size 9x16 377 377 RenderBlock (anonymous) at (0,0) size 8x16 378 378 RenderText at (0,-5) size 8x24 379 379 text run at (0,-5) width 8: "\x{2225}" 380 RenderMathMLSpace {mspace} at (1 96,0) size 1x41380 RenderMathMLSpace {mspace} at (123,0) size 1x41 381 381 RenderText {#text} at (0,0) size 0x0 -
trunk/Source/WebCore/ChangeLog
r165456 r165461 1 2014-03-11 Frédéric Wang <fred.wang@free.fr> 2 3 Implement MathML spacing around operators . 4 https://bugs.webkit.org/show_bug.cgi?id=115787 5 6 Reviewed by Chris Fleizach. 7 8 This makes the <mo> operators use the lspace/rspace properties to 9 determine their spacing. The spacing is now consistent with the one 10 of <mfenced> and as a consequence bug 118843 is fixed. This also ensures 11 that the rendering of <mo> elements is updated when the form or 12 attributes are changed. 13 14 Tests: mathml/presentation/dir-mo.html 15 mathml/presentation/mo-form-dynamic.html 16 mathml/presentation/mo-form-minus-plus.html 17 mathml/presentation/mo-form.html 18 mathml/presentation/mo-lspace-rspace-dynamic.html 19 mathml/presentation/mo-lspace-rspace.html 20 mathml/presentation/mo-whitespaces.html 21 22 * css/mathml.css: 23 * mathml/MathMLInlineContainerElement.cpp: 24 (WebCore::MathMLInlineContainerElement::childrenChanged): 25 * mathml/MathMLInlineContainerElement.h: 26 * rendering/mathml/RenderMathMLOperator.cpp: 27 (WebCore::RenderMathMLOperator::setOperatorPropertiesFromOpDictEntry): 28 (WebCore::RenderMathMLOperator::SetOperatorProperties): 29 (WebCore::RenderMathMLOperator::updateFromElement): 30 (WebCore::RenderMathMLOperator::updateOperatorProperties): 31 (WebCore::RenderMathMLOperator::updateStyle): 32 * rendering/mathml/RenderMathMLOperator.h: 33 * rendering/mathml/RenderMathMLRow.cpp: 34 (WebCore::RenderMathMLRow::updateOperatorProperties): 35 * rendering/mathml/RenderMathMLRow.h: 36 * rendering/mathml/RenderMathMLToken.h: 37 1 38 2014-03-11 Brent Fulgham <bfulgham@apple.com> 2 39 -
trunk/Source/WebCore/css/mathml.css
r163553 r165461 104 104 msubsup > mi:first-child + * + * { 105 105 -webkit-margin-start: 0.14em; /* This is larger than 0.1em because the child's font-size is smaller than the <msubsup>'s. */ 106 }107 108 /* FIXME: For a RenderMathMLOperator's margin-start and margin-end, or for a MathML "embellished operator", check the operator's lspace and rspace attributes,109 and the MathML operator dictionary. */110 math > mo, mrow > mo, msqrt > mo, mtd > mo {111 -webkit-margin-start: 0.2em;112 -webkit-margin-end: 0.2em;113 }114 math > mo:first-child, mrow > mo:first-child, msqrt > mo:first-child, mtd > mo:first-child,115 math > mo:last-child, mrow > mo:last-child, msqrt > mo:last-child, mtd > mo:last-child {116 -webkit-margin-start: 0.1em;117 -webkit-margin-end: 0.1em;118 106 } 119 107 -
trunk/Source/WebCore/mathml/MathMLInlineContainerElement.cpp
r162933 r165461 56 56 } 57 57 58 void MathMLInlineContainerElement::childrenChanged(const ChildChange& change) 59 { 60 if (renderer()) { 61 if (renderer()->isRenderMathMLRow()) 62 toRenderMathMLRow(renderer())->updateOperatorProperties(); 63 else if (hasLocalName(mathTag) || hasLocalName(msqrtTag)) { 64 auto childRenderer = renderer()->firstChild(); 65 if (childRenderer && childRenderer->isRenderMathMLRow()) 66 toRenderMathMLRow(childRenderer)->updateOperatorProperties(); 67 } 68 } 69 MathMLElement::childrenChanged(change); 70 } 71 58 72 RenderPtr<RenderElement> MathMLInlineContainerElement::createElementRenderer(PassRef<RenderStyle> style) 59 73 { -
trunk/Source/WebCore/mathml/MathMLInlineContainerElement.h
r162139 r165461 41 41 protected: 42 42 MathMLInlineContainerElement(const QualifiedName& tagName, Document&); 43 void childrenChanged(const ChildChange&); 43 44 44 45 private: -
trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp
r165436 r165461 1161 1161 1162 1162 // Leading and trailing space is specified as multiple of 1/18em. 1163 m_leadingSpace = entry->lspace * style().font Size() / 18;1164 m_trailingSpace = entry->rspace * style().font Size() / 18;1163 m_leadingSpace = entry->lspace * style().font().size() / 18; 1164 m_trailingSpace = entry->rspace * style().font().size() / 18; 1165 1165 } 1166 1166 … … 1196 1196 else 1197 1197 m_operatorFlags = 0; // This resets all the operator properties. 1198 m_leadingSpace = 5 * style().font Size() / 18; // This sets leading space to "thickmathspace".1199 m_trailingSpace = 5 * style().font Size() / 18; // This sets trailing space to "thickmathspace".1200 m_minSize = style().font Size(); // This sets minsize to "1em".1198 m_leadingSpace = 5 * style().font().size() / 18; // This sets leading space to "thickmathspace". 1199 m_trailingSpace = 5 * style().font().size() / 18; // This sets trailing space to "thickmathspace". 1200 m_minSize = style().font().size(); // This sets minsize to "1em". 1201 1201 m_maxSize = intMaxForLayoutUnit; // This sets maxsize to "infinity". 1202 1202 … … 1237 1237 if (maxsize != "infinity") 1238 1238 parseMathMLLength(maxsize, m_maxSize, &style(), false); 1239 }1240 1241 // FIXME: this should be removed when operator spacing is implemented (https://bugs.webkit.org/show_bug.cgi?id=115787). At the moment spacing for normal <mo> elements is handled in mathml.css and mfenced uses the arbitrary constants below.1242 if (isFencedOperator()) {1243 if (hasOperatorFlag(MathMLOperatorDictionary::Fence)) {1244 m_leadingSpace = 0.1f * style().fontSize();1245 m_trailingSpace = 0.1f * style().fontSize();1246 } else if (hasOperatorFlag(MathMLOperatorDictionary::Separator)) {1247 m_leadingSpace = 0;1248 m_trailingSpace = 0.25f * style().fontSize();1249 }1250 } else {1251 m_leadingSpace = 0;1252 m_trailingSpace = 0;1253 1239 } 1254 1240 } … … 1375 1361 } 1376 1362 1363 void RenderMathMLOperator::updateFromElement() 1364 { 1365 SetOperatorProperties(); 1366 RenderMathMLToken::updateFromElement(); 1367 } 1368 1369 void RenderMathMLOperator::updateOperatorProperties() 1370 { 1371 SetOperatorProperties(); 1372 if (!isEmpty()) 1373 updateStyle(); 1374 setNeedsLayoutAndPrefWidthsRecalc(); 1375 } 1376 1377 1377 bool RenderMathMLOperator::shouldAllowStretching(UChar& stretchedCharacter) 1378 1378 { … … 1428 1428 1429 1429 // We add spacing around the operator. 1430 // FIXME: The spacing should be added to the whole embellished operator (https://bugs.webkit.org/show_bug.cgi?id=124831). 1431 // FIXME: The spacing should only be added inside (perhaps inferred) mrow (http://www.w3.org/TR/MathML/chapter3.html#presm.opspacing). 1430 1432 const auto& wrapper = toRenderElement(firstChild()); 1431 1433 auto newStyle = RenderStyle::createAnonymousStyleWithDisplay(&style(), FLEX); -
trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h
r165436 r165461 50 50 UChar character; 51 51 Form form; 52 // FIXME: spacing around <mo> operators is not implemented yet (https://bugs.webkit.org/show_bug.cgi?id=115787).53 52 unsigned short lspace; 54 53 unsigned short rspace; … … 82 81 void updateTokenContent(const String& operatorString); 83 82 void updateTokenContent() override final; 83 void updateOperatorProperties(); 84 84 85 85 private: … … 94 94 virtual RenderMathMLOperator* unembellishedOperator() override { return this; } 95 95 void rebuildTokenContent(const String& operatorString); 96 void updateFromElement() override; 96 97 97 98 bool shouldAllowStretching(UChar& characterForStretching); -
trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp
r164700 r165461 56 56 } 57 57 58 void RenderMathMLRow::updateOperatorProperties() 59 { 60 for (RenderObject* child = firstChild(); child; child = child->nextSibling()) { 61 if (child->isRenderMathMLBlock()) { 62 auto renderOperator = toRenderMathMLBlock(child)->unembellishedOperator(); 63 if (renderOperator) 64 renderOperator->updateOperatorProperties(); 65 } 66 } 67 setNeedsLayoutAndPrefWidthsRecalc(); 68 } 69 58 70 void RenderMathMLRow::layout() 59 71 { -
trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h
r162158 r165461 41 41 42 42 static RenderPtr<RenderMathMLRow> createAnonymousWithParentRenderer(RenderMathMLRoot&); 43 void updateOperatorProperties(); 43 44 44 45 protected: … … 50 51 }; 51 52 53 RENDER_OBJECT_TYPE_CASTS(RenderMathMLRow, isRenderMathMLRow()) 54 52 55 } 53 56 -
trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.h
r163793 r165461 46 46 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild) override; 47 47 virtual void updateTokenContent(); 48 void updateFromElement() override; 48 49 49 50 protected: … … 52 53 private: 53 54 virtual const char* renderName() const override { return isAnonymous() ? "RenderMathMLToken (anonymous)" : "RenderMathMLToken"; } 54 void updateFromElement() override;55 55 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override; 56 56 virtual void updateStyle();
Note: See TracChangeset
for help on using the changeset viewer.