235498 2022-01-23 14:49:56 -0800 [LFC][IFC] Display builders should flip coords for writing mode 2022-01-24 06:01:21 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1833144 0 zalan 2022-01-23 14:49:56 -0800 ssia 1833145 1 449766 zalan 2022-01-23 14:53:11 -0800 Created attachment 449766 Patch 1833153 2 449768 zalan 2022-01-23 15:59:01 -0800 Created attachment 449768 Patch 1833174 3 449773 zalan 2022-01-23 17:26:12 -0800 Created attachment 449773 Patch 1833268 4 ews-feeder 2022-01-24 06:00:05 -0800 Committed r288436 (246325@main): <https://commits.webkit.org/246325@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 449773. 1833269 5 webkit-bug-importer 2022-01-24 06:01:21 -0800 <rdar://problem/87966193> 449766 2022-01-23 14:53:11 -0800 2022-01-23 16:54:20 -0800 Patch bug-235498-20220123145310.patch text/plain 6922 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NDIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWYzYjcxMjMzZDEzY2Ji M2ZkYjA3NTNhMjUzYTlkZDU5MWUyMWExYy4uNmE2YjFmN2VjZmQyM2Y0OTUxMDM5NDU1MWQxMWFh MGQ4MDFiZDBiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIyLTAxLTIzICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIERpc3BsYXkg YnVpbGRlcnMgc2hvdWxkIGZsaXAgY29vcmRzIGZvciB3cml0aW5nIG1vZGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTQ5OAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERpc3BsYXkgYm94ZXMvbGluZXMg YWxsIGhhdmUgdmlzdWFsIGdlb21ldHJpZXMuIFRoaXMgcGF0Y2ggZmxpcHMgdGhlaXIgY29vcmRz IHdoZW4gdGhleQorICAgICAgICBhcmUgaW5zaWRlIGEgYmxvY2sgd2l0aCB2ZXJ0aWNhbCB3cml0 aW5nIG1vZGUuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgZW5hYmxpbmcg dmVydGljYWwgd3JpdGluZyBtb2RlIGZvciBJRkMuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRl cjo6cHJvY2Vzc05vbkJpZGlDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmZsaXBMb2dpY2Fs UmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGUpOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmg6Cisg ICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVE aXNwbGF5TGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVE aXNwbGF5TGluZUJ1aWxkZXI6OmJ1aWxkIGNvbnN0KToKKwogMjAyMi0wMS0yMyAgQW50b2luZSBR dWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBtX2xhc3RTdHlsZUNoYW5nZUV2 ZW50U3R5bGUgbnVsbCBwdHIgZGVyZWYgZm9yIGFjY2VsZXJhdGVkIENTUyBBbmltYXRpb24gd2l0 aCBubyBkdXJhdGlvbiBhbmQgYW4gaW1wbGljaXQga2V5ZnJhbWUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNw cAppbmRleCAwYTVmMzcxZTY4MGIzZjg1YTM4NGFiZjcyMzQxZTBlZDg2Mjk4YzE4Li4zMmE4Yjdi NDhhYzg5Y2JiMTlmOGFhMDY4YzI4MjM0M2E5ZmYyNWI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3Bs YXlDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3Bw CkBAIC0zMzIsOCArMzMyLDEwIEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpw cm9jZXNzTm9uQmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDCiAgICAgICAgIGF1 dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5b3V0Qm94KCk7CiAKICAgICAgICAgYXV0byB2aXN1 YWxSZWN0UmVsYXRpdmVUb1Jvb3QgPSBbJl0oYXV0byBsb2dpY2FsUmVjdCkgewotICAgICAgICAg ICAgbG9naWNhbFJlY3QubW92ZUJ5KHsgY29udGVudFN0YXJ0SW5WaXN1YWxPcmRlciwgZGlzcGxh eUxpbmUudG9wKCkgfSk7Ci0gICAgICAgICAgICByZXR1cm4gbG9naWNhbFJlY3Q7CisgICAgICAg ICAgICBhdXRvJiBzdHlsZSA9IG1fbGluZUluZGV4ID8gbGF5b3V0Qm94LnN0eWxlKCkgOiBsYXlv dXRCb3guZmlyc3RMaW5lU3R5bGUoKTsKKyAgICAgICAgICAgIGF1dG8gdmlzdWFsUmVjdCA9IGZs aXBMb2dpY2FsUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGUobG9naWNhbFJlY3QsIHN0eWxlLndy aXRpbmdNb2RlKCkpOworICAgICAgICAgICAgdmlzdWFsUmVjdC5tb3ZlQnkoeyBjb250ZW50U3Rh cnRJblZpc3VhbE9yZGVyLCBkaXNwbGF5TGluZS50b3AoKSB9KTsKKyAgICAgICAgICAgIHJldHVy biB2aXN1YWxSZWN0OwogICAgICAgICB9OwogCiAgICAgICAgIGlmIChsaW5lUnVuLmlzVGV4dCgp KSB7CkBAIC01NTksOSArNTYxLDEzIEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVy Ojpwcm9jZXNzQmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgICAg ICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgICAgIGF1dG8gdmlzdWFsUmVjdFJlbGF0aXZl VG9Sb290ID0gWyZdKGF1dG8gbG9naWNhbFJlY3QpIHsKLSAgICAgICAgICAgICAgICBsb2dpY2Fs UmVjdC5zZXRMZWZ0KGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIpOwotICAgICAgICAgICAgICAg IGxvZ2ljYWxSZWN0Lm1vdmVWZXJ0aWNhbGx5KGRpc3BsYXlMaW5lLnRvcCgpKTsKLSAgICAgICAg ICAgICAgICByZXR1cm4gbG9naWNhbFJlY3Q7CisgICAgICAgICAgICAgICAgYXV0byYgc3R5bGUg PSBtX2xpbmVJbmRleCA/IGxheW91dEJveC5zdHlsZSgpIDogbGF5b3V0Qm94LmZpcnN0TGluZVN0 eWxlKCk7CisgICAgICAgICAgICAgICAgYXV0byB2aXN1YWxSZWN0ID0gZmxpcExvZ2ljYWxSZWN0 VG9WaXN1YWxGb3JXcml0aW5nTW9kZShsb2dpY2FsUmVjdCwgc3R5bGUud3JpdGluZ01vZGUoKSk7 CisgICAgICAgICAgICAgICAgaWYgKHN0eWxlLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCisg ICAgICAgICAgICAgICAgICAgIHZpc3VhbFJlY3Quc2V0TGVmdChjb250ZW50UmlnaHRJblZpc3Vh bE9yZGVyKTsKKyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIHZpc3Vh bFJlY3Quc2V0VG9wKGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIpOworICAgICAgICAgICAgICAg IHJldHVybiB2aXN1YWxSZWN0OwogICAgICAgICAgICAgfTsKIAogICAgICAgICAgICAgYXV0byBw YXJlbnREaXNwbGF5Qm94Tm9kZUluZGV4ID0gZW5zdXJlRGlzcGxheUJveEZvckNvbnRhaW5lcihs YXlvdXRCb3gucGFyZW50KCksIGRpc3BsYXlCb3hUcmVlLCBhbmNlc3RvclN0YWNrLCBib3hlcyk7 CkBAIC03NzQsNiArNzgwLDIzIEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpj b21wdXRlSXNGaXJzdElzTGFzdEJveEZvcklubGluZUNvbnRlbnQoRGlzcGxhCiAgICAgYm94ZXNb bGFzdFJvb3RJbmxpbmVCb3hJbmRleF0uc2V0SXNMYXN0Rm9yTGF5b3V0Qm94KHRydWUpOwogfQog CitJbmxpbmVSZWN0IElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6ZmxpcExvZ2ljYWxSZWN0 VG9WaXN1YWxGb3JXcml0aW5nTW9kZShjb25zdCBJbmxpbmVSZWN0JiBsb2dpY2FsUmVjdCwgV3Jp dGluZ01vZGUgd3JpdGluZ01vZGUpCit7CisgICAgc3dpdGNoICh3cml0aW5nTW9kZSkgeworICAg IGNhc2UgV3JpdGluZ01vZGU6OlRvcFRvQm90dG9tOgorICAgICAgICByZXR1cm4gbG9naWNhbFJl Y3Q7CisgICAgY2FzZSBXcml0aW5nTW9kZTo6TGVmdFRvUmlnaHQ6CisgICAgY2FzZSBXcml0aW5n TW9kZTo6UmlnaHRUb0xlZnQ6IHsKKyAgICAgICAgLy8gU2VlIElubGluZUZvcm1hdHRpbmdHZW9t ZXRyeSBmb3IgbW9yZSBpbmZvLgorICAgICAgICByZXR1cm4gSW5saW5lUmVjdCB7IGxvZ2ljYWxS ZWN0LmxlZnQoKSwgbG9naWNhbFJlY3QudG9wKCksIGxvZ2ljYWxSZWN0LmhlaWdodCgpLCBsb2dp Y2FsUmVjdC53aWR0aCgpIH07CisgICAgfQorICAgIGRlZmF1bHQ6CisgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOworICAgICAgICBicmVhazsKKyAgICB9CisgICAgcmV0dXJuIGxvZ2ljYWxS ZWN0OworfQorCiB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVy LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNw bGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5oCmluZGV4IGExNWJiODI2NjcxZGI4MTU2 OWI4OTU0YmUzOWQ0MzM2YjRhMzE5NzQuLjAxODQ4NWZiOTE3OGEzNmI4YTkzYjI2ZWRjMDUwNjE3 ZTA0NTU3ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9J bmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaApAQCAtNDcsNiArNDcsNyBAQCBwdWJsaWM6CiAg ICAgRGlzcGxheUJveGVzIGJ1aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYsIGNv bnN0IExpbmVCb3gmLCBjb25zdCBJbmxpbmVEaXNwbGF5OjpMaW5lJiwgY29uc3Qgc2l6ZV90IGxp bmVJbmRleCk7CiAKICAgICBzdGF0aWMgdm9pZCBjb21wdXRlSXNGaXJzdElzTGFzdEJveEZvcklu bGluZUNvbnRlbnQoRGlzcGxheUJveGVzJik7CisgICAgc3RhdGljIElubGluZVJlY3QgZmxpcExv Z2ljYWxSZWN0VG9WaXN1YWxGb3JXcml0aW5nTW9kZShjb25zdCBJbmxpbmVSZWN0JiBsb2dpY2Fs UmVjdCwgV3JpdGluZ01vZGUpOwogCiBwcml2YXRlOgogICAgIHZvaWQgcHJvY2Vzc05vbkJpZGlD b250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYsIGNvbnN0IExpbmVCb3gmLCBj b25zdCBJbmxpbmVEaXNwbGF5OjpMaW5lJiwgRGlzcGxheUJveGVzJik7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lu bGluZURpc3BsYXlMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRlci5jcHAK aW5kZXggNzU4NTJiOWE2YjBhYmU2ZDY4OWZmZmNmZDZhNmFkZjVlYzI2NzNiNy4uMmRiZWUyNTNm ZDgzZTQ3NGU2NjM1ZmYyOWM4MTQ0ZjM4ZmQyYjAzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5 TGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmNwcApAQCAtMjgs NiArMjgsNyBAQAogCiAjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCiAKKyNp bmNsdWRlICJJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaCIKICNpbmNsdWRlICJMYXlvdXRC b3hHZW9tZXRyeS5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC05Myw4ICs5NCwxMCBAQCBJ bmxpbmVEaXNwbGF5OjpMaW5lIElubGluZURpc3BsYXlMaW5lQnVpbGRlcjo6YnVpbGQoY29uc3Qg TGluZUJ1aWxkZXI6OkxpbmVDb250ZQogICAgIGF1dG8gbGluZUJveFJlY3QgPSBJbmxpbmVSZWN0 IHsgbGluZUNvbnRlbnQubGluZUxvZ2ljYWxUb3BMZWZ0LnkoKSwgbGluZUJveFZpc3VhbExlZnQs IGxpbmVDb250ZW50LmxpbmVMb2dpY2FsV2lkdGgsIGxpbmVCb3hMb2dpY2FsSGVpZ2h0IH07CiAg ICAgYXV0byBlbmNsb3NpbmdMaW5lR2VvbWV0cnkgPSBjb2xsZWN0RW5jbG9zaW5nTGluZUdlb21l dHJ5KGxpbmVCb3gsIGxpbmVCb3hSZWN0KTsKIAotICAgIHJldHVybiBJbmxpbmVEaXNwbGF5OjpM aW5lIHsgbGluZUJveFJlY3QKLSAgICAgICAgLCBlbmNsb3NpbmdMaW5lR2VvbWV0cnkuc2Nyb2xs YWJsZU92ZXJmbG93UmVjdAorICAgIC8vIEZJWE1FOiBGaWd1cmUgb3V0IGlmIHByb3BlcnRpZXMg bGlrZSBlbmNsb3NpbmdMaW5lR2VvbWV0cnkgdG9wIGFuZCBib3R0b20gbmVlZHMgdG8gYmUgZmxp cHBlZCBhcyB3ZWxsLgorICAgIGF1dG8gd3JpdGluZ01vZGUgPSByb290KCkuc3R5bGUoKS53cml0 aW5nTW9kZSgpOworICAgIHJldHVybiBJbmxpbmVEaXNwbGF5OjpMaW5lIHsgSW5saW5lRGlzcGxh eUNvbnRlbnRCdWlsZGVyOjpmbGlwTG9naWNhbFJlY3RUb1Zpc3VhbEZvcldyaXRpbmdNb2RlKGxp bmVCb3hSZWN0LCB3cml0aW5nTW9kZSkKKyAgICAgICAgLCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1 aWxkZXI6OmZsaXBMb2dpY2FsUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGUoZW5jbG9zaW5nTGlu ZUdlb21ldHJ5LnNjcm9sbGFibGVPdmVyZmxvd1JlY3QsIHdyaXRpbmdNb2RlKQogICAgICAgICAs IGVuY2xvc2luZ0xpbmVHZW9tZXRyeS5lbmNsb3NpbmdUb3BBbmRCb3R0b20KICAgICAgICAgLCBy b290SW5saW5lQm94LmxvZ2ljYWxUb3AoKSArIHJvb3RJbmxpbmVCb3guYmFzZWxpbmUoKQogICAg ICAgICAsIGNvbnRlbnRWaXN1YWxMZWZ0Cg== 449768 2022-01-23 15:59:01 -0800 2022-01-23 17:26:10 -0800 Patch bug-235498-20220123155900.patch text/plain 6985 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NDIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWYzYjcxMjMzZDEzY2Ji M2ZkYjA3NTNhMjUzYTlkZDU5MWUyMWExYy4uNmE2YjFmN2VjZmQyM2Y0OTUxMDM5NDU1MWQxMWFh MGQ4MDFiZDBiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIyLTAxLTIzICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIERpc3BsYXkg YnVpbGRlcnMgc2hvdWxkIGZsaXAgY29vcmRzIGZvciB3cml0aW5nIG1vZGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTQ5OAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERpc3BsYXkgYm94ZXMvbGluZXMg YWxsIGhhdmUgdmlzdWFsIGdlb21ldHJpZXMuIFRoaXMgcGF0Y2ggZmxpcHMgdGhlaXIgY29vcmRz IHdoZW4gdGhleQorICAgICAgICBhcmUgaW5zaWRlIGEgYmxvY2sgd2l0aCB2ZXJ0aWNhbCB3cml0 aW5nIG1vZGUuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgZW5hYmxpbmcg dmVydGljYWwgd3JpdGluZyBtb2RlIGZvciBJRkMuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRl cjo6cHJvY2Vzc05vbkJpZGlDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmZsaXBMb2dpY2Fs UmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGUpOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmg6Cisg ICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVE aXNwbGF5TGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVE aXNwbGF5TGluZUJ1aWxkZXI6OmJ1aWxkIGNvbnN0KToKKwogMjAyMi0wMS0yMyAgQW50b2luZSBR dWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBtX2xhc3RTdHlsZUNoYW5nZUV2 ZW50U3R5bGUgbnVsbCBwdHIgZGVyZWYgZm9yIGFjY2VsZXJhdGVkIENTUyBBbmltYXRpb24gd2l0 aCBubyBkdXJhdGlvbiBhbmQgYW4gaW1wbGljaXQga2V5ZnJhbWUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNw cAppbmRleCAwYTVmMzcxZTY4MGIzZjg1YTM4NGFiZjcyMzQxZTBlZDg2Mjk4YzE4Li4zZDg1MDVk ZGU1MzBhZGFiMmJjMTRmNzg2NGMyNDY0YjljZDZiODVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3Bs YXlDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3Bw CkBAIC0zMzIsOCArMzMyLDEwIEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpw cm9jZXNzTm9uQmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDCiAgICAgICAgIGF1 dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5b3V0Qm94KCk7CiAKICAgICAgICAgYXV0byB2aXN1 YWxSZWN0UmVsYXRpdmVUb1Jvb3QgPSBbJl0oYXV0byBsb2dpY2FsUmVjdCkgewotICAgICAgICAg ICAgbG9naWNhbFJlY3QubW92ZUJ5KHsgY29udGVudFN0YXJ0SW5WaXN1YWxPcmRlciwgZGlzcGxh eUxpbmUudG9wKCkgfSk7Ci0gICAgICAgICAgICByZXR1cm4gbG9naWNhbFJlY3Q7CisgICAgICAg ICAgICBhdXRvJiBzdHlsZSA9IG1fbGluZUluZGV4ID8gbGF5b3V0Qm94LnN0eWxlKCkgOiBsYXlv dXRCb3guZmlyc3RMaW5lU3R5bGUoKTsKKyAgICAgICAgICAgIGF1dG8gdmlzdWFsUmVjdCA9IGZs aXBMb2dpY2FsUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGUobG9naWNhbFJlY3QsIHN0eWxlLndy aXRpbmdNb2RlKCkpOworICAgICAgICAgICAgdmlzdWFsUmVjdC5tb3ZlQnkoeyBjb250ZW50U3Rh cnRJblZpc3VhbE9yZGVyLCBkaXNwbGF5TGluZS50b3AoKSB9KTsKKyAgICAgICAgICAgIHJldHVy biB2aXN1YWxSZWN0OwogICAgICAgICB9OwogCiAgICAgICAgIGlmIChsaW5lUnVuLmlzVGV4dCgp KSB7CkBAIC01NTksOSArNTYxLDE0IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVy Ojpwcm9jZXNzQmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgICAg ICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgICAgIGF1dG8gdmlzdWFsUmVjdFJlbGF0aXZl VG9Sb290ID0gWyZdKGF1dG8gbG9naWNhbFJlY3QpIHsKLSAgICAgICAgICAgICAgICBsb2dpY2Fs UmVjdC5zZXRMZWZ0KGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIpOwotICAgICAgICAgICAgICAg IGxvZ2ljYWxSZWN0Lm1vdmVWZXJ0aWNhbGx5KGRpc3BsYXlMaW5lLnRvcCgpKTsKLSAgICAgICAg ICAgICAgICByZXR1cm4gbG9naWNhbFJlY3Q7CisgICAgICAgICAgICAgICAgYXV0byYgc3R5bGUg PSBtX2xpbmVJbmRleCA/IGxheW91dEJveC5zdHlsZSgpIDogbGF5b3V0Qm94LmZpcnN0TGluZVN0 eWxlKCk7CisgICAgICAgICAgICAgICAgYXV0byB2aXN1YWxSZWN0ID0gZmxpcExvZ2ljYWxSZWN0 VG9WaXN1YWxGb3JXcml0aW5nTW9kZShsb2dpY2FsUmVjdCwgc3R5bGUud3JpdGluZ01vZGUoKSk7 CisgICAgICAgICAgICAgICAgaWYgKHN0eWxlLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCisg ICAgICAgICAgICAgICAgICAgIHZpc3VhbFJlY3Quc2V0TGVmdChjb250ZW50UmlnaHRJblZpc3Vh bE9yZGVyKTsKKyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIHZpc3Vh bFJlY3Quc2V0VG9wKGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIpOworICAgICAgICAgICAgICAg IHZpc3VhbFJlY3QubW92ZVZlcnRpY2FsbHkoZGlzcGxheUxpbmUudG9wKCkpOworICAgICAgICAg ICAgICAgIHJldHVybiB2aXN1YWxSZWN0OwogICAgICAgICAgICAgfTsKIAogICAgICAgICAgICAg YXV0byBwYXJlbnREaXNwbGF5Qm94Tm9kZUluZGV4ID0gZW5zdXJlRGlzcGxheUJveEZvckNvbnRh aW5lcihsYXlvdXRCb3gucGFyZW50KCksIGRpc3BsYXlCb3hUcmVlLCBhbmNlc3RvclN0YWNrLCBi b3hlcyk7CkBAIC03NzQsNiArNzgxLDIzIEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWls ZGVyOjpjb21wdXRlSXNGaXJzdElzTGFzdEJveEZvcklubGluZUNvbnRlbnQoRGlzcGxhCiAgICAg Ym94ZXNbbGFzdFJvb3RJbmxpbmVCb3hJbmRleF0uc2V0SXNMYXN0Rm9yTGF5b3V0Qm94KHRydWUp OwogfQogCitJbmxpbmVSZWN0IElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6ZmxpcExvZ2lj YWxSZWN0VG9WaXN1YWxGb3JXcml0aW5nTW9kZShjb25zdCBJbmxpbmVSZWN0JiBsb2dpY2FsUmVj dCwgV3JpdGluZ01vZGUgd3JpdGluZ01vZGUpCit7CisgICAgc3dpdGNoICh3cml0aW5nTW9kZSkg eworICAgIGNhc2UgV3JpdGluZ01vZGU6OlRvcFRvQm90dG9tOgorICAgICAgICByZXR1cm4gbG9n aWNhbFJlY3Q7CisgICAgY2FzZSBXcml0aW5nTW9kZTo6TGVmdFRvUmlnaHQ6CisgICAgY2FzZSBX cml0aW5nTW9kZTo6UmlnaHRUb0xlZnQ6IHsKKyAgICAgICAgLy8gU2VlIElubGluZUZvcm1hdHRp bmdHZW9tZXRyeSBmb3IgbW9yZSBpbmZvLgorICAgICAgICByZXR1cm4gSW5saW5lUmVjdCB7IGxv Z2ljYWxSZWN0LmxlZnQoKSwgbG9naWNhbFJlY3QudG9wKCksIGxvZ2ljYWxSZWN0LmhlaWdodCgp LCBsb2dpY2FsUmVjdC53aWR0aCgpIH07CisgICAgfQorICAgIGRlZmF1bHQ6CisgICAgICAgIEFT U0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICBicmVhazsKKyAgICB9CisgICAgcmV0dXJuIGxv Z2ljYWxSZWN0OworfQorCiB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRC dWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5oCmluZGV4IGExNWJiODI2Njcx ZGI4MTU2OWI4OTU0YmUzOWQ0MzM2YjRhMzE5NzQuLjAxODQ4NWZiOTE3OGEzNmI4YTkzYjI2ZWRj MDUwNjE3ZTA0NTU3ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmgK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlz cGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaApAQCAtNDcsNiArNDcsNyBAQCBwdWJs aWM6CiAgICAgRGlzcGxheUJveGVzIGJ1aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVu dCYsIGNvbnN0IExpbmVCb3gmLCBjb25zdCBJbmxpbmVEaXNwbGF5OjpMaW5lJiwgY29uc3Qgc2l6 ZV90IGxpbmVJbmRleCk7CiAKICAgICBzdGF0aWMgdm9pZCBjb21wdXRlSXNGaXJzdElzTGFzdEJv eEZvcklubGluZUNvbnRlbnQoRGlzcGxheUJveGVzJik7CisgICAgc3RhdGljIElubGluZVJlY3Qg ZmxpcExvZ2ljYWxSZWN0VG9WaXN1YWxGb3JXcml0aW5nTW9kZShjb25zdCBJbmxpbmVSZWN0JiBs b2dpY2FsUmVjdCwgV3JpdGluZ01vZGUpOwogCiBwcml2YXRlOgogICAgIHZvaWQgcHJvY2Vzc05v bkJpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYsIGNvbnN0IExpbmVC b3gmLCBjb25zdCBJbmxpbmVEaXNwbGF5OjpMaW5lJiwgRGlzcGxheUJveGVzJik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNw bGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRl ci5jcHAKaW5kZXggNzU4NTJiOWE2YjBhYmU2ZDY4OWZmZmNmZDZhNmFkZjVlYzI2NzNiNy4uMmRi ZWUyNTNmZDgzZTQ3NGU2NjM1ZmYyOWM4MTQ0ZjM4ZmQyYjAzMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVE aXNwbGF5TGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmNwcApA QCAtMjgsNiArMjgsNyBAQAogCiAjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQp CiAKKyNpbmNsdWRlICJJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaCIKICNpbmNsdWRlICJM YXlvdXRCb3hHZW9tZXRyeS5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC05Myw4ICs5NCwx MCBAQCBJbmxpbmVEaXNwbGF5OjpMaW5lIElubGluZURpc3BsYXlMaW5lQnVpbGRlcjo6YnVpbGQo Y29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZQogICAgIGF1dG8gbGluZUJveFJlY3QgPSBJbmxp bmVSZWN0IHsgbGluZUNvbnRlbnQubGluZUxvZ2ljYWxUb3BMZWZ0LnkoKSwgbGluZUJveFZpc3Vh bExlZnQsIGxpbmVDb250ZW50LmxpbmVMb2dpY2FsV2lkdGgsIGxpbmVCb3hMb2dpY2FsSGVpZ2h0 IH07CiAgICAgYXV0byBlbmNsb3NpbmdMaW5lR2VvbWV0cnkgPSBjb2xsZWN0RW5jbG9zaW5nTGlu ZUdlb21ldHJ5KGxpbmVCb3gsIGxpbmVCb3hSZWN0KTsKIAotICAgIHJldHVybiBJbmxpbmVEaXNw bGF5OjpMaW5lIHsgbGluZUJveFJlY3QKLSAgICAgICAgLCBlbmNsb3NpbmdMaW5lR2VvbWV0cnku c2Nyb2xsYWJsZU92ZXJmbG93UmVjdAorICAgIC8vIEZJWE1FOiBGaWd1cmUgb3V0IGlmIHByb3Bl cnRpZXMgbGlrZSBlbmNsb3NpbmdMaW5lR2VvbWV0cnkgdG9wIGFuZCBib3R0b20gbmVlZHMgdG8g YmUgZmxpcHBlZCBhcyB3ZWxsLgorICAgIGF1dG8gd3JpdGluZ01vZGUgPSByb290KCkuc3R5bGUo KS53cml0aW5nTW9kZSgpOworICAgIHJldHVybiBJbmxpbmVEaXNwbGF5OjpMaW5lIHsgSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyOjpmbGlwTG9naWNhbFJlY3RUb1Zpc3VhbEZvcldyaXRpbmdN b2RlKGxpbmVCb3hSZWN0LCB3cml0aW5nTW9kZSkKKyAgICAgICAgLCBJbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXI6OmZsaXBMb2dpY2FsUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGUoZW5jbG9z aW5nTGluZUdlb21ldHJ5LnNjcm9sbGFibGVPdmVyZmxvd1JlY3QsIHdyaXRpbmdNb2RlKQogICAg ICAgICAsIGVuY2xvc2luZ0xpbmVHZW9tZXRyeS5lbmNsb3NpbmdUb3BBbmRCb3R0b20KICAgICAg ICAgLCByb290SW5saW5lQm94LmxvZ2ljYWxUb3AoKSArIHJvb3RJbmxpbmVCb3guYmFzZWxpbmUo KQogICAgICAgICAsIGNvbnRlbnRWaXN1YWxMZWZ0Cg== 449773 2022-01-23 17:26:12 -0800 2022-01-24 06:00:06 -0800 Patch bug-235498-20220123172611.patch text/plain 7564 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NDIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWYzYjcxMjMzZDEzY2Ji M2ZkYjA3NTNhMjUzYTlkZDU5MWUyMWExYy4uNmE2YjFmN2VjZmQyM2Y0OTUxMDM5NDU1MWQxMWFh MGQ4MDFiZDBiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIyLTAxLTIzICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIERpc3BsYXkg YnVpbGRlcnMgc2hvdWxkIGZsaXAgY29vcmRzIGZvciB3cml0aW5nIG1vZGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTQ5OAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERpc3BsYXkgYm94ZXMvbGluZXMg YWxsIGhhdmUgdmlzdWFsIGdlb21ldHJpZXMuIFRoaXMgcGF0Y2ggZmxpcHMgdGhlaXIgY29vcmRz IHdoZW4gdGhleQorICAgICAgICBhcmUgaW5zaWRlIGEgYmxvY2sgd2l0aCB2ZXJ0aWNhbCB3cml0 aW5nIG1vZGUuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgZW5hYmxpbmcg dmVydGljYWwgd3JpdGluZyBtb2RlIGZvciBJRkMuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRl cjo6cHJvY2Vzc05vbkJpZGlDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmZsaXBMb2dpY2Fs UmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGUpOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmg6Cisg ICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVE aXNwbGF5TGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVE aXNwbGF5TGluZUJ1aWxkZXI6OmJ1aWxkIGNvbnN0KToKKwogMjAyMi0wMS0yMyAgQW50b2luZSBR dWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBtX2xhc3RTdHlsZUNoYW5nZUV2 ZW50U3R5bGUgbnVsbCBwdHIgZGVyZWYgZm9yIGFjY2VsZXJhdGVkIENTUyBBbmltYXRpb24gd2l0 aCBubyBkdXJhdGlvbiBhbmQgYW4gaW1wbGljaXQga2V5ZnJhbWUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNw cAppbmRleCAwYTVmMzcxZTY4MGIzZjg1YTM4NGFiZjcyMzQxZTBlZDg2Mjk4YzE4Li5iNDUzOWVl NmIzZWY1YzA1NjVjZmFkY2MwNWUzZDhkZDRjZDdhNDA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3Bs YXlDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3Bw CkBAIC0zMjYsMTQgKzMyNiwxNiBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6 cHJvY2Vzc05vbkJpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQwogICAgICAgICBo YXNDb250ZW50ID0gaGFzQ29udGVudCB8fCBsaW5lUnVuLmlzVGV4dCgpIHx8IGxpbmVSdW4uaXNC b3goKTsKICAgICBBU1NFUlQobGluZUNvbnRlbnQuaW5saW5lQmFzZURpcmVjdGlvbiA9PSBUZXh0 RGlyZWN0aW9uOjpMVFIgfHwgIWhhc0NvbnRlbnQpOwogI2VuZGlmCisgICAgYXV0byB3cml0aW5n TW9kZSA9IHJvb3QoKS5zdHlsZSgpLndyaXRpbmdNb2RlKCk7CiAgICAgYXV0byBjb250ZW50U3Rh cnRJblZpc3VhbE9yZGVyID0gZGlzcGxheUxpbmUubGVmdCgpICsgZGlzcGxheUxpbmUuY29udGVu dExlZnQoKTsKIAogICAgIGZvciAoYXV0byYgbGluZVJ1biA6IGxpbmVDb250ZW50LnJ1bnMpIHsK ICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gbGluZVJ1bi5sYXlvdXRCb3goKTsKIAogICAgICAg ICBhdXRvIHZpc3VhbFJlY3RSZWxhdGl2ZVRvUm9vdCA9IFsmXShhdXRvIGxvZ2ljYWxSZWN0KSB7 Ci0gICAgICAgICAgICBsb2dpY2FsUmVjdC5tb3ZlQnkoeyBjb250ZW50U3RhcnRJblZpc3VhbE9y ZGVyLCBkaXNwbGF5TGluZS50b3AoKSB9KTsKLSAgICAgICAgICAgIHJldHVybiBsb2dpY2FsUmVj dDsKKyAgICAgICAgICAgIGF1dG8gdmlzdWFsUmVjdCA9IGZsaXBMb2dpY2FsUmVjdFRvVmlzdWFs Rm9yV3JpdGluZ01vZGUobG9naWNhbFJlY3QsIHdyaXRpbmdNb2RlKTsKKyAgICAgICAgICAgIHZp c3VhbFJlY3QubW92ZUJ5KHsgY29udGVudFN0YXJ0SW5WaXN1YWxPcmRlciwgZGlzcGxheUxpbmUu dG9wKCkgfSk7CisgICAgICAgICAgICByZXR1cm4gdmlzdWFsUmVjdDsKICAgICAgICAgfTsKIAog ICAgICAgICBpZiAobGluZVJ1bi5pc1RleHQoKSkgewpAQCAtNTQyLDYgKzU0NCw3IEBAIHZvaWQg SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQoY29uc3QgTGlu ZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgYXV0byBkaXNwbGF5Qm94VHJlZSA9IERpc3BsYXlCb3hU cmVlIHsgfTsKICAgICBhbmNlc3RvclN0YWNrLnB1c2goeyB9LCByb290KCkpOwogCisgICAgYXV0 byB3cml0aW5nTW9kZSA9IHJvb3QoKS5zdHlsZSgpLndyaXRpbmdNb2RlKCk7CiAgICAgYXV0byBj b250ZW50U3RhcnRJblZpc3VhbE9yZGVyID0gZGlzcGxheUxpbmUubGVmdCgpICsgZGlzcGxheUxp bmUuY29udGVudExlZnQoKTsKICAgICBhdXRvIGhhc0lubGluZUJveCA9IGZhbHNlOwogICAgIGF1 dG8gY3JlYXRlRGlzcGxheUJveGVzSW5WaXN1YWxPcmRlciA9IFsmXSB7CkBAIC01NTksOSArNTYy LDEzIEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRl bnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgICAgICAgICAgICAgY29udGludWU7 CiAKICAgICAgICAgICAgIGF1dG8gdmlzdWFsUmVjdFJlbGF0aXZlVG9Sb290ID0gWyZdKGF1dG8g bG9naWNhbFJlY3QpIHsKLSAgICAgICAgICAgICAgICBsb2dpY2FsUmVjdC5zZXRMZWZ0KGNvbnRl bnRSaWdodEluVmlzdWFsT3JkZXIpOwotICAgICAgICAgICAgICAgIGxvZ2ljYWxSZWN0Lm1vdmVW ZXJ0aWNhbGx5KGRpc3BsYXlMaW5lLnRvcCgpKTsKLSAgICAgICAgICAgICAgICByZXR1cm4gbG9n aWNhbFJlY3Q7CisgICAgICAgICAgICAgICAgYXV0byB2aXN1YWxSZWN0ID0gZmxpcExvZ2ljYWxS ZWN0VG9WaXN1YWxGb3JXcml0aW5nTW9kZShsb2dpY2FsUmVjdCwgd3JpdGluZ01vZGUpOworICAg ICAgICAgICAgICAgIGlmIChXZWJDb3JlOjppc0hvcml6b250YWxXcml0aW5nTW9kZSh3cml0aW5n TW9kZSkpCisgICAgICAgICAgICAgICAgICAgIHZpc3VhbFJlY3Quc2V0TGVmdChjb250ZW50Umln aHRJblZpc3VhbE9yZGVyKTsKKyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAg ICAgIHZpc3VhbFJlY3Quc2V0VG9wKGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIpOworICAgICAg ICAgICAgICAgIHZpc3VhbFJlY3QubW92ZVZlcnRpY2FsbHkoZGlzcGxheUxpbmUudG9wKCkpOwor ICAgICAgICAgICAgICAgIHJldHVybiB2aXN1YWxSZWN0OwogICAgICAgICAgICAgfTsKIAogICAg ICAgICAgICAgYXV0byBwYXJlbnREaXNwbGF5Qm94Tm9kZUluZGV4ID0gZW5zdXJlRGlzcGxheUJv eEZvckNvbnRhaW5lcihsYXlvdXRCb3gucGFyZW50KCksIGRpc3BsYXlCb3hUcmVlLCBhbmNlc3Rv clN0YWNrLCBib3hlcyk7CkBAIC03NzQsNiArNzgxLDIzIEBAIHZvaWQgSW5saW5lRGlzcGxheUNv bnRlbnRCdWlsZGVyOjpjb21wdXRlSXNGaXJzdElzTGFzdEJveEZvcklubGluZUNvbnRlbnQoRGlz cGxhCiAgICAgYm94ZXNbbGFzdFJvb3RJbmxpbmVCb3hJbmRleF0uc2V0SXNMYXN0Rm9yTGF5b3V0 Qm94KHRydWUpOwogfQogCitJbmxpbmVSZWN0IElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6 ZmxpcExvZ2ljYWxSZWN0VG9WaXN1YWxGb3JXcml0aW5nTW9kZShjb25zdCBJbmxpbmVSZWN0JiBs b2dpY2FsUmVjdCwgV3JpdGluZ01vZGUgd3JpdGluZ01vZGUpCit7CisgICAgc3dpdGNoICh3cml0 aW5nTW9kZSkgeworICAgIGNhc2UgV3JpdGluZ01vZGU6OlRvcFRvQm90dG9tOgorICAgICAgICBy ZXR1cm4gbG9naWNhbFJlY3Q7CisgICAgY2FzZSBXcml0aW5nTW9kZTo6TGVmdFRvUmlnaHQ6Cisg ICAgY2FzZSBXcml0aW5nTW9kZTo6UmlnaHRUb0xlZnQ6IHsKKyAgICAgICAgLy8gU2VlIElubGlu ZUZvcm1hdHRpbmdHZW9tZXRyeSBmb3IgbW9yZSBpbmZvLgorICAgICAgICByZXR1cm4gSW5saW5l UmVjdCB7IGxvZ2ljYWxSZWN0LmxlZnQoKSwgbG9naWNhbFJlY3QudG9wKCksIGxvZ2ljYWxSZWN0 LmhlaWdodCgpLCBsb2dpY2FsUmVjdC53aWR0aCgpIH07CisgICAgfQorICAgIGRlZmF1bHQ6Cisg ICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICBicmVhazsKKyAgICB9CisgICAg cmV0dXJuIGxvZ2ljYWxSZWN0OworfQorCiB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxh eUNvbnRlbnRCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5oCmluZGV4IGEx NWJiODI2NjcxZGI4MTU2OWI4OTU0YmUzOWQ0MzM2YjRhMzE5NzQuLjAxODQ4NWZiOTE3OGEzNmI4 YTkzYjI2ZWRjMDUwNjE3ZTA0NTU3ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRC dWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaApAQCAtNDcsNiArNDcs NyBAQCBwdWJsaWM6CiAgICAgRGlzcGxheUJveGVzIGJ1aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpM aW5lQ29udGVudCYsIGNvbnN0IExpbmVCb3gmLCBjb25zdCBJbmxpbmVEaXNwbGF5OjpMaW5lJiwg Y29uc3Qgc2l6ZV90IGxpbmVJbmRleCk7CiAKICAgICBzdGF0aWMgdm9pZCBjb21wdXRlSXNGaXJz dElzTGFzdEJveEZvcklubGluZUNvbnRlbnQoRGlzcGxheUJveGVzJik7CisgICAgc3RhdGljIElu bGluZVJlY3QgZmxpcExvZ2ljYWxSZWN0VG9WaXN1YWxGb3JXcml0aW5nTW9kZShjb25zdCBJbmxp bmVSZWN0JiBsb2dpY2FsUmVjdCwgV3JpdGluZ01vZGUpOwogCiBwcml2YXRlOgogICAgIHZvaWQg cHJvY2Vzc05vbkJpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYsIGNv bnN0IExpbmVCb3gmLCBjb25zdCBJbmxpbmVEaXNwbGF5OjpMaW5lJiwgRGlzcGxheUJveGVzJik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlM aW5lQnVpbGRlci5jcHAKaW5kZXggNzU4NTJiOWE2YjBhYmU2ZDY4OWZmZmNmZDZhNmFkZjVlYzI2 NzNiNy4uMmRiZWUyNTNmZDgzZTQ3NGU2NjM1ZmYyOWM4MTQ0ZjM4ZmQyYjAzMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxh eS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWls ZGVyLmNwcApAQCAtMjgsNiArMjgsNyBAQAogCiAjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5H X0NPTlRFWFQpCiAKKyNpbmNsdWRlICJJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaCIKICNp bmNsdWRlICJMYXlvdXRCb3hHZW9tZXRyeS5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC05 Myw4ICs5NCwxMCBAQCBJbmxpbmVEaXNwbGF5OjpMaW5lIElubGluZURpc3BsYXlMaW5lQnVpbGRl cjo6YnVpbGQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZQogICAgIGF1dG8gbGluZUJveFJl Y3QgPSBJbmxpbmVSZWN0IHsgbGluZUNvbnRlbnQubGluZUxvZ2ljYWxUb3BMZWZ0LnkoKSwgbGlu ZUJveFZpc3VhbExlZnQsIGxpbmVDb250ZW50LmxpbmVMb2dpY2FsV2lkdGgsIGxpbmVCb3hMb2dp Y2FsSGVpZ2h0IH07CiAgICAgYXV0byBlbmNsb3NpbmdMaW5lR2VvbWV0cnkgPSBjb2xsZWN0RW5j bG9zaW5nTGluZUdlb21ldHJ5KGxpbmVCb3gsIGxpbmVCb3hSZWN0KTsKIAotICAgIHJldHVybiBJ bmxpbmVEaXNwbGF5OjpMaW5lIHsgbGluZUJveFJlY3QKLSAgICAgICAgLCBlbmNsb3NpbmdMaW5l R2VvbWV0cnkuc2Nyb2xsYWJsZU92ZXJmbG93UmVjdAorICAgIC8vIEZJWE1FOiBGaWd1cmUgb3V0 IGlmIHByb3BlcnRpZXMgbGlrZSBlbmNsb3NpbmdMaW5lR2VvbWV0cnkgdG9wIGFuZCBib3R0b20g bmVlZHMgdG8gYmUgZmxpcHBlZCBhcyB3ZWxsLgorICAgIGF1dG8gd3JpdGluZ01vZGUgPSByb290 KCkuc3R5bGUoKS53cml0aW5nTW9kZSgpOworICAgIHJldHVybiBJbmxpbmVEaXNwbGF5OjpMaW5l IHsgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpmbGlwTG9naWNhbFJlY3RUb1Zpc3VhbEZv cldyaXRpbmdNb2RlKGxpbmVCb3hSZWN0LCB3cml0aW5nTW9kZSkKKyAgICAgICAgLCBJbmxpbmVE aXNwbGF5Q29udGVudEJ1aWxkZXI6OmZsaXBMb2dpY2FsUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01v ZGUoZW5jbG9zaW5nTGluZUdlb21ldHJ5LnNjcm9sbGFibGVPdmVyZmxvd1JlY3QsIHdyaXRpbmdN b2RlKQogICAgICAgICAsIGVuY2xvc2luZ0xpbmVHZW9tZXRyeS5lbmNsb3NpbmdUb3BBbmRCb3R0 b20KICAgICAgICAgLCByb290SW5saW5lQm94LmxvZ2ljYWxUb3AoKSArIHJvb3RJbmxpbmVCb3gu YmFzZWxpbmUoKQogICAgICAgICAsIGNvbnRlbnRWaXN1YWxMZWZ0Cg==