Changeset 83126 in webkit


Ignore:
Timestamp:
Apr 6, 2011 6:02:27 PM (13 years ago)
Author:
mitz@apple.com
Message:

<rdar://problem/9084761> REGRESSION (r73993): Default Arabic line spacing has gotten very loose when the specified font is not Arabic
https://bugs.webkit.org/show_bug.cgi?id=58002

Reviewed by Darin Adler.

Source/WebCore:

  • platform/graphics/mac/SimpleFontDataMac.mm:

(WebCore::SimpleFontData::platformInit): The version of Geeza Pro in Snow Leopard
does not require the vertical metrics tweaks that were needed in Leopard. That the
tweaks were being applied went mostly unnoticed until r73993, because until then it
only affected cases where Geeza Pro was specified, not when it occurred as a fallback
font.

LayoutTests:

  • platform/mac/fast/dom/52776-expected.checksum:
  • platform/mac/fast/dom/52776-expected.png:
  • platform/mac/fast/dom/52776-expected.txt:
  • platform/mac/fast/text/complex-text-opacity-expected.txt:
  • platform/mac/fast/text/international/Geeza-Pro-vertical-metrics-adjustment-expected.txt:
  • platform/mac/fast/text/international/bidi-AN-after-L-expected.checksum:
  • platform/mac/fast/text/international/bidi-AN-after-L-expected.png:
  • platform/mac/fast/text/international/bidi-AN-after-L-expected.txt:
  • platform/mac/fast/text/international/bidi-AN-after-empty-run-expected.checksum:
  • platform/mac/fast/text/international/bidi-AN-after-empty-run-expected.png:
  • platform/mac/fast/text/international/bidi-AN-after-empty-run-expected.txt:
  • platform/mac/fast/text/international/bidi-CS-after-AN-expected.txt:
  • platform/mac/fast/text/international/bidi-mirror-he-ar-expected.txt:
  • platform/mac/fast/text/international/bidi-neutral-run-expected.checksum:
  • platform/mac/fast/text/international/bidi-neutral-run-expected.png:
  • platform/mac/fast/text/international/bidi-neutral-run-expected.txt:
  • platform/mac/platform/mac/fast/text/international/Geeza-Pro-vertical-metrics-adjustment-expected.checksum:
  • platform/mac/platform/mac/fast/text/international/Geeza-Pro-vertical-metrics-adjustment-expected.png:
Location:
trunk
Files:
21 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r83124 r83126  
     12011-04-06  Dan Bernstein  <mitz@apple.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        <rdar://problem/9084761> REGRESSION (r73993): Default Arabic line spacing has gotten very loose when the specified font is not Arabic
     6        https://bugs.webkit.org/show_bug.cgi?id=58002
     7
     8        * platform/mac/fast/dom/52776-expected.checksum:
     9        * platform/mac/fast/dom/52776-expected.png:
     10        * platform/mac/fast/dom/52776-expected.txt:
     11        * platform/mac/fast/text/complex-text-opacity-expected.txt:
     12        * platform/mac/fast/text/international/Geeza-Pro-vertical-metrics-adjustment-expected.txt:
     13        * platform/mac/fast/text/international/bidi-AN-after-L-expected.checksum:
     14        * platform/mac/fast/text/international/bidi-AN-after-L-expected.png:
     15        * platform/mac/fast/text/international/bidi-AN-after-L-expected.txt:
     16        * platform/mac/fast/text/international/bidi-AN-after-empty-run-expected.checksum:
     17        * platform/mac/fast/text/international/bidi-AN-after-empty-run-expected.png:
     18        * platform/mac/fast/text/international/bidi-AN-after-empty-run-expected.txt:
     19        * platform/mac/fast/text/international/bidi-CS-after-AN-expected.txt:
     20        * platform/mac/fast/text/international/bidi-mirror-he-ar-expected.txt:
     21        * platform/mac/fast/text/international/bidi-neutral-run-expected.checksum:
     22        * platform/mac/fast/text/international/bidi-neutral-run-expected.png:
     23        * platform/mac/fast/text/international/bidi-neutral-run-expected.txt:
     24        * platform/mac/platform/mac/fast/text/international/Geeza-Pro-vertical-metrics-adjustment-expected.checksum:
     25        * platform/mac/platform/mac/fast/text/international/Geeza-Pro-vertical-metrics-adjustment-expected.png:
     26
    1272011-04-06  Adrienne Walker  <enne@google.com>
    228
  • trunk/LayoutTests/platform/mac/fast/dom/52776-expected.checksum

    r76319 r83126  
    1 f402d60286ecf6584ab7e68bbb2ae3b9
     12f71d00fcba51dfdfdfd0140e1ba555f
  • trunk/LayoutTests/platform/mac/fast/dom/52776-expected.txt

    r78897 r83126  
    1 layer at (0,0) size 785x1724
     1layer at (0,0) size 785x1704
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x1724
    4   RenderBlock {HTML} at (0,0) size 785x1724
    5     RenderBody {BODY} at (8,16) size 769x1692
    6       RenderBlock {DIV} at (0,0) size 769x821
     3layer at (0,0) size 785x1704
     4  RenderBlock {HTML} at (0,0) size 785x1704
     5    RenderBody {BODY} at (8,16) size 769x1672
     6      RenderBlock {DIV} at (0,0) size 769x811
    77        RenderBlock {P} at (0,0) size 769x18
    88          RenderText {#text} at (682,0) size 87x18
     
    119119            text run at (753,0) width 0 RTL: "\x{202C}"
    120120            text run at (753,0) width 16: "12"
    121         RenderBlock {DIV} at (0,710) size 769x28
     121        RenderBlock {DIV} at (0,710) size 769x23
    122122          RenderText {#text} at (753,2) size 16x18
    123123            text run at (753,2) width 0 RTL: "\x{202A}"
    124124            text run at (753,2) width 0 RTL: "\x{202C}"
    125125            text run at (753,2) width 16: "\x{660}\x{661}"
    126         RenderBlock {DIV} at (0,738) size 769x28
     126        RenderBlock {DIV} at (0,733) size 769x23
    127127          RenderText {#text} at (751,2) size 18x18
    128128            text run at (751,2) width 0 RTL: "\x{202A}"
    129129            text run at (751,2) width 18 RTL: "\x{683}\x{684}\x{202C}"
    130         RenderBlock {DIV} at (0,766) size 769x18
     130        RenderBlock {DIV} at (0,756) size 769x18
    131131          RenderText {#text} at (769,0) size 0x18
    132132            text run at (769,0) width 0 RTL: "\x{202A}"
    133133            text run at (769,0) width 0 RTL: "\x{1}\x{202C}"
    134         RenderBlock {DIV} at (0,784) size 769x18
     134        RenderBlock {DIV} at (0,774) size 769x18
    135135          RenderText {#text} at (747,0) size 22x18
    136136            text run at (747,0) width 22: "abc\x{202C}"
    137137            text run at (769,0) width 0 RTL: "\x{202A}"
    138         RenderBlock {DIV} at (0,802) size 769x19
     138        RenderBlock {DIV} at (0,792) size 769x19
    139139          RenderText {#text} at (749,1) size 20x18
    140140            text run at (749,1) width 1 RTL: "\x{202A}"
    141141            text run at (749,1) width 20 RTL: "\x{5D0}\x{5D1}\x{202C}"
    142       RenderBlock {DIV} at (0,837) size 769x821
     142      RenderBlock {DIV} at (0,827) size 769x811
    143143        RenderBlock {P} at (0,0) size 769x18
    144144          RenderText {#text} at (0,0) size 87x18
     
    241241            text run at (0,0) width 16: "12\x{202C}"
    242242            text run at (16,0) width 0: "\x{202A}"
    243         RenderBlock {DIV} at (0,710) size 769x28
     243        RenderBlock {DIV} at (0,710) size 769x23
    244244          RenderText {#text} at (0,2) size 16x18
    245245            text run at (0,2) width 16: "\x{660}\x{661}"
    246246            text run at (16,2) width 0: "\x{202C}"
    247247            text run at (16,2) width 0: "\x{202A}"
    248         RenderBlock {DIV} at (0,738) size 769x28
     248        RenderBlock {DIV} at (0,733) size 769x23
    249249          RenderText {#text} at (0,2) size 18x18
    250250            text run at (0,2) width 18 RTL: "\x{683}\x{684}"
    251251            text run at (18,2) width 0: "\x{202C}"
    252252            text run at (18,2) width 0: "\x{202A}"
    253         RenderBlock {DIV} at (0,766) size 769x18
     253        RenderBlock {DIV} at (0,756) size 769x18
    254254          RenderText {#text} at (0,0) size 0x18
    255255            text run at (0,0) width 0: "\x{1}\x{202C}"
    256256            text run at (0,0) width 0: "\x{202A}"
    257         RenderBlock {DIV} at (0,784) size 769x18
     257        RenderBlock {DIV} at (0,774) size 769x18
    258258          RenderText {#text} at (0,0) size 22x18
    259259            text run at (0,0) width 22: "abc\x{202C}"
    260260            text run at (22,0) width 0: "\x{202A}"
    261         RenderBlock {DIV} at (0,802) size 769x19
     261        RenderBlock {DIV} at (0,792) size 769x19
    262262          RenderText {#text} at (0,1) size 20x18
    263263            text run at (0,1) width 20 RTL: "\x{5D0}\x{5D1}"
    264264            text run at (19,1) width 1: "\x{202C}"
    265265            text run at (19,1) width 1: "\x{202A}"
    266       RenderBlock {UL} at (0,1674) size 769x18
     266      RenderBlock {UL} at (0,1654) size 769x18
    267267        RenderListItem {LI} at (40,0) size 729x18
    268268          RenderListMarker at (-17,0) size 7x18: bullet
  • trunk/LayoutTests/platform/mac/fast/text/complex-text-opacity-expected.txt

    r73993 r83126  
    3838          text run at (484,0) width 6: " "
    3939        RenderText {#text} at (0,0) size 0x0
    40       RenderBlock {DIV} at (0,74) size 784x44
     40      RenderBlock {DIV} at (0,74) size 784x37
    4141        RenderInline {SPAN} at (0,0) size 50x29
    4242          RenderText {#text} at (560,2) size 50x29
  • trunk/LayoutTests/platform/mac/fast/text/international/Geeza-Pro-vertical-metrics-adjustment-expected.txt

    r42028 r83126  
    1 layer at (0,0) size 785x698
     1layer at (0,0) size 785x618
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x698
    4   RenderBlock {HTML} at (0,0) size 785x698
    5     RenderBody {BODY} at (8,8) size 769x682
     3layer at (0,0) size 785x618
     4  RenderBlock {HTML} at (0,0) size 785x618
     5    RenderBody {BODY} at (8,8) size 769x602
    66      RenderBlock {P} at (0,0) size 769x18
    77        RenderText {#text} at (0,0) size 750x18
    88          text run at (0,0) width 478: "Test the vertical metric adjustment for Geeza Pro. Red text should not draw "
    99          text run at (478,0) width 272: "above the green line or below the blue line."
    10       RenderBlock {DIV} at (0,34) size 769x52 [bgcolor=#D3D3D3]
    11         RenderInline {SPAN} at (0,0) size 111x19 [color=#FF0000] [border: (1px solid #008000) none (1px solid #0000FF) none]
    12           RenderText {#text} at (650,8) size 111x17
     10      RenderBlock {DIV} at (0,34) size 769x46 [bgcolor=#D3D3D3]
     11        RenderInline {SPAN} at (0,0) size 111x16 [color=#FF0000] [border: (1px solid #008000) none (1px solid #0000FF) none]
     12          RenderText {#text} at (650,8) size 111x14
    1313            text run at (650,8) width 111 RTL: "\x{628}\x{62F}\x{621} \x{627}\x{644}\x{645}\x{64D} \x{641}\x{64A} \x{62A}\x{62D}\x{637}\x{645} \x{644}\x{62C}\x{645}\x{64E}\x{651}\x{644} \x{627}\x{644}\x{627}\x{633}\x{628}\x{627}\x{646}\x{64A}\x{629}"
    1414        RenderBR {BR} at (650,18) size 0x0
    15         RenderText {#text} at (625,26) size 136x17
    16           text run at (625,26) width 136 RTL: "\x{628}\x{62F}\x{621} \x{627}\x{644}\x{62A}\x{62D}\x{642}\x{64A}\x{642} \x{641}\x{64A} \x{62A}\x{62D}\x{637}\x{645} \x{627}\x{644}\x{637}\x{627}\x{626}\x{631}\x{629} \x{627}\x{644}\x{627}\x{633}\x{628}\x{627}\x{646}\x{64A}\x{629}"
    17       RenderBlock {DIV} at (0,94) size 769x60 [bgcolor=#D3D3D3]
    18         RenderInline {SPAN} at (0,0) size 140x22 [color=#FF0000] [border: (1px solid #008000) none (1px solid #0000FF) none]
    19           RenderText {#text} at (621,9) size 140x20
     15        RenderText {#text} at (625,23) size 136x14
     16          text run at (625,23) width 136 RTL: "\x{628}\x{62F}\x{621} \x{627}\x{644}\x{62A}\x{62D}\x{642}\x{64A}\x{642} \x{641}\x{64A} \x{62A}\x{62D}\x{637}\x{645} \x{627}\x{644}\x{637}\x{627}\x{626}\x{631}\x{629} \x{627}\x{644}\x{627}\x{633}\x{628}\x{627}\x{646}\x{64A}\x{629}"
     17      RenderBlock {DIV} at (0,88) size 769x54 [bgcolor=#D3D3D3]
     18        RenderInline {SPAN} at (0,0) size 140x19 [color=#FF0000] [border: (1px solid #008000) none (1px solid #0000FF) none]
     19          RenderText {#text} at (621,9) size 140x17
    2020            text run at (621,9) width 140 RTL: "\x{628}\x{62F}\x{621} \x{627}\x{644}\x{645}\x{64D} \x{641}\x{64A} \x{62A}\x{62D}\x{637}\x{645} \x{644}\x{62C}\x{645}\x{64E}\x{651}\x{644} \x{627}\x{644}\x{627}\x{633}\x{628}\x{627}\x{646}\x{64A}\x{629}"
    2121        RenderBR {BR} at (621,21) size 0x0
    22         RenderText {#text} at (590,31) size 171x20
    23           text run at (590,31) width 171 RTL: "\x{628}\x{62F}\x{621} \x{627}\x{644}\x{62A}\x{62D}\x{642}\x{64A}\x{642} \x{641}\x{64A} \x{62A}\x{62D}\x{637}\x{645} \x{627}\x{644}\x{637}\x{627}\x{626}\x{631}\x{629} \x{627}\x{644}\x{627}\x{633}\x{628}\x{627}\x{646}\x{64A}\x{629}"
    24       RenderBlock {DIV} at (0,162) size 769x66 [bgcolor=#D3D3D3]
    25         RenderInline {SPAN} at (0,0) size 156x25 [color=#FF0000] [border: (1px solid #008000) none (1px solid #0000FF) none]
    26           RenderText {#text} at (605,9) size 156x23
     22        RenderText {#text} at (590,28) size 171x17
     23          text run at (590,28) width 171 RTL: "\x{628}\x{62F}\x{621} \x{627}\x{644}\x{62A}\x{62D}\x{642}\x{64A}\x{642} \x{641}\x{64A} \x{62A}\x{62D}\x{637}\x{645} \x{627}\x{644}\x{637}\x{627}\x{626}\x{631}\x{629} \x{627}\x{644}\x{627}\x{633}\x{628}\x{627}\x{646}\x{64A}\x{629}"
     24      RenderBlock {DIV} at (0,150) size 769x58 [bgcolor=#D3D3D3]
     25        RenderInline {SPAN} at (0,0) size 156x21 [color=#FF0000] [border: (1px solid #008000) none (1px solid #0000FF) none]
     26          RenderText {#text} at (605,9) size 156x19
    2727            text run at (605,9) width 156 RTL: "\x{628}\x{62F}\x{621} \x{627}\x{644}\x{645}\x{64D} \x{641}\x{64A} \x{62A}\x{62D}\x{637}\x{645} \x{644}\x{62C}\x{645}\x{64E}\x{651}\x{644} \x{627}\x{644}\x{627}\x{633}\x{628}\x{627}\x{646}\x{64A}\x{629}"
    2828        RenderBR {BR} at (605,23) size 0x0
    29         RenderText {#text} at (572,34) size 189x23
    30           text run at (572,34) width 189 RTL: "\x{628}\x{62F}\x{621} \x{627}\x{644}\x{62A}\x{62D}\x{642}\x{64A}\x{642} \x{641}\x{64A} \x{62A}\x{62D}\x{637}\x{645} \x{627}\x{644}\x{637}\x{627}\x{626}\x{631}\x{629} \x{627}\x{644}\x{627}\x{633}\x{628}\x{627}\x{646}\x{64A}\x{629}"
    31       RenderBlock {DIV} at (0,236) size 769x100 [bgcolor=#D3D3D3]
    32         RenderInline {SPAN} at (0,0) size 272x41 [color=#FF0000] [border: (1px solid #008000) none (1px solid #0000FF) none]
    33           RenderText {#text} at (489,9) size 272x39
     29        RenderText {#text} at (572,30) size 189x19
     30          text run at (572,30) width 189 RTL: "\x{628}\x{62F}\x{621} \x{627}\x{644}\x{62A}\x{62D}\x{642}\x{64A}\x{642} \x{641}\x{64A} \x{62A}\x{62D}\x{637}\x{645} \x{627}\x{644}\x{637}\x{627}\x{626}\x{631}\x{629} \x{627}\x{644}\x{627}\x{633}\x{628}\x{627}\x{646}\x{64A}\x{629}"
     31      RenderBlock {DIV} at (0,216) size 769x86 [bgcolor=#D3D3D3]
     32        RenderInline {SPAN} at (0,0) size 272x34 [color=#FF0000] [border: (1px solid #008000) none (1px solid #0000FF) none]
     33          RenderText {#text} at (489,9) size 272x32
    3434            text run at (489,9) width 272 RTL: "\x{628}\x{62F}\x{621} \x{627}\x{644}\x{645}\x{64D} \x{641}\x{64A} \x{62A}\x{62D}\x{637}\x{645} \x{644}\x{62C}\x{645}\x{64E}\x{651}\x{644} \x{627}\x{644}\x{627}\x{633}\x{628}\x{627}\x{646}\x{64A}\x{629}"
    3535        RenderBR {BR} at (489,32) size 0x0
    36         RenderText {#text} at (432,51) size 329x39
    37           text run at (432,51) width 329 RTL: "\x{628}\x{62F}\x{621} \x{627}\x{644}\x{62A}\x{62D}\x{642}\x{64A}\x{642} \x{641}\x{64A} \x{62A}\x{62D}\x{637}\x{645} \x{627}\x{644}\x{637}\x{627}\x{626}\x{631}\x{629} \x{627}\x{644}\x{627}\x{633}\x{628}\x{627}\x{646}\x{64A}\x{629}"
    38       RenderBlock {DIV} at (0,344) size 769x144 [bgcolor=#D3D3D3]
    39         RenderInline {SPAN} at (0,0) size 410x61 [color=#FF0000] [border: (1px solid #008000) none (1px solid #0000FF) none]
    40           RenderText {#text} at (351,10) size 410x59
     36        RenderText {#text} at (432,44) size 329x32
     37          text run at (432,44) width 329 RTL: "\x{628}\x{62F}\x{621} \x{627}\x{644}\x{62A}\x{62D}\x{642}\x{64A}\x{642} \x{641}\x{64A} \x{62A}\x{62D}\x{637}\x{645} \x{627}\x{644}\x{637}\x{627}\x{626}\x{631}\x{629} \x{627}\x{644}\x{627}\x{633}\x{628}\x{627}\x{646}\x{64A}\x{629}"
     38      RenderBlock {DIV} at (0,310) size 769x124 [bgcolor=#D3D3D3]
     39        RenderInline {SPAN} at (0,0) size 410x51 [color=#FF0000] [border: (1px solid #008000) none (1px solid #0000FF) none]
     40          RenderText {#text} at (351,10) size 410x49
    4141            text run at (351,10) width 410 RTL: "\x{628}\x{62F}\x{621} \x{627}\x{644}\x{645}\x{64D} \x{641}\x{64A} \x{62A}\x{62D}\x{637}\x{645} \x{644}\x{62C}\x{645}\x{64E}\x{651}\x{644} \x{627}\x{644}\x{627}\x{633}\x{628}\x{627}\x{646}\x{64A}\x{629}"
    4242        RenderBR {BR} at (351,45) size 0x0
    43         RenderText {#text} at (261,74) size 500x59
    44           text run at (261,74) width 500 RTL: "\x{628}\x{62F}\x{621} \x{627}\x{644}\x{62A}\x{62D}\x{642}\x{64A}\x{642} \x{641}\x{64A} \x{62A}\x{62D}\x{637}\x{645} \x{627}\x{644}\x{637}\x{627}\x{626}\x{631}\x{629} \x{627}\x{644}\x{627}\x{633}\x{628}\x{627}\x{646}\x{64A}\x{629}"
    45       RenderBlock {DIV} at (0,496) size 769x186 [bgcolor=#D3D3D3]
    46         RenderInline {SPAN} at (0,0) size 541x80 [color=#FF0000] [border: (1px solid #008000) none (1px solid #0000FF) none]
    47           RenderText {#text} at (220,11) size 541x78
     43        RenderText {#text} at (261,64) size 500x49
     44          text run at (261,64) width 500 RTL: "\x{628}\x{62F}\x{621} \x{627}\x{644}\x{62A}\x{62D}\x{642}\x{64A}\x{642} \x{641}\x{64A} \x{62A}\x{62D}\x{637}\x{645} \x{627}\x{644}\x{637}\x{627}\x{626}\x{631}\x{629} \x{627}\x{644}\x{627}\x{633}\x{628}\x{627}\x{646}\x{64A}\x{629}"
     45      RenderBlock {DIV} at (0,442) size 769x160 [bgcolor=#D3D3D3]
     46        RenderInline {SPAN} at (0,0) size 541x67 [color=#FF0000] [border: (1px solid #008000) none (1px solid #0000FF) none]
     47          RenderText {#text} at (220,11) size 541x65
    4848            text run at (220,11) width 541 RTL: "\x{628}\x{62F}\x{621} \x{627}\x{644}\x{645}\x{64D} \x{641}\x{64A} \x{62A}\x{62D}\x{637}\x{645} \x{644}\x{62C}\x{645}\x{64E}\x{651}\x{644} \x{627}\x{644}\x{627}\x{633}\x{628}\x{627}\x{646}\x{64A}\x{629}"
    4949        RenderBR {BR} at (220,57) size 0x0
    50         RenderText {#text} at (105,96) size 656x78
    51           text run at (105,96) width 656 RTL: "\x{628}\x{62F}\x{621} \x{627}\x{644}\x{62A}\x{62D}\x{642}\x{64A}\x{642} \x{641}\x{64A} \x{62A}\x{62D}\x{637}\x{645} \x{627}\x{644}\x{637}\x{627}\x{626}\x{631}\x{629} \x{627}\x{644}\x{627}\x{633}\x{628}\x{627}\x{646}\x{64A}\x{629}"
     50        RenderText {#text} at (105,83) size 656x65
     51          text run at (105,83) width 656 RTL: "\x{628}\x{62F}\x{621} \x{627}\x{644}\x{62A}\x{62D}\x{642}\x{64A}\x{642} \x{641}\x{64A} \x{62A}\x{62D}\x{637}\x{645} \x{627}\x{644}\x{637}\x{627}\x{626}\x{631}\x{629} \x{627}\x{644}\x{627}\x{633}\x{628}\x{627}\x{646}\x{64A}\x{629}"
  • trunk/LayoutTests/platform/mac/fast/text/international/bidi-AN-after-L-expected.checksum

    r78855 r83126  
    1 17e506077f077a79d3beda8c059f3c6c
     14ad4dfd7d11c8670d3b928a74b756fc1
  • trunk/LayoutTests/platform/mac/fast/text/international/bidi-AN-after-L-expected.txt

    r78855 r83126  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x130
    4   RenderBlock {HTML} at (0,0) size 800x130
    5     RenderBody {BODY} at (8,8) size 784x106
     3layer at (0,0) size 800x120
     4  RenderBlock {HTML} at (0,0) size 800x120
     5    RenderBody {BODY} at (8,8) size 784x96
    66      RenderBlock (anonymous) at (0,0) size 784x18
    77        RenderText {#text} at (0,0) size 279x18
    88          text run at (0,0) width 279: "The following two lines should be the same:"
    9       RenderBlock {P} at (0,34) size 784x28
     9      RenderBlock {P} at (0,34) size 784x23
    1010        RenderText {#text} at (0,2) size 73x18
    1111          text run at (0,2) width 73 LTR override: "abc\x{5D2}\x{5D1}\x{5D0}\x{661}\x{662}\x{663}"
    12       RenderBlock {P} at (0,78) size 784x28
     12      RenderBlock {P} at (0,73) size 784x23
    1313        RenderText {#text} at (0,2) size 73x18
    1414          text run at (0,2) width 22: "abc"
  • trunk/LayoutTests/platform/mac/fast/text/international/bidi-AN-after-empty-run-expected.checksum

    r73993 r83126  
    1 e70ff5e4f4cbbd682be465179d0b0642
     1eebcccc39af5ad5922416faf5faff023
  • trunk/LayoutTests/platform/mac/fast/text/international/bidi-AN-after-empty-run-expected.txt

    r73993 r83126  
    1818        RenderText {#text} at (0,0) size 320x18
    1919          text run at (0,0) width 320: "The boxes below should be identical to each other."
    20       RenderBlock {DIV} at (0,68) size 90x66 [border: (1px solid #0000FF)]
    21         RenderText {#text} at (5,7) size 62x46
     20      RenderBlock {DIV} at (0,68) size 90x56 [border: (1px solid #0000FF)]
     21        RenderText {#text} at (5,7) size 62x41
    2222          text run at (5,7) width 58 RTL: "\x{627}\x{644}\x{645}\x{627}\x{626}\x{629} \x{645}\x{644}\x{64A}\x{627}\x{631}"
    2323          text run at (63,7) width 4: " "
    24           text run at (5,35) width 20 RTL: " \x{645}\x{646}"
    25           text run at (25,35) width 40: "12345"
    26       RenderBlock {DIV} at (0,134) size 90x66 [border: (1px solid #0000FF)]
    27         RenderText {#text} at (5,7) size 60x46
     24          text run at (5,30) width 20 RTL: " \x{645}\x{646}"
     25          text run at (25,30) width 40: "12345"
     26      RenderBlock {DIV} at (0,124) size 90x56 [border: (1px solid #0000FF)]
     27        RenderText {#text} at (5,7) size 60x41
    2828          text run at (5,7) width 58 RTL: "\x{627}\x{644}\x{645}\x{627}\x{626}\x{629} \x{645}\x{644}\x{64A}\x{627}\x{631}"
    29           text run at (5,35) width 20 RTL: " \x{645}\x{646}"
    30           text run at (25,35) width 40: "12345"
     29          text run at (5,30) width 20 RTL: " \x{645}\x{646}"
     30          text run at (25,30) width 40: "12345"
  • trunk/LayoutTests/platform/mac/fast/text/international/bidi-CS-after-AN-expected.txt

    r73993 r83126  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x94
    4   RenderBlock {HTML} at (0,0) size 800x94
    5     RenderBody {BODY} at (8,16) size 784x62
     3layer at (0,0) size 800x89
     4  RenderBlock {HTML} at (0,0) size 800x89
     5    RenderBody {BODY} at (8,16) size 784x57
    66      RenderBlock {P} at (0,0) size 784x18
    77        RenderText {#text} at (0,0) size 471x18
    88          text run at (0,0) width 471: "The following should look like: Arabic characters 123.4 Arabic characters."
    9       RenderBlock {P} at (0,34) size 784x28
     9      RenderBlock {P} at (0,34) size 784x23
    1010        RenderText {#text} at (0,2) size 77x18
    1111          text run at (0,2) width 19 RTL: " \x{644}\x{645}\x{646}"
  • trunk/LayoutTests/platform/mac/fast/text/international/bidi-mirror-he-ar-expected.txt

    r79027 r83126  
    1616        RenderText {#text} at (762,0) size 22x18
    1717          text run at (762,0) width 22 RTL: "\x{5C6}(\x{5C6})"
    18       RenderBlock {DIV} at (0,105) size 784x28
     18      RenderBlock {DIV} at (0,105) size 784x23
    1919        RenderText {#text} at (758,2) size 26x18
    2020          text run at (758,2) width 26 RTL: "\x{644}(\x{644})"
  • trunk/LayoutTests/platform/mac/fast/text/international/bidi-neutral-run-expected.checksum

    r78855 r83126  
    1 9666cb9c45202033c544e69f508911c0
     1f0be81e70537d70698390b13a6230dc1
  • trunk/LayoutTests/platform/mac/fast/text/international/bidi-neutral-run-expected.txt

    r78855 r83126  
    1 layer at (0,0) size 785x7106
     1layer at (0,0) size 785x6586
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x7106
    4   RenderBlock {HTML} at (0,0) size 785x7106
    5     RenderBody {BODY} at (8,8) size 769x7082
     3layer at (0,0) size 785x6586
     4  RenderBlock {HTML} at (0,0) size 785x6586
     5    RenderBody {BODY} at (8,8) size 769x6562
    66      RenderBlock {P} at (0,0) size 769x18
    77        RenderText {#text} at (0,0) size 300x18
    88          text run at (0,0) width 300: "Tests the resolved level of runs of neutral types."
    9       RenderBlock {DIV} at (0,34) size 769x3516
     9      RenderBlock {DIV} at (0,34) size 769x3256
    1010        RenderBlock {P} at (0,0) size 769x18
    1111          RenderText {#text} at (0,0) size 43x18
     
    1515            text run at (0,1) width 20 RTL: "\x{5D0}\x{5D1}"
    1616            text run at (19,1) width 29: "(^cd"
    17         RenderBlock {P} at (0,69) size 769x28
     17        RenderBlock {P} at (0,69) size 769x23
    1818          RenderText {#text} at (0,2) size 43x18
    1919            text run at (0,2) width 15 RTL: "\x{627}\x{628}"
    2020            text run at (15,2) width 28: "(^cd"
    21         RenderBlock {P} at (0,113) size 769x18
     21        RenderBlock {P} at (0,108) size 769x18
    2222          RenderText {#text} at (0,0) size 59x18
    2323            text run at (0,0) width 59: "ab12(^cd"
    24         RenderBlock {P} at (0,147) size 769x19
     24        RenderBlock {P} at (0,142) size 769x19
    2525          RenderText {#text} at (0,1) size 64x18
    2626            text run at (0,1) width 16: "12"
    2727            text run at (16,1) width 20 RTL: "\x{5D0}\x{5D1}"
    2828            text run at (35,1) width 29: "(^cd"
    29         RenderBlock {P} at (0,182) size 769x28
     29        RenderBlock {P} at (0,177) size 769x23
    3030          RenderText {#text} at (0,2) size 59x18
    3131            text run at (0,2) width 16: "12"
    3232            text run at (16,2) width 15 RTL: "\x{627}\x{628}"
    3333            text run at (31,2) width 28: "(^cd"
    34         RenderBlock {P} at (0,226) size 769x28
     34        RenderBlock {P} at (0,216) size 769x23
    3535          RenderText {#text} at (0,2) size 59x18
    3636            text run at (0,2) width 15: "ab"
    3737            text run at (15,2) width 16: "\x{661}\x{662}"
    3838            text run at (31,2) width 28: "(^cd"
    39         RenderBlock {P} at (0,270) size 769x28
     39        RenderBlock {P} at (0,255) size 769x23
    4040          RenderText {#text} at (0,2) size 64x18
    4141            text run at (0,2) width 16: "\x{661}\x{662}"
    4242            text run at (16,2) width 20 RTL: "\x{5D0}\x{5D1}"
    4343            text run at (35,2) width 29: "(^cd"
    44         RenderBlock {P} at (0,314) size 769x28
     44        RenderBlock {P} at (0,294) size 769x23
    4545          RenderText {#text} at (0,2) size 59x18
    4646            text run at (0,2) width 16: "\x{661}\x{662}"
    4747            text run at (16,2) width 15 RTL: "\x{627}\x{628}"
    4848            text run at (31,2) width 28: "(^cd"
    49         RenderBlock {P} at (0,358) size 769x18
     49        RenderBlock {P} at (0,333) size 769x18
    5050          RenderText {#text} at (0,0) size 35x18
    5151            text run at (0,0) width 7: "\x{202A}?"
    5252            text run at (7,0) width 28: "\x{202C}(^cd"
    53         RenderBlock {P} at (0,392) size 769x18
     53        RenderBlock {P} at (0,367) size 769x18
    5454          RenderText {#text} at (0,0) size 35x18
    5555            text run at (0,0) width 7 RTL: "\x{202B}?"
    5656            text run at (7,0) width 28: "\x{202C}(^cd"
    57         RenderBlock {P} at (0,426) size 769x19
     57        RenderBlock {P} at (0,401) size 769x19
    5858          RenderText {#text} at (0,1) size 43x18
    5959            text run at (0,1) width 28: "ab(^"
    6060            text run at (28,1) width 15 RTL: "\x{5D2}\x{5D3}"
    61         RenderBlock {P} at (0,461) size 769x19
     61        RenderBlock {P} at (0,436) size 769x19
    6262          RenderText {#text} at (0,1) size 48x18
    6363            text run at (0,1) width 48 RTL: "\x{5D0}\x{5D1}(^\x{5D2}\x{5D3}"
    64         RenderBlock {P} at (0,496) size 769x28
     64        RenderBlock {P} at (0,471) size 769x23
    6565          RenderText {#text} at (0,2) size 43x18
    6666            text run at (0,2) width 43 RTL: "\x{627}\x{628}(^\x{5D2}\x{5D3}"
    67         RenderBlock {P} at (0,540) size 769x19
     67        RenderBlock {P} at (0,510) size 769x19
    6868          RenderText {#text} at (0,1) size 59x18
    6969            text run at (0,1) width 44: "ab12(^"
    7070            text run at (44,1) width 15 RTL: "\x{5D2}\x{5D3}"
    71         RenderBlock {P} at (0,575) size 769x19
     71        RenderBlock {P} at (0,545) size 769x19
    7272          RenderText {#text} at (0,1) size 64x18
    7373            text run at (0,1) width 28 RTL: "(^\x{5D2}\x{5D3}"
    7474            text run at (27,1) width 17: "12"
    7575            text run at (43,1) width 21 RTL: "\x{5D0}\x{5D1}"
    76         RenderBlock {P} at (0,610) size 769x28
     76        RenderBlock {P} at (0,580) size 769x23
    7777          RenderText {#text} at (0,2) size 59x18
    7878            text run at (0,2) width 28 RTL: "(^\x{5D2}\x{5D3}"
    7979            text run at (27,2) width 17: "12"
    8080            text run at (43,2) width 16 RTL: "\x{627}\x{628}"
    81         RenderBlock {P} at (0,654) size 769x28
     81        RenderBlock {P} at (0,619) size 769x23
    8282          RenderText {#text} at (0,2) size 59x18
    8383            text run at (0,2) width 15: "ab"
    8484            text run at (15,2) width 28 RTL: "(^\x{5D2}\x{5D3}"
    8585            text run at (42,2) width 17: "\x{661}\x{662}"
    86         RenderBlock {P} at (0,698) size 769x28
     86        RenderBlock {P} at (0,658) size 769x23
    8787          RenderText {#text} at (0,2) size 64x18
    8888            text run at (0,2) width 28 RTL: "(^\x{5D2}\x{5D3}"
    8989            text run at (27,2) width 17: "\x{661}\x{662}"
    9090            text run at (43,2) width 21 RTL: "\x{5D0}\x{5D1}"
    91         RenderBlock {P} at (0,742) size 769x28
     91        RenderBlock {P} at (0,697) size 769x23
    9292          RenderText {#text} at (0,2) size 59x18
    9393            text run at (0,2) width 28 RTL: "(^\x{5D2}\x{5D3}"
    9494            text run at (27,2) width 17: "\x{661}\x{662}"
    9595            text run at (43,2) width 16 RTL: "\x{627}\x{628}"
    96         RenderBlock {P} at (0,786) size 769x19
     96        RenderBlock {P} at (0,736) size 769x19
    9797          RenderText {#text} at (0,1) size 35x18
    9898            text run at (0,1) width 7: "\x{202A}?"
    9999            text run at (7,1) width 13: "\x{202C}(^"
    100100            text run at (20,1) width 15 RTL: "\x{5D2}\x{5D3}"
    101         RenderBlock {P} at (0,821) size 769x19
     101        RenderBlock {P} at (0,771) size 769x19
    102102          RenderText {#text} at (0,1) size 35x18
    103103            text run at (0,1) width 28 RTL: "\x{202C}(^\x{5D2}\x{5D3}"
    104104            text run at (27,1) width 8 RTL: "\x{202B}?"
    105         RenderBlock {P} at (0,856) size 769x28
     105        RenderBlock {P} at (0,806) size 769x23
    106106          RenderText {#text} at (0,2) size 45x18
    107107            text run at (0,2) width 28: "ab(^"
    108108            text run at (28,2) width 17 RTL: "\x{62C}\x{62F}"
    109         RenderBlock {P} at (0,900) size 769x28
     109        RenderBlock {P} at (0,845) size 769x23
    110110          RenderText {#text} at (0,2) size 50x18
    111111            text run at (0,2) width 50 RTL: "\x{5D0}\x{5D1}(^\x{62C}\x{62F}"
    112         RenderBlock {P} at (0,944) size 769x28
     112        RenderBlock {P} at (0,884) size 769x23
    113113          RenderText {#text} at (0,2) size 45x18
    114114            text run at (0,2) width 45 RTL: "\x{627}\x{628}(^\x{62C}\x{62F}"
    115         RenderBlock {P} at (0,988) size 769x28
     115        RenderBlock {P} at (0,923) size 769x23
    116116          RenderText {#text} at (0,2) size 61x18
    117117            text run at (0,2) width 44: "ab12(^"
    118118            text run at (44,2) width 17 RTL: "\x{62C}\x{62F}"
    119         RenderBlock {P} at (0,1032) size 769x28
     119        RenderBlock {P} at (0,962) size 769x23
    120120          RenderText {#text} at (0,2) size 66x18
    121121            text run at (0,2) width 30 RTL: "(^\x{62C}\x{62F}"
    122122            text run at (30,2) width 16: "12"
    123123            text run at (46,2) width 20 RTL: "\x{5D0}\x{5D1}"
    124         RenderBlock {P} at (0,1076) size 769x28
     124        RenderBlock {P} at (0,1001) size 769x23
    125125          RenderText {#text} at (0,2) size 61x18
    126126            text run at (0,2) width 30 RTL: "(^\x{62C}\x{62F}"
    127127            text run at (30,2) width 16: "12"
    128128            text run at (46,2) width 15 RTL: "\x{627}\x{628}"
    129         RenderBlock {P} at (0,1120) size 769x28
     129        RenderBlock {P} at (0,1040) size 769x23
    130130          RenderText {#text} at (0,2) size 61x18
    131131            text run at (0,2) width 15: "ab"
    132132            text run at (15,2) width 30 RTL: "(^\x{62C}\x{62F}"
    133133            text run at (45,2) width 16: "\x{661}\x{662}"
    134         RenderBlock {P} at (0,1164) size 769x28
     134        RenderBlock {P} at (0,1079) size 769x23
    135135          RenderText {#text} at (0,2) size 66x18
    136136            text run at (0,2) width 30 RTL: "(^\x{62C}\x{62F}"
    137137            text run at (30,2) width 16: "\x{661}\x{662}"
    138138            text run at (46,2) width 20 RTL: "\x{5D0}\x{5D1}"
    139         RenderBlock {P} at (0,1208) size 769x28
     139        RenderBlock {P} at (0,1118) size 769x23
    140140          RenderText {#text} at (0,2) size 61x18
    141141            text run at (0,2) width 30 RTL: "(^\x{62C}\x{62F}"
    142142            text run at (30,2) width 16: "\x{661}\x{662}"
    143143            text run at (46,2) width 15 RTL: "\x{627}\x{628}"
    144         RenderBlock {P} at (0,1252) size 769x28
     144        RenderBlock {P} at (0,1157) size 769x23
    145145          RenderText {#text} at (0,2) size 37x18
    146146            text run at (0,2) width 7: "\x{202A}?"
    147147            text run at (7,2) width 13: "\x{202C}(^"
    148148            text run at (20,2) width 17 RTL: "\x{62C}\x{62F}"
    149         RenderBlock {P} at (0,1296) size 769x28
     149        RenderBlock {P} at (0,1196) size 769x23
    150150          RenderText {#text} at (0,2) size 37x18
    151151            text run at (0,2) width 30 RTL: "\x{202C}(^\x{62C}\x{62F}"
    152152            text run at (30,2) width 7 RTL: "\x{202B}?"
    153         RenderBlock {P} at (0,1340) size 769x19
     153        RenderBlock {P} at (0,1235) size 769x19
    154154          RenderText {#text} at (0,1) size 63x18
    155155            text run at (0,1) width 44: "ab(^34"
    156156            text run at (44,1) width 12 RTL: "\x{5E9}"
    157157            text run at (55,1) width 8: "z"
    158         RenderBlock {P} at (0,1375) size 769x19
     158        RenderBlock {P} at (0,1270) size 769x19
    159159          RenderText {#text} at (0,1) size 67x18
    160160            text run at (0,1) width 12 RTL: "\x{5E9}"
     
    162162            text run at (27,1) width 33 RTL: "\x{5D0}\x{5D1}(^"
    163163            text run at (59,1) width 8: "z"
    164         RenderBlock {P} at (0,1410) size 769x28
     164        RenderBlock {P} at (0,1305) size 769x23
    165165          RenderText {#text} at (0,2) size 63x18
    166166            text run at (0,2) width 12 RTL: "\x{5E9}"
     
    168168            text run at (27,2) width 29 RTL: "\x{627}\x{628}(^"
    169169            text run at (55,2) width 8: "z"
    170         RenderBlock {P} at (0,1454) size 769x19
     170        RenderBlock {P} at (0,1344) size 769x19
    171171          RenderText {#text} at (0,1) size 79x18
    172172            text run at (0,1) width 60: "ab12(^34"
    173173            text run at (60,1) width 12 RTL: "\x{5E9}"
    174174            text run at (71,1) width 8: "z"
    175         RenderBlock {P} at (0,1489) size 769x19
     175        RenderBlock {P} at (0,1379) size 769x19
    176176          RenderText {#text} at (0,1) size 83x18
    177177            text run at (0,1) width 12 RTL: "\x{5E9}"
     
    181181            text run at (56,1) width 20 RTL: "\x{5D0}\x{5D1}"
    182182            text run at (75,1) width 8: "z"
    183         RenderBlock {P} at (0,1524) size 769x28
     183        RenderBlock {P} at (0,1414) size 769x23
    184184          RenderText {#text} at (0,2) size 79x18
    185185            text run at (0,2) width 12 RTL: "\x{5E9}"
     
    189189            text run at (56,2) width 16 RTL: "\x{627}\x{628}"
    190190            text run at (71,2) width 8: "z"
    191         RenderBlock {P} at (0,1568) size 769x28
     191        RenderBlock {P} at (0,1453) size 769x23
    192192          RenderText {#text} at (0,2) size 79x18
    193193            text run at (0,2) width 15: "ab"
     
    196196            text run at (60,2) width 12 RTL: "\x{5E9}"
    197197            text run at (71,2) width 8: "z"
    198         RenderBlock {P} at (0,1612) size 769x28
     198        RenderBlock {P} at (0,1492) size 769x23
    199199          RenderText {#text} at (0,2) size 83x18
    200200            text run at (0,2) width 12 RTL: "\x{5E9}"
     
    204204            text run at (56,2) width 20 RTL: "\x{5D0}\x{5D1}"
    205205            text run at (75,2) width 8: "z"
    206         RenderBlock {P} at (0,1656) size 769x28
     206        RenderBlock {P} at (0,1531) size 769x23
    207207          RenderText {#text} at (0,2) size 79x18
    208208            text run at (0,2) width 12 RTL: "\x{5E9}"
     
    212212            text run at (56,2) width 16 RTL: "\x{627}\x{628}"
    213213            text run at (71,2) width 8: "z"
    214         RenderBlock {P} at (0,1700) size 769x19
     214        RenderBlock {P} at (0,1570) size 769x19
    215215          RenderText {#text} at (0,1) size 55x18
    216216            text run at (0,1) width 7: "\x{202A}?"
     
    218218            text run at (36,1) width 12 RTL: "\x{5E9}"
    219219            text run at (47,1) width 8: "z"
    220         RenderBlock {P} at (0,1735) size 769x19
     220        RenderBlock {P} at (0,1605) size 769x19
    221221          RenderText {#text} at (0,1) size 55x18
    222222            text run at (0,1) width 12 RTL: "\x{5E9}"
     
    225225            text run at (40,1) width 8 RTL: "\x{202B}?"
    226226            text run at (47,1) width 8: "z"
    227         RenderBlock {P} at (0,1770) size 769x28
     227        RenderBlock {P} at (0,1640) size 769x23
    228228          RenderText {#text} at (0,2) size 63x18
    229229            text run at (0,2) width 28: "ab(^"
     
    231231            text run at (39,2) width 17: "\x{663}\x{664}"
    232232            text run at (55,2) width 8: "z"
    233         RenderBlock {P} at (0,1814) size 769x28
     233        RenderBlock {P} at (0,1679) size 769x23
    234234          RenderText {#text} at (0,2) size 67x18
    235235            text run at (0,2) width 12 RTL: "\x{5E9}"
     
    237237            text run at (27,2) width 33 RTL: "\x{5D0}\x{5D1}(^"
    238238            text run at (59,2) width 8: "z"
    239         RenderBlock {P} at (0,1858) size 769x28
     239        RenderBlock {P} at (0,1718) size 769x23
    240240          RenderText {#text} at (0,2) size 63x18
    241241            text run at (0,2) width 12 RTL: "\x{5E9}"
     
    243243            text run at (27,2) width 29 RTL: "\x{627}\x{628}(^"
    244244            text run at (55,2) width 8: "z"
    245         RenderBlock {P} at (0,1902) size 769x28
     245        RenderBlock {P} at (0,1757) size 769x23
    246246          RenderText {#text} at (0,2) size 79x18
    247247            text run at (0,2) width 44: "ab12(^"
     
    249249            text run at (55,2) width 17: "\x{663}\x{664}"
    250250            text run at (71,2) width 8: "z"
    251         RenderBlock {P} at (0,1946) size 769x28
     251        RenderBlock {P} at (0,1796) size 769x23
    252252          RenderText {#text} at (0,2) size 83x18
    253253            text run at (0,2) width 12 RTL: "\x{5E9}"
     
    257257            text run at (56,2) width 20 RTL: "\x{5D0}\x{5D1}"
    258258            text run at (75,2) width 8: "z"
    259         RenderBlock {P} at (0,1990) size 769x28
     259        RenderBlock {P} at (0,1835) size 769x23
    260260          RenderText {#text} at (0,2) size 79x18
    261261            text run at (0,2) width 12 RTL: "\x{5E9}"
     
    265265            text run at (56,2) width 16 RTL: "\x{627}\x{628}"
    266266            text run at (71,2) width 8: "z"
    267         RenderBlock {P} at (0,2034) size 769x28
     267        RenderBlock {P} at (0,1874) size 769x23
    268268          RenderText {#text} at (0,2) size 79x18
    269269            text run at (0,2) width 15: "ab"
     
    273273            text run at (55,2) width 17: "\x{661}\x{662}"
    274274            text run at (71,2) width 8: "z"
    275         RenderBlock {P} at (0,2078) size 769x28
     275        RenderBlock {P} at (0,1913) size 769x23
    276276          RenderText {#text} at (0,2) size 83x18
    277277            text run at (0,2) width 12 RTL: "\x{5E9}"
     
    281281            text run at (56,2) width 20 RTL: "\x{5D0}\x{5D1}"
    282282            text run at (75,2) width 8: "z"
    283         RenderBlock {P} at (0,2122) size 769x28
     283        RenderBlock {P} at (0,1952) size 769x23
    284284          RenderText {#text} at (0,2) size 79x18
    285285            text run at (0,2) width 12 RTL: "\x{5E9}"
     
    289289            text run at (56,2) width 16 RTL: "\x{627}\x{628}"
    290290            text run at (71,2) width 8: "z"
    291         RenderBlock {P} at (0,2166) size 769x28
     291        RenderBlock {P} at (0,1991) size 769x23
    292292          RenderText {#text} at (0,2) size 55x18
    293293            text run at (0,2) width 7: "\x{202A}?"
     
    296296            text run at (31,2) width 17: "\x{663}\x{664}"
    297297            text run at (47,2) width 8: "z"
    298         RenderBlock {P} at (0,2210) size 769x28
     298        RenderBlock {P} at (0,2030) size 769x23
    299299          RenderText {#text} at (0,2) size 55x18
    300300            text run at (0,2) width 12 RTL: "\x{5E9}"
     
    303303            text run at (40,2) width 8 RTL: "\x{202B}?"
    304304            text run at (47,2) width 8: "z"
    305         RenderBlock {P} at (0,2254) size 769x18
     305        RenderBlock {P} at (0,2069) size 769x18
    306306          RenderText {#text} at (0,0) size 33x18
    307307            text run at (0,0) width 28: "ab(^"
    308308            text run at (28,0) width 5: "\x{202A}!"
    309309            text run at (33,0) width 0: "\x{202C}"
    310         RenderBlock {P} at (0,2288) size 769x19
     310        RenderBlock {P} at (0,2103) size 769x19
    311311          RenderText {#text} at (0,1) size 38x18
    312312            text run at (0,1) width 20 RTL: "\x{5D0}\x{5D1}"
     
    314314            text run at (32,1) width 6: "\x{202A}!"
    315315            text run at (37,1) width 1: "\x{202C}"
    316         RenderBlock {P} at (0,2323) size 769x28
     316        RenderBlock {P} at (0,2138) size 769x23
    317317          RenderText {#text} at (0,2) size 33x18
    318318            text run at (0,2) width 15 RTL: "\x{627}\x{628}"
     
    320320            text run at (28,2) width 5: "\x{202A}!"
    321321            text run at (33,2) width 0: "\x{202C}"
    322         RenderBlock {P} at (0,2367) size 769x18
     322        RenderBlock {P} at (0,2177) size 769x18
    323323          RenderText {#text} at (0,0) size 49x18
    324324            text run at (0,0) width 44: "ab12(^"
    325325            text run at (44,0) width 5: "\x{202A}!"
    326326            text run at (49,0) width 0: "\x{202C}"
    327         RenderBlock {P} at (0,2401) size 769x19
     327        RenderBlock {P} at (0,2211) size 769x19
    328328          RenderText {#text} at (0,1) size 54x18
    329329            text run at (0,1) width 16: "12"
     
    332332            text run at (48,1) width 6: "\x{202A}!"
    333333            text run at (53,1) width 1: "\x{202C}"
    334         RenderBlock {P} at (0,2436) size 769x28
     334        RenderBlock {P} at (0,2246) size 769x23
    335335          RenderText {#text} at (0,2) size 49x18
    336336            text run at (0,2) width 16: "12"
     
    339339            text run at (44,2) width 5: "\x{202A}!"
    340340            text run at (49,2) width 0: "\x{202C}"
    341         RenderBlock {P} at (0,2480) size 769x28
     341        RenderBlock {P} at (0,2285) size 769x23
    342342          RenderText {#text} at (0,2) size 49x18
    343343            text run at (0,2) width 15: "ab"
     
    346346            text run at (44,2) width 5: "\x{202A}!"
    347347            text run at (49,2) width 0: "\x{202C}"
    348         RenderBlock {P} at (0,2524) size 769x28
     348        RenderBlock {P} at (0,2324) size 769x23
    349349          RenderText {#text} at (0,2) size 54x18
    350350            text run at (0,2) width 16: "\x{661}\x{662}"
     
    353353            text run at (48,2) width 6: "\x{202A}!"
    354354            text run at (53,2) width 1: "\x{202C}"
    355         RenderBlock {P} at (0,2568) size 769x28
     355        RenderBlock {P} at (0,2363) size 769x23
    356356          RenderText {#text} at (0,2) size 49x18
    357357            text run at (0,2) width 16: "\x{661}\x{662}"
     
    360360            text run at (44,2) width 5: "\x{202A}!"
    361361            text run at (49,2) width 0: "\x{202C}"
    362         RenderBlock {P} at (0,2612) size 769x18
     362        RenderBlock {P} at (0,2402) size 769x18
    363363          RenderText {#text} at (0,0) size 25x18
    364364            text run at (0,0) width 7: "\x{202A}?"
     
    366366            text run at (20,0) width 5: "\x{202A}!"
    367367            text run at (25,0) width 0: "\x{202C}"
    368         RenderBlock {P} at (0,2646) size 769x18
     368        RenderBlock {P} at (0,2436) size 769x18
    369369          RenderText {#text} at (0,0) size 25x18
    370370            text run at (0,0) width 7 RTL: "\x{202B}?"
     
    372372            text run at (20,0) width 5: "\x{202A}!"
    373373            text run at (25,0) width 0: "\x{202C}"
    374         RenderBlock {P} at (0,2680) size 769x18
     374        RenderBlock {P} at (0,2470) size 769x18
    375375          RenderText {#text} at (0,0) size 33x18
    376376            text run at (0,0) width 28: "ab(^"
    377377            text run at (28,0) width 5 RTL: "\x{202B}!"
    378378            text run at (33,0) width 0: "\x{202C}"
    379         RenderBlock {P} at (0,2714) size 769x19
     379        RenderBlock {P} at (0,2504) size 769x19
    380380          RenderText {#text} at (0,1) size 38x18
    381381            text run at (0,1) width 5 RTL: "\x{202B}!"
    382382            text run at (5,1) width 33 RTL: "\x{5D0}\x{5D1}(^"
    383383            text run at (37,1) width 1: "\x{202C}"
    384         RenderBlock {P} at (0,2749) size 769x28
     384        RenderBlock {P} at (0,2539) size 769x23
    385385          RenderText {#text} at (0,2) size 33x18
    386386            text run at (0,2) width 5 RTL: "\x{202B}!"
    387387            text run at (5,2) width 28 RTL: "\x{627}\x{628}(^"
    388388            text run at (33,2) width 0: "\x{202C}"
    389         RenderBlock {P} at (0,2793) size 769x18
     389        RenderBlock {P} at (0,2578) size 769x18
    390390          RenderText {#text} at (0,0) size 49x18
    391391            text run at (0,0) width 44: "ab12(^"
    392392            text run at (44,0) width 5 RTL: "\x{202B}!"
    393393            text run at (49,0) width 0: "\x{202C}"
    394         RenderBlock {P} at (0,2827) size 769x19
     394        RenderBlock {P} at (0,2612) size 769x19
    395395          RenderText {#text} at (0,1) size 54x18
    396396            text run at (0,1) width 5 RTL: "\x{202B}!"
     
    399399            text run at (34,1) width 20 RTL: "\x{5D0}\x{5D1}"
    400400            text run at (53,1) width 1: "\x{202C}"
    401         RenderBlock {P} at (0,2862) size 769x28
     401        RenderBlock {P} at (0,2647) size 769x23
    402402          RenderText {#text} at (0,2) size 49x18
    403403            text run at (0,2) width 5 RTL: "\x{202B}!"
     
    406406            text run at (34,2) width 15 RTL: "\x{627}\x{628}"
    407407            text run at (49,2) width 0: "\x{202C}"
    408         RenderBlock {P} at (0,2906) size 769x28
     408        RenderBlock {P} at (0,2686) size 769x23
    409409          RenderText {#text} at (0,2) size 49x18
    410410            text run at (0,2) width 15: "ab"
     
    413413            text run at (33,2) width 16: "\x{661}\x{662}"
    414414            text run at (49,2) width 0: "\x{202C}"
    415         RenderBlock {P} at (0,2950) size 769x28
     415        RenderBlock {P} at (0,2725) size 769x23
    416416          RenderText {#text} at (0,2) size 54x18
    417417            text run at (0,2) width 5 RTL: "\x{202B}!"
     
    420420            text run at (34,2) width 20 RTL: "\x{5D0}\x{5D1}"
    421421            text run at (53,2) width 1: "\x{202C}"
    422         RenderBlock {P} at (0,2994) size 769x28
     422        RenderBlock {P} at (0,2764) size 769x23
    423423          RenderText {#text} at (0,2) size 49x18
    424424            text run at (0,2) width 5 RTL: "\x{202B}!"
     
    427427            text run at (34,2) width 15 RTL: "\x{627}\x{628}"
    428428            text run at (49,2) width 0: "\x{202C}"
    429         RenderBlock {P} at (0,3038) size 769x18
     429        RenderBlock {P} at (0,2803) size 769x18
    430430          RenderText {#text} at (0,0) size 25x18
    431431            text run at (0,0) width 7: "\x{202A}?"
     
    433433            text run at (20,0) width 5 RTL: "\x{202B}!"
    434434            text run at (25,0) width 0: "\x{202C}"
    435         RenderBlock {P} at (0,3072) size 769x18
     435        RenderBlock {P} at (0,2837) size 769x18
    436436          RenderText {#text} at (0,0) size 25x18
    437437            text run at (0,0) width 5 RTL: "\x{202B}!"
     
    439439            text run at (18,0) width 7 RTL: "\x{202B}?"
    440440            text run at (25,0) width 0: "\x{202C}"
    441         RenderBlock {P} at (0,3106) size 769x18
     441        RenderBlock {P} at (0,2871) size 769x18
    442442          RenderText {#text} at (0,0) size 28x18
    443443            text run at (0,0) width 28: "\x{202A}ab(^"
    444444            text run at (28,0) width 0: "\x{202C}"
    445         RenderBlock {P} at (0,3140) size 769x19
     445        RenderBlock {P} at (0,2905) size 769x19
    446446          RenderText {#text} at (0,1) size 33x18
    447447            text run at (0,1) width 20 RTL: "\x{202A}\x{5D0}\x{5D1}"
    448448            text run at (19,1) width 14: "(^"
    449449            text run at (32,1) width 1: "\x{202C}"
    450         RenderBlock {P} at (0,3175) size 769x28
     450        RenderBlock {P} at (0,2940) size 769x23
    451451          RenderText {#text} at (0,2) size 28x18
    452452            text run at (0,2) width 15 RTL: "\x{202A}\x{627}\x{628}"
    453453            text run at (15,2) width 13: "(^"
    454454            text run at (28,2) width 0: "\x{202C}"
    455         RenderBlock {P} at (0,3219) size 769x18
     455        RenderBlock {P} at (0,2979) size 769x18
    456456          RenderText {#text} at (0,0) size 44x18
    457457            text run at (0,0) width 44: "\x{202A}ab12(^"
    458458            text run at (44,0) width 0: "\x{202C}"
    459         RenderBlock {P} at (0,3253) size 769x19
     459        RenderBlock {P} at (0,3013) size 769x19
    460460          RenderText {#text} at (0,1) size 49x18
    461461            text run at (0,1) width 16: "12"
     
    463463            text run at (35,1) width 14: "(^"
    464464            text run at (48,1) width 1: "\x{202C}"
    465         RenderBlock {P} at (0,3288) size 769x28
     465        RenderBlock {P} at (0,3048) size 769x23
    466466          RenderText {#text} at (0,2) size 44x18
    467467            text run at (0,2) width 16: "12"
     
    469469            text run at (31,2) width 13: "(^"
    470470            text run at (44,2) width 0: "\x{202C}"
    471         RenderBlock {P} at (0,3332) size 769x28
     471        RenderBlock {P} at (0,3087) size 769x23
    472472          RenderText {#text} at (0,2) size 44x18
    473473            text run at (0,2) width 15: "\x{202A}ab"
     
    475475            text run at (31,2) width 13: "(^"
    476476            text run at (44,2) width 0: "\x{202C}"
    477         RenderBlock {P} at (0,3376) size 769x28
     477        RenderBlock {P} at (0,3126) size 769x23
    478478          RenderText {#text} at (0,2) size 49x18
    479479            text run at (0,2) width 16: "\x{661}\x{662}"
     
    481481            text run at (35,2) width 14: "(^"
    482482            text run at (48,2) width 1: "\x{202C}"
    483         RenderBlock {P} at (0,3420) size 769x28
     483        RenderBlock {P} at (0,3165) size 769x23
    484484          RenderText {#text} at (0,2) size 44x18
    485485            text run at (0,2) width 16: "\x{661}\x{662}"
     
    487487            text run at (31,2) width 13: "(^"
    488488            text run at (44,2) width 0: "\x{202C}"
    489         RenderBlock {P} at (0,3464) size 769x18
     489        RenderBlock {P} at (0,3204) size 769x18
    490490          RenderText {#text} at (0,0) size 20x18
    491491            text run at (0,0) width 0: "\x{202A}"
     
    493493            text run at (7,0) width 13: "\x{202C}(^"
    494494            text run at (20,0) width 0: "\x{202C}"
    495         RenderBlock {P} at (0,3498) size 769x18
     495        RenderBlock {P} at (0,3238) size 769x18
    496496          RenderText {#text} at (0,0) size 20x18
    497497            text run at (0,0) width 0: "\x{202A}"
     
    499499            text run at (7,0) width 13: "\x{202C}(^"
    500500            text run at (20,0) width 0: "\x{202C}"
    501       RenderBlock {DIV} at (0,3566) size 769x3516
     501      RenderBlock {DIV} at (0,3306) size 769x3256
    502502        RenderBlock {P} at (0,0) size 769x18
    503503          RenderText {#text} at (0,0) size 43x18
     
    507507            text run at (0,1) width 15: "cd"
    508508            text run at (15,1) width 33 RTL: "\x{5D0}\x{5D1}(^"
    509         RenderBlock {P} at (0,69) size 769x28
     509        RenderBlock {P} at (0,69) size 769x23
    510510          RenderText {#text} at (0,2) size 43x18
    511511            text run at (0,2) width 15: "cd"
    512512            text run at (15,2) width 28 RTL: "\x{627}\x{628}(^"
    513         RenderBlock {P} at (0,113) size 769x18
     513        RenderBlock {P} at (0,108) size 769x18
    514514          RenderText {#text} at (0,0) size 59x18
    515515            text run at (0,0) width 59: "ab12(^cd"
    516         RenderBlock {P} at (0,147) size 769x19
     516        RenderBlock {P} at (0,142) size 769x19
    517517          RenderText {#text} at (0,1) size 64x18
    518518            text run at (0,1) width 15: "cd"
     
    520520            text run at (28,1) width 16: "12"
    521521            text run at (44,1) width 20 RTL: "\x{5D0}\x{5D1}"
    522         RenderBlock {P} at (0,182) size 769x28
     522        RenderBlock {P} at (0,177) size 769x23
    523523          RenderText {#text} at (0,2) size 59x18
    524524            text run at (0,2) width 15: "cd"
     
    526526            text run at (28,2) width 16: "12"
    527527            text run at (44,2) width 15 RTL: "\x{627}\x{628}"
    528         RenderBlock {P} at (0,226) size 769x28
     528        RenderBlock {P} at (0,216) size 769x23
    529529          RenderText {#text} at (0,2) size 59x18
    530530            text run at (0,2) width 15: "cd"
    531531            text run at (15,2) width 13 RTL: "(^"
    532532            text run at (28,2) width 31: "ab\x{661}\x{662}"
    533         RenderBlock {P} at (0,270) size 769x28
     533        RenderBlock {P} at (0,255) size 769x23
    534534          RenderText {#text} at (0,2) size 64x18
    535535            text run at (0,2) width 15: "cd"
     
    537537            text run at (28,2) width 16: "\x{661}\x{662}"
    538538            text run at (44,2) width 20 RTL: "\x{5D0}\x{5D1}"
    539         RenderBlock {P} at (0,314) size 769x28
     539        RenderBlock {P} at (0,294) size 769x23
    540540          RenderText {#text} at (0,2) size 59x18
    541541            text run at (0,2) width 15: "cd"
     
    543543            text run at (28,2) width 16: "\x{661}\x{662}"
    544544            text run at (44,2) width 15 RTL: "\x{627}\x{628}"
    545         RenderBlock {P} at (0,358) size 769x18
     545        RenderBlock {P} at (0,333) size 769x18
    546546          RenderText {#text} at (0,0) size 35x18
    547547            text run at (0,0) width 7: "\x{202A}?"
    548548            text run at (7,0) width 28: "\x{202C}(^cd"
    549         RenderBlock {P} at (0,392) size 769x18
     549        RenderBlock {P} at (0,367) size 769x18
    550550          RenderText {#text} at (0,0) size 35x18
    551551            text run at (0,0) width 15: "cd"
    552552            text run at (15,0) width 13 RTL: "\x{202C}(^"
    553553            text run at (28,0) width 7 RTL: "\x{202B}?"
    554         RenderBlock {P} at (0,426) size 769x19
     554        RenderBlock {P} at (0,401) size 769x19
    555555          RenderText {#text} at (0,1) size 43x18
    556556            text run at (0,1) width 28 RTL: "(^\x{5D2}\x{5D3}"
    557557            text run at (27,1) width 16: "ab"
    558         RenderBlock {P} at (0,461) size 769x19
     558        RenderBlock {P} at (0,436) size 769x19
    559559          RenderText {#text} at (0,1) size 48x18
    560560            text run at (0,1) width 48 RTL: "\x{5D0}\x{5D1}(^\x{5D2}\x{5D3}"
    561         RenderBlock {P} at (0,496) size 769x28
     561        RenderBlock {P} at (0,471) size 769x23
    562562          RenderText {#text} at (0,2) size 43x18
    563563            text run at (0,2) width 43 RTL: "\x{627}\x{628}(^\x{5D2}\x{5D3}"
    564         RenderBlock {P} at (0,540) size 769x19
     564        RenderBlock {P} at (0,510) size 769x19
    565565          RenderText {#text} at (0,1) size 59x18
    566566            text run at (0,1) width 28 RTL: "(^\x{5D2}\x{5D3}"
    567567            text run at (27,1) width 32: "ab12"
    568         RenderBlock {P} at (0,575) size 769x19
     568        RenderBlock {P} at (0,545) size 769x19
    569569          RenderText {#text} at (0,1) size 64x18
    570570            text run at (0,1) width 28 RTL: "(^\x{5D2}\x{5D3}"
    571571            text run at (27,1) width 17: "12"
    572572            text run at (43,1) width 21 RTL: "\x{5D0}\x{5D1}"
    573         RenderBlock {P} at (0,610) size 769x28
     573        RenderBlock {P} at (0,580) size 769x23
    574574          RenderText {#text} at (0,2) size 59x18
    575575            text run at (0,2) width 28 RTL: "(^\x{5D2}\x{5D3}"
    576576            text run at (27,2) width 17: "12"
    577577            text run at (43,2) width 16 RTL: "\x{627}\x{628}"
    578         RenderBlock {P} at (0,654) size 769x28
     578        RenderBlock {P} at (0,619) size 769x23
    579579          RenderText {#text} at (0,2) size 59x18
    580580            text run at (0,2) width 28 RTL: "(^\x{5D2}\x{5D3}"
    581581            text run at (27,2) width 32: "ab\x{661}\x{662}"
    582         RenderBlock {P} at (0,698) size 769x28
     582        RenderBlock {P} at (0,658) size 769x23
    583583          RenderText {#text} at (0,2) size 64x18
    584584            text run at (0,2) width 28 RTL: "(^\x{5D2}\x{5D3}"
    585585            text run at (27,2) width 17: "\x{661}\x{662}"
    586586            text run at (43,2) width 21 RTL: "\x{5D0}\x{5D1}"
    587         RenderBlock {P} at (0,742) size 769x28
     587        RenderBlock {P} at (0,697) size 769x23
    588588          RenderText {#text} at (0,2) size 59x18
    589589            text run at (0,2) width 28 RTL: "(^\x{5D2}\x{5D3}"
    590590            text run at (27,2) width 17: "\x{661}\x{662}"
    591591            text run at (43,2) width 16 RTL: "\x{627}\x{628}"
    592         RenderBlock {P} at (0,786) size 769x19
     592        RenderBlock {P} at (0,736) size 769x19
    593593          RenderText {#text} at (0,1) size 35x18
    594594            text run at (0,1) width 28 RTL: "\x{202C}(^\x{5D2}\x{5D3}"
    595595            text run at (27,1) width 8: "\x{202A}?"
    596         RenderBlock {P} at (0,821) size 769x19
     596        RenderBlock {P} at (0,771) size 769x19
    597597          RenderText {#text} at (0,1) size 35x18
    598598            text run at (0,1) width 28 RTL: "\x{202C}(^\x{5D2}\x{5D3}"
    599599            text run at (27,1) width 8 RTL: "\x{202B}?"
    600         RenderBlock {P} at (0,856) size 769x28
     600        RenderBlock {P} at (0,806) size 769x23
    601601          RenderText {#text} at (0,2) size 45x18
    602602            text run at (0,2) width 30 RTL: "(^\x{62C}\x{62F}"
    603603            text run at (30,2) width 15: "ab"
    604         RenderBlock {P} at (0,900) size 769x28
     604        RenderBlock {P} at (0,845) size 769x23
    605605          RenderText {#text} at (0,2) size 50x18
    606606            text run at (0,2) width 50 RTL: "\x{5D0}\x{5D1}(^\x{62C}\x{62F}"
    607         RenderBlock {P} at (0,944) size 769x28
     607        RenderBlock {P} at (0,884) size 769x23
    608608          RenderText {#text} at (0,2) size 45x18
    609609            text run at (0,2) width 45 RTL: "\x{627}\x{628}(^\x{62C}\x{62F}"
    610         RenderBlock {P} at (0,988) size 769x28
     610        RenderBlock {P} at (0,923) size 769x23
    611611          RenderText {#text} at (0,2) size 61x18
    612612            text run at (0,2) width 30 RTL: "(^\x{62C}\x{62F}"
    613613            text run at (30,2) width 31: "ab12"
    614         RenderBlock {P} at (0,1032) size 769x28
     614        RenderBlock {P} at (0,962) size 769x23
    615615          RenderText {#text} at (0,2) size 66x18
    616616            text run at (0,2) width 30 RTL: "(^\x{62C}\x{62F}"
    617617            text run at (30,2) width 16: "12"
    618618            text run at (46,2) width 20 RTL: "\x{5D0}\x{5D1}"
    619         RenderBlock {P} at (0,1076) size 769x28
     619        RenderBlock {P} at (0,1001) size 769x23
    620620          RenderText {#text} at (0,2) size 61x18
    621621            text run at (0,2) width 30 RTL: "(^\x{62C}\x{62F}"
    622622            text run at (30,2) width 16: "12"
    623623            text run at (46,2) width 15 RTL: "\x{627}\x{628}"
    624         RenderBlock {P} at (0,1120) size 769x28
     624        RenderBlock {P} at (0,1040) size 769x23
    625625          RenderText {#text} at (0,2) size 61x18
    626626            text run at (0,2) width 30 RTL: "(^\x{62C}\x{62F}"
    627627            text run at (30,2) width 31: "ab\x{661}\x{662}"
    628         RenderBlock {P} at (0,1164) size 769x28
     628        RenderBlock {P} at (0,1079) size 769x23
    629629          RenderText {#text} at (0,2) size 66x18
    630630            text run at (0,2) width 30 RTL: "(^\x{62C}\x{62F}"
    631631            text run at (30,2) width 16: "\x{661}\x{662}"
    632632            text run at (46,2) width 20 RTL: "\x{5D0}\x{5D1}"
    633         RenderBlock {P} at (0,1208) size 769x28
     633        RenderBlock {P} at (0,1118) size 769x23
    634634          RenderText {#text} at (0,2) size 61x18
    635635            text run at (0,2) width 30 RTL: "(^\x{62C}\x{62F}"
    636636            text run at (30,2) width 16: "\x{661}\x{662}"
    637637            text run at (46,2) width 15 RTL: "\x{627}\x{628}"
    638         RenderBlock {P} at (0,1252) size 769x28
     638        RenderBlock {P} at (0,1157) size 769x23
    639639          RenderText {#text} at (0,2) size 37x18
    640640            text run at (0,2) width 30 RTL: "\x{202C}(^\x{62C}\x{62F}"
    641641            text run at (30,2) width 7: "\x{202A}?"
    642         RenderBlock {P} at (0,1296) size 769x28
     642        RenderBlock {P} at (0,1196) size 769x23
    643643          RenderText {#text} at (0,2) size 37x18
    644644            text run at (0,2) width 30 RTL: "\x{202C}(^\x{62C}\x{62F}"
    645645            text run at (30,2) width 7 RTL: "\x{202B}?"
    646         RenderBlock {P} at (0,1340) size 769x19
     646        RenderBlock {P} at (0,1235) size 769x19
    647647          RenderText {#text} at (0,1) size 63x18
    648648            text run at (0,1) width 7: "z"
    649649            text run at (7,1) width 12 RTL: "\x{5E9}"
    650650            text run at (18,1) width 45: "ab(^34"
    651         RenderBlock {P} at (0,1375) size 769x19
     651        RenderBlock {P} at (0,1270) size 769x19
    652652          RenderText {#text} at (0,1) size 67x18
    653653            text run at (0,1) width 7: "z"
     
    655655            text run at (18,1) width 17: "34"
    656656            text run at (34,1) width 33 RTL: "\x{5D0}\x{5D1}(^"
    657         RenderBlock {P} at (0,1410) size 769x28
     657        RenderBlock {P} at (0,1305) size 769x23
    658658          RenderText {#text} at (0,2) size 63x18
    659659            text run at (0,2) width 7: "z"
     
    661661            text run at (18,2) width 17: "34"
    662662            text run at (34,2) width 29 RTL: "\x{627}\x{628}(^"
    663         RenderBlock {P} at (0,1454) size 769x19
     663        RenderBlock {P} at (0,1344) size 769x19
    664664          RenderText {#text} at (0,1) size 79x18
    665665            text run at (0,1) width 7: "z"
    666666            text run at (7,1) width 12 RTL: "\x{5E9}"
    667667            text run at (18,1) width 61: "ab12(^34"
    668         RenderBlock {P} at (0,1489) size 769x19
     668        RenderBlock {P} at (0,1379) size 769x19
    669669          RenderText {#text} at (0,1) size 83x18
    670670            text run at (0,1) width 7: "z"
     
    674674            text run at (47,1) width 17: "12"
    675675            text run at (63,1) width 20 RTL: "\x{5D0}\x{5D1}"
    676         RenderBlock {P} at (0,1524) size 769x28
     676        RenderBlock {P} at (0,1414) size 769x23
    677677          RenderText {#text} at (0,2) size 79x18
    678678            text run at (0,2) width 7: "z"
     
    682682            text run at (47,2) width 17: "12"
    683683            text run at (63,2) width 16 RTL: "\x{627}\x{628}"
    684         RenderBlock {P} at (0,1568) size 769x28
     684        RenderBlock {P} at (0,1453) size 769x23
    685685          RenderText {#text} at (0,2) size 79x18
    686686            text run at (0,2) width 7: "z"
     
    689689            text run at (34,2) width 14 RTL: "(^"
    690690            text run at (47,2) width 32: "ab\x{661}\x{662}"
    691         RenderBlock {P} at (0,1612) size 769x28
     691        RenderBlock {P} at (0,1492) size 769x23
    692692          RenderText {#text} at (0,2) size 83x18
    693693            text run at (0,2) width 7: "z"
     
    697697            text run at (47,2) width 17: "\x{661}\x{662}"
    698698            text run at (63,2) width 20 RTL: "\x{5D0}\x{5D1}"
    699         RenderBlock {P} at (0,1656) size 769x28
     699        RenderBlock {P} at (0,1531) size 769x23
    700700          RenderText {#text} at (0,2) size 79x18
    701701            text run at (0,2) width 7: "z"
     
    705705            text run at (47,2) width 17: "\x{661}\x{662}"
    706706            text run at (63,2) width 16 RTL: "\x{627}\x{628}"
    707         RenderBlock {P} at (0,1700) size 769x19
     707        RenderBlock {P} at (0,1570) size 769x19
    708708          RenderText {#text} at (0,1) size 55x18
    709709            text run at (0,1) width 7: "z"
     
    711711            text run at (18,1) width 8: "\x{202A}?"
    712712            text run at (25,1) width 30: "\x{202C}(^34"
    713         RenderBlock {P} at (0,1735) size 769x19
     713        RenderBlock {P} at (0,1605) size 769x19
    714714          RenderText {#text} at (0,1) size 55x18
    715715            text run at (0,1) width 7: "z"
     
    718718            text run at (34,1) width 14 RTL: "\x{202C}(^"
    719719            text run at (47,1) width 8 RTL: "\x{202B}?"
    720         RenderBlock {P} at (0,1770) size 769x28
     720        RenderBlock {P} at (0,1640) size 769x23
    721721          RenderText {#text} at (0,2) size 63x18
    722722            text run at (0,2) width 7: "z"
     
    725725            text run at (34,2) width 14 RTL: "(^"
    726726            text run at (47,2) width 16: "ab"
    727         RenderBlock {P} at (0,1814) size 769x28
     727        RenderBlock {P} at (0,1679) size 769x23
    728728          RenderText {#text} at (0,2) size 67x18
    729729            text run at (0,2) width 7: "z"
     
    731731            text run at (18,2) width 17: "\x{663}\x{664}"
    732732            text run at (34,2) width 33 RTL: "\x{5D0}\x{5D1}(^"
    733         RenderBlock {P} at (0,1858) size 769x28
     733        RenderBlock {P} at (0,1718) size 769x23
    734734          RenderText {#text} at (0,2) size 63x18
    735735            text run at (0,2) width 7: "z"
     
    737737            text run at (18,2) width 17: "\x{663}\x{664}"
    738738            text run at (34,2) width 29 RTL: "\x{627}\x{628}(^"
    739         RenderBlock {P} at (0,1902) size 769x28
     739        RenderBlock {P} at (0,1757) size 769x23
    740740          RenderText {#text} at (0,2) size 79x18
    741741            text run at (0,2) width 7: "z"
     
    744744            text run at (34,2) width 14 RTL: "(^"
    745745            text run at (47,2) width 32: "ab12"
    746         RenderBlock {P} at (0,1946) size 769x28
     746        RenderBlock {P} at (0,1796) size 769x23
    747747          RenderText {#text} at (0,2) size 83x18
    748748            text run at (0,2) width 7: "z"
     
    752752            text run at (47,2) width 17: "12"
    753753            text run at (63,2) width 20 RTL: "\x{5D0}\x{5D1}"
    754         RenderBlock {P} at (0,1990) size 769x28
     754        RenderBlock {P} at (0,1835) size 769x23
    755755          RenderText {#text} at (0,2) size 79x18
    756756            text run at (0,2) width 7: "z"
     
    760760            text run at (47,2) width 17: "12"
    761761            text run at (63,2) width 16 RTL: "\x{627}\x{628}"
    762         RenderBlock {P} at (0,2034) size 769x28
     762        RenderBlock {P} at (0,1874) size 769x23
    763763          RenderText {#text} at (0,2) size 79x18
    764764            text run at (0,2) width 7: "z"
     
    767767            text run at (34,2) width 14 RTL: "(^"
    768768            text run at (47,2) width 32: "ab\x{661}\x{662}"
    769         RenderBlock {P} at (0,2078) size 769x28
     769        RenderBlock {P} at (0,1913) size 769x23
    770770          RenderText {#text} at (0,2) size 83x18
    771771            text run at (0,2) width 7: "z"
     
    775775            text run at (47,2) width 17: "\x{661}\x{662}"
    776776            text run at (63,2) width 20 RTL: "\x{5D0}\x{5D1}"
    777         RenderBlock {P} at (0,2122) size 769x28
     777        RenderBlock {P} at (0,1952) size 769x23
    778778          RenderText {#text} at (0,2) size 79x18
    779779            text run at (0,2) width 7: "z"
     
    783783            text run at (47,2) width 17: "\x{661}\x{662}"
    784784            text run at (63,2) width 16 RTL: "\x{627}\x{628}"
    785         RenderBlock {P} at (0,2166) size 769x28
     785        RenderBlock {P} at (0,1991) size 769x23
    786786          RenderText {#text} at (0,2) size 55x18
    787787            text run at (0,2) width 7: "z"
     
    790790            text run at (34,2) width 14 RTL: "\x{202C}(^"
    791791            text run at (47,2) width 8: "\x{202A}?"
    792         RenderBlock {P} at (0,2210) size 769x28
     792        RenderBlock {P} at (0,2030) size 769x23
    793793          RenderText {#text} at (0,2) size 55x18
    794794            text run at (0,2) width 7: "z"
     
    797797            text run at (34,2) width 14 RTL: "\x{202C}(^"
    798798            text run at (47,2) width 8 RTL: "\x{202B}?"
    799         RenderBlock {P} at (0,2254) size 769x18
     799        RenderBlock {P} at (0,2069) size 769x18
    800800          RenderText {#text} at (0,0) size 33x18
    801801            text run at (0,0) width 0 RTL: "\x{202C}"
    802802            text run at (0,0) width 28: "ab(^"
    803803            text run at (28,0) width 5: "\x{202A}!"
    804         RenderBlock {P} at (0,2288) size 769x19
     804        RenderBlock {P} at (0,2103) size 769x19
    805805          RenderText {#text} at (0,1) size 38x18
    806806            text run at (0,1) width 0 RTL: "\x{202C}"
    807807            text run at (0,1) width 5: "\x{202A}!"
    808808            text run at (5,1) width 33 RTL: "\x{5D0}\x{5D1}(^"
    809         RenderBlock {P} at (0,2323) size 769x28
     809        RenderBlock {P} at (0,2138) size 769x23
    810810          RenderText {#text} at (0,2) size 33x18
    811811            text run at (0,2) width 0 RTL: "\x{202C}"
    812812            text run at (0,2) width 5: "\x{202A}!"
    813813            text run at (5,2) width 28 RTL: "\x{627}\x{628}(^"
    814         RenderBlock {P} at (0,2367) size 769x18
     814        RenderBlock {P} at (0,2177) size 769x18
    815815          RenderText {#text} at (0,0) size 49x18
    816816            text run at (0,0) width 0 RTL: "\x{202C}"
    817817            text run at (0,0) width 44: "ab12(^"
    818818            text run at (44,0) width 5: "\x{202A}!"
    819         RenderBlock {P} at (0,2401) size 769x19
     819        RenderBlock {P} at (0,2211) size 769x19
    820820          RenderText {#text} at (0,1) size 54x18
    821821            text run at (0,1) width 0 RTL: "\x{202C}"
     
    824824            text run at (18,1) width 16: "12"
    825825            text run at (34,1) width 20 RTL: "\x{5D0}\x{5D1}"
    826         RenderBlock {P} at (0,2436) size 769x28
     826        RenderBlock {P} at (0,2246) size 769x23
    827827          RenderText {#text} at (0,2) size 49x18
    828828            text run at (0,2) width 0 RTL: "\x{202C}"
     
    831831            text run at (18,2) width 16: "12"
    832832            text run at (34,2) width 15 RTL: "\x{627}\x{628}"
    833         RenderBlock {P} at (0,2480) size 769x28
     833        RenderBlock {P} at (0,2285) size 769x23
    834834          RenderText {#text} at (0,2) size 49x18
    835835            text run at (0,2) width 0 RTL: "\x{202C}"
     
    837837            text run at (5,2) width 13 RTL: "(^"
    838838            text run at (18,2) width 31: "ab\x{661}\x{662}"
    839         RenderBlock {P} at (0,2524) size 769x28
     839        RenderBlock {P} at (0,2324) size 769x23
    840840          RenderText {#text} at (0,2) size 54x18
    841841            text run at (0,2) width 0 RTL: "\x{202C}"
     
    844844            text run at (18,2) width 16: "\x{661}\x{662}"
    845845            text run at (34,2) width 20 RTL: "\x{5D0}\x{5D1}"
    846         RenderBlock {P} at (0,2568) size 769x28
     846        RenderBlock {P} at (0,2363) size 769x23
    847847          RenderText {#text} at (0,2) size 49x18
    848848            text run at (0,2) width 0 RTL: "\x{202C}"
     
    851851            text run at (18,2) width 16: "\x{661}\x{662}"
    852852            text run at (34,2) width 15 RTL: "\x{627}\x{628}"
    853         RenderBlock {P} at (0,2612) size 769x18
     853        RenderBlock {P} at (0,2402) size 769x18
    854854          RenderText {#text} at (0,0) size 25x18
    855855            text run at (0,0) width 0 RTL: "\x{202C}"
     
    857857            text run at (7,0) width 13: "\x{202C}(^"
    858858            text run at (20,0) width 5: "\x{202A}!"
    859         RenderBlock {P} at (0,2646) size 769x18
     859        RenderBlock {P} at (0,2436) size 769x18
    860860          RenderText {#text} at (0,0) size 25x18
    861861            text run at (0,0) width 0 RTL: "\x{202C}"
     
    863863            text run at (5,0) width 13 RTL: "\x{202C}(^"
    864864            text run at (18,0) width 7 RTL: "\x{202B}?"
    865         RenderBlock {P} at (0,2680) size 769x18
     865        RenderBlock {P} at (0,2470) size 769x18
    866866          RenderText {#text} at (0,0) size 33x18
    867867            text run at (0,0) width 0 RTL: "\x{202C}"
     
    869869            text run at (5,0) width 13 RTL: "(^"
    870870            text run at (18,0) width 15: "ab"
    871         RenderBlock {P} at (0,2714) size 769x19
     871        RenderBlock {P} at (0,2504) size 769x19
    872872          RenderText {#text} at (0,1) size 38x18
    873873            text run at (0,1) width 0 RTL: "\x{202C}"
    874874            text run at (0,1) width 5 RTL: "\x{202B}!"
    875875            text run at (5,1) width 33 RTL: "\x{5D0}\x{5D1}(^"
    876         RenderBlock {P} at (0,2749) size 769x28
     876        RenderBlock {P} at (0,2539) size 769x23
    877877          RenderText {#text} at (0,2) size 33x18
    878878            text run at (0,2) width 0 RTL: "\x{202C}"
    879879            text run at (0,2) width 5 RTL: "\x{202B}!"
    880880            text run at (5,2) width 28 RTL: "\x{627}\x{628}(^"
    881         RenderBlock {P} at (0,2793) size 769x18
     881        RenderBlock {P} at (0,2578) size 769x18
    882882          RenderText {#text} at (0,0) size 49x18
    883883            text run at (0,0) width 0 RTL: "\x{202C}"
     
    885885            text run at (5,0) width 13 RTL: "(^"
    886886            text run at (18,0) width 31: "ab12"
    887         RenderBlock {P} at (0,2827) size 769x19
     887        RenderBlock {P} at (0,2612) size 769x19
    888888          RenderText {#text} at (0,1) size 54x18
    889889            text run at (0,1) width 0 RTL: "\x{202C}"
     
    892892            text run at (18,1) width 16: "12"
    893893            text run at (34,1) width 20 RTL: "\x{5D0}\x{5D1}"
    894         RenderBlock {P} at (0,2862) size 769x28
     894        RenderBlock {P} at (0,2647) size 769x23
    895895          RenderText {#text} at (0,2) size 49x18
    896896            text run at (0,2) width 0 RTL: "\x{202C}"
     
    899899            text run at (18,2) width 16: "12"
    900900            text run at (34,2) width 15 RTL: "\x{627}\x{628}"
    901         RenderBlock {P} at (0,2906) size 769x28
     901        RenderBlock {P} at (0,2686) size 769x23
    902902          RenderText {#text} at (0,2) size 49x18
    903903            text run at (0,2) width 0 RTL: "\x{202C}"
     
    905905            text run at (5,2) width 13 RTL: "(^"
    906906            text run at (18,2) width 31: "ab\x{661}\x{662}"
    907         RenderBlock {P} at (0,2950) size 769x28
     907        RenderBlock {P} at (0,2725) size 769x23
    908908          RenderText {#text} at (0,2) size 54x18
    909909            text run at (0,2) width 0 RTL: "\x{202C}"
     
    912912            text run at (18,2) width 16: "\x{661}\x{662}"
    913913            text run at (34,2) width 20 RTL: "\x{5D0}\x{5D1}"
    914         RenderBlock {P} at (0,2994) size 769x28
     914        RenderBlock {P} at (0,2764) size 769x23
    915915          RenderText {#text} at (0,2) size 49x18
    916916            text run at (0,2) width 0 RTL: "\x{202C}"
     
    919919            text run at (18,2) width 16: "\x{661}\x{662}"
    920920            text run at (34,2) width 15 RTL: "\x{627}\x{628}"
    921         RenderBlock {P} at (0,3038) size 769x18
     921        RenderBlock {P} at (0,2803) size 769x18
    922922          RenderText {#text} at (0,0) size 25x18
    923923            text run at (0,0) width 0 RTL: "\x{202C}"
     
    925925            text run at (5,0) width 13 RTL: "\x{202C}(^"
    926926            text run at (18,0) width 7: "\x{202A}?"
    927         RenderBlock {P} at (0,3072) size 769x18
     927        RenderBlock {P} at (0,2837) size 769x18
    928928          RenderText {#text} at (0,0) size 25x18
    929929            text run at (0,0) width 0 RTL: "\x{202C}"
     
    931931            text run at (5,0) width 13 RTL: "\x{202C}(^"
    932932            text run at (18,0) width 7 RTL: "\x{202B}?"
    933         RenderBlock {P} at (0,3106) size 769x18
     933        RenderBlock {P} at (0,2871) size 769x18
    934934          RenderText {#text} at (0,0) size 28x18
    935935            text run at (0,0) width 0 RTL: "\x{202C}"
    936936            text run at (0,0) width 28: "\x{202A}ab(^"
    937         RenderBlock {P} at (0,3140) size 769x19
     937        RenderBlock {P} at (0,2905) size 769x19
    938938          RenderText {#text} at (0,1) size 33x18
    939939            text run at (0,1) width 0 RTL: "\x{202C}"
    940940            text run at (0,1) width 20 RTL: "\x{202A}\x{5D0}\x{5D1}"
    941941            text run at (19,1) width 14: "(^"
    942         RenderBlock {P} at (0,3175) size 769x28
     942        RenderBlock {P} at (0,2940) size 769x23
    943943          RenderText {#text} at (0,2) size 28x18
    944944            text run at (0,2) width 0 RTL: "\x{202C}"
    945945            text run at (0,2) width 15 RTL: "\x{202A}\x{627}\x{628}"
    946946            text run at (15,2) width 13: "(^"
    947         RenderBlock {P} at (0,3219) size 769x18
     947        RenderBlock {P} at (0,2979) size 769x18
    948948          RenderText {#text} at (0,0) size 44x18
    949949            text run at (0,0) width 0 RTL: "\x{202C}"
    950950            text run at (0,0) width 44: "\x{202A}ab12(^"
    951         RenderBlock {P} at (0,3253) size 769x19
     951        RenderBlock {P} at (0,3013) size 769x19
    952952          RenderText {#text} at (0,1) size 49x18
    953953            text run at (0,1) width 0 RTL: "\x{202C}"
     
    955955            text run at (16,1) width 20 RTL: "\x{202A}\x{5D0}\x{5D1}"
    956956            text run at (35,1) width 14: "(^"
    957         RenderBlock {P} at (0,3288) size 769x28
     957        RenderBlock {P} at (0,3048) size 769x23
    958958          RenderText {#text} at (0,2) size 44x18
    959959            text run at (0,2) width 0 RTL: "\x{202C}"
     
    961961            text run at (16,2) width 15 RTL: "\x{202A}\x{627}\x{628}"
    962962            text run at (31,2) width 13: "(^"
    963         RenderBlock {P} at (0,3332) size 769x28
     963        RenderBlock {P} at (0,3087) size 769x23
    964964          RenderText {#text} at (0,2) size 44x18
    965965            text run at (0,2) width 0 RTL: "\x{202C}"
     
    967967            text run at (15,2) width 16: "\x{661}\x{662}"
    968968            text run at (31,2) width 13: "(^"
    969         RenderBlock {P} at (0,3376) size 769x28
     969        RenderBlock {P} at (0,3126) size 769x23
    970970          RenderText {#text} at (0,2) size 49x18
    971971            text run at (0,2) width 0 RTL: "\x{202C}"
     
    973973            text run at (16,2) width 20 RTL: "\x{202A}\x{5D0}\x{5D1}"
    974974            text run at (35,2) width 14: "(^"
    975         RenderBlock {P} at (0,3420) size 769x28
     975        RenderBlock {P} at (0,3165) size 769x23
    976976          RenderText {#text} at (0,2) size 44x18
    977977            text run at (0,2) width 0 RTL: "\x{202C}"
     
    979979            text run at (16,2) width 15 RTL: "\x{202A}\x{627}\x{628}"
    980980            text run at (31,2) width 13: "(^"
    981         RenderBlock {P} at (0,3464) size 769x18
     981        RenderBlock {P} at (0,3204) size 769x18
    982982          RenderText {#text} at (0,0) size 20x18
    983983            text run at (0,0) width 0 RTL: "\x{202C}"
     
    985985            text run at (0,0) width 7: "\x{202A}?"
    986986            text run at (7,0) width 13: "\x{202C}(^"
    987         RenderBlock {P} at (0,3498) size 769x18
     987        RenderBlock {P} at (0,3238) size 769x18
    988988          RenderText {#text} at (0,0) size 20x18
    989989            text run at (0,0) width 0 RTL: "\x{202C}"
  • trunk/LayoutTests/platform/mac/platform/mac/fast/text/international/Geeza-Pro-vertical-metrics-adjustment-expected.checksum

    r72320 r83126  
    1 c08fca225de6c2b98d18b853e6bb9028
     135aa8c335badd4ef26f3a1211c3b6a9c
  • trunk/Source/WebCore/ChangeLog

    r83123 r83126  
     12011-04-06  Dan Bernstein  <mitz@apple.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        <rdar://problem/9084761> REGRESSION (r73993): Default Arabic line spacing has gotten very loose when the specified font is not Arabic
     6        https://bugs.webkit.org/show_bug.cgi?id=58002
     7
     8        * platform/graphics/mac/SimpleFontDataMac.mm:
     9        (WebCore::SimpleFontData::platformInit): The version of Geeza Pro in Snow Leopard
     10        does not require the vertical metrics tweaks that were needed in Leopard. That the
     11        tweaks were being applied went mostly unnoticed until r73993, because until then it
     12        only affected cases where Geeza Pro was specified, not when it occurred as a fallback
     13        font.
     14
    1152011-04-06  Roland Steiner  <rolandsteiner@chromium.org>
    216
  • trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm

    r80755 r83126  
    242242    if ([familyName isEqualToString:@"Times"] || [familyName isEqualToString:@"Helvetica"] || [familyName isEqualToString:@"Courier"])
    243243        ascent += floorf(((ascent + descent) * 0.15f) + 0.5f);
     244#if defined(BUILDING_ON_LEOPARD)
    244245    else if ([familyName isEqualToString:@"Geeza Pro"]) {
    245246        // Geeza Pro has glyphs that draw slightly above the ascent or far below the descent. Adjust
     
    249250        descent *= 2.f;
    250251    }
     252#endif
    251253
    252254    // Compute and store line spacing, before the line metrics hacks are applied.
Note: See TracChangeset for help on using the changeset viewer.