Changeset 203289 in webkit
- Timestamp:
- Jul 15, 2016 11:47:16 AM (8 years ago)
- Location:
- trunk
- Files:
-
- 17 edited
-
LayoutTests/ChangeLog (modified) (1 diff)
-
LayoutTests/imported/mathml-in-html5/fonts/math/axisheight5000-verticalarrow14000.woff (modified) (previous)
-
LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/operators/mo-axis-height-1-expected.txt (modified) (1 diff)
-
LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/operators/mo-axis-height-1.html (modified) (3 diffs)
-
LayoutTests/platform/gtk/mathml/opentype/vertical-expected.png (modified) (previous)
-
LayoutTests/platform/gtk/mathml/opentype/vertical-expected.txt (modified) (5 diffs)
-
LayoutTests/platform/gtk/mathml/presentation/mo-stretch-expected.png (modified) (previous)
-
LayoutTests/platform/gtk/mathml/presentation/mo-stretch-expected.txt (modified) (5 diffs)
-
LayoutTests/platform/ios-simulator/mathml/opentype/opentype-stretchy-expected.txt (modified) (5 diffs)
-
LayoutTests/platform/ios-simulator/mathml/presentation/mo-stretch-expected.txt (modified) (12 diffs)
-
LayoutTests/platform/mac/mathml/opentype/opentype-stretchy-expected.txt (modified) (5 diffs)
-
LayoutTests/platform/mac/mathml/presentation/mo-stretch-expected.txt (modified) (4 diffs)
-
Source/WebCore/ChangeLog (modified) (1 diff)
-
Source/WebCore/rendering/mathml/MathOperator.cpp (modified) (1 diff)
-
Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp (modified) (2 diffs)
-
Source/WebCore/rendering/mathml/RenderMathMLOperator.h (modified) (1 diff)
-
Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r203288 r203289 1 2016-07-15 Frederic Wang <fwang@igalia.com> 2 3 MathOperator: Improve alignment for vertical size variant 4 https://bugs.webkit.org/show_bug.cgi?id=158866 5 6 Reviewed by Brent Fulgham. 7 8 We import the latest version of mo-axis-height-1.html and update the expectation now that we 9 pass the two cases (size variant and glyph assembly). We also rebaseline some pixel tests. 10 11 * imported/mathml-in-html5/fonts/math/axisheight5000-verticalarrow14000.woff: Updated. 12 * imported/mathml-in-html5/mathml/presentation-markup/operators/mo-axis-height-1-expected.txt: Updated to expect PASS. 13 * imported/mathml-in-html5/mathml/presentation-markup/operators/mo-axis-height-1.html: Updated to include the two tests. 14 * platform/gtk/mathml/opentype/vertical-expected.png: Rebaseline to take into account better alignment of size variant. 15 * platform/gtk/mathml/opentype/vertical-expected.txt: Ditto. 16 * platform/gtk/mathml/presentation/mo-stretch-expected.png: Ditto. 17 * platform/gtk/mathml/presentation/mo-stretch-expected.txt: Ditto. 18 * platform/ios-simulator/mathml/opentype/opentype-stretchy-expected.txt: Ditto. 19 * platform/ios-simulator/mathml/presentation/mo-stretch-expected.txt: Ditto. 20 * platform/mac/mathml/opentype/opentype-stretchy-expected.txt: Ditto. 21 * platform/mac/mathml/presentation/mo-stretch-expected.txt: Ditto. 22 1 23 2016-07-15 Brady Eidson <beidson@apple.com> 2 24 -
trunk/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/operators/mo-axis-height-1-expected.txt
r202973 r203289 1 ↨ 2 1 3 ↨ 2 4 3 5 4 FAIL AxisHeight assert_approx_equals: mo: axis height expected 50 +/- 1 but got 70 6 PASS AxisHeight (size variant) 7 PASS AxisHeight (glyph assembly) 5 8 -
trunk/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/operators/mo-axis-height-1.html
r202973 r203289 19 19 <script> 20 20 var emToPx = 10 / 1000; // font-size: 10px, font.em = 1000 21 var epsilon = 1;21 var epsilon = 5; 22 22 23 23 function getBox(aId) { … … 35 35 test(function() { 36 36 var v1 = 5000 * emToPx; 37 var moMiddle = (getBox("mo").bottom + getBox("mo").top) / 2; 38 assert_approx_equals(getBox("baseline").bottom - moMiddle, 37 var moMiddle = (getBox("mo1").bottom + getBox("mo1").top) / 2; 38 assert_approx_equals(getBox("mo1").height, 39 14000 * emToPx, epsilon, "mo: size"); 40 assert_approx_equals(getBox("baseline1").bottom - moMiddle, 39 41 v1, epsilon, "mo: axis height"); 40 }, "AxisHeight"); 42 }, "AxisHeight (size variant)"); 43 44 test(function() { 45 var v1 = 5000 * emToPx; 46 var moMiddle = (getBox("mo2").bottom + getBox("mo2").top) / 2; 47 assert_approx_equals(getBox("mo2").height, 48 2 * (getBox("target2").height - v1), 49 epsilon, "mo: size"); 50 assert_approx_equals(getBox("baseline2").bottom - moMiddle, 51 v1, epsilon, "mo: axis height"); 52 }, "AxisHeight (glyph assembly)"); 41 53 42 54 done(); … … 48 60 <math style="font-family: axisheight5000-verticalarrow14000;"> 49 61 <mrow> 50 <mspace id="baseline" mathbackground="blue" width="100px" height="1px"/> 51 <mo id="mo" mathcolor="green">↨</mo> 52 <mspace mathbackground="black" width="10px" height="100px"/> 62 <mspace id="baseline1" mathbackground="blue" width="50px" height="1px"/> 63 <mpadded voffset="50px"><mspace mathbackground="cyan" width="50px" height="1px"/></mpadded> 64 <mo id="mo1" symmetric="true" mathcolor="green">↨</mo> 65 <mspace mathbackground="gray" width="10px" height="50px"/> 66 </mrow> 67 </math> 68 <math style="font-family: axisheight5000-verticalarrow14000;"> 69 <mrow> 70 <mspace id="baseline2" mathbackground="blue" width="50px" height="1px"/> 71 <mpadded voffset="50px"><mspace mathbackground="cyan" width="50px" height="1px"/></mpadded> 72 <mo id="mo2" symmetric="true" mathcolor="green">↨</mo> 73 <mspace id="target2" mathbackground="gray" width="10px" height="200px"/> 53 74 </mrow> 54 75 </math> -
trunk/LayoutTests/platform/gtk/mathml/opentype/vertical-expected.txt
r203171 r203289 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x3 584 RenderBlock {HTML} at (0,0) size 800x3 585 RenderBody {BODY} at (8,16) size 784x3 266 RenderBlock {P} at (0,0) size 784x1 87 RenderMathMLMath {math} at (0, 2) size 98x163 layer at (0,0) size 800x362 4 RenderBlock {HTML} at (0,0) size 800x362 5 RenderBody {BODY} at (8,16) size 784x330 6 RenderBlock {P} at (0,0) size 784x19 7 RenderMathMLMath {math} at (0,0) size 98x16 8 8 RenderMathMLOperator {mo} at (0,0) size 4x16 9 9 RenderBlock (anonymous) at (0,0) size 4x16 … … 66 66 RenderText {#text} at (0,-45) size 6x106 67 67 text run at (0,-45) width 6: "\x{27E9}" 68 RenderMathMLSpace {mspace} at (97, 4) size 0x868 RenderMathMLSpace {mspace} at (97,8) size 0x8 69 69 RenderText {#text} at (0,0) size 0x0 70 RenderBlock {P} at (0,3 4) size 784x2471 RenderMathMLMath {math} at (0, 0) size 126x2470 RenderBlock {P} at (0,35) size 784x27 71 RenderMathMLMath {math} at (0,3) size 126x24 72 72 RenderMathMLOperator {mo} at (0,0) size 7x24 73 73 RenderBlock (anonymous) at (0,0) size 4x16 … … 131 131 text run at (0,-45) width 6: "\x{27E9}" 132 132 RenderMathMLSpace {mspace} at (125,0) size 0x16 133 RenderText {#text} at (125, 2) size 5x17134 text run at (125, 2) width 5: " "135 RenderMathMLMath {math} at (129,0) size 210x2 3136 RenderMathMLOperator {mo} at (0, 1) size 17x22133 RenderText {#text} at (125,5) size 5x17 134 text run at (125,5) width 5: " " 135 RenderMathMLMath {math} at (129,0) size 210x22 136 RenderMathMLOperator {mo} at (0,0) size 17x22 137 137 RenderBlock (anonymous) at (0,0) size 8x15 138 138 RenderText {#text} at (0,-46) size 8x106 139 139 text run at (0,-46) width 8: "\x{2191}" 140 RenderMathMLOperator {mo} at (16, 1) size 18x22140 RenderMathMLOperator {mo} at (16,0) size 18x22 141 141 RenderBlock (anonymous) at (0,0) size 8x15 142 142 RenderText {#text} at (0,-45) size 8x106 143 143 text run at (0,-45) width 8: "\x{2193}" 144 RenderMathMLOperator {mo} at (33, 3) size 18x18144 RenderMathMLOperator {mo} at (33,2) size 18x18 145 145 RenderBlock (anonymous) at (0,0) size 8x18 146 146 RenderText {#text} at (0,-44) size 8x106 147 147 text run at (0,-44) width 8: "\x{2195}" 148 RenderMathMLOperator {mo} at (50, 1) size 20x22148 RenderMathMLOperator {mo} at (50,0) size 20x22 149 149 RenderBlock (anonymous) at (0,0) size 10x14 150 150 RenderText {#text} at (0,-46) size 10x106 151 151 text run at (0,-46) width 10: "\x{21A5}" 152 RenderMathMLOperator {mo} at (69, 1) size 20x22152 RenderMathMLOperator {mo} at (69,0) size 20x22 153 153 RenderBlock (anonymous) at (0,0) size 10x14 154 154 RenderText {#text} at (0,-46) size 10x106 155 155 text run at (0,-46) width 10: "\x{21A7}" 156 RenderMathMLOperator {mo} at (88, 4) size 17x16156 RenderMathMLOperator {mo} at (88,3) size 17x16 157 157 RenderBlock (anonymous) at (0,0) size 7x16 158 158 RenderText {#text} at (0,-45) size 7x106 159 159 text run at (0,-45) width 7: "\x{21BE}" 160 RenderMathMLOperator {mo} at (104, 4) size 17x16160 RenderMathMLOperator {mo} at (104,3) size 17x16 161 161 RenderBlock (anonymous) at (0,0) size 7x16 162 162 RenderText {#text} at (0,-45) size 7x106 163 163 text run at (0,-45) width 7: "\x{21C2}" 164 RenderMathMLOperator {mo} at (120, 4) size 16x16164 RenderMathMLOperator {mo} at (120,3) size 16x16 165 165 RenderBlock (anonymous) at (0,0) size 7x16 166 166 RenderText {#text} at (0,-45) size 7x106 167 167 text run at (0,-45) width 7: "\x{21BF}" 168 RenderMathMLOperator {mo} at (136, 4) size 16x16168 RenderMathMLOperator {mo} at (136,3) size 16x16 169 169 RenderBlock (anonymous) at (0,0) size 7x16 170 170 RenderText {#text} at (0,-45) size 7x106 171 171 text run at (0,-45) width 7: "\x{21C3}" 172 RenderMathMLOperator {mo} at (151, 1) size 20x22172 RenderMathMLOperator {mo} at (151,0) size 20x22 173 173 RenderBlock (anonymous) at (0,0) size 10x15 174 174 RenderText {#text} at (0,-46) size 10x106 175 175 text run at (0,-46) width 10: "\x{21D1}" 176 RenderMathMLOperator {mo} at (170, 1) size 20x22176 RenderMathMLOperator {mo} at (170,0) size 20x22 177 177 RenderBlock (anonymous) at (0,0) size 10x15 178 178 RenderText {#text} at (0,-45) size 10x106 179 179 text run at (0,-45) width 10: "\x{21D3}" 180 RenderMathMLOperator {mo} at (189, 4) size 20x16180 RenderMathMLOperator {mo} at (189,3) size 20x16 181 181 RenderBlock (anonymous) at (0,0) size 10x16 182 182 RenderText {#text} at (0,-45) size 10x106 183 183 text run at (0,-45) width 10: "\x{21D5}" 184 RenderMathMLSpace {mspace} at (208, 0) size 0x16184 RenderMathMLSpace {mspace} at (208,3) size 0x16 185 185 RenderText {#text} at (0,0) size 0x0 186 RenderBlock {P} at (0,7 4) size 784x42186 RenderBlock {P} at (0,78) size 784x42 187 187 RenderMathMLMath {math} at (0,0) size 158x42 188 188 RenderMathMLOperator {mo} at (0,1) size 8x40 … … 248 248 RenderMathMLSpace {mspace} at (157,1) size 0x24 249 249 RenderText {#text} at (0,0) size 0x0 250 RenderBlock {P} at (0,13 2) size 784x58250 RenderBlock {P} at (0,136) size 784x58 251 251 RenderMathMLMath {math} at (0,0) size 192x58 252 252 RenderMathMLOperator {mo} at (0,1) size 11x56 … … 364 364 RenderMathMLSpace {mspace} at (209,0) size 0x32 365 365 RenderText {#text} at (0,0) size 0x0 366 RenderBlock {P} at (0,2 06) size 784x120366 RenderBlock {P} at (0,210) size 784x120 367 367 RenderMathMLMath {math} at (0,0) size 192x120 368 368 RenderMathMLOperator {mo} at (0,0) size 11x120 -
trunk/LayoutTests/platform/gtk/mathml/presentation/mo-stretch-expected.txt
r203171 r203289 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x26 84 RenderBlock {HTML} at (0,0) size 800x26 85 RenderBody {BODY} at (8,8) size 784x25 23 layer at (0,0) size 800x269 4 RenderBlock {HTML} at (0,0) size 800x269 5 RenderBody {BODY} at (8,8) size 784x253 6 6 RenderMathMLMath {math} at (0,0) size 130x36 7 7 RenderMathMLRow {mrow} at (0,0) size 130x36 … … 54 54 RenderText {#text} at (0,-45) size 4x106 55 55 text run at (0,-45) width 4: "|" 56 RenderMathMLOperator {mo} at (106, 10) size 7x1657 RenderBlock (anonymous) at (0,0) size 6x16 58 RenderText {#text} at (0,-45) size 6x106 59 text run at (0,-45) width 6: "\x{2016}" 60 RenderMathMLOperator {mo} at (112, 10) size 18x1656 RenderMathMLOperator {mo} at (106,6) size 7x16 57 RenderBlock (anonymous) at (0,0) size 6x16 58 RenderText {#text} at (0,-45) size 6x106 59 text run at (0,-45) width 6: "\x{2016}" 60 RenderMathMLOperator {mo} at (112,6) size 18x16 61 61 RenderBlock (anonymous) at (0,0) size 8x16 62 62 RenderText {#text} at (0,-45) size 8x106 … … 126 126 RenderText {#text} at (169,97) size 5x17 127 127 text run at (169,97) width 5: " " 128 RenderMathMLMath {math} at (173, 61) size 170x92129 RenderMathMLRow {mrow} at (0,0) size 170x9 2130 RenderMathMLOperator {mo} at (0, 0) size 14x92131 RenderBlock (anonymous) at (0,0) size 6x16 132 RenderText {#text} at (0,-45) size 6x106 133 text run at (0,-45) width 6: "(" 134 RenderMathMLOperator {mo} at (14, 0) size 14x92135 RenderBlock (anonymous) at (0,0) size 6x16 136 RenderText {#text} at (0,-45) size 6x106 137 text run at (0,-45) width 6: ")" 138 RenderMathMLOperator {mo} at (28, 0) size 14x92139 RenderBlock (anonymous) at (0,0) size 8x16 140 RenderText {#text} at (0,-45) size 8x106 141 text run at (0,-45) width 8: "{" 142 RenderMathMLOperator {mo} at (42, 0) size 14x92143 RenderBlock (anonymous) at (0,0) size 8x16 144 RenderText {#text} at (0,-45) size 8x106 145 text run at (0,-45) width 8: "}" 146 RenderMathMLOperator {mo} at (56, 0) size 11x92147 RenderBlock (anonymous) at (0,0) size 4x16 148 RenderText {#text} at (0,-45) size 4x106 149 text run at (0,-45) width 4: "[" 150 RenderMathMLOperator {mo} at (67, 0) size 11x92151 RenderBlock (anonymous) at (0,0) size 4x16 152 RenderText {#text} at (0,-45) size 4x106 153 text run at (0,-45) width 4: "]" 154 RenderMathMLOperator {mo} at (78, 0) size 11x92155 RenderBlock (anonymous) at (0,0) size 7x16 156 RenderText {#text} at (0,-45) size 7x106 157 text run at (0,-45) width 7: "\x{2308}" 158 RenderMathMLOperator {mo} at (89, 0) size 11x92159 RenderBlock (anonymous) at (0,0) size 7x16 160 RenderText {#text} at (0,-45) size 7x106 161 text run at (0,-45) width 7: "\x{2309}" 162 RenderMathMLOperator {mo} at (100, 0) size 11x92163 RenderBlock (anonymous) at (0,0) size 7x16 164 RenderText {#text} at (0,-45) size 7x106 165 text run at (0,-45) width 7: "\x{230A}" 166 RenderMathMLOperator {mo} at (111, 0) size 11x92167 RenderBlock (anonymous) at (0,0) size 7x16 168 RenderText {#text} at (0,-45) size 7x106 169 text run at (0,-45) width 7: "\x{230B}" 170 RenderMathMLOperator {mo} at (122, 28) size 17x36171 RenderBlock (anonymous) at (0,0) size 11x18 172 RenderText {#text} at (0,-44) size 11x106 173 text run at (0,-44) width 11: "\x{222B}" 174 RenderMathMLOperator {mo} at (138, 0) size 9x92175 RenderBlock (anonymous) at (0,0) size 4x16 176 RenderText {#text} at (0,-45) size 4x106 177 text run at (0,-45) width 4: "|" 178 RenderMathMLOperator {mo} at (146, 17) size 8x58179 RenderBlock (anonymous) at (0,0) size 6x16 180 RenderText {#text} at (0,-45) size 6x106 181 text run at (0,-45) width 6: "\x{2016}" 182 RenderMathMLOperator {mo} at (153, 17) size 17x58183 RenderBlock (anonymous) at (0,0) size 8x16 184 RenderText {#text} at (0,-45) size 8x106 185 text run at (0,-45) width 8: "\x{2225}" 186 RenderMathMLSpace {mspace} at (169, 0) size 0x51128 RenderMathMLMath {math} at (173,57) size 170x96 129 RenderMathMLRow {mrow} at (0,0) size 170x96 130 RenderMathMLOperator {mo} at (0,4) size 14x92 131 RenderBlock (anonymous) at (0,0) size 6x16 132 RenderText {#text} at (0,-45) size 6x106 133 text run at (0,-45) width 6: "(" 134 RenderMathMLOperator {mo} at (14,4) size 14x92 135 RenderBlock (anonymous) at (0,0) size 6x16 136 RenderText {#text} at (0,-45) size 6x106 137 text run at (0,-45) width 6: ")" 138 RenderMathMLOperator {mo} at (28,4) size 14x92 139 RenderBlock (anonymous) at (0,0) size 8x16 140 RenderText {#text} at (0,-45) size 8x106 141 text run at (0,-45) width 8: "{" 142 RenderMathMLOperator {mo} at (42,4) size 14x92 143 RenderBlock (anonymous) at (0,0) size 8x16 144 RenderText {#text} at (0,-45) size 8x106 145 text run at (0,-45) width 8: "}" 146 RenderMathMLOperator {mo} at (56,4) size 11x92 147 RenderBlock (anonymous) at (0,0) size 4x16 148 RenderText {#text} at (0,-45) size 4x106 149 text run at (0,-45) width 4: "[" 150 RenderMathMLOperator {mo} at (67,4) size 11x92 151 RenderBlock (anonymous) at (0,0) size 4x16 152 RenderText {#text} at (0,-45) size 4x106 153 text run at (0,-45) width 4: "]" 154 RenderMathMLOperator {mo} at (78,4) size 11x92 155 RenderBlock (anonymous) at (0,0) size 7x16 156 RenderText {#text} at (0,-45) size 7x106 157 text run at (0,-45) width 7: "\x{2308}" 158 RenderMathMLOperator {mo} at (89,4) size 11x92 159 RenderBlock (anonymous) at (0,0) size 7x16 160 RenderText {#text} at (0,-45) size 7x106 161 text run at (0,-45) width 7: "\x{2309}" 162 RenderMathMLOperator {mo} at (100,4) size 11x92 163 RenderBlock (anonymous) at (0,0) size 7x16 164 RenderText {#text} at (0,-45) size 7x106 165 text run at (0,-45) width 7: "\x{230A}" 166 RenderMathMLOperator {mo} at (111,4) size 11x92 167 RenderBlock (anonymous) at (0,0) size 7x16 168 RenderText {#text} at (0,-45) size 7x106 169 text run at (0,-45) width 7: "\x{230B}" 170 RenderMathMLOperator {mo} at (122,32) size 17x36 171 RenderBlock (anonymous) at (0,0) size 11x18 172 RenderText {#text} at (0,-44) size 11x106 173 text run at (0,-44) width 11: "\x{222B}" 174 RenderMathMLOperator {mo} at (138,4) size 9x92 175 RenderBlock (anonymous) at (0,0) size 4x16 176 RenderText {#text} at (0,-45) size 4x106 177 text run at (0,-45) width 4: "|" 178 RenderMathMLOperator {mo} at (146,0) size 8x58 179 RenderBlock (anonymous) at (0,0) size 6x16 180 RenderText {#text} at (0,-45) size 6x106 181 text run at (0,-45) width 6: "\x{2016}" 182 RenderMathMLOperator {mo} at (153,0) size 17x58 183 RenderBlock (anonymous) at (0,0) size 8x16 184 RenderText {#text} at (0,-45) size 8x106 185 text run at (0,-45) width 8: "\x{2225}" 186 RenderMathMLSpace {mspace} at (169,4) size 0x51 187 187 RenderText {#text} at (342,97) size 5x17 188 188 text run at (342,97) width 5: " " … … 237 237 RenderText {#text} at (0,-45) size 4x106 238 238 text run at (0,-45) width 4: "|" 239 RenderMathMLOperator {mo} at (120, 6) size 7x24240 RenderBlock (anonymous) at (0,0) size 6x16 241 RenderText {#text} at (0,-45) size 6x106 242 text run at (0,-45) width 6: "\x{2016}" 243 RenderMathMLOperator {mo} at (126, 6) size 16x24239 RenderMathMLOperator {mo} at (120,0) size 7x24 240 RenderBlock (anonymous) at (0,0) size 6x16 241 RenderText {#text} at (0,-45) size 6x106 242 text run at (0,-45) width 6: "\x{2016}" 243 RenderMathMLOperator {mo} at (126,0) size 16x24 244 244 RenderBlock (anonymous) at (0,0) size 8x16 245 245 RenderText {#text} at (0,-45) size 8x106 … … 249 249 text run at (487,97) width 5: " " 250 250 RenderBR {BR} at (0,0) size 0x0 251 RenderMathMLMath {math} at (0,178) size 185x7 5252 RenderMathMLRoot {msqrt} at (0,0) size 185x7 5253 RenderMathMLOperator {mo} at (17, 2) size 14x73254 RenderBlock (anonymous) at (0,0) size 6x16 255 RenderText {#text} at (0,-45) size 6x106 256 text run at (0,-45) width 6: "(" 257 RenderMathMLOperator {mo} at (31, 2) size 14x73258 RenderBlock (anonymous) at (0,0) size 6x16 259 RenderText {#text} at (0,-45) size 6x106 260 text run at (0,-45) width 6: ")" 261 RenderMathMLOperator {mo} at (45, 2) size 14x73262 RenderBlock (anonymous) at (0,0) size 8x16 263 RenderText {#text} at (0,-45) size 8x106 264 text run at (0,-45) width 8: "{" 265 RenderMathMLOperator {mo} at (59, 2) size 14x73266 RenderBlock (anonymous) at (0,0) size 8x16 267 RenderText {#text} at (0,-45) size 8x106 268 text run at (0,-45) width 8: "}" 269 RenderMathMLOperator {mo} at (73, 2) size 11x73270 RenderBlock (anonymous) at (0,0) size 4x16 271 RenderText {#text} at (0,-45) size 4x106 272 text run at (0,-45) width 4: "[" 273 RenderMathMLOperator {mo} at (84, 2) size 11x73274 RenderBlock (anonymous) at (0,0) size 4x16 275 RenderText {#text} at (0,-45) size 4x106 276 text run at (0,-45) width 4: "]" 277 RenderMathMLOperator {mo} at (95, 2) size 11x73278 RenderBlock (anonymous) at (0,0) size 7x16 279 RenderText {#text} at (0,-45) size 7x106 280 text run at (0,-45) width 7: "\x{2308}" 281 RenderMathMLOperator {mo} at (106, 2) size 11x73282 RenderBlock (anonymous) at (0,0) size 7x16 283 RenderText {#text} at (0,-45) size 7x106 284 text run at (0,-45) width 7: "\x{2309}" 285 RenderMathMLOperator {mo} at (117, 2) size 11x73286 RenderBlock (anonymous) at (0,0) size 7x16 287 RenderText {#text} at (0,-45) size 7x106 288 text run at (0,-45) width 7: "\x{230A}" 289 RenderMathMLOperator {mo} at (128, 2) size 11x73290 RenderBlock (anonymous) at (0,0) size 7x16 291 RenderText {#text} at (0,-45) size 7x106 292 text run at (0,-45) width 7: "\x{230B}" 293 RenderMathMLOperator {mo} at (139,2 0) size 17x37294 RenderBlock (anonymous) at (0,0) size 11x18 295 RenderText {#text} at (0,-44) size 11x106 296 text run at (0,-44) width 11: "\x{222B}" 297 RenderMathMLOperator {mo} at (155, 2) size 9x73298 RenderBlock (anonymous) at (0,0) size 4x16 299 RenderText {#text} at (0,-45) size 4x106 300 text run at (0,-45) width 4: "|" 301 RenderMathMLOperator {mo} at (163, 17) size 7x43302 RenderBlock (anonymous) at (0,0) size 6x16 303 RenderText {#text} at (0,-45) size 6x106 304 text run at (0,-45) width 6: "\x{2016}" 305 RenderMathMLOperator {mo} at (169, 17) size 16x43306 RenderBlock (anonymous) at (0,0) size 8x16 307 RenderText {#text} at (0,-45) size 8x106 308 text run at (0,-45) width 8: "\x{2225}" 309 RenderMathMLSpace {mspace} at (184, 2) size 0x42251 RenderMathMLMath {math} at (0,178) size 185x76 252 RenderMathMLRoot {msqrt} at (0,0) size 185x76 253 RenderMathMLOperator {mo} at (17,3) size 14x73 254 RenderBlock (anonymous) at (0,0) size 6x16 255 RenderText {#text} at (0,-45) size 6x106 256 text run at (0,-45) width 6: "(" 257 RenderMathMLOperator {mo} at (31,3) size 14x73 258 RenderBlock (anonymous) at (0,0) size 6x16 259 RenderText {#text} at (0,-45) size 6x106 260 text run at (0,-45) width 6: ")" 261 RenderMathMLOperator {mo} at (45,3) size 14x73 262 RenderBlock (anonymous) at (0,0) size 8x16 263 RenderText {#text} at (0,-45) size 8x106 264 text run at (0,-45) width 8: "{" 265 RenderMathMLOperator {mo} at (59,3) size 14x73 266 RenderBlock (anonymous) at (0,0) size 8x16 267 RenderText {#text} at (0,-45) size 8x106 268 text run at (0,-45) width 8: "}" 269 RenderMathMLOperator {mo} at (73,3) size 11x73 270 RenderBlock (anonymous) at (0,0) size 4x16 271 RenderText {#text} at (0,-45) size 4x106 272 text run at (0,-45) width 4: "[" 273 RenderMathMLOperator {mo} at (84,3) size 11x73 274 RenderBlock (anonymous) at (0,0) size 4x16 275 RenderText {#text} at (0,-45) size 4x106 276 text run at (0,-45) width 4: "]" 277 RenderMathMLOperator {mo} at (95,3) size 11x73 278 RenderBlock (anonymous) at (0,0) size 7x16 279 RenderText {#text} at (0,-45) size 7x106 280 text run at (0,-45) width 7: "\x{2308}" 281 RenderMathMLOperator {mo} at (106,3) size 11x73 282 RenderBlock (anonymous) at (0,0) size 7x16 283 RenderText {#text} at (0,-45) size 7x106 284 text run at (0,-45) width 7: "\x{2309}" 285 RenderMathMLOperator {mo} at (117,3) size 11x73 286 RenderBlock (anonymous) at (0,0) size 7x16 287 RenderText {#text} at (0,-45) size 7x106 288 text run at (0,-45) width 7: "\x{230A}" 289 RenderMathMLOperator {mo} at (128,3) size 11x73 290 RenderBlock (anonymous) at (0,0) size 7x16 291 RenderText {#text} at (0,-45) size 7x106 292 text run at (0,-45) width 7: "\x{230B}" 293 RenderMathMLOperator {mo} at (139,21) size 17x37 294 RenderBlock (anonymous) at (0,0) size 11x18 295 RenderText {#text} at (0,-44) size 11x106 296 text run at (0,-44) width 11: "\x{222B}" 297 RenderMathMLOperator {mo} at (155,3) size 9x73 298 RenderBlock (anonymous) at (0,0) size 4x16 299 RenderText {#text} at (0,-45) size 4x106 300 text run at (0,-45) width 4: "|" 301 RenderMathMLOperator {mo} at (163,2) size 7x43 302 RenderBlock (anonymous) at (0,0) size 6x16 303 RenderText {#text} at (0,-45) size 6x106 304 text run at (0,-45) width 6: "\x{2016}" 305 RenderMathMLOperator {mo} at (169,2) size 16x43 306 RenderBlock (anonymous) at (0,0) size 8x16 307 RenderText {#text} at (0,-45) size 8x106 308 text run at (0,-45) width 8: "\x{2225}" 309 RenderMathMLSpace {mspace} at (184,3) size 0x42 310 310 RenderText {#text} at (0,0) size 0x0 -
trunk/LayoutTests/platform/ios-simulator/mathml/opentype/opentype-stretchy-expected.txt
r203171 r203289 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x34 24 RenderBlock {HTML} at (0,0) size 800x34 25 RenderBody {BODY} at (8,16) size 784x3 106 RenderBlock {P} at (0,0) size 784x3 67 RenderMathMLMath {math} at (0,2 1) size 26x113 layer at (0,0) size 800x341 4 RenderBlock {HTML} at (0,0) size 800x341 5 RenderBody {BODY} at (8,16) size 784x309 6 RenderBlock {P} at (0,0) size 784x35 7 RenderMathMLMath {math} at (0,20) size 26x11 8 8 RenderMathMLRow {mrow} at (0,0) size 26x11 9 9 RenderMathMLOperator {mo} at (0,0) size 26x11 … … 11 11 RenderText {#text} at (0,-3) size 3x0 12 12 text run at (0,-3) width 3: "\x{219F}" 13 RenderText {#text} at (26,1 6) size 4x1914 text run at (26,1 6) width 4: " "15 RenderMathMLMath {math} at (30,1 1) size 26x2113 RenderText {#text} at (26,15) size 4x19 14 text run at (26,15) width 4: " " 15 RenderMathMLMath {math} at (30,10) size 26x21 16 16 RenderMathMLRow {mrow} at (0,0) size 26x21 17 17 RenderMathMLOperator {mo} at (0,0) size 26x21 … … 19 19 RenderText {#text} at (0,-3) size 3x0 20 20 text run at (0,-3) width 3: "\x{219F}" 21 RenderText {#text} at (56,1 6) size 4x1922 text run at (56,1 6) width 4: " "21 RenderText {#text} at (56,15) size 4x19 22 text run at (56,15) width 4: " " 23 23 RenderMathMLMath {math} at (60,0) size 26x31 24 24 RenderMathMLRow {mrow} at (0,0) size 26x31 … … 28 28 text run at (0,-3) width 3: "\x{219F}" 29 29 RenderText {#text} at (0,0) size 0x0 30 RenderBlock {P} at (0,5 2) size 784x15530 RenderBlock {P} at (0,51) size 784x155 31 31 RenderMathMLMath {math} at (0,0) size 47x150 32 32 RenderMathMLRow {mrow} at (0,0) size 47x150 … … 36 36 text run at (0,-3) width 3: "\x{219F}" 37 37 RenderText {#text} at (0,0) size 0x0 38 RenderBlock {P} at (0,22 3) size 784x8738 RenderBlock {P} at (0,222) size 784x87 39 39 RenderMathMLMath {math} at (0,0) size 84x82 40 40 RenderMathMLRow {mrow} at (0,0) size 84x82 -
trunk/LayoutTests/platform/ios-simulator/mathml/presentation/mo-stretch-expected.txt
r203171 r203289 4 4 RenderBlock {HTML} at (0,0) size 800x252 5 5 RenderBody {BODY} at (8,8) size 784x236 6 RenderMathMLMath {math} at (0, 2) size 58x186 RenderMathMLMath {math} at (0,3) size 58x18 7 7 RenderMathMLRow {mrow} at (0,0) size 58x18 8 8 RenderMathMLOperator {mo} at (0,1) size 6x15 … … 14 14 RenderText {#text} at (0,0) size 6x17 15 15 text run at (0,0) width 6: ")" 16 RenderMathMLOperator {mo} at (10, 1) size 9x1617 RenderBlock (anonymous) at (0,0) size 8x17 18 RenderText {#text} at (0,1) size 8x17 19 text run at (0,1) width 8: "{" 20 RenderMathMLOperator {mo} at (18, 1) size 8x1616 RenderMathMLOperator {mo} at (10,0) size 9x16 17 RenderBlock (anonymous) at (0,0) size 8x17 18 RenderText {#text} at (0,1) size 8x17 19 text run at (0,1) width 8: "{" 20 RenderMathMLOperator {mo} at (18,0) size 8x16 21 21 RenderBlock (anonymous) at (0,0) size 8x17 22 22 RenderText {#text} at (0,1) size 8x17 … … 30 30 RenderText {#text} at (0,0) size 6x17 31 31 text run at (0,0) width 6: "]" 32 RenderMathMLOperator {mo} at (36, 13) size 0x033 RenderBlock (anonymous) at (0,0) size 7x16 34 RenderText {#text} at (0,1) size 7x17 35 text run at (0,1) width 7: "\x{2308}" 36 RenderMathMLOperator {mo} at (36, 13) size 0x037 RenderBlock (anonymous) at (0,0) size 7x16 38 RenderText {#text} at (0,1) size 7x17 39 text run at (0,1) width 7: "\x{2309}" 40 RenderMathMLOperator {mo} at (36, 13) size 0x041 RenderBlock (anonymous) at (0,0) size 7x16 42 RenderText {#text} at (0,1) size 7x17 43 text run at (0,1) width 7: "\x{230A}" 44 RenderMathMLOperator {mo} at (36, 13) size 0x032 RenderMathMLOperator {mo} at (36,8) size 0x0 33 RenderBlock (anonymous) at (0,0) size 7x16 34 RenderText {#text} at (0,1) size 7x17 35 text run at (0,1) width 7: "\x{2308}" 36 RenderMathMLOperator {mo} at (36,8) size 0x0 37 RenderBlock (anonymous) at (0,0) size 7x16 38 RenderText {#text} at (0,1) size 7x17 39 text run at (0,1) width 7: "\x{2309}" 40 RenderMathMLOperator {mo} at (36,8) size 0x0 41 RenderBlock (anonymous) at (0,0) size 7x16 42 RenderText {#text} at (0,1) size 7x17 43 text run at (0,1) width 7: "\x{230A}" 44 RenderMathMLOperator {mo} at (36,8) size 0x0 45 45 RenderBlock (anonymous) at (0,0) size 7x16 46 46 RenderText {#text} at (0,1) size 7x17 … … 54 54 RenderText {#text} at (0,1) size 4x17 55 55 text run at (0,1) width 4: "|" 56 RenderMathMLOperator {mo} at (48, 13) size 0x057 RenderBlock (anonymous) at (0,0) size 5x13 58 RenderText {#text} at (0,0) size 5x17 59 text run at (0,0) width 5: "\x{2016}" 60 RenderMathMLOperator {mo} at (48, 13) size 10x056 RenderMathMLOperator {mo} at (48,4) size 0x0 57 RenderBlock (anonymous) at (0,0) size 5x13 58 RenderText {#text} at (0,0) size 5x17 59 text run at (0,0) width 5: "\x{2016}" 60 RenderMathMLOperator {mo} at (48,4) size 10x0 61 61 RenderBlock (anonymous) at (0,0) size 11x13 62 62 RenderText {#text} at (0,0) size 11x17 … … 91 91 RenderText {#text} at (0,0) size 6x17 92 92 text run at (0,0) width 6: "]" 93 RenderMathMLOperator {mo} at (40,7 5) size 0x094 RenderBlock (anonymous) at (0,0) size 7x16 95 RenderText {#text} at (0,1) size 7x17 96 text run at (0,1) width 7: "\x{2308}" 97 RenderMathMLOperator {mo} at (40,7 5) size 0x098 RenderBlock (anonymous) at (0,0) size 7x16 99 RenderText {#text} at (0,1) size 7x17 100 text run at (0,1) width 7: "\x{2309}" 101 RenderMathMLOperator {mo} at (40,7 5) size 0x0102 RenderBlock (anonymous) at (0,0) size 7x16 103 RenderText {#text} at (0,1) size 7x17 104 text run at (0,1) width 7: "\x{230A}" 105 RenderMathMLOperator {mo} at (40,7 5) size 0x093 RenderMathMLOperator {mo} at (40,71) size 0x0 94 RenderBlock (anonymous) at (0,0) size 7x16 95 RenderText {#text} at (0,1) size 7x17 96 text run at (0,1) width 7: "\x{2308}" 97 RenderMathMLOperator {mo} at (40,71) size 0x0 98 RenderBlock (anonymous) at (0,0) size 7x16 99 RenderText {#text} at (0,1) size 7x17 100 text run at (0,1) width 7: "\x{2309}" 101 RenderMathMLOperator {mo} at (40,71) size 0x0 102 RenderBlock (anonymous) at (0,0) size 7x16 103 RenderText {#text} at (0,1) size 7x17 104 text run at (0,1) width 7: "\x{230A}" 105 RenderMathMLOperator {mo} at (40,71) size 0x0 106 106 RenderBlock (anonymous) at (0,0) size 7x16 107 107 RenderText {#text} at (0,1) size 7x17 … … 115 115 RenderText {#text} at (0,1) size 4x17 116 116 text run at (0,1) width 4: "|" 117 RenderMathMLOperator {mo} at (58, 75) size 0x0118 RenderBlock (anonymous) at (0,0) size 5x13 119 RenderText {#text} at (0,0) size 5x17 120 text run at (0,0) width 5: "\x{2016}" 121 RenderMathMLOperator {mo} at (58, 75) size 10x0117 RenderMathMLOperator {mo} at (58,38) size 0x0 118 RenderBlock (anonymous) at (0,0) size 5x13 119 RenderText {#text} at (0,0) size 5x17 120 text run at (0,0) width 5: "\x{2016}" 121 RenderMathMLOperator {mo} at (58,38) size 10x0 122 122 RenderBlock (anonymous) at (0,0) size 11x13 123 123 RenderText {#text} at (0,0) size 11x17 … … 152 152 RenderText {#text} at (0,0) size 6x17 153 153 text run at (0,0) width 6: "]" 154 RenderMathMLOperator {mo} at (40, 50) size 0x0155 RenderBlock (anonymous) at (0,0) size 7x16 156 RenderText {#text} at (0,1) size 7x17 157 text run at (0,1) width 7: "\x{2308}" 158 RenderMathMLOperator {mo} at (40, 50) size 0x0159 RenderBlock (anonymous) at (0,0) size 7x16 160 RenderText {#text} at (0,1) size 7x17 161 text run at (0,1) width 7: "\x{2309}" 162 RenderMathMLOperator {mo} at (40, 50) size 0x0163 RenderBlock (anonymous) at (0,0) size 7x16 164 RenderText {#text} at (0,1) size 7x17 165 text run at (0,1) width 7: "\x{230A}" 166 RenderMathMLOperator {mo} at (40, 50) size 0x0154 RenderMathMLOperator {mo} at (40,46) size 0x0 155 RenderBlock (anonymous) at (0,0) size 7x16 156 RenderText {#text} at (0,1) size 7x17 157 text run at (0,1) width 7: "\x{2308}" 158 RenderMathMLOperator {mo} at (40,46) size 0x0 159 RenderBlock (anonymous) at (0,0) size 7x16 160 RenderText {#text} at (0,1) size 7x17 161 text run at (0,1) width 7: "\x{2309}" 162 RenderMathMLOperator {mo} at (40,46) size 0x0 163 RenderBlock (anonymous) at (0,0) size 7x16 164 RenderText {#text} at (0,1) size 7x17 165 text run at (0,1) width 7: "\x{230A}" 166 RenderMathMLOperator {mo} at (40,46) size 0x0 167 167 RenderBlock (anonymous) at (0,0) size 7x16 168 168 RenderText {#text} at (0,1) size 7x17 … … 176 176 RenderText {#text} at (0,1) size 4x17 177 177 text run at (0,1) width 4: "|" 178 RenderMathMLOperator {mo} at (58, 50) size 0x0179 RenderBlock (anonymous) at (0,0) size 5x13 180 RenderText {#text} at (0,0) size 5x17 181 text run at (0,0) width 5: "\x{2016}" 182 RenderMathMLOperator {mo} at (58, 50) size 10x0178 RenderMathMLOperator {mo} at (58,25) size 0x0 179 RenderBlock (anonymous) at (0,0) size 5x13 180 RenderText {#text} at (0,0) size 5x17 181 text run at (0,0) width 5: "\x{2016}" 182 RenderMathMLOperator {mo} at (58,25) size 10x0 183 183 RenderBlock (anonymous) at (0,0) size 11x13 184 184 RenderText {#text} at (0,0) size 11x17 … … 213 213 RenderText {#text} at (0,0) size 6x17 214 214 text run at (0,0) width 6: "]" 215 RenderMathMLOperator {mo} at (39, 20) size 0x0216 RenderBlock (anonymous) at (0,0) size 7x16 217 RenderText {#text} at (0,1) size 7x17 218 text run at (0,1) width 7: "\x{2308}" 219 RenderMathMLOperator {mo} at (39, 20) size 0x0220 RenderBlock (anonymous) at (0,0) size 7x16 221 RenderText {#text} at (0,1) size 7x17 222 text run at (0,1) width 7: "\x{2309}" 223 RenderMathMLOperator {mo} at (39, 20) size 0x0224 RenderBlock (anonymous) at (0,0) size 7x16 225 RenderText {#text} at (0,1) size 7x17 226 text run at (0,1) width 7: "\x{230A}" 227 RenderMathMLOperator {mo} at (39, 20) size 0x0215 RenderMathMLOperator {mo} at (39,16) size 0x0 216 RenderBlock (anonymous) at (0,0) size 7x16 217 RenderText {#text} at (0,1) size 7x17 218 text run at (0,1) width 7: "\x{2308}" 219 RenderMathMLOperator {mo} at (39,16) size 0x0 220 RenderBlock (anonymous) at (0,0) size 7x16 221 RenderText {#text} at (0,1) size 7x17 222 text run at (0,1) width 7: "\x{2309}" 223 RenderMathMLOperator {mo} at (39,16) size 0x0 224 RenderBlock (anonymous) at (0,0) size 7x16 225 RenderText {#text} at (0,1) size 7x17 226 text run at (0,1) width 7: "\x{230A}" 227 RenderMathMLOperator {mo} at (39,16) size 0x0 228 228 RenderBlock (anonymous) at (0,0) size 7x16 229 229 RenderText {#text} at (0,1) size 7x17 … … 233 233 RenderText {#text} at (0,1) size 5x17 234 234 text run at (0,1) width 5: "\x{222B}" 235 RenderMathMLOperator {mo} at (51, 7) size 8x18236 RenderBlock (anonymous) at (0,0) size 4x18 237 RenderText {#text} at (0,1) size 4x17 238 text run at (0,1) width 4: "|" 239 RenderMathMLOperator {mo} at (58, 20) size 0x0240 RenderBlock (anonymous) at (0,0) size 5x13 241 RenderText {#text} at (0,0) size 5x17 242 text run at (0,0) width 5: "\x{2016}" 243 RenderMathMLOperator {mo} at (58, 20) size 10x0235 RenderMathMLOperator {mo} at (51,8) size 8x18 236 RenderBlock (anonymous) at (0,0) size 4x18 237 RenderText {#text} at (0,1) size 4x17 238 text run at (0,1) width 4: "|" 239 RenderMathMLOperator {mo} at (58,10) size 0x0 240 RenderBlock (anonymous) at (0,0) size 5x13 241 RenderText {#text} at (0,0) size 5x17 242 text run at (0,0) width 5: "\x{2016}" 243 RenderMathMLOperator {mo} at (58,10) size 10x0 244 244 RenderBlock (anonymous) at (0,0) size 11x13 245 245 RenderText {#text} at (0,0) size 11x17 … … 275 275 RenderText {#text} at (0,0) size 6x17 276 276 text run at (0,0) width 6: "]" 277 RenderMathMLOperator {mo} at (49, 41) size 0x0278 RenderBlock (anonymous) at (0,0) size 7x16 279 RenderText {#text} at (0,1) size 7x17 280 text run at (0,1) width 7: "\x{2308}" 281 RenderMathMLOperator {mo} at (49, 41) size 0x0282 RenderBlock (anonymous) at (0,0) size 7x16 283 RenderText {#text} at (0,1) size 7x17 284 text run at (0,1) width 7: "\x{2309}" 285 RenderMathMLOperator {mo} at (49, 41) size 0x0286 RenderBlock (anonymous) at (0,0) size 7x16 287 RenderText {#text} at (0,1) size 7x17 288 text run at (0,1) width 7: "\x{230A}" 289 RenderMathMLOperator {mo} at (49, 41) size 0x0277 RenderMathMLOperator {mo} at (49,37) size 0x0 278 RenderBlock (anonymous) at (0,0) size 7x16 279 RenderText {#text} at (0,1) size 7x17 280 text run at (0,1) width 7: "\x{2308}" 281 RenderMathMLOperator {mo} at (49,37) size 0x0 282 RenderBlock (anonymous) at (0,0) size 7x16 283 RenderText {#text} at (0,1) size 7x17 284 text run at (0,1) width 7: "\x{2309}" 285 RenderMathMLOperator {mo} at (49,37) size 0x0 286 RenderBlock (anonymous) at (0,0) size 7x16 287 RenderText {#text} at (0,1) size 7x17 288 text run at (0,1) width 7: "\x{230A}" 289 RenderMathMLOperator {mo} at (49,37) size 0x0 290 290 RenderBlock (anonymous) at (0,0) size 7x16 291 291 RenderText {#text} at (0,1) size 7x17 … … 299 299 RenderText {#text} at (0,1) size 4x17 300 300 text run at (0,1) width 4: "|" 301 RenderMathMLOperator {mo} at (67, 41) size 0x0302 RenderBlock (anonymous) at (0,0) size 5x13 303 RenderText {#text} at (0,0) size 5x17 304 text run at (0,0) width 5: "\x{2016}" 305 RenderMathMLOperator {mo} at (67, 41) size 10x0301 RenderMathMLOperator {mo} at (67,21) size 0x0 302 RenderBlock (anonymous) at (0,0) size 5x13 303 RenderText {#text} at (0,0) size 5x17 304 text run at (0,0) width 5: "\x{2016}" 305 RenderMathMLOperator {mo} at (67,21) size 10x0 306 306 RenderBlock (anonymous) at (0,0) size 11x13 307 307 RenderText {#text} at (0,0) size 11x17 -
trunk/LayoutTests/platform/mac/mathml/opentype/opentype-stretchy-expected.txt
r203171 r203289 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x33 94 RenderBlock {HTML} at (0,0) size 800x33 95 RenderBody {BODY} at (8,16) size 784x30 76 RenderBlock {P} at (0,0) size 784x3 57 RenderMathMLMath {math} at (0,2 1) size 26x113 layer at (0,0) size 800x338 4 RenderBlock {HTML} at (0,0) size 800x338 5 RenderBody {BODY} at (8,16) size 784x306 6 RenderBlock {P} at (0,0) size 784x34 7 RenderMathMLMath {math} at (0,20) size 26x11 8 8 RenderMathMLRow {mrow} at (0,0) size 26x11 9 9 RenderMathMLOperator {mo} at (0,0) size 26x11 … … 11 11 RenderText {#text} at (0,-3) size 3x0 12 12 text run at (0,-3) width 3: "\x{219F}" 13 RenderText {#text} at (26,1 7) size 4x1814 text run at (26,1 7) width 4: " "15 RenderMathMLMath {math} at (30,1 1) size 26x2113 RenderText {#text} at (26,16) size 4x18 14 text run at (26,16) width 4: " " 15 RenderMathMLMath {math} at (30,10) size 26x21 16 16 RenderMathMLRow {mrow} at (0,0) size 26x21 17 17 RenderMathMLOperator {mo} at (0,0) size 26x21 … … 19 19 RenderText {#text} at (0,-3) size 3x0 20 20 text run at (0,-3) width 3: "\x{219F}" 21 RenderText {#text} at (56,1 7) size 4x1822 text run at (56,1 7) width 4: " "21 RenderText {#text} at (56,16) size 4x18 22 text run at (56,16) width 4: " " 23 23 RenderMathMLMath {math} at (60,0) size 26x31 24 24 RenderMathMLRow {mrow} at (0,0) size 26x31 … … 28 28 text run at (0,-3) width 3: "\x{219F}" 29 29 RenderText {#text} at (0,0) size 0x0 30 RenderBlock {P} at (0,5 1) size 784x15430 RenderBlock {P} at (0,50) size 784x154 31 31 RenderMathMLMath {math} at (0,0) size 47x150 32 32 RenderMathMLRow {mrow} at (0,0) size 47x150 … … 36 36 text run at (0,-3) width 3: "\x{219F}" 37 37 RenderText {#text} at (0,0) size 0x0 38 RenderBlock {P} at (0,22 1) size 784x8638 RenderBlock {P} at (0,220) size 784x86 39 39 RenderMathMLMath {math} at (0,0) size 84x82 40 40 RenderMathMLRow {mrow} at (0,0) size 84x82 -
trunk/LayoutTests/platform/mac/mathml/presentation/mo-stretch-expected.txt
r203171 r203289 6 6 RenderMathMLMath {math} at (0,0) size 108x25 7 7 RenderMathMLRow {mrow} at (0,0) size 108x25 8 RenderMathMLOperator {mo} at (0, 5) size 6x149 RenderBlock (anonymous) at (0,0) size 6x14 10 RenderText {#text} at (0,-6) size 6x24 11 text run at (0,-6) width 6: "(" 12 RenderMathMLOperator {mo} at (5, 5) size 6x1413 RenderBlock (anonymous) at (0,0) size 6x14 14 RenderText {#text} at (0,-6) size 6x24 15 text run at (0,-6) width 6: ")" 16 RenderMathMLOperator {mo} at (10, 5) size 9x1417 RenderBlock (anonymous) at (0,0) size 8x14 18 RenderText {#text} at (0,-6) size 8x24 19 text run at (0,-6) width 8: "{" 20 RenderMathMLOperator {mo} at (18, 5) size 8x1421 RenderBlock (anonymous) at (0,0) size 8x14 22 RenderText {#text} at (0,-6) size 8x24 23 text run at (0,-6) width 8: "}" 24 RenderMathMLOperator {mo} at (25, 5) size 7x1425 RenderBlock (anonymous) at (0,0) size 6x14 26 RenderText {#text} at (0,-6) size 6x24 27 text run at (0,-6) width 6: "[" 28 RenderMathMLOperator {mo} at (31, 5) size 6x148 RenderMathMLOperator {mo} at (0,6) size 6x14 9 RenderBlock (anonymous) at (0,0) size 6x14 10 RenderText {#text} at (0,-6) size 6x24 11 text run at (0,-6) width 6: "(" 12 RenderMathMLOperator {mo} at (5,6) size 6x14 13 RenderBlock (anonymous) at (0,0) size 6x14 14 RenderText {#text} at (0,-6) size 6x24 15 text run at (0,-6) width 6: ")" 16 RenderMathMLOperator {mo} at (10,6) size 9x14 17 RenderBlock (anonymous) at (0,0) size 8x14 18 RenderText {#text} at (0,-6) size 8x24 19 text run at (0,-6) width 8: "{" 20 RenderMathMLOperator {mo} at (18,6) size 8x14 21 RenderBlock (anonymous) at (0,0) size 8x14 22 RenderText {#text} at (0,-6) size 8x24 23 text run at (0,-6) width 8: "}" 24 RenderMathMLOperator {mo} at (25,6) size 7x14 25 RenderBlock (anonymous) at (0,0) size 6x14 26 RenderText {#text} at (0,-6) size 6x24 27 text run at (0,-6) width 6: "[" 28 RenderMathMLOperator {mo} at (31,6) size 6x14 29 29 RenderBlock (anonymous) at (0,0) size 6x14 30 30 RenderText {#text} at (0,-6) size 6x24 … … 54 54 RenderText {#text} at (0,-6) size 4x24 55 55 text run at (0,-6) width 4: "|" 56 RenderMathMLOperator {mo} at (81, 5) size 9x1557 RenderBlock (anonymous) at (0,0) size 9x16 58 RenderText {#text} at (0,-5) size 9x24 59 text run at (0,-5) width 9: "\x{2016}" 60 RenderMathMLOperator {mo} at (89, 5) size 19x1556 RenderMathMLOperator {mo} at (81,1) size 9x15 57 RenderBlock (anonymous) at (0,0) size 9x16 58 RenderText {#text} at (0,-5) size 9x24 59 text run at (0,-5) width 9: "\x{2016}" 60 RenderMathMLOperator {mo} at (89,1) size 19x15 61 61 RenderBlock (anonymous) at (0,0) size 9x16 62 62 RenderText {#text} at (0,-5) size 9x24 … … 197 197 RenderText {#text} at (0,-6) size 6x24 198 198 text run at (0,-6) width 6: ")" 199 RenderMathMLOperator {mo} at (14, 9) size 9x14200 RenderBlock (anonymous) at (0,0) size 8x14 201 RenderText {#text} at (0,-6) size 8x24 202 text run at (0,-6) width 8: "{" 203 RenderMathMLOperator {mo} at (22, 9) size 8x14199 RenderMathMLOperator {mo} at (14,10) size 9x14 200 RenderBlock (anonymous) at (0,0) size 8x14 201 RenderText {#text} at (0,-6) size 8x24 202 text run at (0,-6) width 8: "{" 203 RenderMathMLOperator {mo} at (22,10) size 8x14 204 204 RenderBlock (anonymous) at (0,0) size 8x14 205 205 RenderText {#text} at (0,-6) size 8x24 … … 237 237 RenderText {#text} at (0,-6) size 4x24 238 238 text run at (0,-6) width 4: "|" 239 RenderMathMLOperator {mo} at (87, 9) size 10x15240 RenderBlock (anonymous) at (0,0) size 9x16 241 RenderText {#text} at (0,-5) size 9x24 242 text run at (0,-5) width 9: "\x{2016}" 243 RenderMathMLOperator {mo} at (96, 9) size 18x15239 RenderMathMLOperator {mo} at (87,3) size 10x15 240 RenderBlock (anonymous) at (0,0) size 9x16 241 RenderText {#text} at (0,-5) size 9x24 242 text run at (0,-5) width 9: "\x{2016}" 243 RenderMathMLOperator {mo} at (96,3) size 18x15 244 244 RenderBlock (anonymous) at (0,0) size 9x16 245 245 RenderText {#text} at (0,-5) size 9x24 -
trunk/Source/WebCore/ChangeLog
r203288 r203289 1 2016-07-15 Frederic Wang <fwang@igalia.com> 2 3 MathOperator: Improve alignment for vertical size variant 4 https://bugs.webkit.org/show_bug.cgi?id=158866 5 6 Reviewed by Brent Fulgham. 7 8 The MathOperator class may stretch operators with either a large glyph or a glyph assembly. 9 In the latter case, the assembly is adjusted to match the stretch ascent and descent 10 requested by the callers. But in the former case the glyph ascent and descent are used 11 instead. We solve this by making MathOperator::stretchTo only take a targetSize and let 12 callers do the vertical alignment they want. This improves the rendering of fences with some 13 math fonts (e.g. XITS) and allows to pass the two cases of mo-axis-height-1.html. 14 15 Test: imported/mathml-in-html5/mathml/presentation-markup/operators/mo-axis-height-1.html 16 17 * rendering/mathml/MathOperator.cpp: 18 (WebCore::MathOperator::stretchTo): Merge vertical and horizontal stretching into the same 19 function with only the targetSize as a parameter. 20 * rendering/mathml/RenderMathMLOperator.cpp: 21 (WebCore::RenderMathMLOperator::stretchTo): Updated to use the new signature. 22 (WebCore::RenderMathMLOperator::verticalStretchedOperatorShift): Helper function to calculate 23 the shift necessary to align the baseline of the MathOperator instance with the one of the 24 RenderMathMLOperator. 25 (WebCore::RenderMathMLOperator::firstLineBaseline): Adjust the baseline. 26 * rendering/mathml/RenderMathMLOperator.h: Declare verticalStretchedOperatorShift. 27 * rendering/mathml/RenderMathMLRoot.cpp: 28 (WebCore::RenderMathMLRoot::layoutBlock): Use the new signature. This function aligns the top 29 of the radical with the overbar so we do not need to adjust baseline alignment here. 30 1 31 2016-07-15 Brady Eidson <beidson@apple.com> 2 32 -
trunk/Source/WebCore/rendering/mathml/MathOperator.cpp
r203280 r203289 395 395 } 396 396 397 void MathOperator::stretchTo(const RenderStyle& style, LayoutUnit ascent, LayoutUnit descent)398 { 399 ASSERT(m_operatorType == Type::VerticalOperator );400 calculateStretchyData(style, false, ascent + descent);397 void MathOperator::stretchTo(const RenderStyle& style, LayoutUnit targetSize) 398 { 399 ASSERT(m_operatorType == Type::VerticalOperator || m_operatorType == Type::HorizontalOperator); 400 calculateStretchyData(style, false, targetSize); 401 401 if (m_stretchType == StretchType::GlyphAssembly) { 402 m_ascent = ascent; 403 m_descent = descent; 404 } 405 } 406 407 void MathOperator::stretchTo(const RenderStyle& style, LayoutUnit width) 408 { 409 ASSERT(m_operatorType == Type::HorizontalOperator); 410 calculateStretchyData(style, false, width); 411 if (m_stretchType == StretchType::GlyphAssembly) 412 m_width = width; 402 if (m_operatorType == Type::VerticalOperator) { 403 m_ascent = targetSize; 404 m_descent = 0; 405 } else 406 m_width = targetSize; 407 } 413 408 } 414 409 -
trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp
r203280 r203289 204 204 m_stretchDepthBelowBaseline *= aspect; 205 205 206 m_mathOperator.stretchTo(style(), m_stretchHeightAboveBaseline ,m_stretchDepthBelowBaseline);206 m_mathOperator.stretchTo(style(), m_stretchHeightAboveBaseline + m_stretchDepthBelowBaseline); 207 207 208 208 setLogicalHeight(m_mathOperator.ascent() + m_mathOperator.descent()); … … 362 362 } 363 363 364 LayoutUnit RenderMathMLOperator::verticalStretchedOperatorShift() const 365 { 366 if (!m_isVertical || !stretchSize()) 367 return 0; 368 369 return (m_stretchDepthBelowBaseline - m_stretchHeightAboveBaseline - m_mathOperator.descent() + m_mathOperator.ascent()) / 2; 370 } 371 364 372 Optional<int> RenderMathMLOperator::firstLineBaseline() const 365 373 { 366 374 if (useMathOperator()) 367 return Optional<int>(std::lround(static_cast<float>(m_mathOperator.ascent() )));375 return Optional<int>(std::lround(static_cast<float>(m_mathOperator.ascent() - verticalStretchedOperatorShift()))); 368 376 return RenderMathMLToken::firstLineBaseline(); 369 377 } -
trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h
r203228 r203289 84 84 void setOperatorPropertiesFromOpDictEntry(const MathMLOperatorDictionary::Entry*); 85 85 86 LayoutUnit verticalStretchedOperatorShift() const; 87 86 88 LayoutUnit m_stretchHeightAboveBaseline; 87 89 LayoutUnit m_stretchDepthBelowBaseline; -
trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp
r202977 r203289 204 204 // Stretch the radical operator to cover the base height. 205 205 // We can then determine the metrics of the radical operator + the base. 206 m_radicalOperator.stretchTo(style(), baseAscent ,baseDescent);206 m_radicalOperator.stretchTo(style(), baseAscent + baseDescent); 207 207 LayoutUnit radicalOperatorHeight = m_radicalOperator.ascent() + m_radicalOperator.descent(); 208 208 LayoutUnit indexBottomRaise = m_degreeBottomRaisePercent * radicalOperatorHeight;
Note: See TracChangeset
for help on using the changeset viewer.
