203769 2019-11-01 15:54:06 -0700 Port FontFaceSet to the HTML5 event loop 2019-11-04 18:55:31 -0800 1 1 1 Unclassified WebKit Text WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 202843 1 cdumez cdumez achristensen ap commit-queue dbates esprehn+autocc ews-watchlist ggaren glenn gyuyoung.kim kangil.han macpherson menard mmaxfield rniwa ross.kirsling sam webkit-bug-importer oldest_to_newest 1586617 0 cdumez 2019-11-01 15:54:06 -0700 Port FontFaceSet to the HTML5 event loop. 1586623 1 382644 cdumez 2019-11-01 16:07:30 -0700 Created attachment 382644 Patch 1586788 2 382644 sam 2019-11-02 19:45:54 -0700 Comment on attachment 382644 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=382644&action=review > Source/WebCore/css/FontFaceSet.cpp:-204 > - m_taskQueue->enqueueTask([this] { What is the reason for not removing m_taskQueue completely? It looks like it is now just created and then nothing is done with it. 1586790 3 cdumez 2019-11-02 19:54:53 -0700 (In reply to Sam Weinig from comment #2) > Comment on attachment 382644 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=382644&action=review > > > Source/WebCore/css/FontFaceSet.cpp:-204 > > - m_taskQueue->enqueueTask([this] { > > What is the reason for not removing m_taskQueue completely? It looks like it > is now just created and then nothing is done with it. It sounds like I forgot? I wrote this during the contributor meeting :P will fix. 1586793 4 382688 cdumez 2019-11-02 20:02:42 -0700 Created attachment 382688 Patch 1586860 5 ap 2019-11-03 11:21:17 -0800 We’re having some troubles with iOS EWS now, but for event loop changes, it’s probably worth waiting until those are cleared! Please also check detailed results from the testers, as EWS logic tends to swipe flaky tests under the carpet. 1586866 6 382710 cdumez 2019-11-03 12:26:29 -0800 Created attachment 382710 Patch 1587172 7 382710 commit-queue 2019-11-04 14:57:58 -0800 Comment on attachment 382710 Patch Clearing flags on attachment: 382710 Committed r252016: <https://trac.webkit.org/changeset/252016> 1587173 8 commit-queue 2019-11-04 14:58:00 -0800 All reviewed patches have been landed. Closing bug. 1587174 9 webkit-bug-importer 2019-11-04 14:58:33 -0800 <rdar://problem/56881893> 1587217 10 ross.kirsling 2019-11-04 16:07:47 -0800 This broke WinCairo, as demonstrated by EWS. 1587259 11 cdumez 2019-11-04 18:55:31 -0800 (In reply to Ross Kirsling from comment #10) > This broke WinCairo, as demonstrated by EWS. Sorry, was fixed later in https://trac.webkit.org/changeset/252028/webkit. 382644 2019-11-01 16:07:30 -0700 2019-11-02 20:02:40 -0700 Patch bug-203769-20191101160729.patch text/plain 3929 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxOTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjc2ZTRhNGUyYzNmZThh YTE2NDFlNWU5OWEyZGNkZDkyMzFiMTQ5Yy4uNzY4OWRlMDhmN2QyZjMzMjAyM2NmZmFmODJmNDlm NjAxZWIzZmYzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE5LTExLTAxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUG9ydCBGb250RmFjZVNldCB0 byB0aGUgSFRNTDUgZXZlbnQgbG9vcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjAzNzY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBjc3MvRm9udEZhY2VTZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Rm9udEZhY2VTZXQ6OmRpZEZpcnN0TGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRGYWNl U2V0Ojpjb21wbGV0ZWRMb2FkaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRGYWNlU2V0Ojpm YWNlRmluaXNoZWQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udEZhY2VTZXQ6OmVucXVldWVUYXNr KToKKyAgICAgICAgKiBjc3MvRm9udEZhY2VTZXQuaDoKKyAgICAgICAgKiBkb20vQWJzdHJhY3RF dmVudExvb3AuaDoKKwogMjAxOS0xMS0wMSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29t PgogCiAgICAgICAgIFBvcnQgU2VydmljZVdvcmtlckNvbnRhaW5lciB0byB0aGUgSFRNTDUgZXZl bnQgbG9vcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNlU2V0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZVNldC5jcHAKaW5kZXggYzYyNWZiZWE3MzkzYjlh ZmFhMDdkZjA4MDkwNTBlZGQ2NmY1N2NlYS4uODBlMTEyM2U1OWI2OTE1MzJlMzFhNzMwZDc2ZmU0 NmQwOWI5MGZhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNlU2V0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRm9udEZhY2VTZXQuY3BwCkBAIC0yNiw2ICsyNiw3 IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiRm9udEZhY2VTZXQuaCIKIAorI2lu Y2x1ZGUgIkFic3RyYWN0RXZlbnRMb29wLmgiCiAjaW5jbHVkZSAiRE9NUHJvbWlzZVByb3h5Lmgi CiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJGb250RmFjZS5oIgpAQCAtMjAxLDcg KzIwMiw3IEBAIHZvaWQgRm9udEZhY2VTZXQ6OmRpZEZpcnN0TGF5b3V0KCkKIHsKICAgICBtX2lz Rmlyc3RMYXlvdXREb25lID0gdHJ1ZTsKICAgICBpZiAoIW1fYmFja2luZy0+aGFzQWN0aXZlRm9u dEZhY2VzKCkgJiYgIW1fcmVhZHlQcm9taXNlLT5pc0Z1bGZpbGxlZCgpKSB7Ci0gICAgICAgIG1f dGFza1F1ZXVlLT5lbnF1ZXVlVGFzayhbdGhpc10geworICAgICAgICBlbnF1ZXVlVGFzayhbdGhp c10gewogICAgICAgICAgICAgaWYgKCFtX3JlYWR5UHJvbWlzZS0+aXNGdWxmaWxsZWQoKSkKICAg ICAgICAgICAgICAgICBtX3JlYWR5UHJvbWlzZS0+cmVzb2x2ZSgqdGhpcyk7CiAgICAgICAgIH0p OwpAQCAtMjExLDcgKzIxMiw3IEBAIHZvaWQgRm9udEZhY2VTZXQ6OmRpZEZpcnN0TGF5b3V0KCkK IHZvaWQgRm9udEZhY2VTZXQ6OmNvbXBsZXRlZExvYWRpbmcoKQogewogICAgIGlmIChtX2lzRmly c3RMYXlvdXREb25lICYmICFtX3JlYWR5UHJvbWlzZS0+aXNGdWxmaWxsZWQoKSkgewotICAgICAg ICBtX3Rhc2tRdWV1ZS0+ZW5xdWV1ZVRhc2soW3RoaXNdIHsKKyAgICAgICAgZW5xdWV1ZVRhc2so W3RoaXNdIHsKICAgICAgICAgICAgIGlmICghbV9yZWFkeVByb21pc2UtPmlzRnVsZmlsbGVkKCkp CiAgICAgICAgICAgICAgICAgbV9yZWFkeVByb21pc2UtPnJlc29sdmUoKnRoaXMpOwogICAgICAg ICB9KTsKQEAgLTIyNyw3ICsyMjgsNyBAQCB2b2lkIEZvbnRGYWNlU2V0OjpmYWNlRmluaXNoZWQo Q1NTRm9udEZhY2UmIGZhY2UsIENTU0ZvbnRGYWNlOjpTdGF0dXMgbmV3U3RhdHVzKQogICAgIGlm IChwZW5kaW5nUHJvbWlzZXMuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX3Rh c2tRdWV1ZS0+ZW5xdWV1ZVRhc2soW3BlbmRpbmdQcm9taXNlcyA9IFdURk1vdmUocGVuZGluZ1By b21pc2VzKSwgbmV3U3RhdHVzXSB7CisgICAgZW5xdWV1ZVRhc2soW3BlbmRpbmdQcm9taXNlcyA9 IFdURk1vdmUocGVuZGluZ1Byb21pc2VzKSwgbmV3U3RhdHVzXSB7CiAgICAgICAgIGZvciAoYXV0 byYgcGVuZGluZ1Byb21pc2UgOiBwZW5kaW5nUHJvbWlzZXMpIHsKICAgICAgICAgICAgIGlmIChw ZW5kaW5nUHJvbWlzZS0+aGFzUmVhY2hlZFRlcm1pbmFsU3RhdGUpCiAgICAgICAgICAgICAgICAg Y29udGludWU7CkBAIC0yNTAsNCArMjUxLDE0IEBAIEZvbnRGYWNlU2V0JiBGb250RmFjZVNldDo6 cmVhZHlQcm9taXNlUmVzb2x2ZSgpCiAgICAgcmV0dXJuICp0aGlzOwogfQogCit2b2lkIEZvbnRG YWNlU2V0OjplbnF1ZXVlVGFzayhGdW5jdGlvbjx2b2lkKCk+JiYgdGFzaykKK3sKKyAgICBhdXRv KiBjb250ZXh0ID0gc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpOworICAgIGlmICghY29udGV4dCkK KyAgICAgICAgcmV0dXJuOworICAgIGNvbnRleHQtPmV2ZW50TG9vcCgpLnF1ZXVlVGFzayhUYXNr U291cmNlOjpGb250TG9hZGluZywgKmNvbnRleHQsIFtwcm90ZWN0ZWRkVGhpcyA9IG1ha2VSZWYo KnRoaXMpLCBwZW5kaW5nQWN0aXZpdHkgPSBtYWtlUGVuZGluZ0FjdGl2aXR5KCp0aGlzKSwgdGFz ayA9IFdURk1vdmUodGFzayldIHsKKyAgICAgICAgdGFzaygpOworICAgIH0pOworfQorCiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvRm9udEZhY2VTZXQuaCBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9Gb250RmFjZVNldC5oCmluZGV4IGExMDJmODAzZGU5ZGRiY2E4MzUyNDg3YjExMDlh MDc5ZTIwOTQwNjMuLjg2MDQ2Y2VmODQ5YjkxZGQ0N2I0YTcwMjVmNWZkMDUzNzc5NjI4MTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZVNldC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9Gb250RmFjZVNldC5oCkBAIC0xMTUsNiArMTE1LDggQEAgcHJpdmF0ZToKICAg ICAvLyBDYWxsYmFjayBmb3IgUmVhZHlQcm9taXNlLgogICAgIEZvbnRGYWNlU2V0JiByZWFkeVBy b21pc2VSZXNvbHZlKCk7CiAKKyAgICB2b2lkIGVucXVldWVUYXNrKEZ1bmN0aW9uPHZvaWQoKT4m Jik7CisKICAgICBSZWY8Q1NTRm9udEZhY2VTZXQ+IG1fYmFja2luZzsKICAgICBIYXNoTWFwPFJl ZlB0cjxGb250RmFjZT4sIFZlY3RvcjxSZWY8UGVuZGluZ1Byb21pc2U+Pj4gbV9wZW5kaW5nUHJv bWlzZXM7CiAgICAgVW5pcXVlUmVmPFJlYWR5UHJvbWlzZT4gbV9yZWFkeVByb21pc2U7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vQWJzdHJhY3RFdmVudExvb3AuaCBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9BYnN0cmFjdEV2ZW50TG9vcC5oCmluZGV4IDY3NTcyMTc4ODNjZmQ2NDdhZDdh OTQyNjBlMjg3ODA1MjgwZjZjNDIuLjUyMjliZjJjNWUyYjQxZDlkNzU4YWFkNDM1YjU1Yzg3ZTk5 MjY2NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9BYnN0cmFjdEV2ZW50TG9vcC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9BYnN0cmFjdEV2ZW50TG9vcC5oCkBAIC0zNCw2ICsz NCw3IEBAIGNsYXNzIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ7CiAKIGVudW0gY2xhc3MgVGFza1Nv dXJjZSA6IHVpbnQ4X3QgewogICAgIERPTU1hbmlwdWxhdGlvbiwKKyAgICBGb250TG9hZGluZywK ICAgICBJZGxlVGFzaywKICAgICBOZXR3b3JraW5nLAogICAgIFVzZXJJbnRlcmFjdGlvbgo= 382688 2019-11-02 20:02:42 -0700 2019-11-03 12:26:27 -0800 Patch bug-203769-20191102200241.patch text/plain 5044 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxOTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzBjNzg4ZThkYjIwODkz ZjE2ZTI5Y2UyZTAwNjM3ZjMxNmZmZGY3My4uYjZiOGE2NGNiMzU2YTI4MjI2NGVjOTdhMzI5Njdh Y2FjZGViODNkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE5LTExLTAxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUG9ydCBGb250RmFjZVNldCB0 byB0aGUgSFRNTDUgZXZlbnQgbG9vcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjAzNzY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBjc3MvRm9udEZhY2VTZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Rm9udEZhY2VTZXQ6OmRpZEZpcnN0TGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRGYWNl U2V0Ojpjb21wbGV0ZWRMb2FkaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRGYWNlU2V0Ojpm YWNlRmluaXNoZWQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udEZhY2VTZXQ6OmVucXVldWVUYXNr KToKKyAgICAgICAgKiBjc3MvRm9udEZhY2VTZXQuaDoKKyAgICAgICAgKiBkb20vQWJzdHJhY3RF dmVudExvb3AuaDoKKwogMjAxOS0xMS0wMiAgT3Jpb2wgQnJ1ZmF1ICA8b2JydWZhdUBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtjc3MtZ3JpZF0gRml4IGxpbmUgbmFtZSBwb3NpdGlvbnMgYWZ0ZXIg YXV0byByZXBlYXQgd2l0aCBubyBsaW5lIG5hbWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvRm9udEZhY2VTZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNlU2V0LmNw cAppbmRleCBjNjI1ZmJlYTczOTNiOWFmYWEwN2RmMDgwOTA1MGVkZDY2ZjU3Y2VhLi5hMGQ4OGZk ZDE5NjBlOGI3YTEyODA3ODcxMmNiNDgzZGM2ZGJmNGNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvRm9udEZhY2VTZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFj ZVNldC5jcHAKQEAgLTI2LDYgKzI2LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRl ICJGb250RmFjZVNldC5oIgogCisjaW5jbHVkZSAiQWJzdHJhY3RFdmVudExvb3AuaCIKICNpbmNs dWRlICJET01Qcm9taXNlUHJveHkuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUg IkZvbnRGYWNlLmgiCkBAIC01OCw3ICs1OSw2IEBAIEZvbnRGYWNlU2V0OjpGb250RmFjZVNldChE b2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0IFZlY3RvcjxSZWZQdHI8Rm9udEZhY2U+PiYgaW5pCiAg ICAgOiBBY3RpdmVET01PYmplY3QoZG9jdW1lbnQpCiAgICAgLCBtX2JhY2tpbmcoQ1NTRm9udEZh Y2VTZXQ6OmNyZWF0ZSgpKQogICAgICwgbV9yZWFkeVByb21pc2UobWFrZVVuaXF1ZVJlZjxSZWFk eVByb21pc2U+KCp0aGlzLCAmRm9udEZhY2VTZXQ6OnJlYWR5UHJvbWlzZVJlc29sdmUpKQotICAg ICwgbV90YXNrUXVldWUoU3VzcGVuZGFibGVUYXNrUXVldWU6OmNyZWF0ZShkb2N1bWVudCkpCiB7 CiAgICAgbV9iYWNraW5nLT5hZGRDbGllbnQoKnRoaXMpOwogICAgIGZvciAoYXV0byYgZmFjZSA6 IGluaXRpYWxGYWNlcykKQEAgLTY5LDcgKzY5LDYgQEAgRm9udEZhY2VTZXQ6OkZvbnRGYWNlU2V0 KERvY3VtZW50JiBkb2N1bWVudCwgQ1NTRm9udEZhY2VTZXQmIGJhY2tpbmcpCiAgICAgOiBBY3Rp dmVET01PYmplY3QoZG9jdW1lbnQpCiAgICAgLCBtX2JhY2tpbmcoYmFja2luZykKICAgICAsIG1f cmVhZHlQcm9taXNlKG1ha2VVbmlxdWVSZWY8UmVhZHlQcm9taXNlPigqdGhpcywgJkZvbnRGYWNl U2V0OjpyZWFkeVByb21pc2VSZXNvbHZlKSkKLSAgICAsIG1fdGFza1F1ZXVlKFN1c3BlbmRhYmxl VGFza1F1ZXVlOjpjcmVhdGUoZG9jdW1lbnQpKQogewogICAgIGlmIChkb2N1bWVudC5mcmFtZSgp KQogICAgICAgICBtX2lzRmlyc3RMYXlvdXREb25lID0gZG9jdW1lbnQuZnJhbWUoKS0+bG9hZGVy KCkuc3RhdGVNYWNoaW5lKCkuZmlyc3RMYXlvdXREb25lKCk7CkBAIC0yMDEsNyArMjAwLDcgQEAg dm9pZCBGb250RmFjZVNldDo6ZGlkRmlyc3RMYXlvdXQoKQogewogICAgIG1faXNGaXJzdExheW91 dERvbmUgPSB0cnVlOwogICAgIGlmICghbV9iYWNraW5nLT5oYXNBY3RpdmVGb250RmFjZXMoKSAm JiAhbV9yZWFkeVByb21pc2UtPmlzRnVsZmlsbGVkKCkpIHsKLSAgICAgICAgbV90YXNrUXVldWUt PmVucXVldWVUYXNrKFt0aGlzXSB7CisgICAgICAgIGVucXVldWVUYXNrKFt0aGlzXSB7CiAgICAg ICAgICAgICBpZiAoIW1fcmVhZHlQcm9taXNlLT5pc0Z1bGZpbGxlZCgpKQogICAgICAgICAgICAg ICAgIG1fcmVhZHlQcm9taXNlLT5yZXNvbHZlKCp0aGlzKTsKICAgICAgICAgfSk7CkBAIC0yMTEs NyArMjEwLDcgQEAgdm9pZCBGb250RmFjZVNldDo6ZGlkRmlyc3RMYXlvdXQoKQogdm9pZCBGb250 RmFjZVNldDo6Y29tcGxldGVkTG9hZGluZygpCiB7CiAgICAgaWYgKG1faXNGaXJzdExheW91dERv bmUgJiYgIW1fcmVhZHlQcm9taXNlLT5pc0Z1bGZpbGxlZCgpKSB7Ci0gICAgICAgIG1fdGFza1F1 ZXVlLT5lbnF1ZXVlVGFzayhbdGhpc10geworICAgICAgICBlbnF1ZXVlVGFzayhbdGhpc10gewog ICAgICAgICAgICAgaWYgKCFtX3JlYWR5UHJvbWlzZS0+aXNGdWxmaWxsZWQoKSkKICAgICAgICAg ICAgICAgICBtX3JlYWR5UHJvbWlzZS0+cmVzb2x2ZSgqdGhpcyk7CiAgICAgICAgIH0pOwpAQCAt MjI3LDcgKzIyNiw3IEBAIHZvaWQgRm9udEZhY2VTZXQ6OmZhY2VGaW5pc2hlZChDU1NGb250RmFj ZSYgZmFjZSwgQ1NTRm9udEZhY2U6OlN0YXR1cyBuZXdTdGF0dXMpCiAgICAgaWYgKHBlbmRpbmdQ cm9taXNlcy5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fdGFza1F1ZXVlLT5l bnF1ZXVlVGFzayhbcGVuZGluZ1Byb21pc2VzID0gV1RGTW92ZShwZW5kaW5nUHJvbWlzZXMpLCBu ZXdTdGF0dXNdIHsKKyAgICBlbnF1ZXVlVGFzayhbcGVuZGluZ1Byb21pc2VzID0gV1RGTW92ZShw ZW5kaW5nUHJvbWlzZXMpLCBuZXdTdGF0dXNdIHsKICAgICAgICAgZm9yIChhdXRvJiBwZW5kaW5n UHJvbWlzZSA6IHBlbmRpbmdQcm9taXNlcykgewogICAgICAgICAgICAgaWYgKHBlbmRpbmdQcm9t aXNlLT5oYXNSZWFjaGVkVGVybWluYWxTdGF0ZSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsK QEAgLTI1MCw0ICsyNDksMTQgQEAgRm9udEZhY2VTZXQmIEZvbnRGYWNlU2V0OjpyZWFkeVByb21p c2VSZXNvbHZlKCkKICAgICByZXR1cm4gKnRoaXM7CiB9CiAKK3ZvaWQgRm9udEZhY2VTZXQ6OmVu cXVldWVUYXNrKEZ1bmN0aW9uPHZvaWQoKT4mJiB0YXNrKQoreworICAgIGF1dG8qIGNvbnRleHQg PSBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCk7CisgICAgaWYgKCFjb250ZXh0KQorICAgICAgICBy ZXR1cm47CisgICAgY29udGV4dC0+ZXZlbnRMb29wKCkucXVldWVUYXNrKFRhc2tTb3VyY2U6OkZv bnRMb2FkaW5nLCAqY29udGV4dCwgW3Byb3RlY3RlZGRUaGlzID0gbWFrZVJlZigqdGhpcyksIHBl bmRpbmdBY3Rpdml0eSA9IG1ha2VQZW5kaW5nQWN0aXZpdHkoKnRoaXMpLCB0YXNrID0gV1RGTW92 ZSh0YXNrKV0geworICAgICAgICB0YXNrKCk7CisgICAgfSk7Cit9CisKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZVNldC5oIGIvU291cmNlL1dlYkNvcmUvY3NzL0Zv bnRGYWNlU2V0LmgKaW5kZXggYTEwMmY4MDNkZTlkZGJjYTgzNTI0ODdiMTEwOWEwNzllMjA5NDA2 My4uNzQ4ZjUzOTdkMWU4MmM4ZmY2NDU5NjhkYzFmZmRiYzBmMjViZjY5OSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNlU2V0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3Nz L0ZvbnRGYWNlU2V0LmgKQEAgLTI5LDcgKzI5LDYgQEAKICNpbmNsdWRlICJDU1NGb250RmFjZVNl dC5oIgogI2luY2x1ZGUgIkV2ZW50VGFyZ2V0LmgiCiAjaW5jbHVkZSAiSURMVHlwZXMuaCIKLSNp bmNsdWRlICJTdXNwZW5kYWJsZVRhc2tRdWV1ZS5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK QEAgLTExNSwxMCArMTE0LDExIEBAIHByaXZhdGU6CiAgICAgLy8gQ2FsbGJhY2sgZm9yIFJlYWR5 UHJvbWlzZS4KICAgICBGb250RmFjZVNldCYgcmVhZHlQcm9taXNlUmVzb2x2ZSgpOwogCisgICAg dm9pZCBlbnF1ZXVlVGFzayhGdW5jdGlvbjx2b2lkKCk+JiYpOworCiAgICAgUmVmPENTU0ZvbnRG YWNlU2V0PiBtX2JhY2tpbmc7CiAgICAgSGFzaE1hcDxSZWZQdHI8Rm9udEZhY2U+LCBWZWN0b3I8 UmVmPFBlbmRpbmdQcm9taXNlPj4+IG1fcGVuZGluZ1Byb21pc2VzOwogICAgIFVuaXF1ZVJlZjxS ZWFkeVByb21pc2U+IG1fcmVhZHlQcm9taXNlOwotICAgIFVuaXF1ZVJlZjxTdXNwZW5kYWJsZVRh c2tRdWV1ZT4gbV90YXNrUXVldWU7CiAgICAgYm9vbCBtX2lzRmlyc3RMYXlvdXREb25lIHsgdHJ1 ZSB9OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0Fic3RyYWN0RXZlbnRM b29wLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vQWJzdHJhY3RFdmVudExvb3AuaAppbmRleCBmMWNi YmE5ZDRmODE2NmE1MTNkZmI2NTBlMzMwNTA1MDAwOTZhOWU0Li4zNjE5ZjE4NWIzMjJjZDQ2NGFk MDE3ZTI0MmFkYTFkNWE4YmQzMjEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vQWJz dHJhY3RFdmVudExvb3AuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vQWJzdHJhY3RFdmVudExv b3AuaApAQCAtMzUsNiArMzUsNyBAQCBjbGFzcyBTY3JpcHRFeGVjdXRpb25Db250ZXh0OwogZW51 bSBjbGFzcyBUYXNrU291cmNlIDogdWludDhfdCB7CiAgICAgRE9NTWFuaXB1bGF0aW9uLAogICAg IEZpbGVSZWFkaW5nLAorICAgIEZvbnRMb2FkaW5nLAogICAgIElkbGVUYXNrLAogICAgIE5ldHdv cmtpbmcsCiAgICAgVXNlckludGVyYWN0aW9uCg== 382710 2019-11-03 12:26:29 -0800 2019-11-04 14:57:58 -0800 Patch bug-203769-20191103122627.patch text/plain 4588 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxOTc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjMwNWU3MjU3ZWFkMzJj YTdmNDNlOGMxMGY3MjA0ZTRmYzMwOTU2Zi4uNzYzMGJlNjIyZTUyMWIxZTI0YTgwNDcyYzY1ZWEz OTRjYjUyZTJmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE5LTExLTAxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUG9ydCBGb250RmFjZVNldCB0 byB0aGUgSFRNTDUgZXZlbnQgbG9vcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjAzNzY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBjc3MvRm9udEZhY2VTZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Rm9udEZhY2VTZXQ6OmRpZEZpcnN0TGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRGYWNl U2V0Ojpjb21wbGV0ZWRMb2FkaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRGYWNlU2V0Ojpm YWNlRmluaXNoZWQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udEZhY2VTZXQ6OmVucXVldWVUYXNr KToKKyAgICAgICAgKiBjc3MvRm9udEZhY2VTZXQuaDoKKyAgICAgICAgKiBkb20vQWJzdHJhY3RF dmVudExvb3AuaDoKKwogMjAxOS0xMS0wMyAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9y Zz4KIAogICAgICAgICBBZGQgYSBoZWxwZXIgZnVuY3Rpb24gdG8gc2NoZWR1bGUgYSB0YXNrIHRv IGRpc3BhdGNoIGFuIGV2ZW50IHRvIEFjdGl2ZURPTU9iamVjdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL0ZvbnRGYWNlU2V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFj ZVNldC5jcHAKaW5kZXggYzYyNWZiZWE3MzkzYjlhZmFhMDdkZjA4MDkwNTBlZGQ2NmY1N2NlYS4u NDNjYmE4OTkwNGRmZmM5MGFkYzM5NjMyNjBiOTUwMjhiNDVlM2MxNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNlU2V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv Rm9udEZhY2VTZXQuY3BwCkBAIC0yNiw2ICsyNiw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAj aW5jbHVkZSAiRm9udEZhY2VTZXQuaCIKIAorI2luY2x1ZGUgIkFic3RyYWN0RXZlbnRMb29wLmgi CiAjaW5jbHVkZSAiRE9NUHJvbWlzZVByb3h5LmgiCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNp bmNsdWRlICJGb250RmFjZS5oIgpAQCAtNTgsNyArNTksNiBAQCBGb250RmFjZVNldDo6Rm9udEZh Y2VTZXQoRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBWZWN0b3I8UmVmUHRyPEZvbnRGYWNlPj4m IGluaQogICAgIDogQWN0aXZlRE9NT2JqZWN0KGRvY3VtZW50KQogICAgICwgbV9iYWNraW5nKENT U0ZvbnRGYWNlU2V0OjpjcmVhdGUoKSkKICAgICAsIG1fcmVhZHlQcm9taXNlKG1ha2VVbmlxdWVS ZWY8UmVhZHlQcm9taXNlPigqdGhpcywgJkZvbnRGYWNlU2V0OjpyZWFkeVByb21pc2VSZXNvbHZl KSkKLSAgICAsIG1fdGFza1F1ZXVlKFN1c3BlbmRhYmxlVGFza1F1ZXVlOjpjcmVhdGUoZG9jdW1l bnQpKQogewogICAgIG1fYmFja2luZy0+YWRkQ2xpZW50KCp0aGlzKTsKICAgICBmb3IgKGF1dG8m IGZhY2UgOiBpbml0aWFsRmFjZXMpCkBAIC02OSw3ICs2OSw2IEBAIEZvbnRGYWNlU2V0OjpGb250 RmFjZVNldChEb2N1bWVudCYgZG9jdW1lbnQsIENTU0ZvbnRGYWNlU2V0JiBiYWNraW5nKQogICAg IDogQWN0aXZlRE9NT2JqZWN0KGRvY3VtZW50KQogICAgICwgbV9iYWNraW5nKGJhY2tpbmcpCiAg ICAgLCBtX3JlYWR5UHJvbWlzZShtYWtlVW5pcXVlUmVmPFJlYWR5UHJvbWlzZT4oKnRoaXMsICZG b250RmFjZVNldDo6cmVhZHlQcm9taXNlUmVzb2x2ZSkpCi0gICAgLCBtX3Rhc2tRdWV1ZShTdXNw ZW5kYWJsZVRhc2tRdWV1ZTo6Y3JlYXRlKGRvY3VtZW50KSkKIHsKICAgICBpZiAoZG9jdW1lbnQu ZnJhbWUoKSkKICAgICAgICAgbV9pc0ZpcnN0TGF5b3V0RG9uZSA9IGRvY3VtZW50LmZyYW1lKCkt PmxvYWRlcigpLnN0YXRlTWFjaGluZSgpLmZpcnN0TGF5b3V0RG9uZSgpOwpAQCAtMjAxLDcgKzIw MCw3IEBAIHZvaWQgRm9udEZhY2VTZXQ6OmRpZEZpcnN0TGF5b3V0KCkKIHsKICAgICBtX2lzRmly c3RMYXlvdXREb25lID0gdHJ1ZTsKICAgICBpZiAoIW1fYmFja2luZy0+aGFzQWN0aXZlRm9udEZh Y2VzKCkgJiYgIW1fcmVhZHlQcm9taXNlLT5pc0Z1bGZpbGxlZCgpKSB7Ci0gICAgICAgIG1fdGFz a1F1ZXVlLT5lbnF1ZXVlVGFzayhbdGhpc10geworICAgICAgICBxdWV1ZVRhc2tLZWVwaW5nT2Jq ZWN0QWxpdmUoKnRoaXMsIFRhc2tTb3VyY2U6OkZvbnRMb2FkaW5nLCBbdGhpc10gewogICAgICAg ICAgICAgaWYgKCFtX3JlYWR5UHJvbWlzZS0+aXNGdWxmaWxsZWQoKSkKICAgICAgICAgICAgICAg ICBtX3JlYWR5UHJvbWlzZS0+cmVzb2x2ZSgqdGhpcyk7CiAgICAgICAgIH0pOwpAQCAtMjExLDcg KzIxMCw3IEBAIHZvaWQgRm9udEZhY2VTZXQ6OmRpZEZpcnN0TGF5b3V0KCkKIHZvaWQgRm9udEZh Y2VTZXQ6OmNvbXBsZXRlZExvYWRpbmcoKQogewogICAgIGlmIChtX2lzRmlyc3RMYXlvdXREb25l ICYmICFtX3JlYWR5UHJvbWlzZS0+aXNGdWxmaWxsZWQoKSkgewotICAgICAgICBtX3Rhc2tRdWV1 ZS0+ZW5xdWV1ZVRhc2soW3RoaXNdIHsKKyAgICAgICAgcXVldWVUYXNrS2VlcGluZ09iamVjdEFs aXZlKCp0aGlzLCBUYXNrU291cmNlOjpGb250TG9hZGluZywgW3RoaXNdIHsKICAgICAgICAgICAg IGlmICghbV9yZWFkeVByb21pc2UtPmlzRnVsZmlsbGVkKCkpCiAgICAgICAgICAgICAgICAgbV9y ZWFkeVByb21pc2UtPnJlc29sdmUoKnRoaXMpOwogICAgICAgICB9KTsKQEAgLTIyNyw3ICsyMjYs NyBAQCB2b2lkIEZvbnRGYWNlU2V0OjpmYWNlRmluaXNoZWQoQ1NTRm9udEZhY2UmIGZhY2UsIENT U0ZvbnRGYWNlOjpTdGF0dXMgbmV3U3RhdHVzKQogICAgIGlmIChwZW5kaW5nUHJvbWlzZXMuaXNF bXB0eSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX3Rhc2tRdWV1ZS0+ZW5xdWV1ZVRhc2so W3BlbmRpbmdQcm9taXNlcyA9IFdURk1vdmUocGVuZGluZ1Byb21pc2VzKSwgbmV3U3RhdHVzXSB7 CisgICAgcXVldWVUYXNrS2VlcGluZ09iamVjdEFsaXZlKCp0aGlzLCBUYXNrU291cmNlOjpGb250 TG9hZGluZywgW3BlbmRpbmdQcm9taXNlcyA9IFdURk1vdmUocGVuZGluZ1Byb21pc2VzKSwgbmV3 U3RhdHVzXSB7CiAgICAgICAgIGZvciAoYXV0byYgcGVuZGluZ1Byb21pc2UgOiBwZW5kaW5nUHJv bWlzZXMpIHsKICAgICAgICAgICAgIGlmIChwZW5kaW5nUHJvbWlzZS0+aGFzUmVhY2hlZFRlcm1p bmFsU3RhdGUpCiAgICAgICAgICAgICAgICAgY29udGludWU7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvRm9udEZhY2VTZXQuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZVNl dC5oCmluZGV4IGExMDJmODAzZGU5ZGRiY2E4MzUyNDg3YjExMDlhMDc5ZTIwOTQwNjMuLjA4MmNj MTRjM2QyMDQ3MTA5OGQ1ZmFmNzYzYTZlY2E0YWRiZWYyZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9Gb250RmFjZVNldC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFj ZVNldC5oCkBAIC0yOSw3ICsyOSw2IEBACiAjaW5jbHVkZSAiQ1NTRm9udEZhY2VTZXQuaCIKICNp bmNsdWRlICJFdmVudFRhcmdldC5oIgogI2luY2x1ZGUgIklETFR5cGVzLmgiCi0jaW5jbHVkZSAi U3VzcGVuZGFibGVUYXNrUXVldWUuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC0xMTgs NyArMTE3LDYgQEAgcHJpdmF0ZToKICAgICBSZWY8Q1NTRm9udEZhY2VTZXQ+IG1fYmFja2luZzsK ICAgICBIYXNoTWFwPFJlZlB0cjxGb250RmFjZT4sIFZlY3RvcjxSZWY8UGVuZGluZ1Byb21pc2U+ Pj4gbV9wZW5kaW5nUHJvbWlzZXM7CiAgICAgVW5pcXVlUmVmPFJlYWR5UHJvbWlzZT4gbV9yZWFk eVByb21pc2U7Ci0gICAgVW5pcXVlUmVmPFN1c3BlbmRhYmxlVGFza1F1ZXVlPiBtX3Rhc2tRdWV1 ZTsKICAgICBib29sIG1faXNGaXJzdExheW91dERvbmUgeyB0cnVlIH07CiB9OwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vVGFza1NvdXJjZS5oIGIvU291cmNlL1dlYkNvcmUvZG9t L1Rhc2tTb3VyY2UuaAppbmRleCBiN2IzZmU3MDY3YjQ3ODUwOWI5YmNlZjFhZDU0OTIwZWY4Yzgz Yzg1Li45NzIyZTdiZDI4OTljZjcyYjk1NzAwZGJmZDlmZWRjOThkYzlhMWU4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kb20vVGFza1NvdXJjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9UYXNrU291cmNlLmgKQEAgLTMwLDYgKzMwLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogZW51 bSBjbGFzcyBUYXNrU291cmNlIDogdWludDhfdCB7CiAgICAgRE9NTWFuaXB1bGF0aW9uLAogICAg IEZpbGVSZWFkaW5nLAorICAgIEZvbnRMb2FkaW5nLAogICAgIElkbGVUYXNrLAogICAgIE5ldHdv cmtpbmcsCiAgICAgVXNlckludGVyYWN0aW9uCg==