170265 2017-03-29 18:20:41 -0700 Migrate to kCTFontCSSWidthAttribute 2017-03-29 19:58:45 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield commit-queue darin oldest_to_newest 1292665 0 mmaxfield 2017-03-29 18:20:41 -0700 Migrate to kCTFontCSSWidthAttribute 1292666 1 305819 mmaxfield 2017-03-29 18:23:39 -0700 Created attachment 305819 Patch 1292683 2 305819 commit-queue 2017-03-29 19:58:41 -0700 Comment on attachment 305819 Patch Clearing flags on attachment: 305819 Committed r214594: <http://trac.webkit.org/changeset/214594> 1292684 3 commit-queue 2017-03-29 19:58:45 -0700 All reviewed patches have been landed. Closing bug. 305819 2017-03-29 18:23:39 -0700 2017-03-29 19:58:41 -0700 Patch bug-170265-20170329182338.patch text/plain 7448 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0NTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTg2M2JlNThiOWFjZDEz MTFiNWQ1NmQ3N2U2MzgxNjM1NzJkODQzNy4uNDE2NDUyMGE5MzFmZGZkNzZkMmVlZjRlMzZlMmZm NTcwOGI0ODAwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE3LTAzLTI5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKKyAgICAgICAgTWlncmF0ZSB0 byBrQ1RGb250Q1NTV2lkdGhBdHRyaWJ1dGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE3MDI2NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFByZXZpb3VzbHksIHdlIHdlcmUgbWFwcGluZyBmcm9tIENvcmUg VGV4dCB3aWR0aHMgdG8gQ1NTIHdpZHRocyBpbiBXZWJLaXQuCisgICAgICAgIEhvd2V2ZXIsIG9u IHNvbWUgT1NlcywgQ29yZSBUZXh0IGNhbiBkaXJlY3RseSB0ZWxsIHVzIHdoYXQgdGhlIENTUyB3 aWR0aAorICAgICAgICB2YWx1ZSBpcy4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSB0 aGVyZSBpcyBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnZXRDU1NB dHRyaWJ1dGUpOgorICAgICAgICAoV2ViQ29yZTo6Y2FwYWJpbGl0aWVzRm9yRm9udERlc2NyaXB0 b3IpOgorICAgICAgICAqIHBsYXRmb3JtL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5oOgorCisyMDE3 LTAzLTI5ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKICAgICAg ICAgVHJ5IHRvIG5vcm1hbGl6ZSB2YXJpYXRpb24gcmFuZ2VzCiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzAxMTkKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQu Y3BwCmluZGV4IDBhNDk2OGYyYzcxODFkYjYwZTRlOWM1ZmRkOGVlODhkNTJlYzY4OTAuLmQyYjgy NmFiYzczZmI4MDdmOGFmZjhjMDEzOGJhMWIyNzA0ZGZkYzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4 dC5jcHAKQEAgLTM2LDYgKzM2LDcgQEAKICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4K IAogI2RlZmluZSBTSE9VTERfVVNFX0NPUkVfVEVYVF9GT05UX0xPT0tVUCAoUExBVEZPUk0oTUFD KSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTAxMjAwKQorI2RlZmluZSBI QVNfQ09SRV9URVhUX1dJRFRIX0FUVFJJQlVURSAoKFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1Nf WF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDEzMDApIHx8IChQTEFURk9STShJT1MpICYmIF9f SVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDExMDAwMCkpCiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIApAQCAtNDE5LDggKzQyMCw3IEBAIHN0YXRpYyBWYXJpYXRpb25EZWZhdWx0c01h cCBkZWZhdWx0VmFyaWF0aW9uVmFsdWVzKENURm9udFJlZiBmb250KQogICAgIH0KICAgICByZXR1 cm4gcmVzdWx0OwogfQotI2VuZGlmCi0jaWYgRU5BQkxFKFZBUklBVElPTl9GT05UUykKKwogc3Rh dGljIGlubGluZSBib29sIGZvbnRJc1N5c3RlbUZvbnQoQ1RGb250UmVmIGZvbnQpCiB7CiAgICAg aWYgKENURm9udERlc2NyaXB0b3JJc1N5c3RlbVVJRm9udChhZG9wdENGKENURm9udENvcHlGb250 RGVzY3JpcHRvcihmb250KSkuZ2V0KCkpKQpAQCAtNDc3LDEyICs0NzcsMTQgQEAgc3RhdGljIGlu bGluZSBmbG9hdCBkZW5vcm1hbGl6ZVNsb3BlKGZsb2F0IHZhbHVlKQogfQogI2VuZGlmCiAKKyNp ZiAhSEFTX0NPUkVfVEVYVF9XSURUSF9BVFRSSUJVVEUgfHwgRU5BQkxFKFZBUklBVElPTl9GT05U UykKIHN0YXRpYyBpbmxpbmUgZmxvYXQgbm9ybWFsaXplV2lkdGgoZmxvYXQgdmFsdWUpCiB7CiAg ICAgaWYgKHZhbHVlIDwgMC41KQogICAgICAgICByZXR1cm4gdmFsdWUgKiA1MCArIDEwMDsKICAg ICByZXR1cm4gdmFsdWUgKiAxNTAgKyA1MDsKIH0KKyNlbmRpZgogCiBSZXRhaW5QdHI8Q1RGb250 UmVmPiBwcmVwYXJlUGxhdGZvcm1Gb250KENURm9udFJlZiBvcmlnaW5hbEZvbnQsIFRleHRSZW5k ZXJpbmdNb2RlIHRleHRSZW5kZXJpbmdNb2RlLCBjb25zdCBGb250RmVhdHVyZVNldHRpbmdzKiBm b250RmFjZUZlYXR1cmVzLCBjb25zdCBGb250VmFyaWFudFNldHRpbmdzKiBmb250RmFjZVZhcmlh bnRTZXR0aW5ncywgY29uc3QgRm9udEZlYXR1cmVTZXR0aW5ncyYgZmVhdHVyZXMsIGNvbnN0IEZv bnRWYXJpYW50U2V0dGluZ3MmIHZhcmlhbnRTZXR0aW5ncywgRm9udFNlbGVjdGlvblJlcXVlc3Qg Zm9udFNlbGVjdGlvblJlcXVlc3QsIGNvbnN0IEZvbnRWYXJpYXRpb25TZXR0aW5ncyYgdmFyaWF0 aW9ucywgRm9udE9wdGljYWxTaXppbmcgZm9udE9wdGljYWxTaXppbmcsIGZsb2F0IHNpemUpCiB7 CkBAIC02NjQsNiArNjY2LDcgQEAgUmVmUHRyPEZvbnQ+IEZvbnRDYWNoZTo6c2ltaWxhckZvbnQo Y29uc3QgRm9udERlc2NyaXB0aW9uJiBkZXNjcmlwdGlvbiwgY29uc3QgQXQKICAgICByZXR1cm4g bnVsbHB0cjsKIH0KIAorI2lmICFIQVNfQ09SRV9URVhUX1dJRFRIX0FUVFJJQlVURQogc3RhdGlj IGZsb2F0IHN0cmV0Y2hGcm9tQ29yZVRleHRUcmFpdHMoQ0ZEaWN0aW9uYXJ5UmVmIHRyYWl0cykK IHsKICAgICBhdXRvIHdpZHRoTnVtYmVyID0gc3RhdGljX2Nhc3Q8Q0ZOdW1iZXJSZWY+KENGRGlj dGlvbmFyeUdldFZhbHVlKHRyYWl0cywga0NURm9udFdpZHRoVHJhaXQpKTsKQEAgLTY3NSw2ICs2 NzgsNyBAQCBzdGF0aWMgZmxvYXQgc3RyZXRjaEZyb21Db3JlVGV4dFRyYWl0cyhDRkRpY3Rpb25h cnlSZWYgdHJhaXRzKQogICAgIEFTU0VSVF9VTlVTRUQoc3VjY2Vzcywgc3VjY2Vzcyk7CiAgICAg cmV0dXJuIG5vcm1hbGl6ZVdpZHRoKGN0V2lkdGgpOwogfQorI2VuZGlmCiAKIHN0YXRpYyB2b2lk IGludmFsaWRhdGVGb250Q2FjaGUoKTsKIApAQCAtOTcxLDYgKzk3NSwxOSBAQCBzdGF0aWMgVmFy aWF0aW9uQ2FwYWJpbGl0aWVzIHZhcmlhdGlvbkNhcGFiaWxpdGllc0ZvckZvbnREZXNjcmlwdG9y KENURm9udERlc2NyaQogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKKyNpZiAhU0hPVUxEX1VTRV9D T1JFX1RFWFRfRk9OVF9MT09LVVAgfHwgSEFTX0NPUkVfVEVYVF9XSURUSF9BVFRSSUJVVEUKK3N0 YXRpYyBmbG9hdCBnZXRDU1NBdHRyaWJ1dGUoQ1RGb250RGVzY3JpcHRvclJlZiBmb250RGVzY3Jp cHRvciwgY29uc3QgQ0ZTdHJpbmdSZWYgYXR0cmlidXRlLCBmbG9hdCBmYWxsYmFjaykKK3sKKyAg ICBhdXRvIG51bWJlciA9IGFkb3B0Q0Yoc3RhdGljX2Nhc3Q8Q0ZOdW1iZXJSZWY+KENURm9udERl c2NyaXB0b3JDb3B5QXR0cmlidXRlKGZvbnREZXNjcmlwdG9yLCBhdHRyaWJ1dGUpKSk7CisgICAg aWYgKCFudW1iZXIpCisgICAgICAgIHJldHVybiBmYWxsYmFjazsKKyAgICBmbG9hdCBjc3NWYWx1 ZTsKKyAgICBhdXRvIHN1Y2Nlc3MgPSBDRk51bWJlckdldFZhbHVlKG51bWJlci5nZXQoKSwga0NG TnVtYmVyRmxvYXRUeXBlLCAmY3NzVmFsdWUpOworICAgIEFTU0VSVF9VTlVTRUQoc3VjY2Vzcywg c3VjY2Vzcyk7CisgICAgcmV0dXJuIGNzc1ZhbHVlOworfQorI2VuZGlmCisKIEZvbnRTZWxlY3Rp b25DYXBhYmlsaXRpZXMgY2FwYWJpbGl0aWVzRm9yRm9udERlc2NyaXB0b3IoQ1RGb250RGVzY3Jp cHRvclJlZiBmb250RGVzY3JpcHRvcikKIHsKICAgICBpZiAoIWZvbnREZXNjcmlwdG9yKQpAQCAt OTc4LDE5ICs5OTUsMjEgQEAgRm9udFNlbGVjdGlvbkNhcGFiaWxpdGllcyBjYXBhYmlsaXRpZXNG b3JGb250RGVzY3JpcHRvcihDVEZvbnREZXNjcmlwdG9yUmVmIGZvbnQKIAogICAgIFZhcmlhdGlv bkNhcGFiaWxpdGllcyB2YXJpYXRpb25DYXBhYmlsaXRpZXMgPSB2YXJpYXRpb25DYXBhYmlsaXRp ZXNGb3JGb250RGVzY3JpcHRvcihmb250RGVzY3JpcHRvcik7CiAKLSNpZiBTSE9VTERfVVNFX0NP UkVfVEVYVF9GT05UX0xPT0tVUAotICAgIGJvb2wgd2VpZ2h0Q29tZXNGcm9tVHJhaXRzID0gIXZh cmlhdGlvbkNhcGFiaWxpdGllcy53ZWlnaHQ7CisjaWYgU0hPVUxEX1VTRV9DT1JFX1RFWFRfRk9O VF9MT09LVVAgfHwgIUhBU19DT1JFX1RFWFRfV0lEVEhfQVRUUklCVVRFCisgICAgYm9vbCB3ZWln aHRPcldpZHRoQ29tZUZyb21UcmFpdHMgPSAhdmFyaWF0aW9uQ2FwYWJpbGl0aWVzLndlaWdodCB8 fCAhdmFyaWF0aW9uQ2FwYWJpbGl0aWVzLndpZHRoOwogI2Vsc2UKLSAgICBib29sIHdlaWdodENv bWVzRnJvbVRyYWl0cyA9IGZhbHNlOworICAgIGJvb2wgd2VpZ2h0T3JXaWR0aENvbWVGcm9tVHJh aXRzID0gZmFsc2U7CiAjZW5kaWYKIAotICAgIGlmICghdmFyaWF0aW9uQ2FwYWJpbGl0aWVzLnNs b3BlIHx8ICF2YXJpYXRpb25DYXBhYmlsaXRpZXMud2lkdGggfHwgd2VpZ2h0Q29tZXNGcm9tVHJh aXRzKSB7CisgICAgaWYgKCF2YXJpYXRpb25DYXBhYmlsaXRpZXMuc2xvcGUgfHwgd2VpZ2h0T3JX aWR0aENvbWVGcm9tVHJhaXRzKSB7CiAgICAgICAgIGF1dG8gdHJhaXRzID0gYWRvcHRDRihzdGF0 aWNfY2FzdDxDRkRpY3Rpb25hcnlSZWY+KENURm9udERlc2NyaXB0b3JDb3B5QXR0cmlidXRlKGZv bnREZXNjcmlwdG9yLCBrQ1RGb250VHJhaXRzQXR0cmlidXRlKSkpOwogICAgICAgICBpZiAodHJh aXRzKSB7CisjaWYgIUhBU19DT1JFX1RFWFRfV0lEVEhfQVRUUklCVVRFCiAgICAgICAgICAgICBp ZiAoIXZhcmlhdGlvbkNhcGFiaWxpdGllcy53aWR0aCkgewogICAgICAgICAgICAgICAgIGF1dG8g d2lkdGhWYWx1ZSA9IHN0cmV0Y2hGcm9tQ29yZVRleHRUcmFpdHModHJhaXRzLmdldCgpKTsKICAg ICAgICAgICAgICAgICB2YXJpYXRpb25DYXBhYmlsaXRpZXMud2lkdGggPSB7eyB3aWR0aFZhbHVl LCB3aWR0aFZhbHVlIH19OwogICAgICAgICAgICAgfQorI2VuZGlmCiAKICAgICAgICAgICAgIGlm ICghdmFyaWF0aW9uQ2FwYWJpbGl0aWVzLnNsb3BlKSB7CiAgICAgICAgICAgICAgICAgYXV0byBz eW1ib2xpY1RyYWl0c051bWJlciA9IHN0YXRpY19jYXN0PENGTnVtYmVyUmVmPihDRkRpY3Rpb25h cnlHZXRWYWx1ZSh0cmFpdHMuZ2V0KCksIGtDVEZvbnRTeW1ib2xpY1RyYWl0KSk7CkBAIC0xMDIy LDE0ICsxMDQxLDE1IEBAIEZvbnRTZWxlY3Rpb25DYXBhYmlsaXRpZXMgY2FwYWJpbGl0aWVzRm9y Rm9udERlc2NyaXB0b3IoQ1RGb250RGVzY3JpcHRvclJlZiBmb250CiAKICNpZiAhU0hPVUxEX1VT RV9DT1JFX1RFWFRfRk9OVF9MT09LVVAKICAgICBpZiAoIXZhcmlhdGlvbkNhcGFiaWxpdGllcy53 ZWlnaHQpIHsKLSAgICAgICAgYXV0byB3ZWlnaHROdW1iZXIgPSBhZG9wdENGKHN0YXRpY19jYXN0 PENGTnVtYmVyUmVmPihDVEZvbnREZXNjcmlwdG9yQ29weUF0dHJpYnV0ZShmb250RGVzY3JpcHRv ciwga0NURm9udENTU1dlaWdodEF0dHJpYnV0ZSkpKTsKLSAgICAgICAgaWYgKHdlaWdodE51bWJl cikgewotICAgICAgICAgICAgZmxvYXQgY3NzV2VpZ2h0OwotICAgICAgICAgICAgYXV0byBzdWNj ZXNzID0gQ0ZOdW1iZXJHZXRWYWx1ZSh3ZWlnaHROdW1iZXIuZ2V0KCksIGtDRk51bWJlckZsb2F0 VHlwZSwgJmNzc1dlaWdodCk7Ci0gICAgICAgICAgICBBU1NFUlRfVU5VU0VEKHN1Y2Nlc3MsIHN1 Y2Nlc3MpOwotICAgICAgICAgICAgdmFyaWF0aW9uQ2FwYWJpbGl0aWVzLndlaWdodCA9IHt7IGNz c1dlaWdodCwgY3NzV2VpZ2h0IH19OwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIHZhcmlh dGlvbkNhcGFiaWxpdGllcy53ZWlnaHQgPSB7eyBzdGF0aWNfY2FzdDxmbG9hdD4obm9ybWFsV2Vp Z2h0VmFsdWUoKSksIHN0YXRpY19jYXN0PGZsb2F0Pihub3JtYWxXZWlnaHRWYWx1ZSgpKSB9fTsK KyAgICAgICAgYXV0byB2YWx1ZSA9IGdldENTU0F0dHJpYnV0ZShmb250RGVzY3JpcHRvciwga0NU Rm9udENTU1dlaWdodEF0dHJpYnV0ZSwgc3RhdGljX2Nhc3Q8ZmxvYXQ+KG5vcm1hbFdlaWdodFZh bHVlKCkpKTsKKyAgICAgICAgdmFyaWF0aW9uQ2FwYWJpbGl0aWVzLndlaWdodCA9IHt7IHZhbHVl LCB2YWx1ZSB9fTsKKyAgICB9CisjZW5kaWYKKworI2lmIEhBU19DT1JFX1RFWFRfV0lEVEhfQVRU UklCVVRFCisgICAgaWYgKCF2YXJpYXRpb25DYXBhYmlsaXRpZXMud2lkdGgpIHsKKyAgICAgICAg YXV0byB2YWx1ZSA9IGdldENTU0F0dHJpYnV0ZShmb250RGVzY3JpcHRvciwga0NURm9udENTU1dp ZHRoQXR0cmlidXRlLCBzdGF0aWNfY2FzdDxmbG9hdD4obm9ybWFsU3RyZXRjaFZhbHVlKCkpKTsK KyAgICAgICAgdmFyaWF0aW9uQ2FwYWJpbGl0aWVzLndpZHRoID0ge3sgdmFsdWUsIHZhbHVlIH19 OwogICAgIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9z cGkvY29jb2EvQ29yZVRleHRTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2Nv YS9Db3JlVGV4dFNQSS5oCmluZGV4IDIzYWMwYmU3OWEzMGE0Y2I3YjFjN2ZhNmNkODE2ZTcwMTQ2 MzM5MjkuLjVjNDU1NDk5ODFjODk0OGU5ODhjYmU3YjUxM2RkNjE5NTJkOTcwYmMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5oCkBAIC04NSw2 ICs4NSw3IEBAIENGQml0VmVjdG9yUmVmIENURm9udENvcHlHbHlwaENvdmVyYWdlRm9yRmVhdHVy ZShDVEZvbnRSZWYsIENGRGljdGlvbmFyeVJlZiBmZWF0CiBDVEZvbnREZXNjcmlwdG9yUmVmIENU Rm9udERlc2NyaXB0b3JDcmVhdGVXaXRoQXR0cmlidXRlc0FuZE9wdGlvbnMoQ0ZEaWN0aW9uYXJ5 UmVmIGF0dHJpYnV0ZXMsIENURm9udERlc2NyaXB0b3JPcHRpb25zKTsKIAogZXh0ZXJuIGNvbnN0 IENGU3RyaW5nUmVmIGtDVEZvbnRDU1NXZWlnaHRBdHRyaWJ1dGU7CitleHRlcm4gY29uc3QgQ0ZT dHJpbmdSZWYga0NURm9udENTU1dpZHRoQXR0cmlidXRlOwogZXh0ZXJuIGNvbnN0IENGU3RyaW5n UmVmIGtDVEZvbnREZXNjcmlwdG9yVGV4dFN0eWxlQXR0cmlidXRlOwogZXh0ZXJuIGNvbnN0IENG U3RyaW5nUmVmIGtDVEZvbnRVSUZvbnREZXNpZ25UcmFpdDsKIAo=