Changeset 224155 in webkit


Ignore:
Timestamp:
Oct 28, 2017 7:45:27 PM (6 years ago)
Author:
mmaxfield@apple.com
Message:

[iOS] Unify Font::platformCharWidthInit() with macOS
​https://bugs.webkit.org/show_bug.cgi?id=178951
<rdar://problem/7848198>

Reviewed by Zalan Bujtas.

Source/WebCore:

The only reason these codepaths are different is because historically this codepath
didn't work with GS fonts (which we don't use anymore).

Tests: fast/forms/search-styled.html

fast/forms/text-control-intrinsic-widths.html
fast/forms/textarea-width.html

  • platform/graphics/cocoa/FontCocoa.mm:

(WebCore::Font::platformCharWidthInit):

LayoutTests:

Updating expected results.

  • platform/ios-wk2/fast/forms/search-styled-expected.txt: Removed.
  • platform/ios-wk2/fast/forms/text-control-intrinsic-widths-expected.txt: Removed.
  • platform/ios-wk2/fast/forms/textarea-width-expected.txt: Removed.
  • platform/ios/fast/forms/search-styled-expected.txt:
  • platform/ios/fast/forms/text-control-intrinsic-widths-expected.txt:
  • platform/ios/fast/forms/textarea-width-expected.txt:
Location:
trunk
Files:
3 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r224153 r224155  
     12017-10-28  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        [iOS] Unify Font::platformCharWidthInit() with macOS
     4        https://bugs.webkit.org/show_bug.cgi?id=178951
     5        <rdar://problem/7848198>
     6
     7        Reviewed by Zalan Bujtas.
     8
     9        Updating expected results.
     10
     11        * platform/ios-wk2/fast/forms/search-styled-expected.txt: Removed.
     12        * platform/ios-wk2/fast/forms/text-control-intrinsic-widths-expected.txt: Removed.
     13        * platform/ios-wk2/fast/forms/textarea-width-expected.txt: Removed.
     14        * platform/ios/fast/forms/search-styled-expected.txt:
     15        * platform/ios/fast/forms/text-control-intrinsic-widths-expected.txt:
     16        * platform/ios/fast/forms/textarea-width-expected.txt:
     17
    1182017-10-28  Chris Dumez  <cdumez@apple.com>
    219

  • trunk/LayoutTests/platform/ios/fast/forms/search-styled-expected.txt

    r179104 r224155  
    44  RenderBlock {HTML} at (0,0) size 800x43
    55    RenderBody {BODY} at (8,8) size 784x27
    6       RenderTextControl {INPUT} at (2,2) size 162x23 [bgcolor=#FFFFFF] [border: (1px solid #BDC7D8)]
    7         RenderFlexibleBox {DIV} at (18,4) size 140x15
     6      RenderTextControl {INPUT} at (2,2) size 142x23 [bgcolor=#FFFFFF] [border: (1px solid #BDC7D8)]
     7        RenderFlexibleBox {DIV} at (18,4) size 120x15
    88          RenderBlock {DIV} at (0,7) size 0x0
    9           RenderBlock {DIV} at (0,0) size 140x15
    10           RenderBlock {DIV} at (140,7) size 0x0
     9          RenderBlock {DIV} at (0,0) size 120x15
     10          RenderBlock {DIV} at (120,7) size 0x0
    1111      RenderText {#text} at (0,0) size 0x0
    12 layer at (28,14) size 140x15
    13   RenderBlock {DIV} at (18,4) size 140x15 [color=#A9A9A9]
    14     RenderText {#text} at (0,0) size 99x15
    15       text run at (0,0) width 99: "Search for Events"
    16 layer at (28,14) size 140x15
    17   RenderBlock {DIV} at (0,0) size 140x15
     12layer at (28,14) size 120x15
     13  RenderBlock {DIV} at (18,4) size 120x15 [color=#A9A9A9]
     14    RenderText {#text} at (0,0) size 98x15
     15      text run at (0,0) width 98: "Search for Events"
     16layer at (28,14) size 120x15
     17  RenderBlock {DIV} at (0,0) size 120x15

  • trunk/LayoutTests/platform/ios/fast/forms/text-control-intrinsic-widths-expected.txt

    r179104 r224155  
    1919
    2020textarea
    21 cols=1 clientWidth=17
    22 cols=2 clientWidth=24
    23 cols=3 clientWidth=31
    24 cols=4 clientWidth=38
    25 cols=5 clientWidth=45
    26 cols=10 clientWidth=80
    27 cols=20 clientWidth=150
    28 cols=50 clientWidth=360
    29 cols=100 clientWidth=710
    30 cols=500 clientWidth=3507
    31 cols=1000 clientWidth=7004
     21cols=1 clientWidth=32
     22cols=2 clientWidth=39
     23cols=3 clientWidth=46
     24cols=4 clientWidth=53
     25cols=5 clientWidth=60
     26cols=10 clientWidth=95
     27cols=20 clientWidth=165
     28cols=50 clientWidth=375
     29cols=100 clientWidth=725
     30cols=500 clientWidth=3522
     31cols=1000 clientWidth=7019
    3232
    3333Courier
    … …  
    4646
    4747textarea
    48 cols=1 clientWidth=17
    49 cols=2 clientWidth=24
    50 cols=3 clientWidth=30
    51 cols=4 clientWidth=37
    52 cols=5 clientWidth=44
    53 cols=10 clientWidth=77
    54 cols=20 clientWidth=143
    55 cols=50 clientWidth=341
    56 cols=100 clientWidth=671
    57 cols=500 clientWidth=3311
    58 cols=1000 clientWidth=6612
     48cols=1 clientWidth=32
     49cols=2 clientWidth=39
     50cols=3 clientWidth=45
     51cols=4 clientWidth=52
     52cols=5 clientWidth=59
     53cols=10 clientWidth=92
     54cols=20 clientWidth=158
     55cols=50 clientWidth=356
     56cols=100 clientWidth=686
     57cols=500 clientWidth=3326
     58cols=1000 clientWidth=6627
    5959
    6060Helvetica
    … …  
    7373
    7474textarea
    75 cols=1 clientWidth=17
    76 cols=2 clientWidth=23
    77 cols=3 clientWidth=29
    78 cols=4 clientWidth=35
    79 cols=5 clientWidth=41
    80 cols=10 clientWidth=72
    81 cols=20 clientWidth=133
    82 cols=50 clientWidth=316
    83 cols=100 clientWidth=622
    84 cols=500 clientWidth=3069
    85 cols=1000 clientWidth=6128
     75cols=1 clientWidth=32
     76cols=2 clientWidth=38
     77cols=3 clientWidth=44
     78cols=4 clientWidth=50
     79cols=5 clientWidth=56
     80cols=10 clientWidth=87
     81cols=20 clientWidth=148
     82cols=50 clientWidth=331
     83cols=100 clientWidth=637
     84cols=500 clientWidth=3084
     85cols=1000 clientWidth=6143
    8686
    8787Monaco
    … …  
    100100
    101101textarea
    102 cols=1 clientWidth=17
    103 cols=2 clientWidth=24
    104 cols=3 clientWidth=30
    105 cols=4 clientWidth=37
    106 cols=5 clientWidth=44
    107 cols=10 clientWidth=77
    108 cols=20 clientWidth=143
    109 cols=50 clientWidth=341
    110 cols=100 clientWidth=671
    111 cols=500 clientWidth=3311
    112 cols=1000 clientWidth=6612
     102cols=1 clientWidth=32
     103cols=2 clientWidth=39
     104cols=3 clientWidth=45
     105cols=4 clientWidth=52
     106cols=5 clientWidth=59
     107cols=10 clientWidth=92
     108cols=20 clientWidth=158
     109cols=50 clientWidth=356
     110cols=100 clientWidth=686
     111cols=500 clientWidth=3326
     112cols=1000 clientWidth=6627
    113113
    114114Times
    … …  
    127127
    128128textarea
    129 cols=1 clientWidth=16
    130 cols=2 clientWidth=21
    131 cols=3 clientWidth=27
    132 cols=4 clientWidth=32
    133 cols=5 clientWidth=38
     129cols=1 clientWidth=31
     130cols=2 clientWidth=36
     131cols=3 clientWidth=42
     132cols=4 clientWidth=47
     133cols=5 clientWidth=53
     134cols=10 clientWidth=80
     135cols=20 clientWidth=135
     136cols=50 clientWidth=300
     137cols=100 clientWidth=575
     138cols=500 clientWidth=2775
     139cols=1000 clientWidth=5525
     140
     141Andale Mono
     142input
     143size=1 clientWidth=15
     144size=2 clientWidth=19
     145size=3 clientWidth=23
     146size=4 clientWidth=27
     147size=5 clientWidth=31
     148size=10 clientWidth=51
     149size=20 clientWidth=91
     150size=50 clientWidth=211
     151size=100 clientWidth=411
     152size=500 clientWidth=2011
     153size=1000 clientWidth=4011
     154
     155textarea
     156cols=1 clientWidth=29
     157cols=2 clientWidth=33
     158cols=3 clientWidth=37
     159cols=4 clientWidth=41
     160cols=5 clientWidth=45
    134161cols=10 clientWidth=65
    135 cols=20 clientWidth=120
    136 cols=50 clientWidth=285
    137 cols=100 clientWidth=560
    138 cols=500 clientWidth=2760
    139 cols=1000 clientWidth=5510
    140 
    141 Andale Mono
     162cols=20 clientWidth=105
     163cols=50 clientWidth=225
     164cols=100 clientWidth=425
     165cols=500 clientWidth=2025
     166cols=1000 clientWidth=4025
     167
     168Arial
     169input
     170size=1 clientWidth=16
     171size=2 clientWidth=21
     172size=3 clientWidth=26
     173size=4 clientWidth=31
     174size=5 clientWidth=36
     175size=10 clientWidth=61
     176size=20 clientWidth=111
     177size=50 clientWidth=261
     178size=100 clientWidth=511
     179size=500 clientWidth=2511
     180size=1000 clientWidth=5011
     181
     182textarea
     183cols=1 clientWidth=30
     184cols=2 clientWidth=35
     185cols=3 clientWidth=40
     186cols=4 clientWidth=45
     187cols=5 clientWidth=50
     188cols=10 clientWidth=75
     189cols=20 clientWidth=125
     190cols=50 clientWidth=275
     191cols=100 clientWidth=525
     192cols=500 clientWidth=2525
     193cols=1000 clientWidth=5025
     194
     195Comic Sans MS
     196input
     197size=1 clientWidth=15
     198size=2 clientWidth=19
     199size=3 clientWidth=23
     200size=4 clientWidth=27
     201size=5 clientWidth=31
     202size=10 clientWidth=51
     203size=20 clientWidth=91
     204size=50 clientWidth=211
     205size=100 clientWidth=411
     206size=500 clientWidth=2011
     207size=1000 clientWidth=4011
     208
     209textarea
     210cols=1 clientWidth=29
     211cols=2 clientWidth=33
     212cols=3 clientWidth=37
     213cols=4 clientWidth=41
     214cols=5 clientWidth=45
     215cols=10 clientWidth=65
     216cols=20 clientWidth=105
     217cols=50 clientWidth=225
     218cols=100 clientWidth=425
     219cols=500 clientWidth=2025
     220cols=1000 clientWidth=4025
     221
     222Courier New
     223input
     224size=1 clientWidth=18
     225size=2 clientWidth=25
     226size=3 clientWidth=32
     227size=4 clientWidth=39
     228size=5 clientWidth=46
     229size=10 clientWidth=81
     230size=20 clientWidth=151
     231size=50 clientWidth=361
     232size=100 clientWidth=711
     233size=500 clientWidth=3511
     234size=1000 clientWidth=7011
     235
     236textarea
     237cols=1 clientWidth=32
     238cols=2 clientWidth=39
     239cols=3 clientWidth=46
     240cols=4 clientWidth=53
     241cols=5 clientWidth=60
     242cols=10 clientWidth=95
     243cols=20 clientWidth=165
     244cols=50 clientWidth=375
     245cols=100 clientWidth=725
     246cols=500 clientWidth=3525
     247cols=1000 clientWidth=7025
     248
     249Georgia
     250input
     251size=1 clientWidth=16
     252size=2 clientWidth=21
     253size=3 clientWidth=26
     254size=4 clientWidth=31
     255size=5 clientWidth=36
     256size=10 clientWidth=61
     257size=20 clientWidth=111
     258size=50 clientWidth=261
     259size=100 clientWidth=511
     260size=500 clientWidth=2511
     261size=1000 clientWidth=5011
     262
     263textarea
     264cols=1 clientWidth=30
     265cols=2 clientWidth=35
     266cols=3 clientWidth=40
     267cols=4 clientWidth=45
     268cols=5 clientWidth=50
     269cols=10 clientWidth=75
     270cols=20 clientWidth=125
     271cols=50 clientWidth=275
     272cols=100 clientWidth=525
     273cols=500 clientWidth=2525
     274cols=1000 clientWidth=5025
     275
     276Times New Roman
     277input
     278size=1 clientWidth=15
     279size=2 clientWidth=19
     280size=3 clientWidth=23
     281size=4 clientWidth=27
     282size=5 clientWidth=31
     283size=10 clientWidth=51
     284size=20 clientWidth=91
     285size=50 clientWidth=211
     286size=100 clientWidth=411
     287size=500 clientWidth=2011
     288size=1000 clientWidth=4011
     289
     290textarea
     291cols=1 clientWidth=29
     292cols=2 clientWidth=33
     293cols=3 clientWidth=37
     294cols=4 clientWidth=41
     295cols=5 clientWidth=45
     296cols=10 clientWidth=65
     297cols=20 clientWidth=105
     298cols=50 clientWidth=225
     299cols=100 clientWidth=425
     300cols=500 clientWidth=2025
     301cols=1000 clientWidth=4025
     302
     303Trebuchet MS
     304input
     305size=1 clientWidth=16
     306size=2 clientWidth=21
     307size=3 clientWidth=26
     308size=4 clientWidth=31
     309size=5 clientWidth=36
     310size=10 clientWidth=61
     311size=20 clientWidth=111
     312size=50 clientWidth=261
     313size=100 clientWidth=511
     314size=500 clientWidth=2511
     315size=1000 clientWidth=5011
     316
     317textarea
     318cols=1 clientWidth=30
     319cols=2 clientWidth=35
     320cols=3 clientWidth=40
     321cols=4 clientWidth=45
     322cols=5 clientWidth=50
     323cols=10 clientWidth=75
     324cols=20 clientWidth=125
     325cols=50 clientWidth=275
     326cols=100 clientWidth=525
     327cols=500 clientWidth=2525
     328cols=1000 clientWidth=5025
     329
     330Verdana
    142331input
    143332size=1 clientWidth=17
    … …  
    154343
    155344textarea
    156 cols=1 clientWidth=16
    157 cols=2 clientWidth=22
    158 cols=3 clientWidth=28
    159 cols=4 clientWidth=34
    160 cols=5 clientWidth=40
    161 cols=10 clientWidth=70
    162 cols=20 clientWidth=130
    163 cols=50 clientWidth=310
    164 cols=100 clientWidth=610
    165 cols=500 clientWidth=3010
    166 cols=1000 clientWidth=6010
    167 
    168 Arial
    169 input
    170 size=1 clientWidth=17
    171 size=2 clientWidth=23
    172 size=3 clientWidth=29
    173 size=4 clientWidth=35
    174 size=5 clientWidth=41
    175 size=10 clientWidth=71
    176 size=20 clientWidth=131
    177 size=50 clientWidth=311
    178 size=100 clientWidth=611
    179 size=500 clientWidth=3011
    180 size=1000 clientWidth=6011
    181 
    182 textarea
    183 cols=1 clientWidth=16
    184 cols=2 clientWidth=22
    185 cols=3 clientWidth=28
    186 cols=4 clientWidth=34
    187 cols=5 clientWidth=40
    188 cols=10 clientWidth=70
    189 cols=20 clientWidth=130
    190 cols=50 clientWidth=310
    191 cols=100 clientWidth=610
    192 cols=500 clientWidth=3010
    193 cols=1000 clientWidth=6010
    194 
    195 Comic Sans MS
    196 input
    197 size=1 clientWidth=17
    198 size=2 clientWidth=23
    199 size=3 clientWidth=29
    200 size=4 clientWidth=35
    201 size=5 clientWidth=41
    202 size=10 clientWidth=71
    203 size=20 clientWidth=131
    204 size=50 clientWidth=311
    205 size=100 clientWidth=611
    206 size=500 clientWidth=3011
    207 size=1000 clientWidth=6011
    208 
    209 textarea
    210 cols=1 clientWidth=16
    211 cols=2 clientWidth=22
    212 cols=3 clientWidth=28
    213 cols=4 clientWidth=34
    214 cols=5 clientWidth=40
    215 cols=10 clientWidth=70
    216 cols=20 clientWidth=130
    217 cols=50 clientWidth=310
    218 cols=100 clientWidth=610
    219 cols=500 clientWidth=3010
    220 cols=1000 clientWidth=6010
    221 
    222 Courier New
    223 input
    224 size=1 clientWidth=18
    225 size=2 clientWidth=25
    226 size=3 clientWidth=32
    227 size=4 clientWidth=39
    228 size=5 clientWidth=46
    229 size=10 clientWidth=81
    230 size=20 clientWidth=151
    231 size=50 clientWidth=361
    232 size=100 clientWidth=711
    233 size=500 clientWidth=3511
    234 size=1000 clientWidth=7011
    235 
    236 textarea
    237 cols=1 clientWidth=17
    238 cols=2 clientWidth=24
    239 cols=3 clientWidth=31
    240 cols=4 clientWidth=38
     345cols=1 clientWidth=31
     346cols=2 clientWidth=37
     347cols=3 clientWidth=43
     348cols=4 clientWidth=49
     349cols=5 clientWidth=55
     350cols=10 clientWidth=85
     351cols=20 clientWidth=145
     352cols=50 clientWidth=325
     353cols=100 clientWidth=625
     354cols=500 clientWidth=3025
     355cols=1000 clientWidth=6025
     356
     357Webdings
     358input
     359size=1 clientWidth=15
     360size=2 clientWidth=19
     361size=3 clientWidth=23
     362size=4 clientWidth=27
     363size=5 clientWidth=31
     364size=10 clientWidth=51
     365size=20 clientWidth=91
     366size=50 clientWidth=211
     367size=100 clientWidth=411
     368size=500 clientWidth=2011
     369size=1000 clientWidth=4011
     370
     371textarea
     372cols=1 clientWidth=29
     373cols=2 clientWidth=33
     374cols=3 clientWidth=37
     375cols=4 clientWidth=41
    241376cols=5 clientWidth=45
    242 cols=10 clientWidth=80
    243 cols=20 clientWidth=150
    244 cols=50 clientWidth=360
    245 cols=100 clientWidth=710
    246 cols=500 clientWidth=3510
    247 cols=1000 clientWidth=7010
    248 
    249 Georgia
    250 input
    251 size=1 clientWidth=18
    252 size=2 clientWidth=25
    253 size=3 clientWidth=32
    254 size=4 clientWidth=39
    255 size=5 clientWidth=46
    256 size=10 clientWidth=81
    257 size=20 clientWidth=151
    258 size=50 clientWidth=361
    259 size=100 clientWidth=711
    260 size=500 clientWidth=3511
    261 size=1000 clientWidth=7011
    262 
    263 textarea
    264 cols=1 clientWidth=17
    265 cols=2 clientWidth=24
    266 cols=3 clientWidth=31
    267 cols=4 clientWidth=38
    268 cols=5 clientWidth=45
    269 cols=10 clientWidth=80
    270 cols=20 clientWidth=150
    271 cols=50 clientWidth=360
    272 cols=100 clientWidth=710
    273 cols=500 clientWidth=3510
    274 cols=1000 clientWidth=7010
    275 
    276 Times New Roman
    277 input
    278 size=1 clientWidth=17
    279 size=2 clientWidth=23
    280 size=3 clientWidth=29
    281 size=4 clientWidth=35
    282 size=5 clientWidth=41
    283 size=10 clientWidth=71
    284 size=20 clientWidth=131
    285 size=50 clientWidth=311
    286 size=100 clientWidth=611
    287 size=500 clientWidth=3011
    288 size=1000 clientWidth=6011
    289 
    290 textarea
    291 cols=1 clientWidth=16
    292 cols=2 clientWidth=22
    293 cols=3 clientWidth=28
    294 cols=4 clientWidth=34
    295 cols=5 clientWidth=40
    296 cols=10 clientWidth=70
    297 cols=20 clientWidth=130
    298 cols=50 clientWidth=310
    299 cols=100 clientWidth=610
    300 cols=500 clientWidth=3010
    301 cols=1000 clientWidth=6010
    302 
    303 Trebuchet MS
    304 input
    305 size=1 clientWidth=17
    306 size=2 clientWidth=23
    307 size=3 clientWidth=29
    308 size=4 clientWidth=35
    309 size=5 clientWidth=41
    310 size=10 clientWidth=71
    311 size=20 clientWidth=131
    312 size=50 clientWidth=311
    313 size=100 clientWidth=611
    314 size=500 clientWidth=3011
    315 size=1000 clientWidth=6011
    316 
    317 textarea
    318 cols=1 clientWidth=16
    319 cols=2 clientWidth=22
    320 cols=3 clientWidth=28
    321 cols=4 clientWidth=34
    322 cols=5 clientWidth=40
    323 cols=10 clientWidth=70
    324 cols=20 clientWidth=130
    325 cols=50 clientWidth=310
    326 cols=100 clientWidth=610
    327 cols=500 clientWidth=3010
    328 cols=1000 clientWidth=6010
    329 
    330 Verdana
    331 input
    332 size=1 clientWidth=18
    333 size=2 clientWidth=25
    334 size=3 clientWidth=32
    335 size=4 clientWidth=39
    336 size=5 clientWidth=46
    337 size=10 clientWidth=81
    338 size=20 clientWidth=151
    339 size=50 clientWidth=361
    340 size=100 clientWidth=711
    341 size=500 clientWidth=3511
    342 size=1000 clientWidth=7011
    343 
    344 textarea
    345 cols=1 clientWidth=17
    346 cols=2 clientWidth=24
    347 cols=3 clientWidth=31
    348 cols=4 clientWidth=38
    349 cols=5 clientWidth=45
    350 cols=10 clientWidth=80
    351 cols=20 clientWidth=150
    352 cols=50 clientWidth=360
    353 cols=100 clientWidth=710
    354 cols=500 clientWidth=3510
    355 cols=1000 clientWidth=7010
    356 
    357 Webdings
    358 input
    359 size=1 clientWidth=17
    360 size=2 clientWidth=23
    361 size=3 clientWidth=29
    362 size=4 clientWidth=35
    363 size=5 clientWidth=41
    364 size=10 clientWidth=71
    365 size=20 clientWidth=131
    366 size=50 clientWidth=311
    367 size=100 clientWidth=611
    368 size=500 clientWidth=3011
    369 size=1000 clientWidth=6011
    370 
    371 textarea
    372 cols=1 clientWidth=16
    373 cols=2 clientWidth=22
    374 cols=3 clientWidth=28
    375 cols=4 clientWidth=34
    376 cols=5 clientWidth=40
    377 cols=10 clientWidth=70
    378 cols=20 clientWidth=130
    379 cols=50 clientWidth=310
    380 cols=100 clientWidth=610
    381 cols=500 clientWidth=3010
    382 cols=1000 clientWidth=6010
     377cols=10 clientWidth=65
     378cols=20 clientWidth=105
     379cols=50 clientWidth=225
     380cols=100 clientWidth=425
     381cols=500 clientWidth=2025
     382cols=1000 clientWidth=4025
    383383
    384384PASS successfullyParsed is true

  • trunk/LayoutTests/platform/ios/fast/forms/textarea-width-expected.txt

    r179104 r224155  
    1111        RenderBR {BR} at (0,0) size 0x19
    1212        RenderText {#text} at (0,0) size 0x0
    13 layer at (8,68) size 540x286 clip at (9,69) size 538x284
    14   RenderTextControl {TEXTAREA} at (0,20) size 540x286 [color=#333333] [bgcolor=#FFFFFF] [border: (1px solid #4C4C4C)]
    15     RenderBlock {DIV} at (3,3) size 534x42
    16       RenderText {#text} at (3,0) size 525x28
    17         text run at (3,0) width 525: "1234567890abcdefghijABCDEFGHIJ1234567890abcdefghijABCDEFGHIJ12345X7890abcdefghijABCDEFG"
    18         text run at (3,14) width 196: "XIJ1234567890abcdefghijABCDEFGHIJ"
    19         text run at (198,14) width 1: " "
     13layer at (8,68) size 467x286 clip at (9,69) size 465x284
     14  RenderTextControl {TEXTAREA} at (0,20) size 467x286 [color=#333333] [bgcolor=#FFFFFF] [border: (1px solid #4C4C4C)]
     15    RenderBlock {DIV} at (3,3) size 461x42
     16      RenderText {#text} at (3,0) size 454x28
     17        text run at (3,0) width 454: "1234567890abcdefghijABCDEFGHIJ1234567890abcdefghijABCDEFGHIJ12345X7890abcde"
     18        text run at (3,14) width 267: "fghijABCDEFGXIJ1234567890abcdefghijABCDEFGHIJ"
     19        text run at (269,14) width 1: " "
    2020      RenderBR {BR} at (3,28) size 0x14

  • trunk/Source/WebCore/ChangeLog

    r224153 r224155  
     12017-10-28  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        [iOS] Unify Font::platformCharWidthInit() with macOS
     4        https://bugs.webkit.org/show_bug.cgi?id=178951
     5        <rdar://problem/7848198>
     6
     7        Reviewed by Zalan Bujtas.
     8
     9        The only reason these codepaths are different is because historically this codepath
     10        didn't work with GS fonts (which we don't use anymore).
     11
     12        Tests: fast/forms/search-styled.html
     13               fast/forms/text-control-intrinsic-widths.html
     14               fast/forms/textarea-width.html
     15
     16        * platform/graphics/cocoa/FontCocoa.mm:
     17        (WebCore::Font::platformCharWidthInit):
     18
    1192017-10-28  Chris Dumez  <cdumez@apple.com>
    220

  • trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm

    r222898 r224155  
    206206    m_avgCharWidth = 0;
    207207    m_maxCharWidth = 0;
    208    
    209 #if PLATFORM(MAC)
     208
    210209    auto os2Table = adoptCF(CTFontCopyTable(m_platformData.font(), kCTFontTableOS2, kCTFontTableOptionNoOptions));
    211210    if (os2Table && CFDataGetLength(os2Table.get()) >= 4) {
    … …  
    225224        m_maxCharWidth = scaleEmToUnits(diff, m_fontMetrics.unitsPerEm()) * m_platformData.size();
    226225    }
    227 #endif
    228226
    229227    // Fallback to a cross-platform estimate, which will populate these values if they are non-positive.
Note: See TracChangeset for help on using the changeset viewer.