215687 2020-08-19 21:40:03 -0700 [Cocoa] CTFontIsSystemUIFont() is faster than CTFontDescriptorIsSystemUIFont()/CTFontCopyFontDescriptor() 2020-09-05 11:21:26 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mmaxfield mmaxfield benjamin cdumez cmarcelo darin ews-watchlist webkit-bug-importer oldest_to_newest 1681623 0 mmaxfield 2020-08-19 21:40:03 -0700 [Cocoa] CTFontIsSystemUIFont() is faster than CTFontDescriptorIsSystemUIFont()/CTFontCopyFontDescriptor() 1681624 1 406915 mmaxfield 2020-08-19 21:42:24 -0700 Created attachment 406915 Patch 1681626 2 mmaxfield 2020-08-19 21:44:37 -0700 <rdar://problem/59295639> 1681631 3 406916 mmaxfield 2020-08-19 21:54:56 -0700 Created attachment 406916 Patch 1681633 4 406916 darin 2020-08-19 22:02:24 -0700 Comment on attachment 406916 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=406916&action=review > Source/WTF/wtf/PlatformUse.h:310 > +#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 110000) > +#define USE_CTFONTISSYSTEMUIFONT 1 > +#endif Is this a USE or a HAVE? > Source/WebCore/platform/graphics/FontPlatformData.h:132 > + static bool isSystemFont(CTFontRef); Does this benefit from being a member function? Why not just a "free function" in this file? 1686035 5 408075 mmaxfield 2020-09-05 01:40:42 -0700 Created attachment 408075 Patch for committing 1686036 6 408076 mmaxfield 2020-09-05 01:49:35 -0700 Created attachment 408076 Patch for committing 1686097 7 ews-feeder 2020-09-05 11:21:26 -0700 Committed r266667: <https://trac.webkit.org/changeset/266667> All reviewed patches have been landed. Closing bug and clearing flags on attachment 408076. 406915 2020-08-19 21:42:24 -0700 2020-08-19 21:54:54 -0700 Patch bug-215687-20200819214223.patch text/plain 7722 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1ODQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDIxOTQ2NjFjNmZkNjQxYmUyZDFhODI5 NGM0ZGUwMDA1YTE5ZjZlNmYuLmM1M2M3MThlNWRiNmQxZDQwOWExMzVlZjA0ZmFhMmRkZWQ2NGE3 MzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjAtMDgtMTkgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIENURm9udElzU3lzdGVtVUlG b250KCkgaXMgZmFzdGVyIHRoYW4gQ1RGb250RGVzY3JpcHRvcklzU3lzdGVtVUlGb250KCkvQ1RG b250Q29weUZvbnREZXNjcmlwdG9yKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxNTY4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogd3RmL1BsYXRmb3JtVXNlLmg6CisKIDIwMjAtMDgtMTggIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgVHVybiBvZmYgd2hl ZWwgZXZlbnQgcmVnaW9ucyB1bnRpbCB3ZSBuZWVkIHRoZW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwMjJkYTFl MWJkOTY0YjEyY2FiOGIwZTE0MTA1NmFlM2Y5NzI5YjU5Li5lODRmZmNmYmZiNmViNTY2YjRiY2Jm OTk0MjBhMjRhYmQ4NDEyMzRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjAtMDgt MTkgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBb Q29jb2FdIENURm9udElzU3lzdGVtVUlGb250KCkgaXMgZmFzdGVyIHRoYW4gQ1RGb250RGVzY3Jp cHRvcklzU3lzdGVtVUlGb250KCkvQ1RGb250Q29weUZvbnREZXNjcmlwdG9yKCkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTY4NworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3RlYWQgb2YgbWFraW5n IHRoZSB0d28gY2FsbHMsIHdlIGNhbiBtYWtlIGEgc2luZ2xlIGNhbGwgdGhhdCBoYXMgdGhlIHNh bWUgZWZmZWN0LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJl aGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9y bURhdGEuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3Jl VGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpmb250SXNTeXN0ZW1Gb250KToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FzY2FkZUNvY29hLm1tOgorICAgICAgICAo V2ViQ29yZTo6Rm9udENhc2NhZGU6OnByaW1hcnlGb250SXNTeXN0ZW1Gb250IGNvbnN0KToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW06 CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKToK KyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6OmlzU3lzdGVtRm9udCk6CisKIDIw MjAtMDgtMTggIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBBdWRp b0J1ZmZlci5kdXJhdGlvbiBzaG91bGQgdXNlIGRvdWJsZSBwcmVjaXNpb24KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCmluZGV4IDkwYmE5ZDA5OTM5OTA3YjMxYjdkZTNiNmVhYzc4Yjc2OGM4NDFhMWYuLjM3N2Y1 ZmFjNGFhYWNkYmU2ZWJjNGE1NzM5NjY5ZDE5MzA1NDllMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL1BBTC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwpA QCAtMSwzICsxLDEyIEBACisyMDIwLTA4LTE5ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVs ZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBDVEZvbnRJc1N5c3RlbVVJRm9udCgpIGlz IGZhc3RlciB0aGFuIENURm9udERlc2NyaXB0b3JJc1N5c3RlbVVJRm9udCgpL0NURm9udENvcHlG b250RGVzY3JpcHRvcigpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTU2ODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHBhbC9zcGkvY29jb2EvQ29yZVRleHRTUEkuaDoKKwogMjAyMC0wOC0xMSAgTXls ZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBBcHBs ZSBpbnRlcm5hbCBNb2phdmUgYnVpbGRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0 Zm9ybVVzZS5oIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm1Vc2UuaAppbmRleCBhZGU0MmRkMTM5 ZjNhOWY0YWFmNDczODJlNWIwZDY0Y2JmNjgxYTA1Li4yZGUzNjdiOTAyZGJkNjVlZGZlYTA5MGRh MTIyN2JlMjM3Y2IwNzE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybVVzZS5o CisrKyBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtVXNlLmgKQEAgLTMwNCwzICszMDQsNyBAQAog I2lmIFBMQVRGT1JNKENPQ09BKSAmJiAhKFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJT SU9OX01JTl9SRVFVSVJFRCA8IDExMDAwMCkKICNkZWZpbmUgVVNFX0NURk9OVFNIQVBFR0xZUEhT IDEKICNlbmRpZgorCisjaWYgUExBVEZPUk0oQ09DT0EpICYmICEoUExBVEZPUk0oTUFDKSAmJiBf X01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTEwMDAwKQorI2RlZmluZSBVU0VfQ1RG T05USVNTWVNURU1VSUZPTlQgMQorI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvcGFsL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5oIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9z cGkvY29jb2EvQ29yZVRleHRTUEkuaAppbmRleCBiMjI4ZjliYzgzMjQ4MzM0OTRhMGM3ODE4M2I0 ZjJlM2I1NWE5ZjE2Li41YWJlZjZkMmFiYTM1OWYyYzMwNDU3YjI5NDlkNzIyYTQwODk4MDg1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvcmVUZXh0U1BJLmgKQEAg LTEzNyw2ICsxMzcsNyBAQCBleHRlcm4gY29uc3QgQ0ZTdHJpbmdSZWYga0NURm9udFVJRm9udERl c2lnblJvdW5kZWQ7CiBleHRlcm4gY29uc3QgQ0ZTdHJpbmdSZWYga0NURnJhbWVNYXhpbXVtTnVt YmVyT2ZMaW5lc0F0dHJpYnV0ZU5hbWU7CiAKIGJvb2wgQ1RGb250RGVzY3JpcHRvcklzU3lzdGVt VUlGb250KENURm9udERlc2NyaXB0b3JSZWYpOworYm9vbCBDVEZvbnRJc1N5c3RlbVVJRm9udChD VEZvbnRSZWYpOwogQ1RGb250UmVmIENURm9udENyZWF0ZUZvckNTUyhDRlN0cmluZ1JlZiBuYW1l LCB1aW50MTZfdCB3ZWlnaHQsIENURm9udFN5bWJvbGljVHJhaXRzLCBDR0Zsb2F0IHNpemUpOwog Q1RGb250UmVmIENURm9udENyZWF0ZUZvckNoYXJhY3RlcnNXaXRoTGFuZ3VhZ2UoQ1RGb250UmVm IGN1cnJlbnRGb250LCBjb25zdCBVVEYxNkNoYXIgKmNoYXJhY3RlcnMsIENGSW5kZXggbGVuZ3Ro LCBDRlN0cmluZ1JlZiBsYW5ndWFnZSwgQ0ZJbmRleCAqY292ZXJlZExlbmd0aCk7CiBDVEZvbnRS ZWYgQ1RGb250Q3JlYXRlRm9yQ2hhcmFjdGVyc1dpdGhMYW5ndWFnZUFuZE9wdGlvbihDVEZvbnRS ZWYgY3VycmVudEZvbnQsIGNvbnN0IFVURjE2Q2hhciAqY2hhcmFjdGVycywgQ0ZJbmRleCBsZW5n dGgsIENGU3RyaW5nUmVmIGxhbmd1YWdlLCBDVEZvbnRGYWxsYmFja09wdGlvbiBvcHRpb24sIENG SW5kZXggKmNvdmVyZWRMZW5ndGgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvRm9udFBsYXRmb3JtRGF0YS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvRm9udFBsYXRmb3JtRGF0YS5oCmluZGV4IDAwYzRhODg1NTM0NjM3YzQyYzY3MDdi OGJmYzhmOTliNjBlNGZlNmQuLjA1NWJmODQ2Y2E1MTdhNDc3NGVhZmIwMzUyZjQzODViNGFlN2Yy ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0 Zm9ybURhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250UGxh dGZvcm1EYXRhLmgKQEAgLTEyOCw2ICsxMjgsOCBAQCBwdWJsaWM6CiAgICAgUmV0YWluUHRyPENG VHlwZVJlZj4gb2JqZWN0Rm9yRXF1YWxpdHlDaGVjaygpIGNvbnN0OwogCiAgICAgYm9vbCBoYXND dXN0b21UcmFja2luZygpIGNvbnN0IHsgcmV0dXJuIGlzU3lzdGVtRm9udCgpOyB9CisKKyAgICBz dGF0aWMgYm9vbCBpc1N5c3RlbUZvbnQoQ1RGb250UmVmKTsKICNlbmRpZgogCiAjaWYgUExBVEZP Uk0oV0lOKSB8fCBQTEFURk9STShDT0NPQSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcAppbmRleCAz NjQwYmYzMTZiN2RjMTlmYWYyMjc3N2FlZTViY2QwZDE0NGE3NWYwLi41MTdhMjc2ZjBlZDVhOTAz ZDFmNWE5ZWI1YzQyNjM0YWM0MWY5ODhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwCkBAIC00 MjUsNyArNDI1LDcgQEAgc3RhdGljIFZhcmlhdGlvbkRlZmF1bHRzTWFwIGRlZmF1bHRWYXJpYXRp b25WYWx1ZXMoQ1RGb250UmVmIGZvbnQpCiAKIHN0YXRpYyBpbmxpbmUgYm9vbCBmb250SXNTeXN0 ZW1Gb250KENURm9udFJlZiBmb250KQogewotICAgIGlmIChDVEZvbnREZXNjcmlwdG9ySXNTeXN0 ZW1VSUZvbnQoYWRvcHRDRihDVEZvbnRDb3B5Rm9udERlc2NyaXB0b3IoZm9udCkpLmdldCgpKSkK KyAgICBpZiAoRm9udFBsYXRmb3JtRGF0YTo6aXNTeXN0ZW1Gb250KGZvbnQpKQogICAgICAgICBy ZXR1cm4gdHJ1ZTsKIAogICAgIGF1dG8gbmFtZSA9IGFkb3B0Q0YoQ1RGb250Q29weVBvc3RTY3Jp cHROYW1lKGZvbnQpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NvY29hL0ZvbnRDYXNjYWRlQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jb2NvYS9Gb250Q2FzY2FkZUNvY29hLm1tCmluZGV4IGUzYjFmMzNkYzRhYTg5YzQx MDM3Yzc4YTRlNTQyOTY5OWJjNWEzMjcuLmNhZjE4ZDA4NmZlMmVlNzBmZTU0MTMzNTdlYWJhYTNj ZDgwMTY5ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nv Y29hL0ZvbnRDYXNjYWRlQ29jb2EubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY29jb2EvRm9udENhc2NhZGVDb2NvYS5tbQpAQCAtMzE2LDcgKzMxNiw3IEBAIHZvaWQg Rm9udENhc2NhZGU6OmRyYXdHbHlwaHMoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBG b250JiBmb250LCBjb25zdCBHCiBib29sIEZvbnRDYXNjYWRlOjpwcmltYXJ5Rm9udElzU3lzdGVt Rm9udCgpIGNvbnN0CiB7CiAgICAgY29uc3QgYXV0byYgZm9udERhdGEgPSBwcmltYXJ5Rm9udCgp OwotICAgIHJldHVybiBDVEZvbnREZXNjcmlwdG9ySXNTeXN0ZW1VSUZvbnQoYWRvcHRDRihDVEZv bnRDb3B5Rm9udERlc2NyaXB0b3IoZm9udERhdGEucGxhdGZvcm1EYXRhKCkuY3RGb250KCkpKS5n ZXQoKSk7CisgICAgcmV0dXJuIEZvbnRQbGF0Zm9ybURhdGE6OmlzU3lzdGVtRm9udChmb250RGF0 YS5wbGF0Zm9ybURhdGEoKS5jdEZvbnQoKSk7CiB9CiAKIC8vIEZJWE1FOiBVc2UgdGhpcyBvbiBh bGwgcG9ydHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0KaW5kZXggNzJlODI1MWMzZDM3 NGUxMDI0OWNlMzQwOTMyNzEzYjA4ZWNhYzhkZS4uZTAzMjA1N2E3MmViODkzYTFlZjY1N2Y3N2U5 NjQ4NTE4NWMxZWNiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRQbGF0Zm9ybURhdGFDb2NvYS5tbQpAQCAtNDQsNyAr NDQsNyBAQCBGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKENURm9udFJlZiBmb250 LCBmbG9hdCBzaXplLCBib29sIHN5bnRoZXRpY0JvbAogICAgIEFTU0VSVF9BUkcoZm9udCwgZm9u dCk7CiAgICAgbV9mb250ID0gZm9udDsKICAgICBtX2lzQ29sb3JCaXRtYXBGb250ID0gQ1RGb250 R2V0U3ltYm9saWNUcmFpdHMoZm9udCkgJiBrQ1RGb250VHJhaXRDb2xvckdseXBoczsKLSAgICBt X2lzU3lzdGVtRm9udCA9IENURm9udERlc2NyaXB0b3JJc1N5c3RlbVVJRm9udChhZG9wdENGKENU Rm9udENvcHlGb250RGVzY3JpcHRvcihtX2ZvbnQuZ2V0KCkpKS5nZXQoKSk7CisgICAgbV9pc1N5 c3RlbUZvbnQgPSBGb250UGxhdGZvcm1EYXRhOjppc1N5c3RlbUZvbnQobV9mb250LmdldCgpKTsK ICAgICBhdXRvIHZhcmlhdGlvbnMgPSBhZG9wdENGKHN0YXRpY19jYXN0PENGRGljdGlvbmFyeVJl Zj4oQ1RGb250Q29weUF0dHJpYnV0ZShmb250LCBrQ1RGb250VmFyaWF0aW9uQXR0cmlidXRlKSkp OwogICAgIG1faGFzVmFyaWF0aW9ucyA9IHZhcmlhdGlvbnMgJiYgQ0ZEaWN0aW9uYXJ5R2V0Q291 bnQodmFyaWF0aW9ucy5nZXQoKSk7CiAKQEAgLTE2MCw2ICsxNjAsMTUgQEAgUmV0YWluUHRyPENG VHlwZVJlZj4gRm9udFBsYXRmb3JtRGF0YTo6b2JqZWN0Rm9yRXF1YWxpdHlDaGVjaygpIGNvbnN0 CiAgICAgcmV0dXJuIG9iamVjdEZvckVxdWFsaXR5Q2hlY2soY3RGb250KCkpOwogfQogCitzdGF0 aWMgYm9vbCBGb250UGxhdGZvcm1EYXRhOjppc1N5c3RlbUZvbnQoQ1RGb250UmVmIGZvbnQpCit7 CisjaWYgVVNFKENURk9OVElTU1lTVEVNVUlGT05UKQorICAgIHJldHVybiBDVEZvbnRJc1N5c3Rl bVVJRm9udChmb250KTsKKyNlbHNlCisgICAgcmV0dXJuIENURm9udERlc2NyaXB0b3JJc1N5c3Rl bVVJRm9udChhZG9wdENGKENURm9udENvcHlGb250RGVzY3JpcHRvcihmb250KSkuZ2V0KCkpOwor I2VuZGlmCit9CisKIFJlZlB0cjxTaGFyZWRCdWZmZXI+IEZvbnRQbGF0Zm9ybURhdGE6Om9wZW5U eXBlVGFibGUodWludDMyX3QgdGFibGUpIGNvbnN0CiB7CiAgICAgaWYgKFJldGFpblB0cjxDRkRh dGFSZWY+IGRhdGEgPSBhZG9wdENGKENURm9udENvcHlUYWJsZShmb250KCksIHRhYmxlLCBrQ1RG b250VGFibGVPcHRpb25Ob09wdGlvbnMpKSkK 406916 2020-08-19 21:54:56 -0700 2020-08-19 22:02:24 -0700 Patch bug-215687-20200819215455.patch text/plain 7715 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1ODQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDIxOTQ2NjFjNmZkNjQxYmUyZDFhODI5 NGM0ZGUwMDA1YTE5ZjZlNmYuLmM1M2M3MThlNWRiNmQxZDQwOWExMzVlZjA0ZmFhMmRkZWQ2NGE3 MzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjAtMDgtMTkgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIENURm9udElzU3lzdGVtVUlG b250KCkgaXMgZmFzdGVyIHRoYW4gQ1RGb250RGVzY3JpcHRvcklzU3lzdGVtVUlGb250KCkvQ1RG b250Q29weUZvbnREZXNjcmlwdG9yKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxNTY4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogd3RmL1BsYXRmb3JtVXNlLmg6CisKIDIwMjAtMDgtMTggIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgVHVybiBvZmYgd2hl ZWwgZXZlbnQgcmVnaW9ucyB1bnRpbCB3ZSBuZWVkIHRoZW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwMjJkYTFl MWJkOTY0YjEyY2FiOGIwZTE0MTA1NmFlM2Y5NzI5YjU5Li5lODRmZmNmYmZiNmViNTY2YjRiY2Jm OTk0MjBhMjRhYmQ4NDEyMzRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjAtMDgt MTkgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBb Q29jb2FdIENURm9udElzU3lzdGVtVUlGb250KCkgaXMgZmFzdGVyIHRoYW4gQ1RGb250RGVzY3Jp cHRvcklzU3lzdGVtVUlGb250KCkvQ1RGb250Q29weUZvbnREZXNjcmlwdG9yKCkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTY4NworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3RlYWQgb2YgbWFraW5n IHRoZSB0d28gY2FsbHMsIHdlIGNhbiBtYWtlIGEgc2luZ2xlIGNhbGwgdGhhdCBoYXMgdGhlIHNh bWUgZWZmZWN0LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJl aGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9y bURhdGEuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3Jl VGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpmb250SXNTeXN0ZW1Gb250KToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FzY2FkZUNvY29hLm1tOgorICAgICAgICAo V2ViQ29yZTo6Rm9udENhc2NhZGU6OnByaW1hcnlGb250SXNTeXN0ZW1Gb250IGNvbnN0KToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW06 CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKToK KyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6OmlzU3lzdGVtRm9udCk6CisKIDIw MjAtMDgtMTggIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBBdWRp b0J1ZmZlci5kdXJhdGlvbiBzaG91bGQgdXNlIGRvdWJsZSBwcmVjaXNpb24KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCmluZGV4IDkwYmE5ZDA5OTM5OTA3YjMxYjdkZTNiNmVhYzc4Yjc2OGM4NDFhMWYuLjM3N2Y1 ZmFjNGFhYWNkYmU2ZWJjNGE1NzM5NjY5ZDE5MzA1NDllMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL1BBTC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwpA QCAtMSwzICsxLDEyIEBACisyMDIwLTA4LTE5ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVs ZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBDVEZvbnRJc1N5c3RlbVVJRm9udCgpIGlz IGZhc3RlciB0aGFuIENURm9udERlc2NyaXB0b3JJc1N5c3RlbVVJRm9udCgpL0NURm9udENvcHlG b250RGVzY3JpcHRvcigpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTU2ODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHBhbC9zcGkvY29jb2EvQ29yZVRleHRTUEkuaDoKKwogMjAyMC0wOC0xMSAgTXls ZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBBcHBs ZSBpbnRlcm5hbCBNb2phdmUgYnVpbGRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0 Zm9ybVVzZS5oIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm1Vc2UuaAppbmRleCBhZGU0MmRkMTM5 ZjNhOWY0YWFmNDczODJlNWIwZDY0Y2JmNjgxYTA1Li4yZGUzNjdiOTAyZGJkNjVlZGZlYTA5MGRh MTIyN2JlMjM3Y2IwNzE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybVVzZS5o CisrKyBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtVXNlLmgKQEAgLTMwNCwzICszMDQsNyBAQAog I2lmIFBMQVRGT1JNKENPQ09BKSAmJiAhKFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJT SU9OX01JTl9SRVFVSVJFRCA8IDExMDAwMCkKICNkZWZpbmUgVVNFX0NURk9OVFNIQVBFR0xZUEhT IDEKICNlbmRpZgorCisjaWYgUExBVEZPUk0oQ09DT0EpICYmICEoUExBVEZPUk0oTUFDKSAmJiBf X01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTEwMDAwKQorI2RlZmluZSBVU0VfQ1RG T05USVNTWVNURU1VSUZPTlQgMQorI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvcGFsL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5oIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9z cGkvY29jb2EvQ29yZVRleHRTUEkuaAppbmRleCBiMjI4ZjliYzgzMjQ4MzM0OTRhMGM3ODE4M2I0 ZjJlM2I1NWE5ZjE2Li41YWJlZjZkMmFiYTM1OWYyYzMwNDU3YjI5NDlkNzIyYTQwODk4MDg1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvcmVUZXh0U1BJLmgKQEAg LTEzNyw2ICsxMzcsNyBAQCBleHRlcm4gY29uc3QgQ0ZTdHJpbmdSZWYga0NURm9udFVJRm9udERl c2lnblJvdW5kZWQ7CiBleHRlcm4gY29uc3QgQ0ZTdHJpbmdSZWYga0NURnJhbWVNYXhpbXVtTnVt YmVyT2ZMaW5lc0F0dHJpYnV0ZU5hbWU7CiAKIGJvb2wgQ1RGb250RGVzY3JpcHRvcklzU3lzdGVt VUlGb250KENURm9udERlc2NyaXB0b3JSZWYpOworYm9vbCBDVEZvbnRJc1N5c3RlbVVJRm9udChD VEZvbnRSZWYpOwogQ1RGb250UmVmIENURm9udENyZWF0ZUZvckNTUyhDRlN0cmluZ1JlZiBuYW1l LCB1aW50MTZfdCB3ZWlnaHQsIENURm9udFN5bWJvbGljVHJhaXRzLCBDR0Zsb2F0IHNpemUpOwog Q1RGb250UmVmIENURm9udENyZWF0ZUZvckNoYXJhY3RlcnNXaXRoTGFuZ3VhZ2UoQ1RGb250UmVm IGN1cnJlbnRGb250LCBjb25zdCBVVEYxNkNoYXIgKmNoYXJhY3RlcnMsIENGSW5kZXggbGVuZ3Ro LCBDRlN0cmluZ1JlZiBsYW5ndWFnZSwgQ0ZJbmRleCAqY292ZXJlZExlbmd0aCk7CiBDVEZvbnRS ZWYgQ1RGb250Q3JlYXRlRm9yQ2hhcmFjdGVyc1dpdGhMYW5ndWFnZUFuZE9wdGlvbihDVEZvbnRS ZWYgY3VycmVudEZvbnQsIGNvbnN0IFVURjE2Q2hhciAqY2hhcmFjdGVycywgQ0ZJbmRleCBsZW5n dGgsIENGU3RyaW5nUmVmIGxhbmd1YWdlLCBDVEZvbnRGYWxsYmFja09wdGlvbiBvcHRpb24sIENG SW5kZXggKmNvdmVyZWRMZW5ndGgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvRm9udFBsYXRmb3JtRGF0YS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvRm9udFBsYXRmb3JtRGF0YS5oCmluZGV4IDAwYzRhODg1NTM0NjM3YzQyYzY3MDdi OGJmYzhmOTliNjBlNGZlNmQuLjA1NWJmODQ2Y2E1MTdhNDc3NGVhZmIwMzUyZjQzODViNGFlN2Yy ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0 Zm9ybURhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250UGxh dGZvcm1EYXRhLmgKQEAgLTEyOCw2ICsxMjgsOCBAQCBwdWJsaWM6CiAgICAgUmV0YWluUHRyPENG VHlwZVJlZj4gb2JqZWN0Rm9yRXF1YWxpdHlDaGVjaygpIGNvbnN0OwogCiAgICAgYm9vbCBoYXND dXN0b21UcmFja2luZygpIGNvbnN0IHsgcmV0dXJuIGlzU3lzdGVtRm9udCgpOyB9CisKKyAgICBz dGF0aWMgYm9vbCBpc1N5c3RlbUZvbnQoQ1RGb250UmVmKTsKICNlbmRpZgogCiAjaWYgUExBVEZP Uk0oV0lOKSB8fCBQTEFURk9STShDT0NPQSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcAppbmRleCAz NjQwYmYzMTZiN2RjMTlmYWYyMjc3N2FlZTViY2QwZDE0NGE3NWYwLi41MTdhMjc2ZjBlZDVhOTAz ZDFmNWE5ZWI1YzQyNjM0YWM0MWY5ODhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwCkBAIC00 MjUsNyArNDI1LDcgQEAgc3RhdGljIFZhcmlhdGlvbkRlZmF1bHRzTWFwIGRlZmF1bHRWYXJpYXRp b25WYWx1ZXMoQ1RGb250UmVmIGZvbnQpCiAKIHN0YXRpYyBpbmxpbmUgYm9vbCBmb250SXNTeXN0 ZW1Gb250KENURm9udFJlZiBmb250KQogewotICAgIGlmIChDVEZvbnREZXNjcmlwdG9ySXNTeXN0 ZW1VSUZvbnQoYWRvcHRDRihDVEZvbnRDb3B5Rm9udERlc2NyaXB0b3IoZm9udCkpLmdldCgpKSkK KyAgICBpZiAoRm9udFBsYXRmb3JtRGF0YTo6aXNTeXN0ZW1Gb250KGZvbnQpKQogICAgICAgICBy ZXR1cm4gdHJ1ZTsKIAogICAgIGF1dG8gbmFtZSA9IGFkb3B0Q0YoQ1RGb250Q29weVBvc3RTY3Jp cHROYW1lKGZvbnQpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NvY29hL0ZvbnRDYXNjYWRlQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jb2NvYS9Gb250Q2FzY2FkZUNvY29hLm1tCmluZGV4IGUzYjFmMzNkYzRhYTg5YzQx MDM3Yzc4YTRlNTQyOTY5OWJjNWEzMjcuLmNhZjE4ZDA4NmZlMmVlNzBmZTU0MTMzNTdlYWJhYTNj ZDgwMTY5ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nv Y29hL0ZvbnRDYXNjYWRlQ29jb2EubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY29jb2EvRm9udENhc2NhZGVDb2NvYS5tbQpAQCAtMzE2LDcgKzMxNiw3IEBAIHZvaWQg Rm9udENhc2NhZGU6OmRyYXdHbHlwaHMoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBG b250JiBmb250LCBjb25zdCBHCiBib29sIEZvbnRDYXNjYWRlOjpwcmltYXJ5Rm9udElzU3lzdGVt Rm9udCgpIGNvbnN0CiB7CiAgICAgY29uc3QgYXV0byYgZm9udERhdGEgPSBwcmltYXJ5Rm9udCgp OwotICAgIHJldHVybiBDVEZvbnREZXNjcmlwdG9ySXNTeXN0ZW1VSUZvbnQoYWRvcHRDRihDVEZv bnRDb3B5Rm9udERlc2NyaXB0b3IoZm9udERhdGEucGxhdGZvcm1EYXRhKCkuY3RGb250KCkpKS5n ZXQoKSk7CisgICAgcmV0dXJuIEZvbnRQbGF0Zm9ybURhdGE6OmlzU3lzdGVtRm9udChmb250RGF0 YS5wbGF0Zm9ybURhdGEoKS5jdEZvbnQoKSk7CiB9CiAKIC8vIEZJWE1FOiBVc2UgdGhpcyBvbiBh bGwgcG9ydHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0KaW5kZXggNzJlODI1MWMzZDM3 NGUxMDI0OWNlMzQwOTMyNzEzYjA4ZWNhYzhkZS4uMTcyMTI2YmJjYjNjZTZmYjZkZDUyMGM3Zjg3 ODU5MTg0MjYxNGMzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRQbGF0Zm9ybURhdGFDb2NvYS5tbQpAQCAtNDQsNyAr NDQsNyBAQCBGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKENURm9udFJlZiBmb250 LCBmbG9hdCBzaXplLCBib29sIHN5bnRoZXRpY0JvbAogICAgIEFTU0VSVF9BUkcoZm9udCwgZm9u dCk7CiAgICAgbV9mb250ID0gZm9udDsKICAgICBtX2lzQ29sb3JCaXRtYXBGb250ID0gQ1RGb250 R2V0U3ltYm9saWNUcmFpdHMoZm9udCkgJiBrQ1RGb250VHJhaXRDb2xvckdseXBoczsKLSAgICBt X2lzU3lzdGVtRm9udCA9IENURm9udERlc2NyaXB0b3JJc1N5c3RlbVVJRm9udChhZG9wdENGKENU Rm9udENvcHlGb250RGVzY3JpcHRvcihtX2ZvbnQuZ2V0KCkpKS5nZXQoKSk7CisgICAgbV9pc1N5 c3RlbUZvbnQgPSBGb250UGxhdGZvcm1EYXRhOjppc1N5c3RlbUZvbnQobV9mb250LmdldCgpKTsK ICAgICBhdXRvIHZhcmlhdGlvbnMgPSBhZG9wdENGKHN0YXRpY19jYXN0PENGRGljdGlvbmFyeVJl Zj4oQ1RGb250Q29weUF0dHJpYnV0ZShmb250LCBrQ1RGb250VmFyaWF0aW9uQXR0cmlidXRlKSkp OwogICAgIG1faGFzVmFyaWF0aW9ucyA9IHZhcmlhdGlvbnMgJiYgQ0ZEaWN0aW9uYXJ5R2V0Q291 bnQodmFyaWF0aW9ucy5nZXQoKSk7CiAKQEAgLTE2MCw2ICsxNjAsMTUgQEAgUmV0YWluUHRyPENG VHlwZVJlZj4gRm9udFBsYXRmb3JtRGF0YTo6b2JqZWN0Rm9yRXF1YWxpdHlDaGVjaygpIGNvbnN0 CiAgICAgcmV0dXJuIG9iamVjdEZvckVxdWFsaXR5Q2hlY2soY3RGb250KCkpOwogfQogCitib29s IEZvbnRQbGF0Zm9ybURhdGE6OmlzU3lzdGVtRm9udChDVEZvbnRSZWYgZm9udCkKK3sKKyNpZiBV U0UoQ1RGT05USVNTWVNURU1VSUZPTlQpCisgICAgcmV0dXJuIENURm9udElzU3lzdGVtVUlGb250 KGZvbnQpOworI2Vsc2UKKyAgICByZXR1cm4gQ1RGb250RGVzY3JpcHRvcklzU3lzdGVtVUlGb250 KGFkb3B0Q0YoQ1RGb250Q29weUZvbnREZXNjcmlwdG9yKGZvbnQpKS5nZXQoKSk7CisjZW5kaWYK K30KKwogUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gRm9udFBsYXRmb3JtRGF0YTo6b3BlblR5cGVUYWJs ZSh1aW50MzJfdCB0YWJsZSkgY29uc3QKIHsKICAgICBpZiAoUmV0YWluUHRyPENGRGF0YVJlZj4g ZGF0YSA9IGFkb3B0Q0YoQ1RGb250Q29weVRhYmxlKGZvbnQoKSwgdGFibGUsIGtDVEZvbnRUYWJs ZU9wdGlvbk5vT3B0aW9ucykpKQo= 408075 2020-09-05 01:40:42 -0700 2020-09-05 01:43:43 -0700 Patch for committing bug-215687-20200905014041.patch text/plain 7799 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2NjU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDZjY2Q1NDFhMDhiZjY0Mzc5Yjg3OTM0 NzZlYTRhN2I5NDJhM2Y5NDIuLjMzN2NhZWYyOWExZWU5M2U3MzQ2ZDUxMjZhODJlNWI4YWExNzRh NDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjAtMDktMDUgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIENURm9udElzU3lzdGVtVUlG b250KCkgaXMgZmFzdGVyIHRoYW4gQ1RGb250RGVzY3JpcHRvcklzU3lzdGVtVUlGb250KCkvQ1RG b250Q29weUZvbnREZXNjcmlwdG9yKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxNTY4NworCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVy LgorCisgICAgICAgICogd3RmL1BsYXRmb3JtSGF2ZS5oOgorCiAyMDIwLTA5LTA0ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTW92ZSBQREYg aGVhZHMtdXAgZGlzcGxheSB0byBVSSBwcm9jZXNzIG9uIG1hY09TCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjli NjJlNThmOGNiMmRjNzM2MzE3ZmFhZWFlOGIzMzI2M2JiNTRmYS4uZDFlZmQwZmVkM2YxNGZkNDEy NDYzYmI5OTdlM2Q0ODdjNDc0N2Q4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIw LTA5LTA1ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAg ICAgW0NvY29hXSBDVEZvbnRJc1N5c3RlbVVJRm9udCgpIGlzIGZhc3RlciB0aGFuIENURm9udERl c2NyaXB0b3JJc1N5c3RlbVVJRm9udCgpL0NURm9udENvcHlGb250RGVzY3JpcHRvcigpCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU2ODcKKworICAg ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBJbnN0ZWFkIG9mIG1ha2lu ZyB0aGUgdHdvIGNhbGxzLCB3ZSBjYW4gbWFrZSBhIHNpbmdsZSBjYWxsIHRoYXQgaGFzIHRoZSBz YW1lIGVmZmVjdC4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSB0aGVyZSBpcyBubyBi ZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250UGxhdGZv cm1EYXRhLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29y ZVRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Zm9udElzU3lzdGVtRm9udCk6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhc2NhZGVDb2NvYS5tbToKKyAgICAgICAg KFdlYkNvcmU6OkZvbnRDYXNjYWRlOjpwcmltYXJ5Rm9udElzU3lzdGVtRm9udCBjb25zdCk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1t OgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YSk6 CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjppc1N5c3RlbUZvbnQpOgorCiAy MDIwLTA5LTA1ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAg ICAgICAgRml4IHRoZSBidWlsZCBhZnRlciByMjY2NjE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9QQUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBh ZTIyMmIzYzA5NTg3MGM5NDU2M2NiOGNjNzVhNTYwYzYwMDM4NmY1Li4xMzhmNjkyZjBmNjllMjlj MGU0YTc5N2Y5YzAxNWI2NjU3ZDYyY2Y3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx MiBAQAorMjAyMC0wOS0wNSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29t PgorCisgICAgICAgIFtDb2NvYV0gQ1RGb250SXNTeXN0ZW1VSUZvbnQoKSBpcyBmYXN0ZXIgdGhh biBDVEZvbnREZXNjcmlwdG9ySXNTeXN0ZW1VSUZvbnQoKS9DVEZvbnRDb3B5Rm9udERlc2NyaXB0 b3IoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1 Njg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgKiBwYWwv c3BpL2NvY29hL0NvcmVUZXh0U1BJLmg6CisKIDIwMjAtMDktMDQgIFNpaHVpIExpdSAgPHNpaHVp X2xpdUBhcHBsZS5jb20+CiAKICAgICAgICAgV2VicGFnZXMgZmxhc2ggd2hlbiBzd2l0Y2hpbmcg YmV0d2VlbiB3aW5kb3dzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUu aCBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCmluZGV4IDU4NDNjNzhkZjc2NmFmZDI3 NTk2YWY1MmUxMmE2OTg0OTU5YjEyYjEuLjBiY2Y4MWYzMDU5MzNiNzlmNTFiMjRiZmY4OTkwNWE1 N2UzMTU1YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCisrKyBi L1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCkBAIC03MzIsMyArNzMyLDEwIEBACiAgICAg fHwgKFBMQVRGT1JNKEFQUExFVFYpICYmIF9fVFZfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0g MTQwMDAwKQogI2RlZmluZSBIQVZFX0NGTkVUV09SS19DTkFNRV9BTkRfQ09PS0lFX1RSQU5TRk9S TV9TUEkgMQogI2VuZGlmCisKKyNpZiAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJ T05fTUlOX1JFUVVJUkVEID49IDExMDAwMCkgXAorICAgIHx8ICgoUExBVEZPUk0oSU9TKSB8fCBQ TEFURk9STShNQUNDQVRBTFlTVCkpICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVE ID49IDE0MDAwMCkgXAorICAgIHx8IChQTEFURk9STShXQVRDSE9TKSAmJiBfX1dBVENIX09TX1ZF UlNJT05fTUlOX1JFUVVJUkVEID49IDcwMDAwKSBcCisgICAgfHwgKFBMQVRGT1JNKEFQUExFVFYp ICYmIF9fVFZfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTQwMDAwKQorI2RlZmluZSBIQVZF X0NURk9OVElTU1lTVEVNVUlGT05UIDEKKyNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvUEFML3BhbC9zcGkvY29jb2EvQ29yZVRleHRTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9w YWwvc3BpL2NvY29hL0NvcmVUZXh0U1BJLmgKaW5kZXggYjIyOGY5YmM4MzI0ODMzNDk0YTBjNzgx ODNiNGYyZTNiNTVhOWYxNi4uNWFiZWY2ZDJhYmEzNTlmMmMzMDQ1N2IyOTQ5ZDcyMmE0MDg5ODA4 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQ29yZVRleHRT UEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5o CkBAIC0xMzcsNiArMTM3LDcgQEAgZXh0ZXJuIGNvbnN0IENGU3RyaW5nUmVmIGtDVEZvbnRVSUZv bnREZXNpZ25Sb3VuZGVkOwogZXh0ZXJuIGNvbnN0IENGU3RyaW5nUmVmIGtDVEZyYW1lTWF4aW11 bU51bWJlck9mTGluZXNBdHRyaWJ1dGVOYW1lOwogCiBib29sIENURm9udERlc2NyaXB0b3JJc1N5 c3RlbVVJRm9udChDVEZvbnREZXNjcmlwdG9yUmVmKTsKK2Jvb2wgQ1RGb250SXNTeXN0ZW1VSUZv bnQoQ1RGb250UmVmKTsKIENURm9udFJlZiBDVEZvbnRDcmVhdGVGb3JDU1MoQ0ZTdHJpbmdSZWYg bmFtZSwgdWludDE2X3Qgd2VpZ2h0LCBDVEZvbnRTeW1ib2xpY1RyYWl0cywgQ0dGbG9hdCBzaXpl KTsKIENURm9udFJlZiBDVEZvbnRDcmVhdGVGb3JDaGFyYWN0ZXJzV2l0aExhbmd1YWdlKENURm9u dFJlZiBjdXJyZW50Rm9udCwgY29uc3QgVVRGMTZDaGFyICpjaGFyYWN0ZXJzLCBDRkluZGV4IGxl bmd0aCwgQ0ZTdHJpbmdSZWYgbGFuZ3VhZ2UsIENGSW5kZXggKmNvdmVyZWRMZW5ndGgpOwogQ1RG b250UmVmIENURm9udENyZWF0ZUZvckNoYXJhY3RlcnNXaXRoTGFuZ3VhZ2VBbmRPcHRpb24oQ1RG b250UmVmIGN1cnJlbnRGb250LCBjb25zdCBVVEYxNkNoYXIgKmNoYXJhY3RlcnMsIENGSW5kZXgg bGVuZ3RoLCBDRlN0cmluZ1JlZiBsYW5ndWFnZSwgQ1RGb250RmFsbGJhY2tPcHRpb24gb3B0aW9u LCBDRkluZGV4ICpjb3ZlcmVkTGVuZ3RoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEuaAppbmRleCAwMGM0YTg4NTUzNDYzN2M0MmM2 NzA3YjhiZmM4Zjk5YjYwZTRmZTZkLi4zMjIxMTliZTgyYWRjYTVkNzdlNzIzZjI3NjI2NjM3NDdk MzFhNTUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250 UGxhdGZvcm1EYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9u dFBsYXRmb3JtRGF0YS5oCkBAIC01MSw2ICs1MSw4IEBAIE9CSkNfQ0xBU1MgTlNGb250OwogCiAj aWYgUExBVEZPUk0oQ09DT0EpCiB0eXBlZGVmIGNvbnN0IHN0cnVjdCBfX0NURm9udCogQ1RGb250 UmVmOworCitib29sIGlzU3lzdGVtRm9udChDVEZvbnRSZWYpOwogI2VuZGlmCiAKICNpZiBVU0Uo Q0cpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9G b250Q2FjaGVDb3JlVGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAKaW5kZXggMzY0MGJmMzE2YjdkYzE5ZmFmMjI3Nzdh ZWU1YmNkMGQxNDRhNzVmMC4uNTE3YTI3NmYwZWQ1YTkwM2QxZjVhOWViNWM0MjYzNGFjNDFmOTg4 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9u dENhY2hlQ29yZVRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcApAQCAtNDI1LDcgKzQyNSw3IEBAIHN0YXRpYyBW YXJpYXRpb25EZWZhdWx0c01hcCBkZWZhdWx0VmFyaWF0aW9uVmFsdWVzKENURm9udFJlZiBmb250 KQogCiBzdGF0aWMgaW5saW5lIGJvb2wgZm9udElzU3lzdGVtRm9udChDVEZvbnRSZWYgZm9udCkK IHsKLSAgICBpZiAoQ1RGb250RGVzY3JpcHRvcklzU3lzdGVtVUlGb250KGFkb3B0Q0YoQ1RGb250 Q29weUZvbnREZXNjcmlwdG9yKGZvbnQpKS5nZXQoKSkpCisgICAgaWYgKEZvbnRQbGF0Zm9ybURh dGE6OmlzU3lzdGVtRm9udChmb250KSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICBhdXRv IG5hbWUgPSBhZG9wdENGKENURm9udENvcHlQb3N0U2NyaXB0TmFtZShmb250KSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FzY2FkZUNv Y29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhc2Nh ZGVDb2NvYS5tbQppbmRleCBlM2IxZjMzZGM0YWE4OWM0MTAzN2M3OGE0ZTU0Mjk2OTliYzVhMzI3 Li5jYWYxOGQwODZmZTJlZTcwZmU1NDEzMzU3ZWFiYWEzY2Q4MDE2OWUwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FzY2FkZUNvY29hLm1t CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYXNjYWRl Q29jb2EubW0KQEAgLTMxNiw3ICszMTYsNyBAQCB2b2lkIEZvbnRDYXNjYWRlOjpkcmF3R2x5cGhz KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgRm9udCYgZm9udCwgY29uc3QgRwogYm9v bCBGb250Q2FzY2FkZTo6cHJpbWFyeUZvbnRJc1N5c3RlbUZvbnQoKSBjb25zdAogewogICAgIGNv bnN0IGF1dG8mIGZvbnREYXRhID0gcHJpbWFyeUZvbnQoKTsKLSAgICByZXR1cm4gQ1RGb250RGVz Y3JpcHRvcklzU3lzdGVtVUlGb250KGFkb3B0Q0YoQ1RGb250Q29weUZvbnREZXNjcmlwdG9yKGZv bnREYXRhLnBsYXRmb3JtRGF0YSgpLmN0Rm9udCgpKSkuZ2V0KCkpOworICAgIHJldHVybiBGb250 UGxhdGZvcm1EYXRhOjppc1N5c3RlbUZvbnQoZm9udERhdGEucGxhdGZvcm1EYXRhKCkuY3RGb250 KCkpOwogfQogCiAvLyBGSVhNRTogVXNlIHRoaXMgb24gYWxsIHBvcnRzLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNv Y29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udFBsYXRm b3JtRGF0YUNvY29hLm1tCmluZGV4IDcyZTgyNTFjM2QzNzRlMTAyNDljZTM0MDkzMjcxM2IwOGVj YWM4ZGUuLmQxOWUyZDg5YTkzZjJlZjEzM2E1YzczMDY4YjI0ZmI2NzM4MjVjZjkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRQbGF0Zm9ybURh dGFDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9G b250UGxhdGZvcm1EYXRhQ29jb2EubW0KQEAgLTM1LDYgKzM1LDE1IEBACiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAorYm9vbCBpc1N5c3RlbUZvbnQoQ1RGb250UmVmIGZvbnQpCit7CisjaWYgSEFW RShDVEZPTlRJU1NZU1RFTVVJRk9OVCkKKyAgICByZXR1cm4gQ1RGb250SXNTeXN0ZW1VSUZvbnQo Zm9udCk7CisjZWxzZQorICAgIHJldHVybiBDVEZvbnREZXNjcmlwdG9ySXNTeXN0ZW1VSUZvbnQo YWRvcHRDRihDVEZvbnRDb3B5Rm9udERlc2NyaXB0b3IoZm9udCkpLmdldCgpKTsKKyNlbmRpZgor fQorCiAvLyBUaGVzZSBDb3JlVGV4dCBUZXh0IFNwYWNpbmcgZmVhdHVyZSBzZWxlY3RvcnMgYXJl IG5vdCBkZWZpbmVkIGluIENvcmVUZXh0LgogZW51bSBUZXh0U3BhY2luZ0NURmVhdHVyZVNlbGVj dG9yIHsgVGV4dFNwYWNpbmdQcm9wb3J0aW9uYWwsIFRleHRTcGFjaW5nRnVsbFdpZHRoLCBUZXh0 U3BhY2luZ0hhbGZXaWR0aCwgVGV4dFNwYWNpbmdUaGlyZFdpZHRoLCBUZXh0U3BhY2luZ1F1YXJ0 ZXJXaWR0aCB9OwogCkBAIC00NCw3ICs1Myw3IEBAIEZvbnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0 Zm9ybURhdGEoQ1RGb250UmVmIGZvbnQsIGZsb2F0IHNpemUsIGJvb2wgc3ludGhldGljQm9sCiAg ICAgQVNTRVJUX0FSRyhmb250LCBmb250KTsKICAgICBtX2ZvbnQgPSBmb250OwogICAgIG1faXND b2xvckJpdG1hcEZvbnQgPSBDVEZvbnRHZXRTeW1ib2xpY1RyYWl0cyhmb250KSAmIGtDVEZvbnRU cmFpdENvbG9yR2x5cGhzOwotICAgIG1faXNTeXN0ZW1Gb250ID0gQ1RGb250RGVzY3JpcHRvcklz U3lzdGVtVUlGb250KGFkb3B0Q0YoQ1RGb250Q29weUZvbnREZXNjcmlwdG9yKG1fZm9udC5nZXQo KSkpLmdldCgpKTsKKyAgICBtX2lzU3lzdGVtRm9udCA9IEZvbnRQbGF0Zm9ybURhdGE6OmlzU3lz dGVtRm9udChtX2ZvbnQuZ2V0KCkpOwogICAgIGF1dG8gdmFyaWF0aW9ucyA9IGFkb3B0Q0Yoc3Rh dGljX2Nhc3Q8Q0ZEaWN0aW9uYXJ5UmVmPihDVEZvbnRDb3B5QXR0cmlidXRlKGZvbnQsIGtDVEZv bnRWYXJpYXRpb25BdHRyaWJ1dGUpKSk7CiAgICAgbV9oYXNWYXJpYXRpb25zID0gdmFyaWF0aW9u cyAmJiBDRkRpY3Rpb25hcnlHZXRDb3VudCh2YXJpYXRpb25zLmdldCgpKTsKIAo= 408076 2020-09-05 01:49:35 -0700 2020-09-05 11:21:26 -0700 Patch for committing bug-215687-20200905014934.patch text/plain 7791 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2NjU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDZjY2Q1NDFhMDhiZjY0Mzc5Yjg3OTM0 NzZlYTRhN2I5NDJhM2Y5NDIuLjMzN2NhZWYyOWExZWU5M2U3MzQ2ZDUxMjZhODJlNWI4YWExNzRh NDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjAtMDktMDUgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIENURm9udElzU3lzdGVtVUlG b250KCkgaXMgZmFzdGVyIHRoYW4gQ1RGb250RGVzY3JpcHRvcklzU3lzdGVtVUlGb250KCkvQ1RG b250Q29weUZvbnREZXNjcmlwdG9yKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxNTY4NworCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVy LgorCisgICAgICAgICogd3RmL1BsYXRmb3JtSGF2ZS5oOgorCiAyMDIwLTA5LTA0ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTW92ZSBQREYg aGVhZHMtdXAgZGlzcGxheSB0byBVSSBwcm9jZXNzIG9uIG1hY09TCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjli NjJlNThmOGNiMmRjNzM2MzE3ZmFhZWFlOGIzMzI2M2JiNTRmYS4uZDFlZmQwZmVkM2YxNGZkNDEy NDYzYmI5OTdlM2Q0ODdjNDc0N2Q4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIw LTA5LTA1ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAg ICAgW0NvY29hXSBDVEZvbnRJc1N5c3RlbVVJRm9udCgpIGlzIGZhc3RlciB0aGFuIENURm9udERl c2NyaXB0b3JJc1N5c3RlbVVJRm9udCgpL0NURm9udENvcHlGb250RGVzY3JpcHRvcigpCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU2ODcKKworICAg ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBJbnN0ZWFkIG9mIG1ha2lu ZyB0aGUgdHdvIGNhbGxzLCB3ZSBjYW4gbWFrZSBhIHNpbmdsZSBjYWxsIHRoYXQgaGFzIHRoZSBz YW1lIGVmZmVjdC4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSB0aGVyZSBpcyBubyBi ZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250UGxhdGZv cm1EYXRhLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29y ZVRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Zm9udElzU3lzdGVtRm9udCk6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhc2NhZGVDb2NvYS5tbToKKyAgICAgICAg KFdlYkNvcmU6OkZvbnRDYXNjYWRlOjpwcmltYXJ5Rm9udElzU3lzdGVtRm9udCBjb25zdCk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1t OgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YSk6 CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjppc1N5c3RlbUZvbnQpOgorCiAy MDIwLTA5LTA1ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAg ICAgICAgRml4IHRoZSBidWlsZCBhZnRlciByMjY2NjE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9QQUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBh ZTIyMmIzYzA5NTg3MGM5NDU2M2NiOGNjNzVhNTYwYzYwMDM4NmY1Li4xMzhmNjkyZjBmNjllMjlj MGU0YTc5N2Y5YzAxNWI2NjU3ZDYyY2Y3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx MiBAQAorMjAyMC0wOS0wNSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29t PgorCisgICAgICAgIFtDb2NvYV0gQ1RGb250SXNTeXN0ZW1VSUZvbnQoKSBpcyBmYXN0ZXIgdGhh biBDVEZvbnREZXNjcmlwdG9ySXNTeXN0ZW1VSUZvbnQoKS9DVEZvbnRDb3B5Rm9udERlc2NyaXB0 b3IoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1 Njg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgKiBwYWwv c3BpL2NvY29hL0NvcmVUZXh0U1BJLmg6CisKIDIwMjAtMDktMDQgIFNpaHVpIExpdSAgPHNpaHVp X2xpdUBhcHBsZS5jb20+CiAKICAgICAgICAgV2VicGFnZXMgZmxhc2ggd2hlbiBzd2l0Y2hpbmcg YmV0d2VlbiB3aW5kb3dzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUu aCBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCmluZGV4IDU4NDNjNzhkZjc2NmFmZDI3 NTk2YWY1MmUxMmE2OTg0OTU5YjEyYjEuLjBiY2Y4MWYzMDU5MzNiNzlmNTFiMjRiZmY4OTkwNWE1 N2UzMTU1YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCisrKyBi L1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCkBAIC03MzIsMyArNzMyLDEwIEBACiAgICAg fHwgKFBMQVRGT1JNKEFQUExFVFYpICYmIF9fVFZfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0g MTQwMDAwKQogI2RlZmluZSBIQVZFX0NGTkVUV09SS19DTkFNRV9BTkRfQ09PS0lFX1RSQU5TRk9S TV9TUEkgMQogI2VuZGlmCisKKyNpZiAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJ T05fTUlOX1JFUVVJUkVEID49IDExMDAwMCkgXAorICAgIHx8ICgoUExBVEZPUk0oSU9TKSB8fCBQ TEFURk9STShNQUNDQVRBTFlTVCkpICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVE ID49IDE0MDAwMCkgXAorICAgIHx8IChQTEFURk9STShXQVRDSE9TKSAmJiBfX1dBVENIX09TX1ZF UlNJT05fTUlOX1JFUVVJUkVEID49IDcwMDAwKSBcCisgICAgfHwgKFBMQVRGT1JNKEFQUExFVFYp ICYmIF9fVFZfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTQwMDAwKQorI2RlZmluZSBIQVZF X0NURk9OVElTU1lTVEVNVUlGT05UIDEKKyNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvUEFML3BhbC9zcGkvY29jb2EvQ29yZVRleHRTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9w YWwvc3BpL2NvY29hL0NvcmVUZXh0U1BJLmgKaW5kZXggYjIyOGY5YmM4MzI0ODMzNDk0YTBjNzgx ODNiNGYyZTNiNTVhOWYxNi4uNWFiZWY2ZDJhYmEzNTlmMmMzMDQ1N2IyOTQ5ZDcyMmE0MDg5ODA4 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQ29yZVRleHRT UEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5o CkBAIC0xMzcsNiArMTM3LDcgQEAgZXh0ZXJuIGNvbnN0IENGU3RyaW5nUmVmIGtDVEZvbnRVSUZv bnREZXNpZ25Sb3VuZGVkOwogZXh0ZXJuIGNvbnN0IENGU3RyaW5nUmVmIGtDVEZyYW1lTWF4aW11 bU51bWJlck9mTGluZXNBdHRyaWJ1dGVOYW1lOwogCiBib29sIENURm9udERlc2NyaXB0b3JJc1N5 c3RlbVVJRm9udChDVEZvbnREZXNjcmlwdG9yUmVmKTsKK2Jvb2wgQ1RGb250SXNTeXN0ZW1VSUZv bnQoQ1RGb250UmVmKTsKIENURm9udFJlZiBDVEZvbnRDcmVhdGVGb3JDU1MoQ0ZTdHJpbmdSZWYg bmFtZSwgdWludDE2X3Qgd2VpZ2h0LCBDVEZvbnRTeW1ib2xpY1RyYWl0cywgQ0dGbG9hdCBzaXpl KTsKIENURm9udFJlZiBDVEZvbnRDcmVhdGVGb3JDaGFyYWN0ZXJzV2l0aExhbmd1YWdlKENURm9u dFJlZiBjdXJyZW50Rm9udCwgY29uc3QgVVRGMTZDaGFyICpjaGFyYWN0ZXJzLCBDRkluZGV4IGxl bmd0aCwgQ0ZTdHJpbmdSZWYgbGFuZ3VhZ2UsIENGSW5kZXggKmNvdmVyZWRMZW5ndGgpOwogQ1RG b250UmVmIENURm9udENyZWF0ZUZvckNoYXJhY3RlcnNXaXRoTGFuZ3VhZ2VBbmRPcHRpb24oQ1RG b250UmVmIGN1cnJlbnRGb250LCBjb25zdCBVVEYxNkNoYXIgKmNoYXJhY3RlcnMsIENGSW5kZXgg bGVuZ3RoLCBDRlN0cmluZ1JlZiBsYW5ndWFnZSwgQ1RGb250RmFsbGJhY2tPcHRpb24gb3B0aW9u LCBDRkluZGV4ICpjb3ZlcmVkTGVuZ3RoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEuaAppbmRleCAwMGM0YTg4NTUzNDYzN2M0MmM2 NzA3YjhiZmM4Zjk5YjYwZTRmZTZkLi40NmM5YWM3NzhhZDlhOTY0NGIxMzFjNTM2ZTIwYmIwOGE0 YzA0ZGFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250 UGxhdGZvcm1EYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9u dFBsYXRmb3JtRGF0YS5oCkBAIC0yNzYsNiArMjc2LDEwIEBAIHByaXZhdGU6CiAjZW5kaWYKIH07 CiAKKyNpZiBQTEFURk9STShDT0NPQSkKK2Jvb2wgaXNTeXN0ZW1Gb250KENURm9udFJlZik7Cisj ZW5kaWYKKwogI2lmIFVTRShBUFBLSVQpICYmIGRlZmluZWQoX19PQkpDX18pCiAKIC8vIE5TRm9u dHMgYW5kIENURm9udFJlZnMgYXJlIHRvbGwtZnJlZS1icmlkZ2VkLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRl eHQuY3BwCmluZGV4IDM2NDBiZjMxNmI3ZGMxOWZhZjIyNzc3YWVlNWJjZDBkMTQ0YTc1ZjAuLjhj MjkxOTM2OWJlYmQ0MTRmNWNlZmJjM2MwMDNjZDRlMWFhOTRhNmYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3Jl VGV4dC5jcHAKQEAgLTQyNSw3ICs0MjUsNyBAQCBzdGF0aWMgVmFyaWF0aW9uRGVmYXVsdHNNYXAg ZGVmYXVsdFZhcmlhdGlvblZhbHVlcyhDVEZvbnRSZWYgZm9udCkKIAogc3RhdGljIGlubGluZSBi b29sIGZvbnRJc1N5c3RlbUZvbnQoQ1RGb250UmVmIGZvbnQpCiB7Ci0gICAgaWYgKENURm9udERl c2NyaXB0b3JJc1N5c3RlbVVJRm9udChhZG9wdENGKENURm9udENvcHlGb250RGVzY3JpcHRvcihm b250KSkuZ2V0KCkpKQorICAgIGlmIChpc1N5c3RlbUZvbnQoZm9udCkpCiAgICAgICAgIHJldHVy biB0cnVlOwogCiAgICAgYXV0byBuYW1lID0gYWRvcHRDRihDVEZvbnRDb3B5UG9zdFNjcmlwdE5h bWUoZm9udCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y29jb2EvRm9udENhc2NhZGVDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NvY29hL0ZvbnRDYXNjYWRlQ29jb2EubW0KaW5kZXggZTNiMWYzM2RjNGFhODljNDEwMzdj NzhhNGU1NDI5Njk5YmM1YTMyNy4uMmQ4YTdjMDE5MGZiYmEwY2U3YzBhNzQwMjBmNjZlYzc2Mjk3 OGM4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2Ev Rm9udENhc2NhZGVDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jb2NvYS9Gb250Q2FzY2FkZUNvY29hLm1tCkBAIC0zMTYsNyArMzE2LDcgQEAgdm9pZCBGb250 Q2FzY2FkZTo6ZHJhd0dseXBocyhHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZvbnQm IGZvbnQsIGNvbnN0IEcKIGJvb2wgRm9udENhc2NhZGU6OnByaW1hcnlGb250SXNTeXN0ZW1Gb250 KCkgY29uc3QKIHsKICAgICBjb25zdCBhdXRvJiBmb250RGF0YSA9IHByaW1hcnlGb250KCk7Ci0g ICAgcmV0dXJuIENURm9udERlc2NyaXB0b3JJc1N5c3RlbVVJRm9udChhZG9wdENGKENURm9udENv cHlGb250RGVzY3JpcHRvcihmb250RGF0YS5wbGF0Zm9ybURhdGEoKS5jdEZvbnQoKSkpLmdldCgp KTsKKyAgICByZXR1cm4gaXNTeXN0ZW1Gb250KGZvbnREYXRhLnBsYXRmb3JtRGF0YSgpLmN0Rm9u dCgpKTsKIH0KIAogLy8gRklYTUU6IFVzZSB0aGlzIG9uIGFsbCBwb3J0cy4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRQbGF0Zm9ybURhdGFD b2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRQbGF0 Zm9ybURhdGFDb2NvYS5tbQppbmRleCA3MmU4MjUxYzNkMzc0ZTEwMjQ5Y2UzNDA5MzI3MTNiMDhl Y2FjOGRlLi5kYjFiNGZmNGExNmE0MjNmZTg2M2NlNzNiNThjNjYyOGMxYjA4ZTY0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1E YXRhQ29jb2EubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2Ev Rm9udFBsYXRmb3JtRGF0YUNvY29hLm1tCkBAIC0zNSw2ICszNSwxNSBAQAogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKK2Jvb2wgaXNTeXN0ZW1Gb250KENURm9udFJlZiBmb250KQoreworI2lmIEhB VkUoQ1RGT05USVNTWVNURU1VSUZPTlQpCisgICAgcmV0dXJuIENURm9udElzU3lzdGVtVUlGb250 KGZvbnQpOworI2Vsc2UKKyAgICByZXR1cm4gQ1RGb250RGVzY3JpcHRvcklzU3lzdGVtVUlGb250 KGFkb3B0Q0YoQ1RGb250Q29weUZvbnREZXNjcmlwdG9yKGZvbnQpKS5nZXQoKSk7CisjZW5kaWYK K30KKwogLy8gVGhlc2UgQ29yZVRleHQgVGV4dCBTcGFjaW5nIGZlYXR1cmUgc2VsZWN0b3JzIGFy ZSBub3QgZGVmaW5lZCBpbiBDb3JlVGV4dC4KIGVudW0gVGV4dFNwYWNpbmdDVEZlYXR1cmVTZWxl Y3RvciB7IFRleHRTcGFjaW5nUHJvcG9ydGlvbmFsLCBUZXh0U3BhY2luZ0Z1bGxXaWR0aCwgVGV4 dFNwYWNpbmdIYWxmV2lkdGgsIFRleHRTcGFjaW5nVGhpcmRXaWR0aCwgVGV4dFNwYWNpbmdRdWFy dGVyV2lkdGggfTsKIApAQCAtNDQsNyArNTMsNyBAQCBGb250UGxhdGZvcm1EYXRhOjpGb250UGxh dGZvcm1EYXRhKENURm9udFJlZiBmb250LCBmbG9hdCBzaXplLCBib29sIHN5bnRoZXRpY0JvbAog ICAgIEFTU0VSVF9BUkcoZm9udCwgZm9udCk7CiAgICAgbV9mb250ID0gZm9udDsKICAgICBtX2lz Q29sb3JCaXRtYXBGb250ID0gQ1RGb250R2V0U3ltYm9saWNUcmFpdHMoZm9udCkgJiBrQ1RGb250 VHJhaXRDb2xvckdseXBoczsKLSAgICBtX2lzU3lzdGVtRm9udCA9IENURm9udERlc2NyaXB0b3JJ c1N5c3RlbVVJRm9udChhZG9wdENGKENURm9udENvcHlGb250RGVzY3JpcHRvcihtX2ZvbnQuZ2V0 KCkpKS5nZXQoKSk7CisgICAgbV9pc1N5c3RlbUZvbnQgPSBXZWJDb3JlOjppc1N5c3RlbUZvbnQo bV9mb250LmdldCgpKTsKICAgICBhdXRvIHZhcmlhdGlvbnMgPSBhZG9wdENGKHN0YXRpY19jYXN0 PENGRGljdGlvbmFyeVJlZj4oQ1RGb250Q29weUF0dHJpYnV0ZShmb250LCBrQ1RGb250VmFyaWF0 aW9uQXR0cmlidXRlKSkpOwogICAgIG1faGFzVmFyaWF0aW9ucyA9IHZhcmlhdGlvbnMgJiYgQ0ZE aWN0aW9uYXJ5R2V0Q291bnQodmFyaWF0aW9ucy5nZXQoKSk7CiAK