219693 2020-12-09 09:03:12 -0800 [LFC][IFC] Line available width computation should be based on the content logical right. 2020-12-10 09:51:35 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 219704 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1713179 0 zalan 2020-12-09 09:03:12 -0800 and not the content logical width. They are mostly the same except when negative word-spacing (letter spacing) pulls the content to the logical left direction. 1713182 1 415764 zalan 2020-12-09 09:06:37 -0800 Created attachment 415764 Patch 1713278 2 415791 zalan 2020-12-09 12:39:01 -0800 Created attachment 415791 Patch 1713571 3 ews-feeder 2020-12-10 09:45:24 -0800 Committed r270629: <https://trac.webkit.org/changeset/270629> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415791. 1713572 4 webkit-bug-importer 2020-12-10 09:46:16 -0800 <rdar://problem/72184696> 415764 2020-12-09 09:06:37 -0800 2020-12-09 11:23:08 -0800 Patch bug-219693-20201209090636.patch text/plain 10822 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTU4NGQwNGI4MmIzYzY3 ZWQ2ZWU2M2FhNzk4ZjZhN2ZmZjYzOTYwZS4uNjgxNTkyZmJiNzZiMzI5NDZmMTQxNGVkMTQ1NmY0 MTM3NWJjYjhiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTEyLTA5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBMaW5lIGF2 YWlsYWJsZSB3aWR0aCBjb21wdXRhdGlvbiBzaG91bGQgYmUgYmFzZWQgb24gdGhlIGNvbnRlbnQg bG9naWNhbCByaWdodC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxOTY5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGFkZGluZyBwcm9wZXIgc3VwcG9ydCBm b3IgbmVnYXRpdmUgd29yZCBzcGFjaW5nIHZhbHVlcyB3aGVyZSB0aGUgbmVnYXRpdmUgdmFsdWUK KyAgICAgICAgcHVsbHMgdGhlIGNvbnRlbnQgb24gdGhlIGxpbmUgdG8gdGhlIGxvZ2ljYWwgbGVm dCBkaXJlY3Rpb24gbWFraW5nIG1vcmUgc3BhY2UgZm9yIHN1YnNlcXVlbnQgY29udGVudC4KKwor ICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjphcHBlbmRJbmxpbmVCb3hTdGFydCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVuZFRleHRDb250ZW50KToKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6TGluZTo6YXBwZW5kTm9uUmVwbGFjZWRJbmxpbmVCb3gpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjphcHBlbmRMaW5lQnJlYWspOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lOjphcHBlbmRXb3JkQnJlYWtPcHBvcnR1bml0eSk6CisgICAgICAg ICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lOjpjb250ZW50TG9naWNhbFJpZ2h0IGNvbnN0KToKKyAgICAgICAgKiBs YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpwbGFjZUlubGluZUNvbnRlbnQpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6Y2xvc2UpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6aGFuZGxlSW5saW5lQ29udGVudCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpyZWJ1aWxkTGluZSk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpyZWJ1aWxkTGluZUZvclRyYWlsaW5nU29mdEh5cGhl bik6CisKIDIwMjAtMTItMDggIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAg ICAgICAgIFtMRkNdW0ludGVncmF0aW9uXSBEb24ndCBhc3N1bWUgZW5zdXJlTGluZUJveGVzIGNh biBiZSBjYWxsZWQgb24gZGlyZWN0IHBhcmVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcAppbmRleCA2MGUxMTU0ZDZjNzcw NWIyNWM1NmUwN2IzNDdmOWFhMmY4MTlkMjFhLi5jY2UwODJiOTk5YzA1N2YyODNhMzFjMjdlNjJk Y2RiZTMyOWVlNTg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVMaW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcApAQCAtMjM0LDcgKzIzNCw3IEBAIHZvaWQgTGluZTo6 YXBwZW5kSW5saW5lQm94U3RhcnQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgSW5saW5l TGF5b3V0VW5pdCBsCiB7CiAgICAgLy8gVGhpcyBpcyByZWFsbHkganVzdCBhIHBsYWNlaG9sZGVy IHRvIG1hcmsgdGhlIHN0YXJ0IG9mIHRoZSBpbmxpbmUgbGV2ZWwgY29udGFpbmVyIDxzcGFuPi4K ICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JC b3goaW5saW5lSXRlbS5sYXlvdXRCb3goKSk7Ci0gICAgYXV0byBhZGp1c3RlZFJ1blN0YXJ0ID0g Y29udGVudExvZ2ljYWxXaWR0aCgpICsgc3RkOjptaW4oYm94R2VvbWV0cnkubWFyZ2luU3RhcnQo KSwgMF9sdSk7CisgICAgYXV0byBhZGp1c3RlZFJ1blN0YXJ0ID0gY29udGVudExvZ2ljYWxSaWdo dCgpICsgc3RkOjptaW4oYm94R2VvbWV0cnkubWFyZ2luU3RhcnQoKSwgMF9sdSk7CiAgICAgYXBw ZW5kTm9uQnJlYWthYmxlU3BhY2UoaW5saW5lSXRlbSwgYWRqdXN0ZWRSdW5TdGFydCwgbG9naWNh bFdpZHRoKTsKIH0KIApAQCAtMjg4LDcgKzI4OCw3IEBAIHZvaWQgTGluZTo6YXBwZW5kVGV4dENv bnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtLCBJbmxpbmVMYXlvdXRV CiAgICAgICAgICAgICBsYXN0UnVuLmV4cGFuZChpbmxpbmVUZXh0SXRlbSwgbG9naWNhbFdpZHRo KTsKICAgICB9CiAgICAgaWYgKGlubGluZVRleHRJdGVtTmVlZHNOZXdSdW4pCi0gICAgICAgIG1f cnVucy5hcHBlbmQoeyBpbmxpbmVUZXh0SXRlbSwgY29udGVudExvZ2ljYWxXaWR0aCgpLCBsb2dp Y2FsV2lkdGggfSk7CisgICAgICAgIG1fcnVucy5hcHBlbmQoeyBpbmxpbmVUZXh0SXRlbSwgY29u dGVudExvZ2ljYWxSaWdodCgpLCBsb2dpY2FsV2lkdGggfSk7CiAgICAgbV9jb250ZW50TG9naWNh bFdpZHRoICs9IGxvZ2ljYWxXaWR0aDsKICAgICAvLyBTZXQgdGhlIHRyYWlsaW5nIHRyaW1tYWJs ZSBjb250ZW50LgogICAgIGlmIChpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSAmJiAhVGV4 dFV0aWw6OnNob3VsZFByZXNlcnZlVHJhaWxpbmdXaGl0ZXNwYWNlKHN0eWxlKSkgewpAQCAtMzA5 LDcgKzMwOSw3IEBAIHZvaWQgTGluZTo6YXBwZW5kTm9uUmVwbGFjZWRJbmxpbmVCb3goY29uc3Qg SW5saW5lSXRlbSYgaW5saW5lSXRlbSwgSW5saW5lTGF5b3V0CiB7CiAgICAgYXV0byYgYm94R2Vv bWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KGlubGluZUl0ZW0ubGF5 b3V0Qm94KCkpOwogICAgIC8vIE5lZ2F0aXZlIG1hcmdpbiBzdGFydCBwdWxscyB0aGUgY29udGVu dCB0byB0aGUgbG9naWNhbCBsZWZ0IGRpcmVjdGlvbi4KLSAgICBhdXRvIGFkanVzdGVkUnVuU3Rh cnQgPSBjb250ZW50TG9naWNhbFdpZHRoKCkgKyBzdGQ6Om1pbihib3hHZW9tZXRyeS5tYXJnaW5T dGFydCgpLCAwX2x1KTsKKyAgICBhdXRvIGFkanVzdGVkUnVuU3RhcnQgPSBjb250ZW50TG9naWNh bFJpZ2h0KCkgKyBzdGQ6Om1pbihib3hHZW9tZXRyeS5tYXJnaW5TdGFydCgpLCAwX2x1KTsKICAg ICBtX3J1bnMuYXBwZW5kKHsgaW5saW5lSXRlbSwgYWRqdXN0ZWRSdW5TdGFydCwgbG9naWNhbFdp ZHRoIH0pOwogICAgIG1fY29udGVudExvZ2ljYWxXaWR0aCArPSBsb2dpY2FsV2lkdGg7CiAgICAg bV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQucmVzZXQoKTsKQEAgLTMyNywxNSArMzI3LDE1IEBA IHZvaWQgTGluZTo6YXBwZW5kTGluZUJyZWFrKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0p CiB7CiAgICAgbV90cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCA9IHsgfTsKICAgICBpZiAoaW5saW5l SXRlbS5pc0hhcmRMaW5lQnJlYWsoKSkKLSAgICAgICAgcmV0dXJuIG1fcnVucy5hcHBlbmQoeyBp bmxpbmVJdGVtLCBjb250ZW50TG9naWNhbFdpZHRoKCksIDBfbHUgfSk7CisgICAgICAgIHJldHVy biBtX3J1bnMuYXBwZW5kKHsgaW5saW5lSXRlbSwgY29udGVudExvZ2ljYWxSaWdodCgpLCAwX2x1 IH0pOwogICAgIC8vIFNvZnQgbGluZSBicmVha3MgKHByZXNlcnZlZCBuZXcgbGluZSBjaGFyYWN0 ZXJzKSByZXF1aXJlIGlubGluZSB0ZXh0IGJveGVzIGZvciBjb21wYXRpYmlsaXR5IHJlYXNvbnMu CiAgICAgQVNTRVJUKGlubGluZUl0ZW0uaXNTb2Z0TGluZUJyZWFrKCkpOwotICAgIG1fcnVucy5h cHBlbmQoeyBkb3duY2FzdDxJbmxpbmVTb2Z0TGluZUJyZWFrSXRlbT4oaW5saW5lSXRlbSksIGNv bnRlbnRMb2dpY2FsV2lkdGgoKSB9KTsKKyAgICBtX3J1bnMuYXBwZW5kKHsgZG93bmNhc3Q8SW5s aW5lU29mdExpbmVCcmVha0l0ZW0+KGlubGluZUl0ZW0pLCBjb250ZW50TG9naWNhbFJpZ2h0KCkg fSk7CiB9CiAKIHZvaWQgTGluZTo6YXBwZW5kV29yZEJyZWFrT3Bwb3J0dW5pdHkoY29uc3QgSW5s aW5lSXRlbSYgaW5saW5lSXRlbSkKIHsKLSAgICBtX3J1bnMuYXBwZW5kKHsgaW5saW5lSXRlbSwg Y29udGVudExvZ2ljYWxXaWR0aCgpLCAwX2x1IH0pOworICAgIG1fcnVucy5hcHBlbmQoeyBpbmxp bmVJdGVtLCBjb250ZW50TG9naWNhbFJpZ2h0KCksIDBfbHUgfSk7CiB9CiAKIGJvb2wgTGluZTo6 aXNSdW5Db25zaWRlcmVkRW1wdHkoY29uc3QgUnVuJiBydW4pIGNvbnN0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmggYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKaW5kZXggMjZm ZWZhMmIyN2I1NmFlYmM2Zjc2M2NmZjIxMWFhZTFlMGQyZGU5Ni4uNmYzYWI2Y2Y5ZTA1MTY3ZjUy NmM5NThlNWU2ZTVkZDczY2RmOGUzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaApAQCAtNTMsNiArNTMsNyBAQCBwdWJsaWM6 CiAgICAgYm9vbCBpc0NvbnNpZGVyZWRFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1faXNDb25zaWRl cmVkRW1wdHk7IH0KIAogICAgIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCgp IGNvbnN0IHsgcmV0dXJuIG1fY29udGVudExvZ2ljYWxXaWR0aDsgfQorICAgIElubGluZUxheW91 dFVuaXQgY29udGVudExvZ2ljYWxSaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUxvZ2ljYWxM ZWZ0ICsgbV9jb250ZW50TG9naWNhbFdpZHRoOyB9CiAKICAgICBJbmxpbmVMYXlvdXRVbml0IHRy aW1tYWJsZVRyYWlsaW5nV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX3RyaW1tYWJsZVRyYWlsaW5n Q29udGVudC53aWR0aCgpOyB9CiAgICAgYm9vbCBpc1RyYWlsaW5nUnVuRnVsbHlUcmltbWFibGUo KSBjb25zdCB7IHJldHVybiBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5pc1RyYWlsaW5nUnVu RnVsbHlUcmltbWFibGUoKTsgfQpAQCAtMTM1LDggKzEzNiw2IEBAIHB1YmxpYzoKICAgICBjb25z dCBSdW5MaXN0JiBydW5zKCkgY29uc3QgeyByZXR1cm4gbV9ydW5zOyB9CiAKIHByaXZhdGU6Ci0g ICAgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFJpZ2h0KCkgY29uc3QgeyByZXR1cm4g bV9saW5lTG9naWNhbExlZnQgKyBtX2NvbnRlbnRMb2dpY2FsV2lkdGg7IH0KLQogICAgIHZvaWQg YXBwZW5kTm9uQnJlYWthYmxlU3BhY2UoY29uc3QgSW5saW5lSXRlbSYsIElubGluZUxheW91dFVu aXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKTsKICAgICB2b2lk IGFwcGVuZFRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVtJiwgSW5saW5lTGF5b3V0VW5p dCBsb2dpY2FsV2lkdGgpOwogICAgIHZvaWQgYXBwZW5kTm9uUmVwbGFjZWRJbmxpbmVCb3goY29u c3QgSW5saW5lSXRlbSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWls ZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCdWlsZGVyLmNwcAppbmRleCAyY2ZhOTU5YjI4MTU4ZmE2NWZlYTIyMjJmMmRkNzdhM2EzMDhj YWU2Li4wNjNlYjJlMzdjNGFkMTY3NjE4ZWZlMGU1MjhjYzllZjhlNjM4YzhhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZUJ1aWxkZXIuY3BwCkBAIC0yOTksNyArMjk5LDcgQEAgTGluZUJ1aWxkZXI6OkNvbW1pdHRl ZENvbnRlbnQgTGluZUJ1aWxkZXI6OnBsYWNlSW5saW5lQ29udGVudChjb25zdCBJbmxpbmVJdGVt UmEKICAgICAgICAgLy8gMi4gQXBwbHkgZmxvYXRzIGFuZCBzaHJpbmsgdGhlIGF2YWlsYWJsZSBo b3Jpem9udGFsIHNwYWNlIGUuZy4gPHNwYW4+aW50cnVfPGRpdiBzdHlsZT0iZmxvYXQ6IGxlZnQi PjwvZGl2PnNpdmVfZmxvYXQ8L3NwYW4+LgogICAgICAgICAvLyAzLiBDaGVjayBpZiB0aGUgY29u dGVudCBmaXRzIHRoZSBsaW5lIGFuZCBjb21taXQgdGhlIGNvbnRlbnQgYWNjb3JkaW5nbHkgKGZ1 bGwsIHBhcnRpYWwgb3Igbm90IGNvbW1pdCBhdCBhbGwpLgogICAgICAgICAvLyA0LiBSZXR1cm4g aWYgd2UgYXJlIGF0IHRoZSBlbmQgb2YgdGhlIGxpbmUgZWl0aGVyIGJ5IG5vdCBiZWluZyBhYmxl IHRvIGZpdCBtb3JlIGNvbnRlbnQgb3IgYmVjYXVzZSBvZiBhbiBleHBsaWNpdCBsaW5lIGJyZWFr LgotICAgICAgICBjYW5kaWRhdGVDb250ZW50Rm9yTGluZShsaW5lQ2FuZGlkYXRlLCBjdXJyZW50 SXRlbUluZGV4LCBuZWVkc0xheW91dFJhbmdlLCBwYXJ0aWFsTGVhZGluZ0NvbnRlbnRMZW5ndGgs IG1fbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCkpOworICAgICAgICBjYW5kaWRhdGVDb250ZW50 Rm9yTGluZShsaW5lQ2FuZGlkYXRlLCBjdXJyZW50SXRlbUluZGV4LCBuZWVkc0xheW91dFJhbmdl LCBwYXJ0aWFsTGVhZGluZ0NvbnRlbnRMZW5ndGgsIG1fbGluZS5jb250ZW50TG9naWNhbFJpZ2h0 KCkpOwogICAgICAgICAvLyBOb3cgY2hlY2sgaWYgd2UgY2FuIHB1dCB0aGlzIGNvbnRlbnQgb24g dGhlIGN1cnJlbnQgbGluZS4KICAgICAgICAgYXV0byByZXN1bHQgPSBSZXN1bHQgeyB9OwogICAg ICAgICBpZiAobGluZUNhbmRpZGF0ZS5mbG9hdEl0ZW0pIHsKQEAgLTM0OCwxMiArMzQ4LDEyIEBA IExpbmVCdWlsZGVyOjpJbmxpbmVJdGVtUmFuZ2UgTGluZUJ1aWxkZXI6OmNsb3NlKGNvbnN0IElu bGluZUl0ZW1SYW5nZSYgbmVlZHNMYXlvCiAgICAgICAgIC8vIExpbmUgaXMgZW1wdHksIHdlIG9u bHkgbWFuYWdlZCB0byBwbGFjZSBmbG9hdCBib3hlcy4KICAgICAgICAgcmV0dXJuIGxpbmVSYW5n ZTsKICAgICB9Ci0gICAgYXV0byBhdmFpbGFibGVXaWR0aCA9IG1fbGluZUxvZ2ljYWxSZWN0Lndp ZHRoKCkgLSBtX2xpbmUuY29udGVudExvZ2ljYWxXaWR0aCgpOworICAgIGF1dG8gYXZhaWxhYmxl V2lkdGggPSBtX2xpbmVMb2dpY2FsUmVjdC53aWR0aCgpIC0gbV9saW5lLmNvbnRlbnRMb2dpY2Fs UmlnaHQoKTsKICAgICBtX2xpbmUucmVtb3ZlQ29sbGFwc2libGVDb250ZW50KGF2YWlsYWJsZVdp ZHRoKTsKICAgICBhdXRvIGhvcml6b250YWxBbGlnbm1lbnQgPSByb290KCkuc3R5bGUoKS50ZXh0 QWxpZ24oKTsKICAgICBhdXRvIHJ1bnNFeHBhbmRIb3Jpem9udGFsbHkgPSBob3Jpem9udGFsQWxp Z25tZW50ID09IFRleHRBbGlnbk1vZGU6Okp1c3RpZnkgJiYgIWlzTGFzdExpbmVXaXRoSW5saW5l Q29udGVudChsaW5lUmFuZ2UsIG5lZWRzTGF5b3V0UmFuZ2UuZW5kLCBjb21taXR0ZWRDb250ZW50 LnBhcnRpYWxUcmFpbGluZ0NvbnRlbnRMZW5ndGgpOwogICAgIGlmIChydW5zRXhwYW5kSG9yaXpv bnRhbGx5KQotICAgICAgICBtX2xpbmUuYXBwbHlSdW5FeHBhbnNpb24obV9saW5lTG9naWNhbFJl Y3Qud2lkdGgoKSAtIG1fbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCkpOworICAgICAgICBtX2xp bmUuYXBwbHlSdW5FeHBhbnNpb24obV9saW5lTG9naWNhbFJlY3Qud2lkdGgoKSAtIG1fbGluZS5j b250ZW50TG9naWNhbFJpZ2h0KCkpOwogICAgIGF1dG8gbGluZUVuZHNXaXRoSHlwaGVuID0gZmFs c2U7CiAgICAgaWYgKCFtX2xpbmUuaXNDb25zaWRlcmVkRW1wdHkoKSkgewogICAgICAgICBBU1NF UlQoIW1fbGluZS5ydW5zKCkuaXNFbXB0eSgpKTsKQEAgLTYyMywxMCArNjIzLDEwIEBAIExpbmVC dWlsZGVyOjpSZXN1bHQgTGluZUJ1aWxkZXI6OmhhbmRsZUlubGluZUNvbnRlbnQoSW5saW5lQ29u dGVudEJyZWFrZXImIGlubGluCiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIGFkanVzdGVkTGlu ZUxvZ2ljYWxSZWN0OwogICAgIH0oKTsKLSAgICBhdXRvIGF2YWlsYWJsZVdpZHRoID0gbGluZUxv Z2ljYWxSZWN0Rm9yQ2FuZGlkYXRlQ29udGVudC53aWR0aCgpIC0gbV9saW5lLmNvbnRlbnRMb2dp Y2FsV2lkdGgoKTsKKyAgICBhdXRvIGF2YWlsYWJsZVdpZHRoID0gbGluZUxvZ2ljYWxSZWN0Rm9y Q2FuZGlkYXRlQ29udGVudC53aWR0aCgpIC0gbV9saW5lLmNvbnRlbnRMb2dpY2FsUmlnaHQoKTsK ICAgICAvLyBDaGVjayBpZiB0aGlzIG5ldyBjb250ZW50IGZpdHMuCiAgICAgYXV0byBpc0xpbmVD b25zaWRlcmVkRW1wdHkgPSBtX2xpbmUuaXNDb25zaWRlcmVkRW1wdHkoKSAmJiAhbV9jb250ZW50 SXNDb25zdHJhaW5lZEJ5RmxvYXQ7Ci0gICAgYXV0byBsaW5lU3RhdHVzID0gSW5saW5lQ29udGVu dEJyZWFrZXI6OkxpbmVTdGF0dXMgeyBtX2xpbmUuY29udGVudExvZ2ljYWxXaWR0aCgpLCBhdmFp bGFibGVXaWR0aCwgbV9saW5lLnRyaW1tYWJsZVRyYWlsaW5nV2lkdGgoKSwgbV9saW5lLnRyYWls aW5nU29mdEh5cGhlbldpZHRoKCksIG1fbGluZS5pc1RyYWlsaW5nUnVuRnVsbHlUcmltbWFibGUo KSwgaXNMaW5lQ29uc2lkZXJlZEVtcHR5IH07CisgICAgYXV0byBsaW5lU3RhdHVzID0gSW5saW5l Q29udGVudEJyZWFrZXI6OkxpbmVTdGF0dXMgeyBtX2xpbmUuY29udGVudExvZ2ljYWxSaWdodCgp LCBhdmFpbGFibGVXaWR0aCwgbV9saW5lLnRyaW1tYWJsZVRyYWlsaW5nV2lkdGgoKSwgbV9saW5l LnRyYWlsaW5nU29mdEh5cGhlbldpZHRoKCksIG1fbGluZS5pc1RyYWlsaW5nUnVuRnVsbHlUcmlt bWFibGUoKSwgaXNMaW5lQ29uc2lkZXJlZEVtcHR5IH07CiAgICAgYXV0byByZXN1bHQgPSBpbmxp bmVDb250ZW50QnJlYWtlci5wcm9jZXNzSW5saW5lQ29udGVudChjb250aW51b3VzSW5saW5lQ29u dGVudCwgbGluZVN0YXR1cyk7CiAgICAgaWYgKHJlc3VsdC5sYXN0V3JhcE9wcG9ydHVuaXR5SXRl bSkKICAgICAgICAgbV93cmFwT3Bwb3J0dW5pdHlMaXN0LmFwcGVuZChyZXN1bHQubGFzdFdyYXBP cHBvcnR1bml0eUl0ZW0pOwpAQCAtNzIyLDcgKzcyMiw3IEBAIHNpemVfdCBMaW5lQnVpbGRlcjo6 cmVidWlsZExpbmUoY29uc3QgSW5saW5lSXRlbVJhbmdlJiBsYXlvdXRSYW5nZSwgY29uc3QgSW5s aW5lCiAgICAgfQogICAgIGZvciAoOyBjdXJyZW50SXRlbUluZGV4IDwgbGF5b3V0UmFuZ2UuZW5k OyArK2N1cnJlbnRJdGVtSW5kZXgpIHsKICAgICAgICAgYXV0byYgaW5saW5lSXRlbSA9IG1faW5s aW5lSXRlbXNbY3VycmVudEl0ZW1JbmRleF07Ci0gICAgICAgIG1fbGluZS5hcHBlbmQoaW5saW5l SXRlbSwgaW5saW5lSXRlbVdpZHRoKGlubGluZUl0ZW0sIG1fbGluZS5jb250ZW50TG9naWNhbFdp ZHRoKCkpKTsKKyAgICAgICAgbV9saW5lLmFwcGVuZChpbmxpbmVJdGVtLCBpbmxpbmVJdGVtV2lk dGgoaW5saW5lSXRlbSwgbV9saW5lLmNvbnRlbnRMb2dpY2FsUmlnaHQoKSkpOwogICAgICAgICBp ZiAoJmlubGluZUl0ZW0gPT0gJmxhc3RJbmxpbmVJdGVtVG9BZGQpCiAgICAgICAgICAgICByZXR1 cm4gY3VycmVudEl0ZW1JbmRleCAtIGxheW91dFJhbmdlLnN0YXJ0ICsgMTsKICAgICB9CkBAIC03 MzgsNyArNzM4LDcgQEAgc2l6ZV90IExpbmVCdWlsZGVyOjpyZWJ1aWxkTGluZUZvclRyYWlsaW5n U29mdEh5cGhlbihjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIGxheW8KICAgICAgICAgLy8gRklYTUU6 IElmIHRoaXMgdHVybnMgb3V0IHRvIGJlIGEgcGVyZiBpc3N1ZSwgd2UgY291bGQgYWxzbyB0cmF2 ZXJzZSB0aGUgd3JhcCBsaXN0IGFuZCBrZWVwIGFkZGluZyB0aGUgaXRlbXMKICAgICAgICAgLy8g d2hpbGUgd2F0Y2hpbmcgdGhlIGF2YWlsYWJsZSB3aWR0aCB2ZXJ5IGNsb3NlbHkuCiAgICAgICAg IGF1dG8gY29tbWl0dGVkQ291bnQgPSByZWJ1aWxkTGluZShsYXlvdXRSYW5nZSwgc29mdFdyYXBP cHBvcnR1bml0eUl0ZW0pOwotICAgICAgICBhdXRvIGF2YWlsYWJsZVdpZHRoID0gbV9saW5lTG9n aWNhbFJlY3Qud2lkdGgoKSAtIG1fbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCk7CisgICAgICAg IGF1dG8gYXZhaWxhYmxlV2lkdGggPSBtX2xpbmVMb2dpY2FsUmVjdC53aWR0aCgpIC0gbV9saW5l LmNvbnRlbnRMb2dpY2FsUmlnaHQoKTsKICAgICAgICAgYXV0byB0cmFpbGluZ1NvZnRIeXBoZW5X aWR0aCA9IG1fbGluZS50cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCgpOwogICAgICAgICAvLyBDaGVj ayBpZiB0aGUgdHJhaWxpbmcgaHlwaGVuIG5vdyBmaXRzIHRoZSBsaW5lIChvciB3ZSBkb24ndCBu ZWVkIGh5aGVuIGFueW1vcmUpLgogICAgICAgICBpZiAoIXRyYWlsaW5nU29mdEh5cGhlbldpZHRo IHx8IHRyYWlsaW5nU29mdEh5cGhlbldpZHRoIDw9IGF2YWlsYWJsZVdpZHRoKSB7Cg== 415791 2020-12-09 12:39:01 -0800 2020-12-10 09:51:35 -0800 Patch bug-219693-20201209123900.patch text/plain 10390 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmM3MzY2ZDc4OGU4OTZj ZjkxYzJhNjJjZTc4NjgxMzgwZTBkZmVhNS4uYTEzODg0NmZkYWJjYWEyNjY3MTcyZmYzNmQ2ZWZk MTQ1OGViMzhiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTEyLTA5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBMaW5lIGF2 YWlsYWJsZSB3aWR0aCBjb21wdXRhdGlvbiBzaG91bGQgYmUgYmFzZWQgb24gdGhlIGNvbnRlbnQg bG9naWNhbCByaWdodC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxOTY5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGFkZGluZyBwcm9wZXIgc3VwcG9ydCBm b3IgbmVnYXRpdmUgd29yZCBzcGFjaW5nIHZhbHVlcyB3aGVyZSB0aGUgbmVnYXRpdmUgdmFsdWUK KyAgICAgICAgcHVsbHMgdGhlIGNvbnRlbnQgb24gdGhlIGxpbmUgdG8gdGhlIGxvZ2ljYWwgbGVm dCBkaXJlY3Rpb24gbWFraW5nIG1vcmUgc3BhY2UgZm9yIHN1YnNlcXVlbnQgY29udGVudC4KKwor ICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjphcHBlbmRJbmxpbmVCb3hTdGFydCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVuZFRleHRDb250ZW50KToKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6TGluZTo6YXBwZW5kTm9uUmVwbGFjZWRJbmxpbmVCb3gpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjphcHBlbmRMaW5lQnJlYWspOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lOjphcHBlbmRXb3JkQnJlYWtPcHBvcnR1bml0eSk6CisgICAgICAg ICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lOjpjb250ZW50TG9naWNhbFJpZ2h0IGNvbnN0KToKKyAgICAgICAgKiBs YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpwbGFjZUlubGluZUNvbnRlbnQpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6Y2xvc2UpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6aGFuZGxlSW5saW5lQ29udGVudCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpyZWJ1aWxkTGluZSk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpyZWJ1aWxkTGluZUZvclRyYWlsaW5nU29mdEh5cGhl bik6CisKIDIwMjAtMTItMDkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXVtJRkNdIFJlbW92ZSByZWR1bmRhbnQgTGluZTo6bGluZUxvZ2ljYWxMZWZ0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmUuY3BwCmluZGV4IGFkYzhmZTBhYWY4MWMwYmJkODJhMDBlNDQyNWUyOGI3ZjczMjgzMTAuLjU0 YjdkNThjNDdlYjkzNjM2Y2FiZTBlZTZhMjA3MTc1OTE5ZjBiOGUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCkBAIC0y MjYsNyArMjI2LDcgQEAgdm9pZCBMaW5lOjphcHBlbmRJbmxpbmVCb3hTdGFydChjb25zdCBJbmxp bmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpbmVMYXlvdXRVbml0IGwKIHsKICAgICAvLyBUaGlzIGlz IHJlYWxseSBqdXN0IGEgcGxhY2Vob2xkZXIgdG8gbWFyayB0aGUgc3RhcnQgb2YgdGhlIGlubGlu ZSBsZXZlbCBjb250YWluZXIgPHNwYW4+LgogICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0 dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChpbmxpbmVJdGVtLmxheW91dEJveCgpKTsKLSAg ICBhdXRvIGFkanVzdGVkUnVuU3RhcnQgPSBjb250ZW50TG9naWNhbFdpZHRoKCkgKyBzdGQ6Om1p bihib3hHZW9tZXRyeS5tYXJnaW5TdGFydCgpLCAwX2x1KTsKKyAgICBhdXRvIGFkanVzdGVkUnVu U3RhcnQgPSBjb250ZW50TG9naWNhbFJpZ2h0KCkgKyBzdGQ6Om1pbihib3hHZW9tZXRyeS5tYXJn aW5TdGFydCgpLCAwX2x1KTsKICAgICBhcHBlbmROb25CcmVha2FibGVTcGFjZShpbmxpbmVJdGVt LCBhZGp1c3RlZFJ1blN0YXJ0LCBsb2dpY2FsV2lkdGgpOwogfQogCkBAIC0yODAsNyArMjgwLDcg QEAgdm9pZCBMaW5lOjphcHBlbmRUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5s aW5lVGV4dEl0ZW0sIElubGluZUxheW91dFUKICAgICAgICAgICAgIGxhc3RSdW4uZXhwYW5kKGlu bGluZVRleHRJdGVtLCBsb2dpY2FsV2lkdGgpOwogICAgIH0KICAgICBpZiAoaW5saW5lVGV4dEl0 ZW1OZWVkc05ld1J1bikKLSAgICAgICAgbV9ydW5zLmFwcGVuZCh7IGlubGluZVRleHRJdGVtLCBj b250ZW50TG9naWNhbFdpZHRoKCksIGxvZ2ljYWxXaWR0aCB9KTsKKyAgICAgICAgbV9ydW5zLmFw cGVuZCh7IGlubGluZVRleHRJdGVtLCBjb250ZW50TG9naWNhbFJpZ2h0KCksIGxvZ2ljYWxXaWR0 aCB9KTsKICAgICBtX2NvbnRlbnRMb2dpY2FsV2lkdGggKz0gbG9naWNhbFdpZHRoOwogICAgIC8v IFNldCB0aGUgdHJhaWxpbmcgdHJpbW1hYmxlIGNvbnRlbnQuCiAgICAgaWYgKGlubGluZVRleHRJ dGVtLmlzV2hpdGVzcGFjZSgpICYmICFUZXh0VXRpbDo6c2hvdWxkUHJlc2VydmVUcmFpbGluZ1do aXRlc3BhY2Uoc3R5bGUpKSB7CkBAIC0zMDEsNyArMzAxLDcgQEAgdm9pZCBMaW5lOjphcHBlbmRO b25SZXBsYWNlZElubGluZUJveChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpbmVM YXlvdXQKIHsKICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2Vv bWV0cnlGb3JCb3goaW5saW5lSXRlbS5sYXlvdXRCb3goKSk7CiAgICAgLy8gTmVnYXRpdmUgbWFy Z2luIHN0YXJ0IHB1bGxzIHRoZSBjb250ZW50IHRvIHRoZSBsb2dpY2FsIGxlZnQgZGlyZWN0aW9u LgotICAgIGF1dG8gYWRqdXN0ZWRSdW5TdGFydCA9IGNvbnRlbnRMb2dpY2FsV2lkdGgoKSArIHN0 ZDo6bWluKGJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCksIDBfbHUpOworICAgIGF1dG8gYWRqdXN0 ZWRSdW5TdGFydCA9IGNvbnRlbnRMb2dpY2FsUmlnaHQoKSArIHN0ZDo6bWluKGJveEdlb21ldHJ5 Lm1hcmdpblN0YXJ0KCksIDBfbHUpOwogICAgIG1fcnVucy5hcHBlbmQoeyBpbmxpbmVJdGVtLCBh ZGp1c3RlZFJ1blN0YXJ0LCBsb2dpY2FsV2lkdGggfSk7CiAgICAgbV9jb250ZW50TG9naWNhbFdp ZHRoICs9IGxvZ2ljYWxXaWR0aDsKICAgICBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5yZXNl dCgpOwpAQCAtMzE5LDE1ICszMTksMTUgQEAgdm9pZCBMaW5lOjphcHBlbmRMaW5lQnJlYWsoY29u c3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSkKIHsKICAgICBtX3RyYWlsaW5nU29mdEh5cGhlbldp ZHRoID0geyB9OwogICAgIGlmIChpbmxpbmVJdGVtLmlzSGFyZExpbmVCcmVhaygpKQotICAgICAg ICByZXR1cm4gbV9ydW5zLmFwcGVuZCh7IGlubGluZUl0ZW0sIGNvbnRlbnRMb2dpY2FsV2lkdGgo KSwgMF9sdSB9KTsKKyAgICAgICAgcmV0dXJuIG1fcnVucy5hcHBlbmQoeyBpbmxpbmVJdGVtLCBj b250ZW50TG9naWNhbFJpZ2h0KCksIDBfbHUgfSk7CiAgICAgLy8gU29mdCBsaW5lIGJyZWFrcyAo cHJlc2VydmVkIG5ldyBsaW5lIGNoYXJhY3RlcnMpIHJlcXVpcmUgaW5saW5lIHRleHQgYm94ZXMg Zm9yIGNvbXBhdGliaWxpdHkgcmVhc29ucy4KICAgICBBU1NFUlQoaW5saW5lSXRlbS5pc1NvZnRM aW5lQnJlYWsoKSk7Ci0gICAgbV9ydW5zLmFwcGVuZCh7IGRvd25jYXN0PElubGluZVNvZnRMaW5l QnJlYWtJdGVtPihpbmxpbmVJdGVtKSwgY29udGVudExvZ2ljYWxXaWR0aCgpIH0pOworICAgIG1f cnVucy5hcHBlbmQoeyBkb3duY2FzdDxJbmxpbmVTb2Z0TGluZUJyZWFrSXRlbT4oaW5saW5lSXRl bSksIGNvbnRlbnRMb2dpY2FsUmlnaHQoKSB9KTsKIH0KIAogdm9pZCBMaW5lOjphcHBlbmRXb3Jk QnJlYWtPcHBvcnR1bml0eShjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtKQogewotICAgIG1f cnVucy5hcHBlbmQoeyBpbmxpbmVJdGVtLCBjb250ZW50TG9naWNhbFdpZHRoKCksIDBfbHUgfSk7 CisgICAgbV9ydW5zLmFwcGVuZCh7IGlubGluZUl0ZW0sIGNvbnRlbnRMb2dpY2FsUmlnaHQoKSwg MF9sdSB9KTsKIH0KIAogYm9vbCBMaW5lOjppc1J1bkNvbnNpZGVyZWRFbXB0eShjb25zdCBSdW4m IHJ1bikgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmUuaAppbmRleCA4YmNhZDhjOTY4YjkyOGFhMjIyNTVjNThiMmU2YWJmMjY0 YTc0ODJiLi44Y2QzYTU5MjNhOTQxMDIzYThjM2VlOTFmYjRiMmQ1YzQyNzJkZjljIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5o CkBAIC01Myw2ICs1Myw4IEBAIHB1YmxpYzoKICAgICBib29sIGlzQ29uc2lkZXJlZEVtcHR5KCkg Y29uc3QgeyByZXR1cm4gbV9pc0NvbnNpZGVyZWRFbXB0eTsgfQogCiAgICAgSW5saW5lTGF5b3V0 VW5pdCBjb250ZW50TG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50TG9naWNh bFdpZHRoOyB9CisgICAgLy8gRklYTUU6IEFkZCBzdXBwb3J0IGZvciBuZWdhdGl2ZSB3b3JkLXNh cGNpbmcgd2hlcmUgY29udGVudExvZ2ljYWxSaWdodCAhPSBjb250ZW50TG9naWNhbFdpZHRoLgor ICAgIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxSaWdodCgpIGNvbnN0IHsgcmV0dXJu IG1fY29udGVudExvZ2ljYWxXaWR0aDsgfQogCiAgICAgSW5saW5lTGF5b3V0VW5pdCB0cmltbWFi bGVUcmFpbGluZ1dpZHRoKCkgY29uc3QgeyByZXR1cm4gbV90cmltbWFibGVUcmFpbGluZ0NvbnRl bnQud2lkdGgoKTsgfQogICAgIGJvb2wgaXNUcmFpbGluZ1J1bkZ1bGx5VHJpbW1hYmxlKCkgY29u c3QgeyByZXR1cm4gbV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQuaXNUcmFpbGluZ1J1bkZ1bGx5 VHJpbW1hYmxlKCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCA5YmRkODRkNTI1NzIz MjdkNGFiNTYxOTMyNDI4ZTcyYzQ5ODY5YTQzLi5kMzY1NGZmZGNjMDMxMzM3NWJjZTQ1Y2JiYjFi MGQyODM5MjMxNzZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0yOTksNyArMjk5LDcg QEAgTGluZUJ1aWxkZXI6OkNvbW1pdHRlZENvbnRlbnQgTGluZUJ1aWxkZXI6OnBsYWNlSW5saW5l Q29udGVudChjb25zdCBJbmxpbmVJdGVtUmEKICAgICAgICAgLy8gMi4gQXBwbHkgZmxvYXRzIGFu ZCBzaHJpbmsgdGhlIGF2YWlsYWJsZSBob3Jpem9udGFsIHNwYWNlIGUuZy4gPHNwYW4+aW50cnVf PGRpdiBzdHlsZT0iZmxvYXQ6IGxlZnQiPjwvZGl2PnNpdmVfZmxvYXQ8L3NwYW4+LgogICAgICAg ICAvLyAzLiBDaGVjayBpZiB0aGUgY29udGVudCBmaXRzIHRoZSBsaW5lIGFuZCBjb21taXQgdGhl IGNvbnRlbnQgYWNjb3JkaW5nbHkgKGZ1bGwsIHBhcnRpYWwgb3Igbm90IGNvbW1pdCBhdCBhbGwp LgogICAgICAgICAvLyA0LiBSZXR1cm4gaWYgd2UgYXJlIGF0IHRoZSBlbmQgb2YgdGhlIGxpbmUg ZWl0aGVyIGJ5IG5vdCBiZWluZyBhYmxlIHRvIGZpdCBtb3JlIGNvbnRlbnQgb3IgYmVjYXVzZSBv ZiBhbiBleHBsaWNpdCBsaW5lIGJyZWFrLgotICAgICAgICBjYW5kaWRhdGVDb250ZW50Rm9yTGlu ZShsaW5lQ2FuZGlkYXRlLCBjdXJyZW50SXRlbUluZGV4LCBuZWVkc0xheW91dFJhbmdlLCBwYXJ0 aWFsTGVhZGluZ0NvbnRlbnRMZW5ndGgsIG1fbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCkpOwor ICAgICAgICBjYW5kaWRhdGVDb250ZW50Rm9yTGluZShsaW5lQ2FuZGlkYXRlLCBjdXJyZW50SXRl bUluZGV4LCBuZWVkc0xheW91dFJhbmdlLCBwYXJ0aWFsTGVhZGluZ0NvbnRlbnRMZW5ndGgsIG1f bGluZS5jb250ZW50TG9naWNhbFJpZ2h0KCkpOwogICAgICAgICAvLyBOb3cgY2hlY2sgaWYgd2Ug Y2FuIHB1dCB0aGlzIGNvbnRlbnQgb24gdGhlIGN1cnJlbnQgbGluZS4KICAgICAgICAgYXV0byBy ZXN1bHQgPSBSZXN1bHQgeyB9OwogICAgICAgICBpZiAobGluZUNhbmRpZGF0ZS5mbG9hdEl0ZW0p IHsKQEAgLTM0OCwxMiArMzQ4LDEyIEBAIExpbmVCdWlsZGVyOjpJbmxpbmVJdGVtUmFuZ2UgTGlu ZUJ1aWxkZXI6OmNsb3NlKGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbmVlZHNMYXlvCiAgICAgICAg IC8vIExpbmUgaXMgZW1wdHksIHdlIG9ubHkgbWFuYWdlZCB0byBwbGFjZSBmbG9hdCBib3hlcy4K ICAgICAgICAgcmV0dXJuIGxpbmVSYW5nZTsKICAgICB9Ci0gICAgYXV0byBhdmFpbGFibGVXaWR0 aCA9IG1fbGluZUxvZ2ljYWxSZWN0LndpZHRoKCkgLSBtX2xpbmUuY29udGVudExvZ2ljYWxXaWR0 aCgpOworICAgIGF1dG8gYXZhaWxhYmxlV2lkdGggPSBtX2xpbmVMb2dpY2FsUmVjdC53aWR0aCgp IC0gbV9saW5lLmNvbnRlbnRMb2dpY2FsUmlnaHQoKTsKICAgICBtX2xpbmUucmVtb3ZlQ29sbGFw c2libGVDb250ZW50KGF2YWlsYWJsZVdpZHRoKTsKICAgICBhdXRvIGhvcml6b250YWxBbGlnbm1l bnQgPSByb290KCkuc3R5bGUoKS50ZXh0QWxpZ24oKTsKICAgICBhdXRvIHJ1bnNFeHBhbmRIb3Jp em9udGFsbHkgPSBob3Jpem9udGFsQWxpZ25tZW50ID09IFRleHRBbGlnbk1vZGU6Okp1c3RpZnkg JiYgIWlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudChsaW5lUmFuZ2UsIG5lZWRzTGF5b3V0UmFu Z2UuZW5kLCBjb21taXR0ZWRDb250ZW50LnBhcnRpYWxUcmFpbGluZ0NvbnRlbnRMZW5ndGgpOwog ICAgIGlmIChydW5zRXhwYW5kSG9yaXpvbnRhbGx5KQotICAgICAgICBtX2xpbmUuYXBwbHlSdW5F eHBhbnNpb24obV9saW5lTG9naWNhbFJlY3Qud2lkdGgoKSAtIG1fbGluZS5jb250ZW50TG9naWNh bFdpZHRoKCkpOworICAgICAgICBtX2xpbmUuYXBwbHlSdW5FeHBhbnNpb24obV9saW5lTG9naWNh bFJlY3Qud2lkdGgoKSAtIG1fbGluZS5jb250ZW50TG9naWNhbFJpZ2h0KCkpOwogICAgIGF1dG8g bGluZUVuZHNXaXRoSHlwaGVuID0gZmFsc2U7CiAgICAgaWYgKCFtX2xpbmUuaXNDb25zaWRlcmVk RW1wdHkoKSkgewogICAgICAgICBBU1NFUlQoIW1fbGluZS5ydW5zKCkuaXNFbXB0eSgpKTsKQEAg LTYyMSwxMCArNjIxLDEwIEBAIExpbmVCdWlsZGVyOjpSZXN1bHQgTGluZUJ1aWxkZXI6OmhhbmRs ZUlubGluZUNvbnRlbnQoSW5saW5lQ29udGVudEJyZWFrZXImIGlubGluCiAgICAgICAgIH0KICAg ICAgICAgcmV0dXJuIGFkanVzdGVkTGluZUxvZ2ljYWxSZWN0OwogICAgIH0oKTsKLSAgICBhdXRv IGF2YWlsYWJsZVdpZHRoID0gbGluZUxvZ2ljYWxSZWN0Rm9yQ2FuZGlkYXRlQ29udGVudC53aWR0 aCgpIC0gbV9saW5lLmNvbnRlbnRMb2dpY2FsV2lkdGgoKTsKKyAgICBhdXRvIGF2YWlsYWJsZVdp ZHRoID0gbGluZUxvZ2ljYWxSZWN0Rm9yQ2FuZGlkYXRlQ29udGVudC53aWR0aCgpIC0gbV9saW5l LmNvbnRlbnRMb2dpY2FsUmlnaHQoKTsKICAgICAvLyBDaGVjayBpZiB0aGlzIG5ldyBjb250ZW50 IGZpdHMuCiAgICAgYXV0byBpc0xpbmVDb25zaWRlcmVkRW1wdHkgPSBtX2xpbmUuaXNDb25zaWRl cmVkRW1wdHkoKSAmJiAhbV9jb250ZW50SXNDb25zdHJhaW5lZEJ5RmxvYXQ7Ci0gICAgYXV0byBs aW5lU3RhdHVzID0gSW5saW5lQ29udGVudEJyZWFrZXI6OkxpbmVTdGF0dXMgeyBtX2xpbmUuY29u dGVudExvZ2ljYWxXaWR0aCgpLCBhdmFpbGFibGVXaWR0aCwgbV9saW5lLnRyaW1tYWJsZVRyYWls aW5nV2lkdGgoKSwgbV9saW5lLnRyYWlsaW5nU29mdEh5cGhlbldpZHRoKCksIG1fbGluZS5pc1Ry YWlsaW5nUnVuRnVsbHlUcmltbWFibGUoKSwgaXNMaW5lQ29uc2lkZXJlZEVtcHR5IH07CisgICAg YXV0byBsaW5lU3RhdHVzID0gSW5saW5lQ29udGVudEJyZWFrZXI6OkxpbmVTdGF0dXMgeyBtX2xp bmUuY29udGVudExvZ2ljYWxSaWdodCgpLCBhdmFpbGFibGVXaWR0aCwgbV9saW5lLnRyaW1tYWJs ZVRyYWlsaW5nV2lkdGgoKSwgbV9saW5lLnRyYWlsaW5nU29mdEh5cGhlbldpZHRoKCksIG1fbGlu ZS5pc1RyYWlsaW5nUnVuRnVsbHlUcmltbWFibGUoKSwgaXNMaW5lQ29uc2lkZXJlZEVtcHR5IH07 CiAgICAgYXV0byByZXN1bHQgPSBpbmxpbmVDb250ZW50QnJlYWtlci5wcm9jZXNzSW5saW5lQ29u dGVudChjb250aW51b3VzSW5saW5lQ29udGVudCwgbGluZVN0YXR1cyk7CiAgICAgaWYgKHJlc3Vs dC5sYXN0V3JhcE9wcG9ydHVuaXR5SXRlbSkKICAgICAgICAgbV93cmFwT3Bwb3J0dW5pdHlMaXN0 LmFwcGVuZChyZXN1bHQubGFzdFdyYXBPcHBvcnR1bml0eUl0ZW0pOwpAQCAtNzIwLDcgKzcyMCw3 IEBAIHNpemVfdCBMaW5lQnVpbGRlcjo6cmVidWlsZExpbmUoY29uc3QgSW5saW5lSXRlbVJhbmdl JiBsYXlvdXRSYW5nZSwgY29uc3QgSW5saW5lCiAgICAgfQogICAgIGZvciAoOyBjdXJyZW50SXRl bUluZGV4IDwgbGF5b3V0UmFuZ2UuZW5kOyArK2N1cnJlbnRJdGVtSW5kZXgpIHsKICAgICAgICAg YXV0byYgaW5saW5lSXRlbSA9IG1faW5saW5lSXRlbXNbY3VycmVudEl0ZW1JbmRleF07Ci0gICAg ICAgIG1fbGluZS5hcHBlbmQoaW5saW5lSXRlbSwgaW5saW5lSXRlbVdpZHRoKGlubGluZUl0ZW0s IG1fbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCkpKTsKKyAgICAgICAgbV9saW5lLmFwcGVuZChp bmxpbmVJdGVtLCBpbmxpbmVJdGVtV2lkdGgoaW5saW5lSXRlbSwgbV9saW5lLmNvbnRlbnRMb2dp Y2FsUmlnaHQoKSkpOwogICAgICAgICBpZiAoJmlubGluZUl0ZW0gPT0gJmxhc3RJbmxpbmVJdGVt VG9BZGQpCiAgICAgICAgICAgICByZXR1cm4gY3VycmVudEl0ZW1JbmRleCAtIGxheW91dFJhbmdl LnN0YXJ0ICsgMTsKICAgICB9CkBAIC03MzYsNyArNzM2LDcgQEAgc2l6ZV90IExpbmVCdWlsZGVy OjpyZWJ1aWxkTGluZUZvclRyYWlsaW5nU29mdEh5cGhlbihjb25zdCBJbmxpbmVJdGVtUmFuZ2Um IGxheW8KICAgICAgICAgLy8gRklYTUU6IElmIHRoaXMgdHVybnMgb3V0IHRvIGJlIGEgcGVyZiBp c3N1ZSwgd2UgY291bGQgYWxzbyB0cmF2ZXJzZSB0aGUgd3JhcCBsaXN0IGFuZCBrZWVwIGFkZGlu ZyB0aGUgaXRlbXMKICAgICAgICAgLy8gd2hpbGUgd2F0Y2hpbmcgdGhlIGF2YWlsYWJsZSB3aWR0 aCB2ZXJ5IGNsb3NlbHkuCiAgICAgICAgIGF1dG8gY29tbWl0dGVkQ291bnQgPSByZWJ1aWxkTGlu ZShsYXlvdXRSYW5nZSwgc29mdFdyYXBPcHBvcnR1bml0eUl0ZW0pOwotICAgICAgICBhdXRvIGF2 YWlsYWJsZVdpZHRoID0gbV9saW5lTG9naWNhbFJlY3Qud2lkdGgoKSAtIG1fbGluZS5jb250ZW50 TG9naWNhbFdpZHRoKCk7CisgICAgICAgIGF1dG8gYXZhaWxhYmxlV2lkdGggPSBtX2xpbmVMb2dp Y2FsUmVjdC53aWR0aCgpIC0gbV9saW5lLmNvbnRlbnRMb2dpY2FsUmlnaHQoKTsKICAgICAgICAg YXV0byB0cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCA9IG1fbGluZS50cmFpbGluZ1NvZnRIeXBoZW5X aWR0aCgpOwogICAgICAgICAvLyBDaGVjayBpZiB0aGUgdHJhaWxpbmcgaHlwaGVuIG5vdyBmaXRz IHRoZSBsaW5lIChvciB3ZSBkb24ndCBuZWVkIGh5aGVuIGFueW1vcmUpLgogICAgICAgICBpZiAo IXRyYWlsaW5nU29mdEh5cGhlbldpZHRoIHx8IHRyYWlsaW5nU29mdEh5cGhlbldpZHRoIDw9IGF2 YWlsYWJsZVdpZHRoKSB7Cg==