Changeset 70304 in webkit
- Timestamp:
- Oct 22, 2010 6:31:40 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 12 edited
-
LayoutTests/ChangeLog (modified) (1 diff)
-
LayoutTests/mathml/xHeight.xhtml (added)
-
LayoutTests/platform/mac/mathml/presentation/fenced-expected.checksum (modified) (1 diff)
-
LayoutTests/platform/mac/mathml/presentation/fenced-expected.png (modified) (previous)
-
LayoutTests/platform/mac/mathml/presentation/fenced-expected.txt (modified) (1 diff)
-
LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.checksum (modified) (1 diff)
-
LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.png (modified) (previous)
-
LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.txt (modified) (12 diffs)
-
LayoutTests/platform/mac/mathml/presentation/tables-expected.checksum (modified) (1 diff)
-
LayoutTests/platform/mac/mathml/presentation/tables-expected.png (modified) (previous)
-
LayoutTests/platform/mac/mathml/presentation/tables-expected.txt (modified) (36 diffs)
-
LayoutTests/platform/mac/mathml/xHeight-expected.checksum (added)
-
LayoutTests/platform/mac/mathml/xHeight-expected.png (added)
-
LayoutTests/platform/mac/mathml/xHeight-expected.txt (added)
-
WebCore/ChangeLog (modified) (1 diff)
-
WebCore/platform/graphics/mac/SimpleFontDataMac.mm (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r70302 r70304 1 2010-10-22 François Sausset <sausset@gmail.com> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 Fix wrong xHeight() value for Apple Symbols font. 6 https://bugs.webkit.org/show_bug.cgi?id=41535 7 8 * mathml/xHeight.xhtml: Added. 9 * platform/mac/mathml/presentation/fenced-expected.checksum: 10 * platform/mac/mathml/presentation/fenced-expected.png: 11 * platform/mac/mathml/presentation/fenced-expected.txt: 12 * platform/mac/mathml/presentation/row-alignment-expected.checksum: 13 * platform/mac/mathml/presentation/row-alignment-expected.png: 14 * platform/mac/mathml/presentation/row-alignment-expected.txt: 15 * platform/mac/mathml/presentation/tables-expected.checksum: 16 * platform/mac/mathml/presentation/tables-expected.png: 17 * platform/mac/mathml/presentation/tables-expected.txt: 18 * platform/mac/mathml/xHeight-expected.checksum: Added. 19 * platform/mac/mathml/xHeight-expected.png: Added. 20 * platform/mac/mathml/xHeight-expected.txt: Added. 21 1 22 2010-10-22 Sheriff Bot <webkit.review.bot@gmail.com> 2 23 -
trunk/LayoutTests/platform/mac/mathml/presentation/fenced-expected.checksum
r69926 r70304 1 f9088cee3e26ced272aa5106fff2dddc 1 b76262c6c2bc8e7c475f13fce3910691 -
trunk/LayoutTests/platform/mac/mathml/presentation/fenced-expected.txt
r70221 r70304 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x10 34 RenderBlock {html} at (0,0) size 800x10 35 RenderBody {body} at (8,16) size 784x7 16 RenderBlock {p} at (0,0) size 784x7 17 RenderBlock {math} at (0,0) size 170x7 18 RenderBlock {mfenced} at (1,0) size 168x7 19 RenderBlock {mfenced} at (1,1 3) size 6x583 layer at (0,0) size 800x106 4 RenderBlock {html} at (0,0) size 800x106 5 RenderBody {body} at (8,16) size 784x74 6 RenderBlock {p} at (0,0) size 784x74 7 RenderBlock {math} at (0,0) size 170x74 8 RenderBlock {mfenced} at (1,0) size 168x74 9 RenderBlock {mfenced} at (1,16) size 6x58 10 10 RenderBlock {div} at (7,22) size 48x48 [bgcolor=#00FF00] 11 RenderBlock {mfenced} at (55,3 5) size 5x1611 RenderBlock {mfenced} at (55,38) size 5x16 12 12 RenderBlock {mfenced} at (0,0) size 4x16 13 13 RenderText {mfenced} at (0,0) size 4x16 14 14 text run at (0,0) width 4: "," 15 15 RenderBlock {div} at (60,22) size 48x48 [bgcolor=#00FF00] 16 RenderBlock {mfenced} at (108,3 5) size 5x1616 RenderBlock {mfenced} at (108,38) size 5x16 17 17 RenderBlock {mfenced} at (0,0) size 4x16 18 18 RenderText {mfenced} at (0,0) size 4x16 19 19 text run at (0,0) width 4: "," 20 20 RenderBlock {div} at (113,22) size 48x48 [bgcolor=#00FF00] 21 RenderBlock {mfenced} at (161,1 3) size 6x5821 RenderBlock {mfenced} at (161,16) size 6x58 22 22 RenderText {#text} at (0,0) size 0x0 23 layer at (10, 29) size 5x10 scrollHeight 1523 layer at (10,32) size 5x10 scrollHeight 15 24 24 RenderBlock {mfenced} at (0,0) size 5x10 25 layer at (10, 39) size 5x10 scrollHeight 1425 layer at (10,42) size 5x10 scrollHeight 14 26 26 RenderBlock {mfenced} at (0,10) size 5x10 27 27 RenderText {mfenced} at (0,-3) size 5x17 28 28 text run at (0,-3) width 5: "\x{239C}" 29 layer at (10, 49) size 5x10 scrollHeight 1429 layer at (10,52) size 5x10 scrollHeight 14 30 30 RenderBlock {mfenced} at (0,20) size 5x10 31 31 RenderText {mfenced} at (0,-3) size 5x17 32 32 text run at (0,-3) width 5: "\x{239C}" 33 layer at (10, 59) size 5x10 scrollHeight 1433 layer at (10,62) size 5x10 scrollHeight 14 34 34 RenderBlock {mfenced} at (0,30) size 5x10 35 35 RenderText {mfenced} at (0,-3) size 5x17 36 36 text run at (0,-3) width 5: "\x{239C}" 37 layer at (10, 69) size 5x7 scrollHeight 1437 layer at (10,72) size 5x7 scrollHeight 14 38 38 RenderBlock {mfenced} at (0,40) size 5x7 39 39 RenderText {mfenced} at (0,-3) size 5x17 40 40 text run at (0,-3) width 5: "\x{239C}" 41 layer at (10,7 6) size 5x11 scrollHeight 1441 layer at (10,79) size 5x11 scrollHeight 14 42 42 RenderBlock {mfenced} at (0,47) size 5x11 43 layer at (170, 29) size 5x10 scrollHeight 1543 layer at (170,32) size 5x10 scrollHeight 15 44 44 RenderBlock {mfenced} at (0,0) size 5x10 45 layer at (170, 39) size 5x10 scrollHeight 1445 layer at (170,42) size 5x10 scrollHeight 14 46 46 RenderBlock {mfenced} at (0,10) size 5x10 47 47 RenderText {mfenced} at (0,-3) size 5x17 48 48 text run at (0,-3) width 5: "\x{239F}" 49 layer at (170, 49) size 5x10 scrollHeight 1449 layer at (170,52) size 5x10 scrollHeight 14 50 50 RenderBlock {mfenced} at (0,20) size 5x10 51 51 RenderText {mfenced} at (0,-3) size 5x17 52 52 text run at (0,-3) width 5: "\x{239F}" 53 layer at (170, 59) size 5x10 scrollHeight 1453 layer at (170,62) size 5x10 scrollHeight 14 54 54 RenderBlock {mfenced} at (0,30) size 5x10 55 55 RenderText {mfenced} at (0,-3) size 5x17 56 56 text run at (0,-3) width 5: "\x{239F}" 57 layer at (170, 69) size 5x7 scrollHeight 1457 layer at (170,72) size 5x7 scrollHeight 14 58 58 RenderBlock {mfenced} at (0,40) size 5x7 59 59 RenderText {mfenced} at (0,-3) size 5x17 60 60 text run at (0,-3) width 5: "\x{239F}" 61 layer at (170,7 6) size 5x11 scrollHeight 1461 layer at (170,79) size 5x11 scrollHeight 14 62 62 RenderBlock {mfenced} at (0,47) size 5x11 63 layer at (10,3 0) size 5x14 backgroundClip at (10,29) size 5x10 clip at (10,29) size 5x10 outlineClip at (10,29) size 5x1063 layer at (10,33) size 5x14 backgroundClip at (10,32) size 5x10 clip at (10,32) size 5x10 outlineClip at (10,32) size 5x10 64 64 RenderBlock (relative positioned) {mfenced} at (0,0) size 5x11 65 65 RenderText {mfenced} at (0,-3) size 5x17 66 66 text run at (0,-3) width 5: "\x{239B}" 67 layer at (10,7 3) size 5x14 backgroundClip at (10,76) size 5x11 clip at (10,76) size 5x11 outlineClip at (10,76) size 5x1167 layer at (10,76) size 5x14 backgroundClip at (10,79) size 5x11 clip at (10,79) size 5x11 outlineClip at (10,79) size 5x11 68 68 RenderBlock (relative positioned) {mfenced} at (0,0) size 5x11 69 69 RenderText {mfenced} at (0,-3) size 5x17 70 70 text run at (0,-3) width 5: "\x{239D}" 71 layer at (170,3 0) size 5x14 backgroundClip at (170,29) size 5x10 clip at (170,29) size 5x10 outlineClip at (170,29) size 5x1071 layer at (170,33) size 5x14 backgroundClip at (170,32) size 5x10 clip at (170,32) size 5x10 outlineClip at (170,32) size 5x10 72 72 RenderBlock (relative positioned) {mfenced} at (0,0) size 5x11 73 73 RenderText {mfenced} at (0,-3) size 5x17 74 74 text run at (0,-3) width 5: "\x{239E}" 75 layer at (170,7 3) size 5x14 backgroundClip at (170,76) size 5x11 clip at (170,76) size 5x11 outlineClip at (170,76) size 5x1175 layer at (170,76) size 5x14 backgroundClip at (170,79) size 5x11 clip at (170,79) size 5x11 outlineClip at (170,79) size 5x11 76 76 RenderBlock (relative positioned) {mfenced} at (0,0) size 5x11 77 77 RenderText {mfenced} at (0,-3) size 5x17 -
trunk/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.checksum
r70221 r70304 1 a2adcc2b842ee0418f419c8b5653b70b 1 6f3f95aa00f5bf78aa1c8bcf95cb879d -
trunk/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.txt
r70221 r70304 189 189 RenderText {#text} at (0,31) size 27x18 190 190 text run at (0,31) width 27: "text " 191 RenderBlock {math} at (27,0) size 74x80191 RenderBlock {math} at (27,0) size 92x80 192 192 RenderBlock {mo} at (1,0) size 6x80 193 RenderTable {mtable} at (7,5) size 60x66194 RenderTableSection (anonymous) at (0,0) size 60x66195 RenderTableRow {mtr} at (0,0) size 60x22196 RenderTableCell {mtd} at (0,0) size 2 0x22 [r=0 c=0 rs=1 cs=1]197 RenderBlock {msub} at ( 0,0) size 20x22193 RenderTable {mtable} at (7,5) size 78x66 194 RenderTableSection (anonymous) at (0,0) size 78x66 195 RenderTableRow {mtr} at (0,0) size 78x22 196 RenderTableCell {mtd} at (0,0) size 26x22 [r=0 c=0 rs=1 cs=1] 197 RenderBlock {msub} at (3,0) size 20x22 198 198 RenderBlock {msub} at (0,0) size 8x19 199 199 RenderInline {mi} at (0,0) size 8x16 … … 203 203 RenderText {#text} at (8,10) size 12x12 204 204 text run at (8,10) width 12: "11" 205 RenderTableCell {mtd} at (2 0,0) size 20x22 [r=0 c=1 rs=1 cs=1]206 RenderBlock {msub} at ( 0,0) size 20x22205 RenderTableCell {mtd} at (26,0) size 26x22 [r=0 c=1 rs=1 cs=1] 206 RenderBlock {msub} at (3,0) size 20x22 207 207 RenderBlock {msub} at (0,0) size 8x19 208 208 RenderInline {mi} at (0,0) size 8x16 … … 212 212 RenderText {#text} at (8,10) size 12x12 213 213 text run at (8,10) width 12: "12" 214 RenderTableCell {mtd} at ( 40,0) size 20x22 [r=0 c=2 rs=1 cs=1]215 RenderBlock {msub} at ( 0,0) size 20x22214 RenderTableCell {mtd} at (52,0) size 26x22 [r=0 c=2 rs=1 cs=1] 215 RenderBlock {msub} at (3,0) size 20x22 216 216 RenderBlock {msub} at (0,0) size 8x19 217 217 RenderInline {mi} at (0,0) size 8x16 … … 221 221 RenderText {#text} at (8,10) size 12x12 222 222 text run at (8,10) width 12: "13" 223 RenderTableRow {mtr} at (0,22) size 60x22224 RenderTableCell {mtd} at (0,22) size 2 0x22 [r=1 c=0 rs=1 cs=1]225 RenderBlock {msub} at ( 0,0) size 20x22223 RenderTableRow {mtr} at (0,22) size 78x22 224 RenderTableCell {mtd} at (0,22) size 26x22 [r=1 c=0 rs=1 cs=1] 225 RenderBlock {msub} at (3,0) size 20x22 226 226 RenderBlock {msub} at (0,0) size 8x19 227 227 RenderInline {mi} at (0,0) size 8x16 … … 231 231 RenderText {#text} at (8,10) size 12x12 232 232 text run at (8,10) width 12: "21" 233 RenderTableCell {mtd} at (2 0,22) size 20x22 [r=1 c=1 rs=1 cs=1]234 RenderBlock {msub} at ( 0,0) size 20x22233 RenderTableCell {mtd} at (26,22) size 26x22 [r=1 c=1 rs=1 cs=1] 234 RenderBlock {msub} at (3,0) size 20x22 235 235 RenderBlock {msub} at (0,0) size 8x19 236 236 RenderInline {mi} at (0,0) size 8x16 … … 240 240 RenderText {#text} at (8,10) size 12x12 241 241 text run at (8,10) width 12: "22" 242 RenderTableCell {mtd} at ( 40,22) size 20x22 [r=1 c=2 rs=1 cs=1]243 RenderBlock {msub} at ( 0,0) size 20x22242 RenderTableCell {mtd} at (52,22) size 26x22 [r=1 c=2 rs=1 cs=1] 243 RenderBlock {msub} at (3,0) size 20x22 244 244 RenderBlock {msub} at (0,0) size 8x19 245 245 RenderInline {mi} at (0,0) size 8x16 … … 249 249 RenderText {#text} at (8,10) size 12x12 250 250 text run at (8,10) width 12: "23" 251 RenderTableRow {mtr} at (0,44) size 60x22252 RenderTableCell {mtd} at (0,44) size 2 0x22 [r=2 c=0 rs=1 cs=1]253 RenderBlock {msub} at ( 0,0) size 19x22251 RenderTableRow {mtr} at (0,44) size 78x22 252 RenderTableCell {mtd} at (0,44) size 26x22 [r=2 c=0 rs=1 cs=1] 253 RenderBlock {msub} at (3,0) size 19x22 254 254 RenderBlock {msub} at (0,0) size 7x19 255 255 RenderInline {mi} at (0,0) size 7x16 … … 259 259 RenderText {#text} at (7,10) size 12x12 260 260 text run at (7,10) width 12: "31" 261 RenderTableCell {mtd} at (2 0,44) size 20x22 [r=2 c=1 rs=1 cs=1]262 RenderBlock {msub} at ( 0,0) size 19x22261 RenderTableCell {mtd} at (26,44) size 26x22 [r=2 c=1 rs=1 cs=1] 262 RenderBlock {msub} at (3,0) size 19x22 263 263 RenderBlock {msub} at (0,0) size 7x19 264 264 RenderInline {mi} at (0,0) size 7x16 … … 268 268 RenderText {#text} at (7,10) size 12x12 269 269 text run at (7,10) width 12: "32" 270 RenderTableCell {mtd} at ( 40,44) size 20x22 [r=2 c=2 rs=1 cs=1]271 RenderBlock {msub} at ( 0,0) size 19x22270 RenderTableCell {mtd} at (52,44) size 26x22 [r=2 c=2 rs=1 cs=1] 271 RenderBlock {msub} at (3,0) size 19x22 272 272 RenderBlock {msub} at (0,0) size 7x19 273 273 RenderInline {mi} at (0,0) size 7x16 … … 277 277 RenderText {#text} at (7,10) size 12x12 278 278 text run at (7,10) width 12: "33" 279 RenderBlock {mo} at ( 67,0) size 6x80279 RenderBlock {mo} at (85,0) size 6x80 280 280 RenderText {#text} at (0,0) size 0x0 281 281 layer at (36,310) size 5x10 scrollHeight 15 … … 411 411 layer at (36,548) size 5x11 scrollHeight 14 412 412 RenderBlock {mo} at (0,69) size 5x11 413 layer at (1 02,479) size 5x10 scrollHeight 15414 RenderBlock {mo} at (0,0) size 5x10 415 layer at (1 02,489) size 5x10 scrollHeight 14416 RenderBlock {mo} at (0,10) size 5x10 417 RenderText {mo} at (0,-3) size 5x17 418 text run at (0,-3) width 5: "\x{23A5}" 419 layer at (1 02,499) size 5x10 scrollHeight 14420 RenderBlock {mo} at (0,20) size 5x10 421 RenderText {mo} at (0,-3) size 5x17 422 text run at (0,-3) width 5: "\x{23A5}" 423 layer at (1 02,509) size 5x10 scrollHeight 14413 layer at (120,479) size 5x10 scrollHeight 15 414 RenderBlock {mo} at (0,0) size 5x10 415 layer at (120,489) size 5x10 scrollHeight 14 416 RenderBlock {mo} at (0,10) size 5x10 417 RenderText {mo} at (0,-3) size 5x17 418 text run at (0,-3) width 5: "\x{23A5}" 419 layer at (120,499) size 5x10 scrollHeight 14 420 RenderBlock {mo} at (0,20) size 5x10 421 RenderText {mo} at (0,-3) size 5x17 422 text run at (0,-3) width 5: "\x{23A5}" 423 layer at (120,509) size 5x10 scrollHeight 14 424 424 RenderBlock {mo} at (0,30) size 5x10 425 425 RenderText {mo} at (0,-3) size 5x17 426 426 text run at (0,-3) width 5: "\x{23A5}" 427 layer at (1 02,519) size 5x10 scrollHeight 14427 layer at (120,519) size 5x10 scrollHeight 14 428 428 RenderBlock {mo} at (0,40) size 5x10 429 429 RenderText {mo} at (0,-3) size 5x17 430 430 text run at (0,-3) width 5: "\x{23A5}" 431 layer at (1 02,529) size 5x10 scrollHeight 14431 layer at (120,529) size 5x10 scrollHeight 14 432 432 RenderBlock {mo} at (0,50) size 5x10 433 433 RenderText {mo} at (0,-3) size 5x17 434 434 text run at (0,-3) width 5: "\x{23A5}" 435 layer at (1 02,539) size 5x9 scrollHeight 14435 layer at (120,539) size 5x9 scrollHeight 14 436 436 RenderBlock {mo} at (0,60) size 5x9 437 437 RenderText {mo} at (0,-3) size 5x17 438 438 text run at (0,-3) width 5: "\x{23A5}" 439 layer at (1 02,548) size 5x11 scrollHeight 14439 layer at (120,548) size 5x11 scrollHeight 14 440 440 RenderBlock {mo} at (0,69) size 5x11 441 441 layer at (36,311) size 5x14 backgroundClip at (36,310) size 5x10 clip at (36,310) size 5x10 outlineClip at (36,310) size 5x10 … … 479 479 RenderText {mo} at (0,-3) size 5x17 480 480 text run at (0,-3) width 5: "\x{23A3}" 481 layer at (1 02,480) size 5x14 backgroundClip at (102,479) size 5x10 clip at (102,479) size 5x10 outlineClip at (102,479) size 5x10481 layer at (120,480) size 5x14 backgroundClip at (120,479) size 5x10 clip at (120,479) size 5x10 outlineClip at (120,479) size 5x10 482 482 RenderBlock (relative positioned) {mo} at (0,0) size 5x11 483 483 RenderText {mo} at (0,-3) size 5x17 484 484 text run at (0,-3) width 5: "\x{23A4}" 485 layer at (1 02,545) size 5x14 backgroundClip at (102,548) size 5x11 clip at (102,548) size 5x11 outlineClip at (102,548) size 5x11485 layer at (120,545) size 5x14 backgroundClip at (120,548) size 5x11 clip at (120,548) size 5x11 outlineClip at (120,548) size 5x11 486 486 RenderBlock (relative positioned) {mo} at (0,0) size 5x11 487 487 RenderText {mo} at (0,-3) size 5x17 -
trunk/LayoutTests/platform/mac/mathml/presentation/tables-expected.checksum
r64967 r70304 1 4bb76a66be1fb135f74d3f495ee5dd85 1 94b971f581cef31ac427a8550b38c463 -
trunk/LayoutTests/platform/mac/mathml/presentation/tables-expected.txt
r70221 r70304 7 7 RenderText {#text} at (0,26) size 49x18 8 8 text run at (0,26) width 49: "simple: " 9 RenderBlock {math} at (49,0) size 62x6610 RenderTable {mtable} at (1,0) size 60x6611 RenderTableSection (anonymous) at (0,0) size 60x6612 RenderTableRow {mtr} at (0,0) size 60x2213 RenderTableCell {mtd} at (0,0) size 2 0x22 [r=0 c=0 rs=1 cs=1]14 RenderBlock {msub} at ( 0,0) size 20x229 RenderBlock {math} at (49,0) size 80x66 10 RenderTable {mtable} at (1,0) size 78x66 11 RenderTableSection (anonymous) at (0,0) size 78x66 12 RenderTableRow {mtr} at (0,0) size 78x22 13 RenderTableCell {mtd} at (0,0) size 26x22 [r=0 c=0 rs=1 cs=1] 14 RenderBlock {msub} at (3,0) size 20x22 15 15 RenderBlock {msub} at (0,0) size 8x19 16 16 RenderInline {mi} at (0,0) size 8x16 … … 20 20 RenderText {#text} at (8,10) size 12x12 21 21 text run at (8,10) width 12: "11" 22 RenderTableCell {mtd} at (2 0,0) size 20x22 [r=0 c=1 rs=1 cs=1]23 RenderBlock {msub} at ( 0,0) size 20x2222 RenderTableCell {mtd} at (26,0) size 26x22 [r=0 c=1 rs=1 cs=1] 23 RenderBlock {msub} at (3,0) size 20x22 24 24 RenderBlock {msub} at (0,0) size 8x19 25 25 RenderInline {mi} at (0,0) size 8x16 … … 29 29 RenderText {#text} at (8,10) size 12x12 30 30 text run at (8,10) width 12: "12" 31 RenderTableCell {mtd} at ( 40,0) size 20x22 [r=0 c=2 rs=1 cs=1]32 RenderBlock {msub} at ( 0,0) size 20x2231 RenderTableCell {mtd} at (52,0) size 26x22 [r=0 c=2 rs=1 cs=1] 32 RenderBlock {msub} at (3,0) size 20x22 33 33 RenderBlock {msub} at (0,0) size 8x19 34 34 RenderInline {mi} at (0,0) size 8x16 … … 38 38 RenderText {#text} at (8,10) size 12x12 39 39 text run at (8,10) width 12: "13" 40 RenderTableRow {mtr} at (0,22) size 60x2241 RenderTableCell {mtd} at (0,22) size 2 0x22 [r=1 c=0 rs=1 cs=1]42 RenderBlock {msub} at ( 0,0) size 20x2240 RenderTableRow {mtr} at (0,22) size 78x22 41 RenderTableCell {mtd} at (0,22) size 26x22 [r=1 c=0 rs=1 cs=1] 42 RenderBlock {msub} at (3,0) size 20x22 43 43 RenderBlock {msub} at (0,0) size 8x19 44 44 RenderInline {mi} at (0,0) size 8x16 … … 48 48 RenderText {#text} at (8,10) size 12x12 49 49 text run at (8,10) width 12: "21" 50 RenderTableCell {mtd} at (2 0,22) size 20x22 [r=1 c=1 rs=1 cs=1]51 RenderBlock {msub} at ( 0,0) size 20x2250 RenderTableCell {mtd} at (26,22) size 26x22 [r=1 c=1 rs=1 cs=1] 51 RenderBlock {msub} at (3,0) size 20x22 52 52 RenderBlock {msub} at (0,0) size 8x19 53 53 RenderInline {mi} at (0,0) size 8x16 … … 57 57 RenderText {#text} at (8,10) size 12x12 58 58 text run at (8,10) width 12: "22" 59 RenderTableCell {mtd} at ( 40,22) size 20x22 [r=1 c=2 rs=1 cs=1]60 RenderBlock {msub} at ( 0,0) size 20x2259 RenderTableCell {mtd} at (52,22) size 26x22 [r=1 c=2 rs=1 cs=1] 60 RenderBlock {msub} at (3,0) size 20x22 61 61 RenderBlock {msub} at (0,0) size 8x19 62 62 RenderInline {mi} at (0,0) size 8x16 … … 66 66 RenderText {#text} at (8,10) size 12x12 67 67 text run at (8,10) width 12: "23" 68 RenderTableRow {mtr} at (0,44) size 60x2269 RenderTableCell {mtd} at (0,44) size 2 0x22 [r=2 c=0 rs=1 cs=1]70 RenderBlock {msub} at ( 0,0) size 19x2268 RenderTableRow {mtr} at (0,44) size 78x22 69 RenderTableCell {mtd} at (0,44) size 26x22 [r=2 c=0 rs=1 cs=1] 70 RenderBlock {msub} at (3,0) size 19x22 71 71 RenderBlock {msub} at (0,0) size 7x19 72 72 RenderInline {mi} at (0,0) size 7x16 … … 76 76 RenderText {#text} at (7,10) size 12x12 77 77 text run at (7,10) width 12: "31" 78 RenderTableCell {mtd} at (2 0,44) size 20x22 [r=2 c=1 rs=1 cs=1]79 RenderBlock {msub} at ( 0,0) size 19x2278 RenderTableCell {mtd} at (26,44) size 26x22 [r=2 c=1 rs=1 cs=1] 79 RenderBlock {msub} at (3,0) size 19x22 80 80 RenderBlock {msub} at (0,0) size 7x19 81 81 RenderInline {mi} at (0,0) size 7x16 … … 85 85 RenderText {#text} at (7,10) size 12x12 86 86 text run at (7,10) width 12: "32" 87 RenderTableCell {mtd} at ( 40,44) size 20x22 [r=2 c=2 rs=1 cs=1]88 RenderBlock {msub} at ( 0,0) size 19x2287 RenderTableCell {mtd} at (52,44) size 26x22 [r=2 c=2 rs=1 cs=1] 88 RenderBlock {msub} at (3,0) size 19x22 89 89 RenderBlock {msub} at (0,0) size 7x19 90 90 RenderInline {mi} at (0,0) size 7x16 … … 98 98 RenderText {#text} at (0,26) size 308x18 99 99 text run at (0,26) width 308: "left, default (center) and right column alignment: " 100 RenderBlock {math} at (308,0) size 198x66101 RenderTable {mtable} at (1,0) size 60x66102 RenderTableSection (anonymous) at (0,0) size 60x66103 RenderTableRow {mtr} at (0,0) size 60x22104 RenderTableCell {mtd} at (0,0) size 2 0x22 [r=0 c=0 rs=1 cs=1]105 RenderBlock {msub} at ( 0,0) size 14x22100 RenderBlock {math} at (308,0) size 252x66 101 RenderTable {mtable} at (1,0) size 78x66 102 RenderTableSection (anonymous) at (0,0) size 78x66 103 RenderTableRow {mtr} at (0,0) size 78x22 104 RenderTableCell {mtd} at (0,0) size 26x22 [r=0 c=0 rs=1 cs=1] 105 RenderBlock {msub} at (3,0) size 14x22 106 106 RenderBlock {msub} at (0,0) size 8x19 107 107 RenderInline {mi} at (0,0) size 8x16 … … 111 111 RenderText {#text} at (8,10) size 6x12 112 112 text run at (8,10) width 6: "1" 113 RenderTableCell {mtd} at (2 0,0) size 20x22 [r=0 c=1 rs=1 cs=1]114 RenderBlock {msub} at ( 0,0) size 20x22113 RenderTableCell {mtd} at (26,0) size 26x22 [r=0 c=1 rs=1 cs=1] 114 RenderBlock {msub} at (3,0) size 20x22 115 115 RenderBlock {msub} at (0,0) size 8x19 116 116 RenderInline {mi} at (0,0) size 8x16 … … 120 120 RenderText {#text} at (8,10) size 12x12 121 121 text run at (8,10) width 12: "12" 122 RenderTableCell {mtd} at ( 40,0) size 20x22 [r=0 c=2 rs=1 cs=1]123 RenderBlock {msub} at ( 0,0) size 20x22122 RenderTableCell {mtd} at (52,0) size 26x22 [r=0 c=2 rs=1 cs=1] 123 RenderBlock {msub} at (3,0) size 20x22 124 124 RenderBlock {msub} at (0,0) size 8x19 125 125 RenderInline {mi} at (0,0) size 8x16 … … 129 129 RenderText {#text} at (8,10) size 12x12 130 130 text run at (8,10) width 12: "13" 131 RenderTableRow {mtr} at (0,22) size 60x22132 RenderTableCell {mtd} at (0,22) size 2 0x22 [r=1 c=0 rs=1 cs=1]133 RenderBlock {msub} at ( 0,0) size 20x22131 RenderTableRow {mtr} at (0,22) size 78x22 132 RenderTableCell {mtd} at (0,22) size 26x22 [r=1 c=0 rs=1 cs=1] 133 RenderBlock {msub} at (3,0) size 20x22 134 134 RenderBlock {msub} at (0,0) size 8x19 135 135 RenderInline {mi} at (0,0) size 8x16 … … 139 139 RenderText {#text} at (8,10) size 12x12 140 140 text run at (8,10) width 12: "21" 141 RenderTableCell {mtd} at (2 0,22) size 20x22 [r=1 c=1 rs=1 cs=1]142 RenderBlock {msub} at ( 0,0) size 14x22141 RenderTableCell {mtd} at (26,22) size 26x22 [r=1 c=1 rs=1 cs=1] 142 RenderBlock {msub} at (3,0) size 14x22 143 143 RenderBlock {msub} at (0,0) size 8x19 144 144 RenderInline {mi} at (0,0) size 8x16 … … 148 148 RenderText {#text} at (8,10) size 6x12 149 149 text run at (8,10) width 6: "2" 150 RenderTableCell {mtd} at ( 40,22) size 20x22 [r=1 c=2 rs=1 cs=1]151 RenderBlock {msub} at ( 0,0) size 20x22150 RenderTableCell {mtd} at (52,22) size 26x22 [r=1 c=2 rs=1 cs=1] 151 RenderBlock {msub} at (3,0) size 20x22 152 152 RenderBlock {msub} at (0,0) size 8x19 153 153 RenderInline {mi} at (0,0) size 8x16 … … 157 157 RenderText {#text} at (8,10) size 12x12 158 158 text run at (8,10) width 12: "23" 159 RenderTableRow {mtr} at (0,44) size 60x22160 RenderTableCell {mtd} at (0,44) size 2 0x22 [r=2 c=0 rs=1 cs=1]161 RenderBlock {msub} at ( 0,0) size 19x22159 RenderTableRow {mtr} at (0,44) size 78x22 160 RenderTableCell {mtd} at (0,44) size 26x22 [r=2 c=0 rs=1 cs=1] 161 RenderBlock {msub} at (3,0) size 19x22 162 162 RenderBlock {msub} at (0,0) size 7x19 163 163 RenderInline {mi} at (0,0) size 7x16 … … 167 167 RenderText {#text} at (7,10) size 12x12 168 168 text run at (7,10) width 12: "31" 169 RenderTableCell {mtd} at (2 0,44) size 20x22 [r=2 c=1 rs=1 cs=1]170 RenderBlock {msub} at ( 0,0) size 19x22169 RenderTableCell {mtd} at (26,44) size 26x22 [r=2 c=1 rs=1 cs=1] 170 RenderBlock {msub} at (3,0) size 19x22 171 171 RenderBlock {msub} at (0,0) size 7x19 172 172 RenderInline {mi} at (0,0) size 7x16 … … 176 176 RenderText {#text} at (7,10) size 12x12 177 177 text run at (7,10) width 12: "32" 178 RenderTableCell {mtd} at ( 40,44) size 20x22 [r=2 c=2 rs=1 cs=1]179 RenderBlock {msub} at ( 0,0) size 13x22178 RenderTableCell {mtd} at (52,44) size 26x22 [r=2 c=2 rs=1 cs=1] 179 RenderBlock {msub} at (3,0) size 13x22 180 180 RenderBlock {msub} at (0,0) size 7x19 181 181 RenderInline {mi} at (0,0) size 7x16 … … 186 186 text run at (7,10) width 6: "3" 187 187 RenderInline {mtext} at (0,0) size 8x16 188 RenderText {#text} at ( 61,29) size 8x16189 text run at ( 61,29) width 8: ", "190 RenderTable {mtable} at ( 69,0) size 60x66191 RenderTableSection (anonymous) at (0,0) size 60x66192 RenderTableRow {mtr} at (0,0) size 60x22193 RenderTableCell {mtd} at (0,0) size 2 0x22 [r=0 c=0 rs=1 cs=1]194 RenderBlock {msub} at ( 3,0) size 14x22188 RenderText {#text} at (79,29) size 8x16 189 text run at (79,29) width 8: ", " 190 RenderTable {mtable} at (87,0) size 78x66 191 RenderTableSection (anonymous) at (0,0) size 78x66 192 RenderTableRow {mtr} at (0,0) size 78x22 193 RenderTableCell {mtd} at (0,0) size 26x22 [r=0 c=0 rs=1 cs=1] 194 RenderBlock {msub} at (6,0) size 14x22 195 195 RenderBlock {msub} at (0,0) size 8x19 196 196 RenderInline {mi} at (0,0) size 8x16 … … 200 200 RenderText {#text} at (8,10) size 6x12 201 201 text run at (8,10) width 6: "1" 202 RenderTableCell {mtd} at (2 0,0) size 20x22 [r=0 c=1 rs=1 cs=1]203 RenderBlock {msub} at ( 0,0) size 20x22202 RenderTableCell {mtd} at (26,0) size 26x22 [r=0 c=1 rs=1 cs=1] 203 RenderBlock {msub} at (3,0) size 20x22 204 204 RenderBlock {msub} at (0,0) size 8x19 205 205 RenderInline {mi} at (0,0) size 8x16 … … 209 209 RenderText {#text} at (8,10) size 12x12 210 210 text run at (8,10) width 12: "12" 211 RenderTableCell {mtd} at ( 40,0) size 20x22 [r=0 c=2 rs=1 cs=1]212 RenderBlock {msub} at ( 0,0) size 20x22211 RenderTableCell {mtd} at (52,0) size 26x22 [r=0 c=2 rs=1 cs=1] 212 RenderBlock {msub} at (3,0) size 20x22 213 213 RenderBlock {msub} at (0,0) size 8x19 214 214 RenderInline {mi} at (0,0) size 8x16 … … 218 218 RenderText {#text} at (8,10) size 12x12 219 219 text run at (8,10) width 12: "13" 220 RenderTableRow {mtr} at (0,22) size 60x22221 RenderTableCell {mtd} at (0,22) size 2 0x22 [r=1 c=0 rs=1 cs=1]222 RenderBlock {msub} at ( 0,0) size 20x22220 RenderTableRow {mtr} at (0,22) size 78x22 221 RenderTableCell {mtd} at (0,22) size 26x22 [r=1 c=0 rs=1 cs=1] 222 RenderBlock {msub} at (3,0) size 20x22 223 223 RenderBlock {msub} at (0,0) size 8x19 224 224 RenderInline {mi} at (0,0) size 8x16 … … 228 228 RenderText {#text} at (8,10) size 12x12 229 229 text run at (8,10) width 12: "21" 230 RenderTableCell {mtd} at (2 0,22) size 20x22 [r=1 c=1 rs=1 cs=1]231 RenderBlock {msub} at ( 3,0) size 14x22230 RenderTableCell {mtd} at (26,22) size 26x22 [r=1 c=1 rs=1 cs=1] 231 RenderBlock {msub} at (6,0) size 14x22 232 232 RenderBlock {msub} at (0,0) size 8x19 233 233 RenderInline {mi} at (0,0) size 8x16 … … 237 237 RenderText {#text} at (8,10) size 6x12 238 238 text run at (8,10) width 6: "2" 239 RenderTableCell {mtd} at ( 40,22) size 20x22 [r=1 c=2 rs=1 cs=1]240 RenderBlock {msub} at ( 0,0) size 20x22239 RenderTableCell {mtd} at (52,22) size 26x22 [r=1 c=2 rs=1 cs=1] 240 RenderBlock {msub} at (3,0) size 20x22 241 241 RenderBlock {msub} at (0,0) size 8x19 242 242 RenderInline {mi} at (0,0) size 8x16 … … 246 246 RenderText {#text} at (8,10) size 12x12 247 247 text run at (8,10) width 12: "23" 248 RenderTableRow {mtr} at (0,44) size 60x22249 RenderTableCell {mtd} at (0,44) size 2 0x22 [r=2 c=0 rs=1 cs=1]250 RenderBlock {msub} at ( 0,0) size 19x22248 RenderTableRow {mtr} at (0,44) size 78x22 249 RenderTableCell {mtd} at (0,44) size 26x22 [r=2 c=0 rs=1 cs=1] 250 RenderBlock {msub} at (3,0) size 19x22 251 251 RenderBlock {msub} at (0,0) size 7x19 252 252 RenderInline {mi} at (0,0) size 7x16 … … 256 256 RenderText {#text} at (7,10) size 12x12 257 257 text run at (7,10) width 12: "31" 258 RenderTableCell {mtd} at (2 0,44) size 20x22 [r=2 c=1 rs=1 cs=1]259 RenderBlock {msub} at ( 0,0) size 19x22258 RenderTableCell {mtd} at (26,44) size 26x22 [r=2 c=1 rs=1 cs=1] 259 RenderBlock {msub} at (3,0) size 19x22 260 260 RenderBlock {msub} at (0,0) size 7x19 261 261 RenderInline {mi} at (0,0) size 7x16 … … 265 265 RenderText {#text} at (7,10) size 12x12 266 266 text run at (7,10) width 12: "32" 267 RenderTableCell {mtd} at ( 40,44) size 20x22 [r=2 c=2 rs=1 cs=1]268 RenderBlock {msub} at ( 3,0) size 13x22267 RenderTableCell {mtd} at (52,44) size 26x22 [r=2 c=2 rs=1 cs=1] 268 RenderBlock {msub} at (6,0) size 13x22 269 269 RenderBlock {msub} at (0,0) size 7x19 270 270 RenderInline {mi} at (0,0) size 7x16 … … 275 275 text run at (7,10) width 6: "3" 276 276 RenderInline {mtext} at (0,0) size 8x16 277 RenderText {#text} at (1 29,29) size 8x16278 text run at (1 29,29) width 8: ", "279 RenderTable {mtable} at (1 37,0) size 60x66280 RenderTableSection (anonymous) at (0,0) size 60x66281 RenderTableRow {mtr} at (0,0) size 60x22282 RenderTableCell {mtd} at (0,0) size 2 0x22 [r=0 c=0 rs=1 cs=1]283 RenderBlock {msub} at ( 6,0) size 14x22277 RenderText {#text} at (165,29) size 8x16 278 text run at (165,29) width 8: ", " 279 RenderTable {mtable} at (173,0) size 78x66 280 RenderTableSection (anonymous) at (0,0) size 78x66 281 RenderTableRow {mtr} at (0,0) size 78x22 282 RenderTableCell {mtd} at (0,0) size 26x22 [r=0 c=0 rs=1 cs=1] 283 RenderBlock {msub} at (9,0) size 14x22 284 284 RenderBlock {msub} at (0,0) size 8x19 285 285 RenderInline {mi} at (0,0) size 8x16 … … 289 289 RenderText {#text} at (8,10) size 6x12 290 290 text run at (8,10) width 6: "1" 291 RenderTableCell {mtd} at (2 0,0) size 20x22 [r=0 c=1 rs=1 cs=1]292 RenderBlock {msub} at ( 0,0) size 20x22291 RenderTableCell {mtd} at (26,0) size 26x22 [r=0 c=1 rs=1 cs=1] 292 RenderBlock {msub} at (3,0) size 20x22 293 293 RenderBlock {msub} at (0,0) size 8x19 294 294 RenderInline {mi} at (0,0) size 8x16 … … 298 298 RenderText {#text} at (8,10) size 12x12 299 299 text run at (8,10) width 12: "12" 300 RenderTableCell {mtd} at ( 40,0) size 20x22 [r=0 c=2 rs=1 cs=1]301 RenderBlock {msub} at ( 0,0) size 20x22300 RenderTableCell {mtd} at (52,0) size 26x22 [r=0 c=2 rs=1 cs=1] 301 RenderBlock {msub} at (3,0) size 20x22 302 302 RenderBlock {msub} at (0,0) size 8x19 303 303 RenderInline {mi} at (0,0) size 8x16 … … 307 307 RenderText {#text} at (8,10) size 12x12 308 308 text run at (8,10) width 12: "13" 309 RenderTableRow {mtr} at (0,22) size 60x22310 RenderTableCell {mtd} at (0,22) size 2 0x22 [r=1 c=0 rs=1 cs=1]311 RenderBlock {msub} at ( 0,0) size 20x22309 RenderTableRow {mtr} at (0,22) size 78x22 310 RenderTableCell {mtd} at (0,22) size 26x22 [r=1 c=0 rs=1 cs=1] 311 RenderBlock {msub} at (3,0) size 20x22 312 312 RenderBlock {msub} at (0,0) size 8x19 313 313 RenderInline {mi} at (0,0) size 8x16 … … 317 317 RenderText {#text} at (8,10) size 12x12 318 318 text run at (8,10) width 12: "21" 319 RenderTableCell {mtd} at (2 0,22) size 20x22 [r=1 c=1 rs=1 cs=1]320 RenderBlock {msub} at ( 6,0) size 14x22319 RenderTableCell {mtd} at (26,22) size 26x22 [r=1 c=1 rs=1 cs=1] 320 RenderBlock {msub} at (9,0) size 14x22 321 321 RenderBlock {msub} at (0,0) size 8x19 322 322 RenderInline {mi} at (0,0) size 8x16 … … 326 326 RenderText {#text} at (8,10) size 6x12 327 327 text run at (8,10) width 6: "2" 328 RenderTableCell {mtd} at ( 40,22) size 20x22 [r=1 c=2 rs=1 cs=1]329 RenderBlock {msub} at ( 0,0) size 20x22328 RenderTableCell {mtd} at (52,22) size 26x22 [r=1 c=2 rs=1 cs=1] 329 RenderBlock {msub} at (3,0) size 20x22 330 330 RenderBlock {msub} at (0,0) size 8x19 331 331 RenderInline {mi} at (0,0) size 8x16 … … 335 335 RenderText {#text} at (8,10) size 12x12 336 336 text run at (8,10) width 12: "23" 337 RenderTableRow {mtr} at (0,44) size 60x22338 RenderTableCell {mtd} at (0,44) size 2 0x22 [r=2 c=0 rs=1 cs=1]339 RenderBlock {msub} at ( 1,0) size 19x22337 RenderTableRow {mtr} at (0,44) size 78x22 338 RenderTableCell {mtd} at (0,44) size 26x22 [r=2 c=0 rs=1 cs=1] 339 RenderBlock {msub} at (4,0) size 19x22 340 340 RenderBlock {msub} at (0,0) size 7x19 341 341 RenderInline {mi} at (0,0) size 7x16 … … 345 345 RenderText {#text} at (7,10) size 12x12 346 346 text run at (7,10) width 12: "31" 347 RenderTableCell {mtd} at (2 0,44) size 20x22 [r=2 c=1 rs=1 cs=1]348 RenderBlock {msub} at ( 1,0) size 19x22347 RenderTableCell {mtd} at (26,44) size 26x22 [r=2 c=1 rs=1 cs=1] 348 RenderBlock {msub} at (4,0) size 19x22 349 349 RenderBlock {msub} at (0,0) size 7x19 350 350 RenderInline {mi} at (0,0) size 7x16 … … 354 354 RenderText {#text} at (7,10) size 12x12 355 355 text run at (7,10) width 12: "32" 356 RenderTableCell {mtd} at ( 40,44) size 20x22 [r=2 c=2 rs=1 cs=1]357 RenderBlock {msub} at ( 7,0) size 13x22356 RenderTableCell {mtd} at (52,44) size 26x22 [r=2 c=2 rs=1 cs=1] 357 RenderBlock {msub} at (10,0) size 13x22 358 358 RenderBlock {msub} at (0,0) size 7x19 359 359 RenderInline {mi} at (0,0) size 7x16 -
trunk/WebCore/ChangeLog
r70303 r70304 1 2010-10-22 François Sausset <sausset@gmail.com> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 Fix wrong xHeight() value for Apple Symbols font. 6 https://bugs.webkit.org/show_bug.cgi?id=41535 7 8 Test: mathml/xHeight.xhtml 9 10 * platform/graphics/mac/SimpleFontDataMac.mm: 11 (WebCore::SimpleFontData::platformInit): 12 1 13 2010-10-22 Nikolas Zimmermann <nzimmermann@rim.com> 2 14 -
trunk/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
r70250 r70304 278 278 m_xHeight = m_platformData.font() ? [m_platformData.font() xHeight] : 0; 279 279 #endif 280 // CGFontGetXHeight() returns a wrong value for "Apple Symbols" font (a float close to 0, but not strictly 0). 281 // The following code makes a guess for m_xHeight in that case. 282 // The int cast is a workaround for the "almost" zero value returned by CGFontGetXHeight(). 283 if (!static_cast<int>(m_xHeight) && fAscent) 284 m_xHeight = 2 * fAscent / 3; 280 285 } 281 286 }
Note: See TracChangeset
for help on using the changeset viewer.
