223985 2021-03-31 00:06:06 -0700 [Cocoa] REGRESSION(r272999): User-installed fonts no longer work in Mail 2021-04-01 11:50:31 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mmaxfield mmaxfield dino jonlee pvollan simon.fraser thorton webkit-bug-importer oldest_to_newest 1745524 0 mmaxfield 2021-03-31 00:06:06 -0700 [Cocoa] REGRESSION(r272999): User-installed fonts no longer work in Mail 1745526 1 424738 mmaxfield 2021-03-31 00:07:20 -0700 Created attachment 424738 Needs a test 1745527 2 mmaxfield 2021-03-31 00:08:05 -0700 <rdar://problem/75975210> 1745546 3 424743 mmaxfield 2021-03-31 01:11:09 -0700 Created attachment 424743 Patch 1745944 4 424873 mmaxfield 2021-03-31 23:08:35 -0700 Created attachment 424873 Patch 1746082 5 424873 pvollan 2021-04-01 10:03:36 -0700 Comment on attachment 424873 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424873&action=review Thanks! R=me. > Source/WebKit/WebProcess/WebPage/WebPage.h:-2275 > - > -#if HAVE(STATIC_FONT_REGISTRY) > - RefPtr<SandboxExtension> m_fontExtension; > -#endif You may also be able to remove the font extension member in WebProcess, since you can consume the extension permanently. 1746108 6 mmaxfield 2021-04-01 11:14:35 -0700 (In reply to Per Arne Vollan from comment #5) > Comment on attachment 424873 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=424873&action=review > > Thanks! R=me. > > > Source/WebKit/WebProcess/WebPage/WebPage.h:-2275 > > - > > -#if HAVE(STATIC_FONT_REGISTRY) > > - RefPtr<SandboxExtension> m_fontExtension; > > -#endif > > You may also be able to remove the font extension member in WebProcess, > since you can consume the extension permanently. SandboxExtension's destructor actually explicitly makes sure that this doesn't happen. 1746129 7 ews-feeder 2021-04-01 11:50:29 -0700 Committed r275371: <https://commits.webkit.org/r275371> All reviewed patches have been landed. Closing bug and clearing flags on attachment 424873. 424738 2021-03-31 00:07:20 -0700 2021-03-31 01:11:07 -0700 Needs a test bug-223985-20210331000719.patch text/plain 2658 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBkY2Q1MGEyYzUwNDhjNGM5 NDU2Zjg4YzMzMWY5NDc0MWMwMzk3MjQuLmNiY2M3ZDkwNDdkMGNlNWNjNmNmYmE2NmFkMWY1NjNj N2FlNWFhODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjEtMDMtMzEgIE15bGVzIEMu IE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIFJFR1JF U1NJT04ocjI3Mjk5OSk6IFVzZXItaW5zdGFsbGVkIGZvbnRzIG5vIGxvbmdlciB3b3JrIGluIE1h aWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzk4 NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzU5NzUyMTA+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6 Om1fbGFzdE5hdmlnYXRpb25XYXNBcHBCb3VuZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6 On5XZWJQYWdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorCiAy MDIxLTAzLTMwICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAg ICAgIFtpT1NdIEZhbGwgYmFjayB0byBjb250ZXh0IG1lbnUgcHJlc2VudGF0aW9uIGFmdGVyIGxv bmcgcHJlc3NpbmcgaW1hZ2Ugb3ZlcmxheSB0ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDc5MmQzNGMxMTA4NzU5OTAxMzMxZmFiNjk4YTg3 MjY0NWIzZWU2MjguLmNkODdmMzQ3NTY0NmJhMTFjNDY0NmRhM2YyN2ZlMjMzOGQ5ZjQ4ZDUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC02Mjks MTIgKzYyOSw4IEBAIFdlYlBhZ2U6OldlYlBhZ2UoUGFnZUlkZW50aWZpZXIgcGFnZUlELCBXZWJQ YWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICNlbmRpZgogCiAjaWYgSEFWRShT VEFUSUNfRk9OVF9SRUdJU1RSWSkKLSAgICBpZiAocGFyYW1ldGVycy5mb250TWFjaEV4dGVuc2lv bkhhbmRsZSkgewotICAgICAgICBpZiAoKG1fZm9udEV4dGVuc2lvbiA9IFNhbmRib3hFeHRlbnNp b246OmNyZWF0ZShXVEZNb3ZlKCpwYXJhbWV0ZXJzLmZvbnRNYWNoRXh0ZW5zaW9uSGFuZGxlKSkp KSB7Ci0gICAgICAgICAgICBib29sIG9rID0gbV9mb250RXh0ZW5zaW9uLT5jb25zdW1lKCk7Ci0g ICAgICAgICAgICBBU1NFUlRfVU5VU0VEKG9rLCBvayk7Ci0gICAgICAgIH0KLSAgICB9CisgICAg aWYgKHBhcmFtZXRlcnMuZm9udE1hY2hFeHRlbnNpb25IYW5kbGUpCisgICAgICAgIFdlYlByb2Nl c3M6OnNpbmdsZXRvbigpLnN3aXRjaEZyb21TdGF0aWNGb250UmVnaXN0cnlUb1VzZXJGb250UmVn aXN0cnkoV1RGTW92ZSgqcGFyYW1ldGVycy5mb250TWFjaEV4dGVuc2lvbkhhbmRsZSkpOwogI2Vu ZGlmCiAKICAgICBtX3BhZ2UgPSBtYWtlVW5pcXVlPFBhZ2U+KFdURk1vdmUocGFnZUNvbmZpZ3Vy YXRpb24pKTsKQEAgLTEwMTksMTEgKzEwMTUsNiBAQCBXZWJQYWdlOjp+V2ViUGFnZSgpCiAgICAg ICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihXVEY6Om51bGxvcHQpOwogICAgIH0KICNlbmRpZgot Ci0jaWYgSEFWRShTVEFUSUNfRk9OVF9SRUdJU1RSWSkKLSAgICBpZiAobV9mb250RXh0ZW5zaW9u KQotICAgICAgICBtX2ZvbnRFeHRlbnNpb24tPnJldm9rZSgpOwotI2VuZGlmCiB9CiAKIElQQzo6 Q29ubmVjdGlvbiogV2ViUGFnZTo6bWVzc2FnZVNlbmRlckNvbm5lY3Rpb24oKSBjb25zdApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IGM1NGE2MThkYjQ2 YTEyZGUwMWE1ODYzNDZhNjZlOTE3Zjc0Y2EyZGIuLmRhOTY0ODFhOWU5MmRmYjkyOWFkNmQwNTQ3 Nzc4M2Y0MmI2Njc4ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmgKQEAgLTIyNjksMTAgKzIyNjksNiBAQCBwcml2YXRlOgogI2lmIEVOQUJMRShJTUFHRV9F WFRSQUNUSU9OKQogICAgIFdlYWtIYXNoU2V0PFdlYkNvcmU6OkVsZW1lbnQ+IG1fZWxlbWVudHNX aXRoRXh0cmFjdGVkSW1hZ2VzOwogI2VuZGlmCi0KLSNpZiBIQVZFKFNUQVRJQ19GT05UX1JFR0lT VFJZKQotICAgIFJlZlB0cjxTYW5kYm94RXh0ZW5zaW9uPiBtX2ZvbnRFeHRlbnNpb247Ci0jZW5k aWYKIH07CiAKICNpZiAhUExBVEZPUk0oSU9TX0ZBTUlMWSkK 424743 2021-03-31 01:11:09 -0700 2021-03-31 23:08:34 -0700 Patch bug-223985-20210331011108.patch text/plain 5268 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBkY2Q1MGEyYzUwNDhjNGM5 NDU2Zjg4YzMzMWY5NDc0MWMwMzk3MjQuLjdjYjJjYzU4YjJhMzg3NTNkN2YwMjU0NTg2YzFkMDBi YjMzYmI3NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDMtMzEgIE15bGVzIEMu IE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIFJFR1JF U1NJT04ocjI3Mjk5OSk6IFVzZXItaW5zdGFsbGVkIGZvbnRzIG5vIGxvbmdlciB3b3JrIGluIE1h aWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzk4 NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzU5NzUyMTA+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHNhbmRib3ggZXh0ZW5zaW9uIHdoaWNo IGFsbG93cyB1c2VyLWluc3RhbGxlZCBmb250cyB0byB3b3JrIHdhcyBwYXJ0IG9mIHRoZSBXZWJQ YWdlLAorICAgICAgICBidXQgaXQgbmVlZHMgdG8gb3V0bGl2ZSB0aGUgV2ViUGFnZS4gVGhpcyBw YXRjaCBzaW1wbHkganVzdCBob29rcyB0aGlzIHNhbmRib3ggZXh0ZW5zaW9uCisgICAgICAgIHVw IHRvIG91ciBleGlzdGluZyBpbmZyYXN0cnVjdHVyZSBvbiB0aGUgV2ViUHJvY2Vzcy4KKworICAg ICAgICBUZXN0OiBXZWJLaXQuRm9udGRTYW5kYm94Q2hlY2syCisKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Om1fbGFzdE5hdmlnYXRp b25XYXNBcHBCb3VuZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6On5XZWJQYWdlKToKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorCiAyMDIxLTAzLTMwICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIEZhbGwg YmFjayB0byBjb250ZXh0IG1lbnUgcHJlc2VudGF0aW9uIGFmdGVyIGxvbmcgcHJlc3NpbmcgaW1h Z2Ugb3ZlcmxheSB0ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuY3BwCmluZGV4IDc5MmQzNGMxMTA4NzU5OTAxMzMxZmFiNjk4YTg3MjY0NWIzZWU2MjguLmNk ODdmMzQ3NTY0NmJhMTFjNDY0NmRhM2YyN2ZlMjMzOGQ5ZjQ4ZDUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC02MjksMTIgKzYyOSw4IEBAIFdl YlBhZ2U6OldlYlBhZ2UoUGFnZUlkZW50aWZpZXIgcGFnZUlELCBXZWJQYWdlQ3JlYXRpb25QYXJh bWV0ZXJzJiYgcGFyYW1ldGVycykKICNlbmRpZgogCiAjaWYgSEFWRShTVEFUSUNfRk9OVF9SRUdJ U1RSWSkKLSAgICBpZiAocGFyYW1ldGVycy5mb250TWFjaEV4dGVuc2lvbkhhbmRsZSkgewotICAg ICAgICBpZiAoKG1fZm9udEV4dGVuc2lvbiA9IFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZShXVEZN b3ZlKCpwYXJhbWV0ZXJzLmZvbnRNYWNoRXh0ZW5zaW9uSGFuZGxlKSkpKSB7Ci0gICAgICAgICAg ICBib29sIG9rID0gbV9mb250RXh0ZW5zaW9uLT5jb25zdW1lKCk7Ci0gICAgICAgICAgICBBU1NF UlRfVU5VU0VEKG9rLCBvayk7Ci0gICAgICAgIH0KLSAgICB9CisgICAgaWYgKHBhcmFtZXRlcnMu Zm9udE1hY2hFeHRlbnNpb25IYW5kbGUpCisgICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigp LnN3aXRjaEZyb21TdGF0aWNGb250UmVnaXN0cnlUb1VzZXJGb250UmVnaXN0cnkoV1RGTW92ZSgq cGFyYW1ldGVycy5mb250TWFjaEV4dGVuc2lvbkhhbmRsZSkpOwogI2VuZGlmCiAKICAgICBtX3Bh Z2UgPSBtYWtlVW5pcXVlPFBhZ2U+KFdURk1vdmUocGFnZUNvbmZpZ3VyYXRpb24pKTsKQEAgLTEw MTksMTEgKzEwMTUsNiBAQCBXZWJQYWdlOjp+V2ViUGFnZSgpCiAgICAgICAgICAgICBjb21wbGV0 aW9uSGFuZGxlcihXVEY6Om51bGxvcHQpOwogICAgIH0KICNlbmRpZgotCi0jaWYgSEFWRShTVEFU SUNfRk9OVF9SRUdJU1RSWSkKLSAgICBpZiAobV9mb250RXh0ZW5zaW9uKQotICAgICAgICBtX2Zv bnRFeHRlbnNpb24tPnJldm9rZSgpOwotI2VuZGlmCiB9CiAKIElQQzo6Q29ubmVjdGlvbiogV2Vi UGFnZTo6bWVzc2FnZVNlbmRlckNvbm5lY3Rpb24oKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IGM1NGE2MThkYjQ2YTEyZGUwMWE1ODYzNDZh NjZlOTE3Zjc0Y2EyZGIuLmRhOTY0ODFhOWU5MmRmYjkyOWFkNmQwNTQ3Nzc4M2Y0MmI2Njc4ZTgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTIyNjks MTAgKzIyNjksNiBAQCBwcml2YXRlOgogI2lmIEVOQUJMRShJTUFHRV9FWFRSQUNUSU9OKQogICAg IFdlYWtIYXNoU2V0PFdlYkNvcmU6OkVsZW1lbnQ+IG1fZWxlbWVudHNXaXRoRXh0cmFjdGVkSW1h Z2VzOwogI2VuZGlmCi0KLSNpZiBIQVZFKFNUQVRJQ19GT05UX1JFR0lTVFJZKQotICAgIFJlZlB0 cjxTYW5kYm94RXh0ZW5zaW9uPiBtX2ZvbnRFeHRlbnNpb247Ci0jZW5kaWYKIH07CiAKICNpZiAh UExBVEZPUk0oSU9TX0ZBTUlMWSkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xz L0NoYW5nZUxvZwppbmRleCA0OTQ3YWZmNDA0N2U4YTFhNzA3MDk5ZWVjZjc4YzA4MmZlNzMzMTk2 Li5iZjhmNTUzZDNkNjRiMDY2MzAzZTNmMDNjNWJkNDZkZjgxODdjMzM2IDEwMDY0NAotLS0gYS9U b29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIw MjEtMDMtMzEgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAg ICAgICBbQ29jb2FdIFJFR1JFU1NJT04ocjI3Mjk5OSk6IFVzZXItaW5zdGFsbGVkIGZvbnRzIG5v IGxvbmdlciB3b3JrIGluIE1haWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMzk4NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzU5NzUyMTA+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdC9Gb250UmVnaXN0cnlTYW5kYm94Q2hlY2subW06CisgICAgICAg IChURVNUKToKKwogMjAyMS0wMy0zMCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgog CiAgICAgICAgIFNlcnZpY2UgV29ya2VyIHNjcmlwdHMgdXNlIHRvbyBtdWNoIG1lbW9yeSBpbiB0 aGUgbmV0d29yayBwcm9jZXNzCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdC9Gb250UmVnaXN0cnlTYW5kYm94Q2hlY2subW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdC9Gb250UmVnaXN0cnlTYW5kYm94Q2hlY2subW0KaW5kZXggMzQ3N2UwZWNh OGE0NWZjZDdiYWJlYTRmOTc4ZDBhNGE2NGY2YzhmYS4uZjgxODgwZDU2MjE5MWIzMTUxNTczMTQ0 YzA3N2RlNTM5YjcxN2JlYSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXQvRm9udFJlZ2lzdHJ5U2FuZGJveENoZWNrLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0L0ZvbnRSZWdpc3RyeVNhbmRib3hDaGVjay5tbQpAQCAtMzAsNiArMzAs NyBAQAogI2ltcG9ydCAiUGxhdGZvcm1VdGlsaXRpZXMuaCIKICNpbXBvcnQgIlRlc3RXS1dlYlZp ZXcuaCIKICNpbXBvcnQgPFdlYktpdC9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5oPgorI2ltcG9ydCA8 V2ViS2l0L1dLUHJvY2Vzc1Bvb2xQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tXZWJWaWV3 UHJpdmF0ZS5oPgogCiBURVNUKFdlYktpdCwgRm9udGRTYW5kYm94Q2hlY2spCkBAIC01Myw0ICs1 NCwyNCBAQCBURVNUKFdlYktpdCwgRm9udGRTYW5kYm94Q2hlY2spCiAgICAgQVNTRVJUX1RSVUUo c2FuZGJveEFjY2VzcygpKTsKIH0KIAorVEVTVChXZWJLaXQsIEZvbnRkU2FuZGJveENoZWNrMikK K3sKKyAgICBhdXRvIGNvbnRleHQgPSBhZG9wdFdLKFRlc3RXZWJLaXRBUEk6OlV0aWw6OmNyZWF0 ZUNvbnRleHRGb3JJbmplY3RlZEJ1bmRsZVRlc3QoIkludGVybmFsc0luamVjdGVkQnVuZGxlVGVz dCIpKTsKKyAgICBXS0NvbnRleHRTZXRVc2VzU2luZ2xlV2ViUHJvY2Vzcyhjb250ZXh0LmdldCgp LCB0cnVlKTsKKyAgICAKKyAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJW aWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCku cHJvY2Vzc1Bvb2wgPSAoV0tQcm9jZXNzUG9vbCAqKWNvbnRleHQuZ2V0KCk7CisKKyAgICBhdXRv IHNhbmRib3hBY2Nlc3MgPSBbJl0oV0tXZWJWaWV3ICp3ZWJWaWV3KSB7CisgICAgICAgIHJldHVy biBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAid2luZG93LmludGVybmFs cy5oYXNTYW5kYm94TWFjaExvb2t1cEFjY2Vzc1RvWFBDU2VydmljZU5hbWUoJ2NvbS5hcHBsZS5X ZWJLaXQuV2ViQ29udGVudCcsICdjb20uYXBwbGUuZm9udHMnKSJdLmJvb2xWYWx1ZTsKKyAgICB9 OworCisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCAxMDsgKytpKSB7CisgICAgICAgIGF1dG8gd2Vi VmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVj dE1ha2UoMCwgMCwgMzIwLCA1MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKSBh ZGRUb1dpbmRvdzpZRVNdKTsKKyAgICAgICAgW3dlYlZpZXcgc3luY2hyb25vdXNseUxvYWRUZXN0 UGFnZU5hbWVkOkAic2ltcGxlIl07CisgICAgICAgIEFTU0VSVF9UUlVFKHNhbmRib3hBY2Nlc3Mo d2ViVmlldy5nZXQoKSkpOworICAgICAgICBbd2ViVmlldyBfY2xvc2VdOworICAgIH0KK30KKwog I2VuZGlmIC8vIFdLX0hBVkVfQ19TUEkK 424873 2021-03-31 23:08:35 -0700 2021-04-01 11:50:30 -0700 Patch bug-223985-20210331230835.patch text/plain 10038 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBkY2Q1MGEyYzUwNDhjNGM5 NDU2Zjg4YzMzMWY5NDc0MWMwMzk3MjQuLjdkMmVlZjA1ZDRiMDhmYWQ5YzZmODBlYTI5YzM2Nzk1 OTMyODJmYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjEtMDMtMzEgIE15bGVzIEMu IE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIFJFR1JF U1NJT04ocjI3Mjk5OSk6IFVzZXItaW5zdGFsbGVkIGZvbnRzIG5vIGxvbmdlciB3b3JrIGluIE1h aWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzk4 NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzU5NzUyMTA+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHNhbmRib3ggZXh0ZW5zaW9uIHdoaWNo IGFsbG93cyB1c2VyLWluc3RhbGxlZCBmb250cyB0byB3b3JrIHdhcyBwYXJ0IG9mIHRoZSBXZWJQ YWdlLAorICAgICAgICBidXQgWFR5cGUgbWF5IGFscmVhZHkgaGF2ZSBiZWVuIGluaXRpYWxpemVk IHRvIHVzZSB0aGUgc3RhdGljIHJlZ2lzdHJ5IGJ5IHRoZSB0aW1lIHRoZSBXZWJQYWdlCisgICAg ICAgIGhhcyBiZWVuIGNyZWF0ZWQuIFRoZXJlZm9yZSwgc2ltcGx5IF9oYXZpbmdfIGEgc2FuZGJv eCBleHRlbnNpb24gaXNuJ3Qgc3VmZmljaWVudDsgaW5zdGVhZCwKKyAgICAgICAgV2ViUGFnZSdz IGNvbnN0cnVjdG9yIG5lZWRzIHRvIGNhbGwgQ1RGb250TWFuYWdlckVuYWJsZUFsbFVzZXJGb250 cygpIHRvIHN3aXRjaCB0byB1c2luZyBmb250ZAorICAgICAgICBpbiBhZGRpdGlvbiB0byB1c2lu ZyB0aGUgc2FuZGJveCBleHRlbnNpb24uCisKKyAgICAgICAgVGVzdDogV2ViS2l0LlVzZXJJbnN0 YWxsZWRGb250c1dvcmsKKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cDoKKyAgICAgICAgKFdlYktpdDo6bV9sYXN0TmF2aWdhdGlvbldhc0FwcEJvdW5kKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZTo6fldlYlBhZ2UpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmg6CisKIDIwMjEtMDMtMzAgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2ll aEBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gRmFsbCBiYWNrIHRvIGNvbnRleHQgbWVudSBw cmVzZW50YXRpb24gYWZ0ZXIgbG9uZyBwcmVzc2luZyBpbWFnZSBvdmVybGF5IHRleHQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggNzkyZDM0YzEx MDg3NTk5MDEzMzFmYWI2OThhODcyNjQ1YjNlZTYyOC4uY2Q4N2YzNDc1NjQ2YmExMWM0NjQ2ZGEz ZjI3ZmUyMzM4ZDlmNDhkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5jcHAKQEAgLTYyOSwxMiArNjI5LDggQEAgV2ViUGFnZTo6V2ViUGFnZShQYWdlSWRl bnRpZmllciBwYWdlSUQsIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQog I2VuZGlmCiAKICNpZiBIQVZFKFNUQVRJQ19GT05UX1JFR0lTVFJZKQotICAgIGlmIChwYXJhbWV0 ZXJzLmZvbnRNYWNoRXh0ZW5zaW9uSGFuZGxlKSB7Ci0gICAgICAgIGlmICgobV9mb250RXh0ZW5z aW9uID0gU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlKFdURk1vdmUoKnBhcmFtZXRlcnMuZm9udE1h Y2hFeHRlbnNpb25IYW5kbGUpKSkpIHsKLSAgICAgICAgICAgIGJvb2wgb2sgPSBtX2ZvbnRFeHRl bnNpb24tPmNvbnN1bWUoKTsKLSAgICAgICAgICAgIEFTU0VSVF9VTlVTRUQob2ssIG9rKTsKLSAg ICAgICAgfQotICAgIH0KKyAgICBpZiAocGFyYW1ldGVycy5mb250TWFjaEV4dGVuc2lvbkhhbmRs ZSkKKyAgICAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuc3dpdGNoRnJvbVN0YXRpY0ZvbnRS ZWdpc3RyeVRvVXNlckZvbnRSZWdpc3RyeShXVEZNb3ZlKCpwYXJhbWV0ZXJzLmZvbnRNYWNoRXh0 ZW5zaW9uSGFuZGxlKSk7CiAjZW5kaWYKIAogICAgIG1fcGFnZSA9IG1ha2VVbmlxdWU8UGFnZT4o V1RGTW92ZShwYWdlQ29uZmlndXJhdGlvbikpOwpAQCAtMTAxOSwxMSArMTAxNSw2IEBAIFdlYlBh Z2U6On5XZWJQYWdlKCkKICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKFdURjo6bnVsbG9w dCk7CiAgICAgfQogI2VuZGlmCi0KLSNpZiBIQVZFKFNUQVRJQ19GT05UX1JFR0lTVFJZKQotICAg IGlmIChtX2ZvbnRFeHRlbnNpb24pCi0gICAgICAgIG1fZm9udEV4dGVuc2lvbi0+cmV2b2tlKCk7 Ci0jZW5kaWYKIH0KIAogSVBDOjpDb25uZWN0aW9uKiBXZWJQYWdlOjptZXNzYWdlU2VuZGVyQ29u bmVjdGlvbigpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmgKaW5kZXggYzU0YTYxOGRiNDZhMTJkZTAxYTU4NjM0NmE2NmU5MTdmNzRjYTJkYi4uZGE5NjQ4 MWE5ZTkyZGZiOTI5YWQ2ZDA1NDc3NzgzZjQyYjY2NzhlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtMjI2OSwxMCArMjI2OSw2IEBAIHByaXZhdGU6 CiAjaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04pCiAgICAgV2Vha0hhc2hTZXQ8V2ViQ29yZTo6 RWxlbWVudD4gbV9lbGVtZW50c1dpdGhFeHRyYWN0ZWRJbWFnZXM7CiAjZW5kaWYKLQotI2lmIEhB VkUoU1RBVElDX0ZPTlRfUkVHSVNUUlkpCi0gICAgUmVmUHRyPFNhbmRib3hFeHRlbnNpb24+IG1f Zm9udEV4dGVuc2lvbjsKLSNlbmRpZgogfTsKIAogI2lmICFQTEFURk9STShJT1NfRkFNSUxZKQpk aWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDQ5NDdh ZmY0MDQ3ZThhMWE3MDcwOTllZWNmNzhjMDgyZmU3MzMxOTYuLmJmOGY1NTNkM2Q2NGIwNjYzMDNl M2YwM2M1YmQ0NmRmODE4N2MzMzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wMy0zMSAgTXlsZXMgQy4gTWF4 ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gUkVHUkVTU0lP TihyMjcyOTk5KTogVXNlci1pbnN0YWxsZWQgZm9udHMgbm8gbG9uZ2VyIHdvcmsgaW4gTWFpbAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzOTg1Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NTk3NTIxMD4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L0Zv bnRSZWdpc3RyeVNhbmRib3hDaGVjay5tbToKKyAgICAgICAgKFRFU1QpOgorCiAyMDIxLTAzLTMw ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgU2VydmljZSBXb3Jr ZXIgc2NyaXB0cyB1c2UgdG9vIG11Y2ggbWVtb3J5IGluIHRoZSBuZXR3b3JrIHByb2Nlc3MKZGlm ZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJv amVjdC5wYnhwcm9qIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJv ai9wcm9qZWN0LnBieHByb2oKaW5kZXggZmJhMDMyYzg1ODNiOWYxODc4ODE4YmE2NDk2OTM0NmM0 ZTA0YjczMy4uMGNiODcyMTEzMTdjMzdmNDM5MDQ4YTQxMDg5MDVkMjM2OGJiZGQwMCAxMDA2NDQK LS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2oKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJv ai9wcm9qZWN0LnBieHByb2oKQEAgLTEwOCw2ICsxMDgsNyBAQAogCQkxQzJCODE4MzFDODkxRjA5 MDBBNTUyOUYgLyogQ2FuY2VsRm9udFN1YnJlc291cmNlUGx1Z0luLm1tIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUMyQjgxODExQzg5MUVGQTAwQTU1MjlG IC8qIENhbmNlbEZvbnRTdWJyZXNvdXJjZVBsdWdJbi5tbSAqLzsgfTsKIAkJMUMyQjgxODYxQzg5 MjU5RDAwQTU1MjlGIC8qIHdlYmZvbnQuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzJCODE4NDFDODkyNEEyMDBBNTUyOUYgLyogd2Vi Zm9udC5odG1sICovOyB9OwogCQkxQzJCODE4NzFDODkyNUEwMDBBNTUyOUYgLyogQWhlbS50dGYg aW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUMy QjgxODUxQzg5MjUyMzAwQTU1MjlGIC8qIEFoZW0udHRmICovOyB9OworCQkxQzUxNTM0QzI2MTU5 NkQ3MDBGQkM0RkUgLyogVXNlckluc3RhbGxlZEFoZW0uaHRtbCBpbiBDb3B5IFJlc291cmNlcyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzUxNTM0QjI2MTU5NkJEMDBGQkM0 RkUgLyogVXNlckluc3RhbGxlZEFoZW0uaHRtbCAqLzsgfTsKIAkJMUM3MzRCNTMyMDc4OEM0ODAw RjQzMEVBIC8qIFN5c3RlbUNvbG9ycy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDFDNzM0QjUyMjA3ODhDNDgwMEY0MzBFQSAvKiBTeXN0ZW1Db2xvcnMu bW0gKi87IH07CiAJCTFDNzkyMDFDMjM0QkREOUIwMDFFQUYyMyAvKiBDb3B5UlRGLm1tIGluIFNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUM3OTIwMUIyMzRCREQ5 QjAwMUVBRjIzIC8qIENvcHlSVEYubW0gKi87IH07CiAJCTFDN0ZFQjIwMjA3QzBGMkUwMEQyMzI3 OCAvKiBCYWNrZ3JvdW5kQ29sb3IubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSAxQzdGRUIxRjIwN0MwRjJEMDBEMjMyNzggLyogQmFja2dyb3VuZENvbG9y Lm1tICovOyB9OwpAQCAtMTY4Nyw2ICsxNjg4LDcgQEAKIAkJCQk0OTUyQkU1RjI1NzgxNkY4MDBC MEFFRjEgLyogdHJ5LXRleHQtc2VsZWN0LXdpdGgtZGlzYWJsZWQtdGV4dC1pbnRlcmFjdGlvbi5o dG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCUY0NDUxQzc2MUVCOEZEODkwMDIwQzVEQSAv KiB0d28tcGFyYWdyYXBoLWNvbnRlbnRlZGl0YWJsZS5odG1sIGluIENvcHkgUmVzb3VyY2VzICov LAogCQkJCTFENjdCRkREMjQzM0VFNjYwMDZCNTA0NyAvKiB0d28tdmlkZW9zLmh0bWwgaW4gQ29w eSBSZXNvdXJjZXMgKi8sCisJCQkJMUM1MTUzNEMyNjE1OTZENzAwRkJDNEZFIC8qIFVzZXJJbnN0 YWxsZWRBaGVtLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJQzU0MEY3ODQxNTJFNUE5 QTAwQTQwQzhDIC8qIHZlcmJvc2VNYXJrdXAuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJ CQlDRDU3Nzc5RDIxMUNFOTFGMDAxQjM3MUUgLyogdmlkZW8td2l0aC1hdWRpby1hbmQtd2ViLWF1 ZGlvLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJQ0RDOEU0OTQxQkM2RjEwODAwNTk0 RkVDIC8qIHZpZGVvLXdpdGgtYXVkaW8uaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKQEAgLTE4 MzIsNiArMTgzNCw3IEBACiAJCTFDMkI4MTgxMUM4OTFFRkEwMEE1NTI5RiAvKiBDYW5jZWxGb250 U3VicmVzb3VyY2VQbHVnSW4ubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBh dGggPSBDYW5jZWxGb250U3VicmVzb3VyY2VQbHVnSW4ubW07IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CiAJCTFDMkI4MTg0MUM4OTI0QTIwMEE1NTI5RiAvKiB3ZWJmb250Lmh0bWwgKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSB0ZXh0Lmh0bWw7IHBhdGggPSB3ZWJmb250Lmh0bWw7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CiAJCTFDMkI4MTg1MUM4OTI1MjMwMEE1NTI5RiAvKiBBaGVtLnR0ZiAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IGZpbGU7IHBhdGggPSBBaGVt LnR0Zjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMUM1MTUzNEIyNjE1OTZCRDAwRkJD NEZFIC8qIFVzZXJJbnN0YWxsZWRBaGVtLmh0bWwgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0Lmh0bWw7IHBhdGggPSBVc2VySW5zdGFsbGVkQWhl bS5odG1sOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQzczNEI1MjIwNzg4QzQ4MDBG NDMwRUEgLyogU3lzdGVtQ29sb3JzLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3Bw OyBwYXRoID0gU3lzdGVtQ29sb3JzLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkx Qzc5MjAxQjIzNEJERDlCMDAxRUFGMjMgLyogQ29weVJURi5tbSAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuY3BwLm9iamNwcDsgcGF0aCA9IENvcHlSVEYubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCTFDN0ZFQjFGMjA3QzBGMkQwMEQyMzI3OCAvKiBCYWNrZ3JvdW5kQ29sb3IubW0gKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBCYWNrZ3JvdW5kQ29sb3IubW07 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC00NTM1LDYgKzQ1MzgsNyBAQAogCQkJCUM5 NTk4NEY2MUUzNkJDRDcwMDJDMEQ0NSAvKiB0ZXN0LXdpdGhvdXQtYXVkaW8tdHJhY2subXA0ICov LAogCQkJCTUyNEJCQ0EwMTlFMzBDNjMwMDJGMUFGMSAvKiB0ZXN0Lm1wNCAqLywKIAkJCQk3QUU5 RTUwODFBRTVBRThCMDBDRjg3NEIgLyogdGVzdC5wZGYgKi8sCisJCQkJMUM1MTUzNEIyNjE1OTZC RDAwRkJDNEZFIC8qIFVzZXJJbnN0YWxsZWRBaGVtLmh0bWwgKi8sCiAJCQkJQzlDOUE5MUMyMURF RDc5NDAwRkRFOTZFIC8qIHZpZGVvLXdpdGgtcGxheS1idXR0b24uaHRtbCAqLywKIAkJCQkwN0NE MzJGNzIwNjVCNzJBMDA2NEE0QkUgLyogdmlkZW8uaHRtbCAqLywKIAkJCQkxQzJCODE4NDFDODky NEEyMDBBNTUyOUYgLyogd2ViZm9udC5odG1sICovLApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXQvRm9udFJlZ2lzdHJ5U2FuZGJveENoZWNrLm1tIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvRm9udFJlZ2lzdHJ5U2FuZGJveENoZWNrLm1tCmlu ZGV4IDM0NzdlMGVjYThhNDVmY2Q3YmFiZWE0Zjk3OGQwYTRhNjRmNmM4ZmEuLjM1ZGNkMDJhMzc3 M2U2ZGU1NmZkNjNiNjA2MDQwOWVlZjU2NTI3YzcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0L0ZvbnRSZWdpc3RyeVNhbmRib3hDaGVjay5tbQorKysgYi9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9Gb250UmVnaXN0cnlTYW5kYm94Q2hlY2subW0K QEAgLTMwLDYgKzMwLDcgQEAKICNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCiAjaW1wb3J0 ICJUZXN0V0tXZWJWaWV3LmgiCiAjaW1wb3J0IDxXZWJLaXQvV0tQcmVmZXJlbmNlc1ByaXZhdGUu aD4KKyNpbXBvcnQgPFdlYktpdC9XS1Byb2Nlc3NQb29sUHJpdmF0ZS5oPgogI2ltcG9ydCA8V2Vi S2l0L1dLV2ViVmlld1ByaXZhdGUuaD4KIAogVEVTVChXZWJLaXQsIEZvbnRkU2FuZGJveENoZWNr KQpAQCAtNTMsNCArNTQsMjkgQEAgVEVTVChXZWJLaXQsIEZvbnRkU2FuZGJveENoZWNrKQogICAg IEFTU0VSVF9UUlVFKHNhbmRib3hBY2Nlc3MoKSk7CiB9CiAKK1RFU1QoV2ViS2l0LCBVc2VySW5z dGFsbGVkRm9udHNXb3JrKQoreworICAgIE5TVVJMICpmb250VVJMID0gW1tOU0J1bmRsZSBtYWlu QnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAIkFoZW0iIHdpdGhFeHRlbnNpb246QCJ0dGYiIHN1YmRp cmVjdG9yeTpAIlRlc3RXZWJLaXRBUEkucmVzb3VyY2VzIl07CisgICAgQ0ZFcnJvclJlZiBlcnJv ciA9IG5pbDsKKyAgICBhdXRvIHJlZ2lzdHJhdGlvblN1Y2NlZWRlZCA9IENURm9udE1hbmFnZXJS ZWdpc3RlckZvbnRzRm9yVVJMKHN0YXRpY19jYXN0PENGVVJMUmVmPihmb250VVJMKSwga0NURm9u dE1hbmFnZXJTY29wZVVzZXIsICZlcnJvcik7CisKKyAgICBhdXRvIGNvbnRleHQgPSBhZG9wdFdL KFRlc3RXZWJLaXRBUEk6OlV0aWw6OmNyZWF0ZUNvbnRleHRGb3JJbmplY3RlZEJ1bmRsZVRlc3Qo IkludGVybmFsc0luamVjdGVkQnVuZGxlVGVzdCIpKTsKKyAgICBXS0NvbnRleHRTZXRVc2VzU2lu Z2xlV2ViUHJvY2Vzcyhjb250ZXh0LmdldCgpLCB0cnVlKTsKKworICAgIGF1dG8gY29uZmlndXJh dGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7Cisg ICAgY29uZmlndXJhdGlvbi5nZXQoKS5wcm9jZXNzUG9vbCA9IChXS1Byb2Nlc3NQb29sICopY29u dGV4dC5nZXQoKTsKKyAgICBbY29uZmlndXJhdGlvbi5nZXQoKS5wcm9jZXNzUG9vbCBfd2FybUlu aXRpYWxQcm9jZXNzXTsKKworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJW aWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwgNjAwLCA1MDApIGNvbmZp Z3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKSBhZGRUb1dpbmRvdzpZRVNdKTsKKyAgICBbd2Vi VmlldyBzeW5jaHJvbm91c2x5TG9hZFRlc3RQYWdlTmFtZWQ6QCJVc2VySW5zdGFsbGVkQWhlbSJd OworICAgIGF1dG8gcmVzdWx0ID0gW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlw dDpAImRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0YXJnZXQnKS5vZmZzZXRXaWR0aCJdLmludFZh bHVlOworICAgIEFTU0VSVF9FUShyZXN1bHQsIDEyICogNDgpOworCisgICAgaWYgKHJlZ2lzdHJh dGlvblN1Y2NlZWRlZCkgeworICAgICAgICBlcnJvciA9IG5pbDsKKyAgICAgICAgQ1RGb250TWFu YWdlclVucmVnaXN0ZXJGb250c0ZvclVSTChzdGF0aWNfY2FzdDxDRlVSTFJlZj4oZm9udFVSTCks IGtDVEZvbnRNYW5hZ2VyU2NvcGVVc2VyLCAmZXJyb3IpOworICAgICAgICBBU1NFUlRfRkFMU0Uo ZXJyb3IpOworICAgIH0KK30KKwogI2VuZGlmIC8vIFdLX0hBVkVfQ19TUEkKZGlmZiAtLWdpdCBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L1VzZXJJbnN0YWxsZWRBaGVtLmh0bWwg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9Vc2VySW5zdGFsbGVkQWhlbS5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjFhMGJkZWUyYmE3NWM3ZjFlNjcxYzYyMThiMjhkODI1NGE1NTZkYmUKLS0t IC9kZXYvbnVsbAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9Vc2VySW5z dGFsbGVkQWhlbS5odG1sCkBAIC0wLDAgKzEsOCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4K KzxoZWFkPgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2IHN0eWxlPSJmb250OiA0OHB4ICdBaGVtJzsi PjxzcGFuIGlkPSJ0YXJnZXQiPkhlbGxvIFdvcmxkITwvc3Bhbj48L2Rpdj4KKzwvYm9keT4KKzwv aHRtbD4K