Changeset 247441 in webkit
- Timestamp:
- Jul 15, 2019 1:23:11 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r247440 r247441 1 2019-07-15 Rob Buis <rbuis@igalia.com> 2 3 MathML WPT test for RadicalDegreeBottomRaisePercent fails 4 https://bugs.webkit.org/show_bug.cgi?id=183631 5 6 Reviewed by Frédéric Wang. 7 8 Adjust test expectations. 9 10 * platform/ios/mathml/presentation/roots-expected.txt: 11 * platform/mac/mathml/presentation/roots-expected.txt: 12 * platform/win/mathml/presentation/roots-expected.txt: 13 1 14 2019-07-15 Yusuke Suzuki <ysuzuki@apple.com> 2 15 -
trunk/LayoutTests/imported/w3c/ChangeLog
r247440 r247441 1 2019-07-15 Rob Buis <rbuis@igalia.com> 2 3 MathML WPT test for RadicalDegreeBottomRaisePercent fails 4 https://bugs.webkit.org/show_bug.cgi?id=183631 5 6 Reviewed by Frédéric Wang. 7 8 Adjust test expectation. 9 10 * web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1-expected.txt: 11 1 12 2019-07-15 Yusuke Suzuki <ysuzuki@apple.com> 2 13 -
trunk/LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1-expected.txt
r242085 r247441 1 1 2 FAIL RadicalDegreeBottomRaisePercent assert_approx_equals: mroot: vertical position of index expected 27.5 +/- 1 but got 25 2 PASS RadicalDegreeBottomRaisePercent 3 3 PASS RadicalDisplayStyleVerticalGap 4 4 PASS RadicalExtraAscender -
trunk/LayoutTests/platform/ios/mathml/presentation/roots-expected.txt
r222390 r247441 160 160 RenderText {#text} at (0,-6) size 8x25 161 161 text run at (0,-6) width 8: "2" 162 RenderMathMLRow {mrow} at (4, 6) size 35x8162 RenderMathMLRow {mrow} at (4,5) size 35x8 163 163 RenderMathMLToken {mi} at (0,1) size 5x5 [padding: 0 1 0 0] 164 164 RenderBlock (anonymous) at (0,0) size 5x6 … … 380 380 RenderText {#text} at (0,-5) size 4x15 381 381 text run at (0,-5) width 4: "z" 382 RenderMathMLToken {mn} at (4, 4) size 5x9382 RenderMathMLToken {mn} at (4,3) size 5x9 383 383 RenderBlock (anonymous) at (0,0) size 5x8 384 384 RenderText {#text} at (0,-3) size 5x15 385 385 text run at (0,-3) width 5: "9" 386 RenderMathMLToken {mn} at (4, 5) size 5x9386 RenderMathMLToken {mn} at (4,4) size 5x9 387 387 RenderBlock (anonymous) at (0,0) size 5x8 388 388 RenderText {#text} at (0,-3) size 5x15 389 389 text run at (0,-3) width 5: "8" 390 RenderMathMLToken {mn} at (4, 7) size 5x8390 RenderMathMLToken {mn} at (4,6) size 5x8 391 391 RenderBlock (anonymous) at (0,0) size 5x7 392 392 RenderText {#text} at (0,-4) size 5x15 393 393 text run at (0,-4) width 5: "7" 394 RenderMathMLToken {mn} at (4, 7) size 5x9394 RenderMathMLToken {mn} at (4,6) size 5x9 395 395 RenderBlock (anonymous) at (0,0) size 5x8 396 396 RenderText {#text} at (0,-3) size 5x15 397 397 text run at (0,-3) width 5: "6" 398 RenderMathMLToken {mn} at (4, 8) size 5x9398 RenderMathMLToken {mn} at (4,7) size 5x9 399 399 RenderBlock (anonymous) at (0,0) size 5x8 400 400 RenderText {#text} at (0,-3) size 5x15 401 401 text run at (0,-3) width 5: "5" 402 RenderMathMLToken {mn} at (4, 9) size 5x9402 RenderMathMLToken {mn} at (4,8) size 5x9 403 403 RenderBlock (anonymous) at (0,0) size 5x8 404 404 RenderText {#text} at (0,-3) size 5x15 405 405 text run at (0,-3) width 5: "4" 406 RenderMathMLToken {mn} at (4, 10) size 5x9406 RenderMathMLToken {mn} at (4,9) size 5x9 407 407 RenderBlock (anonymous) at (0,0) size 5x8 408 408 RenderText {#text} at (0,-3) size 5x15 … … 506 506 RenderText {#text} at (0,-5) size 4x15 507 507 text run at (0,-5) width 4: "z" 508 RenderMathMLToken {mn} at (73, 4) size 5x9508 RenderMathMLToken {mn} at (73,3) size 5x9 509 509 RenderBlock (anonymous) at (0,0) size 5x8 510 510 RenderText {#text} at (0,-3) size 5x15 511 511 text run at (0,-3) width 5: "9" 512 RenderMathMLToken {mn} at (114, 5) size 5x9512 RenderMathMLToken {mn} at (114,4) size 5x9 513 513 RenderBlock (anonymous) at (0,0) size 5x8 514 514 RenderText {#text} at (0,-3) size 5x15 515 515 text run at (0,-3) width 5: "8" 516 RenderMathMLToken {mn} at (155, 7) size 5x8516 RenderMathMLToken {mn} at (155,6) size 5x8 517 517 RenderBlock (anonymous) at (0,0) size 5x7 518 518 RenderText {#text} at (0,-4) size 5x15 519 519 text run at (0,-4) width 5: "7" 520 RenderMathMLToken {mn} at (196, 7) size 5x9520 RenderMathMLToken {mn} at (196,6) size 5x9 521 521 RenderBlock (anonymous) at (0,0) size 5x8 522 522 RenderText {#text} at (0,-3) size 5x15 523 523 text run at (0,-3) width 5: "6" 524 RenderMathMLToken {mn} at (237, 8) size 5x9524 RenderMathMLToken {mn} at (237,7) size 5x9 525 525 RenderBlock (anonymous) at (0,0) size 5x8 526 526 RenderText {#text} at (0,-3) size 5x15 527 527 text run at (0,-3) width 5: "5" 528 RenderMathMLToken {mn} at (278, 9) size 5x9528 RenderMathMLToken {mn} at (278,8) size 5x9 529 529 RenderBlock (anonymous) at (0,0) size 5x8 530 530 RenderText {#text} at (0,-3) size 5x15 531 531 text run at (0,-3) width 5: "4" 532 RenderMathMLToken {mn} at (319, 10) size 5x9532 RenderMathMLToken {mn} at (319,9) size 5x9 533 533 RenderBlock (anonymous) at (0,0) size 5x8 534 534 RenderText {#text} at (0,-3) size 5x15 -
trunk/LayoutTests/platform/mac/mathml/presentation/roots-expected.txt
r203171 r247441 160 160 RenderText {#text} at (0,-6) size 8x24 161 161 text run at (0,-6) width 8: "2" 162 RenderMathMLRow {mrow} at (4, 6) size 35x8162 RenderMathMLRow {mrow} at (4,5) size 35x8 163 163 RenderMathMLToken {mi} at (0,1) size 5x5 [padding: 0 1 0 0] 164 164 RenderBlock (anonymous) at (0,0) size 5x6 … … 380 380 RenderText {#text} at (0,-4) size 4x13 381 381 text run at (0,-4) width 4: "z" 382 RenderMathMLToken {mn} at (4, 4) size 5x9382 RenderMathMLToken {mn} at (4,3) size 5x9 383 383 RenderBlock (anonymous) at (0,0) size 5x8 384 384 RenderText {#text} at (0,-2) size 5x13 385 385 text run at (0,-2) width 5: "9" 386 RenderMathMLToken {mn} at (4, 5) size 5x9386 RenderMathMLToken {mn} at (4,4) size 5x9 387 387 RenderBlock (anonymous) at (0,0) size 5x8 388 388 RenderText {#text} at (0,-2) size 5x13 389 389 text run at (0,-2) width 5: "8" 390 RenderMathMLToken {mn} at (4, 7) size 5x8390 RenderMathMLToken {mn} at (4,6) size 5x8 391 391 RenderBlock (anonymous) at (0,0) size 5x7 392 392 RenderText {#text} at (0,-3) size 5x13 393 393 text run at (0,-3) width 5: "7" 394 RenderMathMLToken {mn} at (4, 7) size 5x9394 RenderMathMLToken {mn} at (4,6) size 5x9 395 395 RenderBlock (anonymous) at (0,0) size 5x8 396 396 RenderText {#text} at (0,-2) size 5x13 397 397 text run at (0,-2) width 5: "6" 398 RenderMathMLToken {mn} at (4, 8) size 5x9398 RenderMathMLToken {mn} at (4,7) size 5x9 399 399 RenderBlock (anonymous) at (0,0) size 5x8 400 400 RenderText {#text} at (0,-2) size 5x13 401 401 text run at (0,-2) width 5: "5" 402 RenderMathMLToken {mn} at (4, 9) size 5x9402 RenderMathMLToken {mn} at (4,8) size 5x9 403 403 RenderBlock (anonymous) at (0,0) size 5x8 404 404 RenderText {#text} at (0,-2) size 5x13 405 405 text run at (0,-2) width 5: "4" 406 RenderMathMLToken {mn} at (4, 10) size 5x9406 RenderMathMLToken {mn} at (4,9) size 5x9 407 407 RenderBlock (anonymous) at (0,0) size 5x8 408 408 RenderText {#text} at (0,-2) size 5x13 … … 506 506 RenderText {#text} at (0,-4) size 4x13 507 507 text run at (0,-4) width 4: "z" 508 RenderMathMLToken {mn} at (73, 4) size 5x9508 RenderMathMLToken {mn} at (73,3) size 5x9 509 509 RenderBlock (anonymous) at (0,0) size 5x8 510 510 RenderText {#text} at (0,-2) size 5x13 511 511 text run at (0,-2) width 5: "9" 512 RenderMathMLToken {mn} at (114, 5) size 5x9512 RenderMathMLToken {mn} at (114,4) size 5x9 513 513 RenderBlock (anonymous) at (0,0) size 5x8 514 514 RenderText {#text} at (0,-2) size 5x13 515 515 text run at (0,-2) width 5: "8" 516 RenderMathMLToken {mn} at (155, 7) size 5x8516 RenderMathMLToken {mn} at (155,6) size 5x8 517 517 RenderBlock (anonymous) at (0,0) size 5x7 518 518 RenderText {#text} at (0,-3) size 5x13 519 519 text run at (0,-3) width 5: "7" 520 RenderMathMLToken {mn} at (196, 7) size 5x9520 RenderMathMLToken {mn} at (196,6) size 5x9 521 521 RenderBlock (anonymous) at (0,0) size 5x8 522 522 RenderText {#text} at (0,-2) size 5x13 523 523 text run at (0,-2) width 5: "6" 524 RenderMathMLToken {mn} at (237, 8) size 5x9524 RenderMathMLToken {mn} at (237,7) size 5x9 525 525 RenderBlock (anonymous) at (0,0) size 5x8 526 526 RenderText {#text} at (0,-2) size 5x13 527 527 text run at (0,-2) width 5: "5" 528 RenderMathMLToken {mn} at (278, 9) size 5x9528 RenderMathMLToken {mn} at (278,8) size 5x9 529 529 RenderBlock (anonymous) at (0,0) size 5x8 530 530 RenderText {#text} at (0,-2) size 5x13 531 531 text run at (0,-2) width 5: "4" 532 RenderMathMLToken {mn} at (319, 10) size 5x9532 RenderMathMLToken {mn} at (319,9) size 5x9 533 533 RenderBlock (anonymous) at (0,0) size 5x8 534 534 RenderText {#text} at (0,-2) size 5x13 -
trunk/LayoutTests/platform/win/mathml/presentation/roots-expected.txt
r203212 r247441 1 layer at (0,0) size 800x 6991 layer at (0,0) size 800x733 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 6994 RenderBlock {html} at (0,0) size 800x 6995 RenderBody {body} at (8,16) size 784x 6673 layer at (0,0) size 800x733 4 RenderBlock {html} at (0,0) size 800x733 5 RenderBody {body} at (8,16) size 784x701 6 6 RenderBlock {p} at (0,0) size 784x18 7 7 RenderText {#text} at (0,0) size 177x18 … … 53 53 RenderText {#text} at (0,-1) size 9x16 54 54 text run at (0,-1) width 9: "1" 55 RenderBlock {p} at (0,106) size 784x 3755 RenderBlock {p} at (0,106) size 784x54 56 56 RenderText {#text} at (0,14) size 113x18 57 57 text run at (0,14) width 113: "root of a fraction: " 58 RenderMathMLMath {math} at (113,0) size 50x 3859 RenderMathMLRoot {msqrt} at (0,0) size 50x 3858 RenderMathMLMath {math} at (113,0) size 50x55 59 RenderMathMLRoot {msqrt} at (0,0) size 50x55 60 60 RenderMathMLFraction {mfrac} at (12,3) size 38x35 61 61 RenderMathMLRow {mrow} at (0,0) size 38x12 … … 85 85 RenderText {#text} at (0,-1) size 9x16 86 86 text run at (0,-1) width 9: "2" 87 RenderBlock {p} at (0,1 59) size 784x2087 RenderBlock {p} at (0,176) size 784x20 88 88 RenderText {#text} at (0,2) size 173x18 89 89 text run at (0,2) width 173: "cube root (should be blue): " … … 98 98 RenderText {#text} at (0,0) size 5x9 99 99 text run at (0,0) width 5: "3" 100 RenderBlock {p} at (0, 195) size 784x20100 RenderBlock {p} at (0,212) size 784x20 101 101 RenderText {#text} at (0,2) size 75x18 102 102 text run at (0,2) width 75: "long index: " … … 128 128 RenderText {#text} at (0,-2) size 4x9 129 129 text run at (0,-2) width 4: "z" 130 RenderBlock {p} at (0,2 31) size 784x37130 RenderBlock {p} at (0,248) size 784x54 131 131 RenderText {#text} at (0,14) size 185x18 132 132 text run at (0,14) width 185: "long index w/ complex base: " 133 RenderMathMLMath {math} at (185,0) size 84x 38134 RenderMathMLRoot {mroot} at (0,0) size 84x 38133 RenderMathMLMath {math} at (185,0) size 84x55 134 RenderMathMLRoot {mroot} at (0,0) size 84x55 135 135 RenderMathMLFraction {mfrac} at (45,3) size 39x35 136 136 RenderMathMLRow {mrow} at (0,0) size 38x12 … … 160 160 RenderText {#text} at (0,-1) size 9x16 161 161 text run at (0,-1) width 9: "2" 162 RenderMathMLRow {mrow} at (1, 6) size 38x9162 RenderMathMLRow {mrow} at (1,11) size 38x9 163 163 RenderMathMLToken {mi} at (0,1) size 5x6 [padding: 0 1 0 0] 164 164 RenderBlock (anonymous) at (0,0) size 4x6 … … 181 181 RenderText {#text} at (0,-2) size 4x9 182 182 text run at (0,-2) width 4: "z" 183 RenderBlock {p} at (0, 284) size 784x38183 RenderBlock {p} at (0,318) size 784x38 184 184 RenderText {#text} at (0,20) size 75x18 185 185 text run at (0,20) width 75: "high index: " … … 204 204 RenderText {#text} at (0,-2) size 4x9 205 205 text run at (0,-2) width 4: "z" 206 RenderBlock {p} at (0,3 38) size 784x97206 RenderBlock {p} at (0,372) size 784x97 207 207 RenderText {#text} at (0,21) size 155x18 208 208 text run at (0,21) width 155: "Imbricated square roots: " … … 283 283 text run at (0,-1) width 10: "A" 284 284 RenderText {#text} at (0,0) size 0x0 285 RenderBlock {p} at (0,4 51) size 784x100285 RenderBlock {p} at (0,485) size 784x100 286 286 RenderText {#text} at (0,33) size 110x18 287 287 text run at (0,33) width 110: "Imbricated roots: " … … 396 396 RenderText {#text} at (0,0) size 5x9 397 397 text run at (0,0) width 5: "6" 398 RenderMathMLToken {mn} at (1,2 6) size 6x9398 RenderMathMLToken {mn} at (1,25) size 6x9 399 399 RenderBlock (anonymous) at (0,0) size 5x8 400 400 RenderText {#text} at (0,0) size 5x9 401 401 text run at (0,0) width 5: "5" 402 RenderMathMLToken {mn} at (1,2 8) size 6x9402 RenderMathMLToken {mn} at (1,26) size 6x9 403 403 RenderBlock (anonymous) at (0,0) size 5x8 404 404 RenderText {#text} at (0,0) size 5x9 405 405 text run at (0,0) width 5: "4" 406 RenderMathMLToken {mn} at (1,2 9) size 6x9406 RenderMathMLToken {mn} at (1,27) size 6x9 407 407 RenderBlock (anonymous) at (0,0) size 5x8 408 408 RenderText {#text} at (0,0) size 5x9 409 409 text run at (0,0) width 5: "3" 410 410 RenderText {#text} at (0,0) size 0x0 411 RenderBlock {p} at (0, 567) size 784x100411 RenderBlock {p} at (0,601) size 784x100 412 412 RenderText {#text} at (0,33) size 74x18 413 413 text run at (0,33) width 74: "RTL roots: " … … 522 522 RenderText {#text} at (0,0) size 5x9 523 523 text run at (0,0) width 5: "6" 524 RenderMathMLToken {mn} at (238,2 6) size 5x9524 RenderMathMLToken {mn} at (238,25) size 5x9 525 525 RenderBlock (anonymous) at (0,0) size 5x8 526 526 RenderText {#text} at (0,0) size 5x9 527 527 text run at (0,0) width 5: "5" 528 RenderMathMLToken {mn} at (277,2 8) size 6x9528 RenderMathMLToken {mn} at (277,26) size 6x9 529 529 RenderBlock (anonymous) at (0,0) size 5x8 530 530 RenderText {#text} at (0,0) size 5x9 531 531 text run at (0,0) width 5: "4" 532 RenderMathMLToken {mn} at (316,2 9) size 6x9532 RenderMathMLToken {mn} at (316,27) size 6x9 533 533 RenderBlock (anonymous) at (0,0) size 5x8 534 534 RenderText {#text} at (0,0) size 5x9 -
trunk/Source/WebCore/ChangeLog
r247440 r247441 1 2019-07-15 Rob Buis <rbuis@igalia.com> 2 3 MathML WPT test for RadicalDegreeBottomRaisePercent fails 4 https://bugs.webkit.org/show_bug.cgi?id=183631 5 6 Reviewed by Frédéric Wang. 7 8 When stretching the radical operator also take thickness 9 and radical gap into account: 10 https://mathml-refresh.github.io/mathml-core/#radicals-msqrt-mroot 11 12 Test: imported/w3c/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html 13 14 * rendering/mathml/RenderMathMLRoot.cpp: 15 (WebCore::RenderMathMLRoot::layoutBlock): 16 1 17 2019-07-15 Yusuke Suzuki <ysuzuki@apple.com> 2 18 -
trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp
r245543 r247441 218 218 // Stretch the radical operator to cover the base height. 219 219 // We can then determine the metrics of the radical operator + the base. 220 m_radicalOperator.stretchTo(style(), baseAscent + baseDescent );220 m_radicalOperator.stretchTo(style(), baseAscent + baseDescent + vertical.verticalGap + vertical.ruleThickness); 221 221 LayoutUnit radicalOperatorHeight = m_radicalOperator.ascent() + m_radicalOperator.descent(); 222 222 LayoutUnit indexBottomRaise { vertical.degreeBottomRaisePercent * radicalOperatorHeight };
Note: See TracChangeset
for help on using the changeset viewer.