233742 2021-12-01 19:08:41 -0800 [LFC][IFC] Move the (bidi)display boxes horizontally by the inline box margin, border and padding start as needed 2021-12-03 06:13:25 -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 1819532 0 zalan 2021-12-01 19:08:41 -0800 ssia 1819534 1 445656 zalan 2021-12-01 19:20:32 -0800 Created attachment 445656 Patch 1819544 2 445662 zalan 2021-12-01 20:11:43 -0800 Created attachment 445662 Patch 1820113 3 ews-feeder 2021-12-03 06:12:15 -0800 Committed r286489 (244828@main): <https://commits.webkit.org/244828@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 445662. 1820114 4 webkit-bug-importer 2021-12-03 06:13:25 -0800 <rdar://problem/86015913> 445656 2021-12-01 19:20:32 -0800 2021-12-01 20:11:41 -0800 Patch bug-233742-20211201192031.patch text/plain 5941 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjI0OTY0ODVkZTEyZTY0 ZjNjNmQxNmI3NDA4NDAyZGIxNDBjNzViMS4uODM0NWQ0NTkyZmFlY2FlYjExYzQzOGNkYzQyYjgw MzlkYWE5ZTQ2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTEyLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIE1vdmUgdGhl IChiaWRpKWRpc3BsYXkgYm94ZXMgaG9yaXpvbnRhbGx5IGJ5IHRoZSBpbmxpbmUgYm94IG1hcmdp biwgYm9yZGVyIGFuZCBwYWRkaW5nIHN0YXJ0IGFzIG5lZWRlZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzNzQyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmUtdmlzaXQgdGhlIG5ld2x5IGNvbnN0cnVj dGVkIGRpc3BsYXkgYm94ZXMgYW5kIG1vdmUgdGhlbSBob3Jpem9udGFsbHkgdXNpbmcgdGhlIGlu bGluZSBib3ggbWFyZ2luLCBib3JkZXIgYW5kIHBhZGRpbmcgc3RhcnQgdmFsdWVzLgorICAgICAg ICBOb3RlIHRoYXQgaW4gdGhpcyBwYXRjaCB3ZSBkb24ndCB5ZXQgaGFuZGxlIHRoZSBlbmQgc2lk ZSBvZiB0aGUgaW5saW5lIGJveGVzLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNv bnRlbnQpOgorCiAyMDIxLTEyLTAxICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBbTEZDXVtJRkNdIENyZWF0ZSBkaXNwbGF5IGJveGVzIGZvciBmcmFnbWVudGVkIGlu bGluZSBib3hlcyBvbiBiaWRpIGJvdW5kYXJpZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVp bGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCmluZGV4IDA0ZGE0MTg2MDI2MTU4ZmIy ZmMzZWZmZDI5NDFkOTYyYWMwYjhkMTguLjA1NGY3MTU4NWY3YTRhMzQ1ZDdmZGVlMTBjNWNhZTg0 ZjQxM2M2MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNv bnRlbnRCdWlsZGVyLmNwcApAQCAtNDA5LDYgKzQwOSw3IEBAIHZvaWQgSW5saW5lRGlzcGxheUNv bnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVD b250CiAgICAgfTsKICAgICBjcmVhdGVEaXNwbGF5Qm94ZXNJblZpc3VhbE9yZGVyRm9yQ29udGVu dFJ1bnMoKTsKIAorICAgIGF1dG8gbmVlZHNEaXNwbGF5Qm94SG9yaXpvbnRhbEFkanVzdG1lbnQg PSBmYWxzZTsKICAgICBhdXRvIGNyZWF0ZURpc3BsYXlCb3hlc0luVmlzdWFsT3JkZXJGb3JJbmxp bmVCb3hlcyA9IFsmXSB7CiAgICAgICAgIC8vIFZpc3VhbCBvcmRlciBjb3VsZCBpbnRyb2R1Y2Ug Z2FwcyBhbmQvb3IgaW5qZWN0IHJ1bnMgb3V0c2lkZSBmcm9tIHRoZSBjdXJyZW50IGlubGluZSBi b3ggY29udGVudC4KICAgICAgICAgLy8gSW4gc3VjaCBjYXNlcywgd2UgbmVlZCB0byAiY2xvc2Ui IGFuZCAib3BlbiIgZGlzcGxheSBib3hlcyBmb3IgdGhlc2UgaW5saW5lIGJveCBmcmFnbWVudHMK QEAgLTQ1Nyw3ICs0NTgsOCBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJv Y2Vzc0JpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udAogICAgICAgICAgICAg ICAgICAgICAgICAgcGFyZW50Qm94U3RhY2suYWRkKGlubGluZUJveCk7CiAKICAgICAgICAgICAg ICAgICAgICAgICAgIGF1dG8gY3JlYXRlQW5kSW5zZXJ0RGlzcGxheUJveEZvcklubGluZUJveEZy YWdtZW50ID0gWyZdIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBhdXRvIHZpc3VhbFJl Y3QgPSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JJbmxpbmVCb3goKmlubGluZUJveCwgZm9y bWF0dGluZ1N0YXRlKCkuYm94R2VvbWV0cnkoKmlubGluZUJveCkpOworICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRlKCkuYm94R2Vv bWV0cnkoKmlubGluZUJveCk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXV0byB2aXN1 YWxSZWN0ID0gbGluZUJveC5sb2dpY2FsQm9yZGVyQm94Rm9ySW5saW5lQm94KCppbmxpbmVCb3gs IGJveEdlb21ldHJ5KTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBVc2UgdGhlIGN1 cnJlbnQgY29udGVudCBsZWZ0IGFzIHRoZSBzdGFydGluZyBwb2ludCBmb3IgdGhpcyBkaXNwbGF5 IGJveC4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2aXN1YWxSZWN0LnNldExlZnQoYm94 ZXNbaW5kZXhdLmxvZ2ljYWxMZWZ0KCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZp c3VhbFJlY3QubW92ZVZlcnRpY2FsbHkobGluZUJveExvZ2ljYWxUb3BMZWZ0LnkoKSk7CkBAIC00 NjUsNiArNDY3LDEyIEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNz QmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdmlzdWFsUmVjdC5zZXRXaWR0aCh7IH0pOwogICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGluc2VydElubGluZUJveERpc3BsYXlCb3hGb3JCaWRpQm91bmRhcnkobGluZUJv eC5pbmxpbmVMZXZlbEJveEZvckxheW91dEJveCgqaW5saW5lQm94KSwgdmlzdWFsUmVjdCwgaW5k ZXgsIGJveGVzKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICArK2luZGV4OworICAgICAg ICAgICAgICAgICAgICAgICAgICAgIC8vIE5lZWQgdG8gcHVzaCB0aGUgcmVzdCBvZiB0aGUgY29u dGVudCB3aGVuIHRoaXMgaW5saW5lIGJveCBoYXMgbWFyZ2luL2JvcmRlci9wYWRkaW5nLgorICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG5lZWRzRGlzcGxheUJveEhvcml6b250YWxBZGp1c3Rt ZW50ID0gbmVlZHNEaXNwbGF5Qm94SG9yaXpvbnRhbEFkanVzdG1lbnQKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgfHwgYm94R2VvbWV0cnkuaG9yaXpvbnRhbEJvcmRlcigpCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHx8IGJveEdlb21ldHJ5Lmhvcml6b250YWxQYWRk aW5nKCkudmFsdWVfb3IoMCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfHwgYm94 R2VvbWV0cnkubWFyZ2luU3RhcnQoKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8 fCBib3hHZW9tZXRyeS5tYXJnaW5FbmQoKTsKICAgICAgICAgICAgICAgICAgICAgICAgIH07CiAg ICAgICAgICAgICAgICAgICAgICAgICBjcmVhdGVBbmRJbnNlcnREaXNwbGF5Qm94Rm9ySW5saW5l Qm94RnJhZ21lbnQoKTsKICAgICAgICAgICAgICAgICAgICAgfQpAQCAtNDc4LDYgKzQ4NiwyNyBA QCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KGNv bnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udAogICAgIH07CiAgICAgaWYgKG5lZWRzTm9uUm9vdElu bGluZUJveERpc3BsYXlCb3gpCiAgICAgICAgIGNyZWF0ZURpc3BsYXlCb3hlc0luVmlzdWFsT3Jk ZXJGb3JJbmxpbmVCb3hlcygpOworCisgICAgYXV0byBhZGp1c3RWaXN1YWxHZW9tZXRyeVdpdGhJ bmxpbmVCb3hlcyA9IFsmXSB7CisgICAgICAgIGF1dG8gYWNjdW11bGF0ZWRPZmZzZXQgPSBJbmxp bmVMYXlvdXRVbml0IHsgfTsKKworICAgICAgICBBU1NFUlQoYm94ZXNbMF0uaXNSb290SW5saW5l Qm94KCkpOworICAgICAgICBmb3IgKHNpemVfdCBpbmRleCA9IDE7IGluZGV4IDwgYm94ZXMuc2l6 ZSgpOyArK2luZGV4KSB7CisgICAgICAgICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gYm94ZXNbaW5k ZXhdOworICAgICAgICAgICAgZGlzcGxheUJveC5tb3ZlSG9yaXpvbnRhbGx5KGFjY3VtdWxhdGVk T2Zmc2V0KTsKKworICAgICAgICAgICAgaWYgKGRpc3BsYXlCb3guaXNOb25Sb290SW5saW5lQm94 KCkgJiYgZGlzcGxheUJveC5pc0ZpcnN0Qm94KCkpIHsKKyAgICAgICAgICAgICAgICAvLyBGSVhN RTogQWRkIHN1cHBvcnQgZm9yIHRoZSAnZW5kJyBzaWRlIG9mIHRoZSBpbmxpbmUgYm94LgorICAg ICAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGRpc3BsYXlCb3gubGF5b3V0Qm94KCk7Cisg ICAgICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUoKS5ib3hH ZW9tZXRyeShsYXlvdXRCb3gpOworCisgICAgICAgICAgICAgICAgZGlzcGxheUJveC5tb3ZlSG9y aXpvbnRhbGx5KGJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCkpOworICAgICAgICAgICAgICAgIGFj Y3VtdWxhdGVkT2Zmc2V0ICs9IGJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCkgKyBib3hHZW9tZXRy eS5ib3JkZXJBbmRQYWRkaW5nU3RhcnQoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAg IH07CisgICAgaWYgKG5lZWRzRGlzcGxheUJveEhvcml6b250YWxBZGp1c3RtZW50KQorICAgICAg ICBhZGp1c3RWaXN1YWxHZW9tZXRyeVdpdGhJbmxpbmVCb3hlcygpOwogfQogCiB2b2lkIElubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc092ZXJmbG93blJ1bnNGb3JFbGxpcHNpcyhE aXNwbGF5Qm94ZXMmIGJveGVzLCBJbmxpbmVMYXlvdXRVbml0IGxpbmVCb3hMb2dpY2FsUmlnaHQp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3hH ZW9tZXRyeS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94R2Vv bWV0cnkuaAppbmRleCA3NDI0ZjZjYmFjNGY5MGZiN2JiYWI0Mzk1OWI3NzUyMmVhYWUzNDkzLi44 Y2U3ZGRlNzAzMzFiM2RmNzgxYzg4ZTI1ZTA1MzBhMWIwZDIyMjIxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3hHZW9tZXRyeS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveEdlb21ldHJ5LmgKQEAgLTc3 LDYgKzc3LDggQEAgcHVibGljOgogICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gdmVydGlj YWxQYWRkaW5nKCkgY29uc3Q7CiAgICAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBob3Jpem9u dGFsUGFkZGluZygpIGNvbnN0OwogCisgICAgSW5saW5lTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRk aW5nU3RhcnQoKSBjb25zdCB7IHJldHVybiBib3JkZXJMZWZ0KCkgKyBwYWRkaW5nTGVmdCgpLnZh bHVlX29yKDApOyB9CisgICAgCiAgICAgTGF5b3V0VW5pdCBjb250ZW50Qm94VG9wKCkgY29uc3Qg eyByZXR1cm4gcGFkZGluZ0JveFRvcCgpICsgcGFkZGluZ1RvcCgpLnZhbHVlX29yKDApOyB9CiAg ICAgTGF5b3V0VW5pdCBjb250ZW50Qm94TGVmdCgpIGNvbnN0IHsgcmV0dXJuIHBhZGRpbmdCb3hM ZWZ0KCkgKyBwYWRkaW5nTGVmdCgpLnZhbHVlX29yKDApOyB9CiAgICAgTGF5b3V0VW5pdCBjb250 ZW50Qm94Qm90dG9tKCkgY29uc3QgeyByZXR1cm4gY29udGVudEJveFRvcCgpICsgY29udGVudEJv eEhlaWdodCgpOyB9Cg== 445662 2021-12-01 20:11:43 -0800 2021-12-03 06:12:16 -0800 Patch bug-233742-20211201201142.patch text/plain 5931 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjI0OTY0ODVkZTEyZTY0 ZjNjNmQxNmI3NDA4NDAyZGIxNDBjNzViMS4uODM0NWQ0NTkyZmFlY2FlYjExYzQzOGNkYzQyYjgw MzlkYWE5ZTQ2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTEyLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIE1vdmUgdGhl IChiaWRpKWRpc3BsYXkgYm94ZXMgaG9yaXpvbnRhbGx5IGJ5IHRoZSBpbmxpbmUgYm94IG1hcmdp biwgYm9yZGVyIGFuZCBwYWRkaW5nIHN0YXJ0IGFzIG5lZWRlZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzNzQyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmUtdmlzaXQgdGhlIG5ld2x5IGNvbnN0cnVj dGVkIGRpc3BsYXkgYm94ZXMgYW5kIG1vdmUgdGhlbSBob3Jpem9udGFsbHkgdXNpbmcgdGhlIGlu bGluZSBib3ggbWFyZ2luLCBib3JkZXIgYW5kIHBhZGRpbmcgc3RhcnQgdmFsdWVzLgorICAgICAg ICBOb3RlIHRoYXQgaW4gdGhpcyBwYXRjaCB3ZSBkb24ndCB5ZXQgaGFuZGxlIHRoZSBlbmQgc2lk ZSBvZiB0aGUgaW5saW5lIGJveGVzLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNv bnRlbnQpOgorCiAyMDIxLTEyLTAxICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBbTEZDXVtJRkNdIENyZWF0ZSBkaXNwbGF5IGJveGVzIGZvciBmcmFnbWVudGVkIGlu bGluZSBib3hlcyBvbiBiaWRpIGJvdW5kYXJpZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVp bGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCmluZGV4IDA0ZGE0MTg2MDI2MTU4ZmIy ZmMzZWZmZDI5NDFkOTYyYWMwYjhkMTguLjA1NGY3MTU4NWY3YTRhMzQ1ZDdmZGVlMTBjNWNhZTg0 ZjQxM2M2MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNv bnRlbnRCdWlsZGVyLmNwcApAQCAtNDA5LDYgKzQwOSw3IEBAIHZvaWQgSW5saW5lRGlzcGxheUNv bnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVD b250CiAgICAgfTsKICAgICBjcmVhdGVEaXNwbGF5Qm94ZXNJblZpc3VhbE9yZGVyRm9yQ29udGVu dFJ1bnMoKTsKIAorICAgIGF1dG8gbmVlZHNEaXNwbGF5Qm94SG9yaXpvbnRhbEFkanVzdG1lbnQg PSBmYWxzZTsKICAgICBhdXRvIGNyZWF0ZURpc3BsYXlCb3hlc0luVmlzdWFsT3JkZXJGb3JJbmxp bmVCb3hlcyA9IFsmXSB7CiAgICAgICAgIC8vIFZpc3VhbCBvcmRlciBjb3VsZCBpbnRyb2R1Y2Ug Z2FwcyBhbmQvb3IgaW5qZWN0IHJ1bnMgb3V0c2lkZSBmcm9tIHRoZSBjdXJyZW50IGlubGluZSBi b3ggY29udGVudC4KICAgICAgICAgLy8gSW4gc3VjaCBjYXNlcywgd2UgbmVlZCB0byAiY2xvc2Ui IGFuZCAib3BlbiIgZGlzcGxheSBib3hlcyBmb3IgdGhlc2UgaW5saW5lIGJveCBmcmFnbWVudHMK QEAgLTQ1Nyw3ICs0NTgsOCBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJv Y2Vzc0JpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udAogICAgICAgICAgICAg ICAgICAgICAgICAgcGFyZW50Qm94U3RhY2suYWRkKGlubGluZUJveCk7CiAKICAgICAgICAgICAg ICAgICAgICAgICAgIGF1dG8gY3JlYXRlQW5kSW5zZXJ0RGlzcGxheUJveEZvcklubGluZUJveEZy YWdtZW50ID0gWyZdIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBhdXRvIHZpc3VhbFJl Y3QgPSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JJbmxpbmVCb3goKmlubGluZUJveCwgZm9y bWF0dGluZ1N0YXRlKCkuYm94R2VvbWV0cnkoKmlubGluZUJveCkpOworICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRlKCkuYm94R2Vv bWV0cnkoKmlubGluZUJveCk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXV0byB2aXN1 YWxSZWN0ID0gbGluZUJveC5sb2dpY2FsQm9yZGVyQm94Rm9ySW5saW5lQm94KCppbmxpbmVCb3gs IGJveEdlb21ldHJ5KTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBVc2UgdGhlIGN1 cnJlbnQgY29udGVudCBsZWZ0IGFzIHRoZSBzdGFydGluZyBwb2ludCBmb3IgdGhpcyBkaXNwbGF5 IGJveC4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2aXN1YWxSZWN0LnNldExlZnQoYm94 ZXNbaW5kZXhdLmxvZ2ljYWxMZWZ0KCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZp c3VhbFJlY3QubW92ZVZlcnRpY2FsbHkobGluZUJveExvZ2ljYWxUb3BMZWZ0LnkoKSk7CkBAIC00 NjUsNiArNDY3LDEyIEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNz QmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdmlzdWFsUmVjdC5zZXRXaWR0aCh7IH0pOwogICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGluc2VydElubGluZUJveERpc3BsYXlCb3hGb3JCaWRpQm91bmRhcnkobGluZUJv eC5pbmxpbmVMZXZlbEJveEZvckxheW91dEJveCgqaW5saW5lQm94KSwgdmlzdWFsUmVjdCwgaW5k ZXgsIGJveGVzKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICArK2luZGV4OworICAgICAg ICAgICAgICAgICAgICAgICAgICAgIC8vIE5lZWQgdG8gcHVzaCB0aGUgcmVzdCBvZiB0aGUgY29u dGVudCB3aGVuIHRoaXMgaW5saW5lIGJveCBoYXMgbWFyZ2luL2JvcmRlci9wYWRkaW5nLgorICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG5lZWRzRGlzcGxheUJveEhvcml6b250YWxBZGp1c3Rt ZW50ID0gbmVlZHNEaXNwbGF5Qm94SG9yaXpvbnRhbEFkanVzdG1lbnQKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgfHwgYm94R2VvbWV0cnkuaG9yaXpvbnRhbEJvcmRlcigpCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHx8IGJveEdlb21ldHJ5Lmhvcml6b250YWxQYWRk aW5nKCkudmFsdWVfb3IoMCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfHwgYm94 R2VvbWV0cnkubWFyZ2luU3RhcnQoKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8 fCBib3hHZW9tZXRyeS5tYXJnaW5FbmQoKTsKICAgICAgICAgICAgICAgICAgICAgICAgIH07CiAg ICAgICAgICAgICAgICAgICAgICAgICBjcmVhdGVBbmRJbnNlcnREaXNwbGF5Qm94Rm9ySW5saW5l Qm94RnJhZ21lbnQoKTsKICAgICAgICAgICAgICAgICAgICAgfQpAQCAtNDc4LDYgKzQ4NiwyNyBA QCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KGNv bnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udAogICAgIH07CiAgICAgaWYgKG5lZWRzTm9uUm9vdElu bGluZUJveERpc3BsYXlCb3gpCiAgICAgICAgIGNyZWF0ZURpc3BsYXlCb3hlc0luVmlzdWFsT3Jk ZXJGb3JJbmxpbmVCb3hlcygpOworCisgICAgYXV0byBhZGp1c3RWaXN1YWxHZW9tZXRyeVdpdGhJ bmxpbmVCb3hlcyA9IFsmXSB7CisgICAgICAgIGF1dG8gYWNjdW11bGF0ZWRPZmZzZXQgPSBJbmxp bmVMYXlvdXRVbml0IHsgfTsKKworICAgICAgICBBU1NFUlQoYm94ZXNbMF0uaXNSb290SW5saW5l Qm94KCkpOworICAgICAgICBmb3IgKHNpemVfdCBpbmRleCA9IDE7IGluZGV4IDwgYm94ZXMuc2l6 ZSgpOyArK2luZGV4KSB7CisgICAgICAgICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gYm94ZXNbaW5k ZXhdOworICAgICAgICAgICAgZGlzcGxheUJveC5tb3ZlSG9yaXpvbnRhbGx5KGFjY3VtdWxhdGVk T2Zmc2V0KTsKKworICAgICAgICAgICAgaWYgKGRpc3BsYXlCb3guaXNOb25Sb290SW5saW5lQm94 KCkgJiYgZGlzcGxheUJveC5pc0ZpcnN0Qm94KCkpIHsKKyAgICAgICAgICAgICAgICAvLyBGSVhN RTogQWRkIHN1cHBvcnQgZm9yIHRoZSAnZW5kJyBzaWRlIG9mIHRoZSBpbmxpbmUgYm94LgorICAg ICAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGRpc3BsYXlCb3gubGF5b3V0Qm94KCk7Cisg ICAgICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUoKS5ib3hH ZW9tZXRyeShsYXlvdXRCb3gpOworCisgICAgICAgICAgICAgICAgZGlzcGxheUJveC5tb3ZlSG9y aXpvbnRhbGx5KGJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCkpOworICAgICAgICAgICAgICAgIGFj Y3VtdWxhdGVkT2Zmc2V0ICs9IGJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCkgKyBib3hHZW9tZXRy eS5ib3JkZXJBbmRQYWRkaW5nU3RhcnQoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAg IH07CisgICAgaWYgKG5lZWRzRGlzcGxheUJveEhvcml6b250YWxBZGp1c3RtZW50KQorICAgICAg ICBhZGp1c3RWaXN1YWxHZW9tZXRyeVdpdGhJbmxpbmVCb3hlcygpOwogfQogCiB2b2lkIElubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc092ZXJmbG93blJ1bnNGb3JFbGxpcHNpcyhE aXNwbGF5Qm94ZXMmIGJveGVzLCBJbmxpbmVMYXlvdXRVbml0IGxpbmVCb3hMb2dpY2FsUmlnaHQp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3hH ZW9tZXRyeS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94R2Vv bWV0cnkuaAppbmRleCA3NDI0ZjZjYmFjNGY5MGZiN2JiYWI0Mzk1OWI3NzUyMmVhYWUzNDkzLi5m MTk5YWQyYjUxMjc2YTA0OWIyYTI2NTdmNzIyOWMxNjc3NWQ5NjNkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3hHZW9tZXRyeS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveEdlb21ldHJ5LmgKQEAgLTc3 LDYgKzc3LDggQEAgcHVibGljOgogICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gdmVydGlj YWxQYWRkaW5nKCkgY29uc3Q7CiAgICAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBob3Jpem9u dGFsUGFkZGluZygpIGNvbnN0OwogCisgICAgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nU3Rh cnQoKSBjb25zdCB7IHJldHVybiBib3JkZXJMZWZ0KCkgKyBwYWRkaW5nTGVmdCgpLnZhbHVlX29y KDApOyB9CisKICAgICBMYXlvdXRVbml0IGNvbnRlbnRCb3hUb3AoKSBjb25zdCB7IHJldHVybiBw YWRkaW5nQm94VG9wKCkgKyBwYWRkaW5nVG9wKCkudmFsdWVfb3IoMCk7IH0KICAgICBMYXlvdXRV bml0IGNvbnRlbnRCb3hMZWZ0KCkgY29uc3QgeyByZXR1cm4gcGFkZGluZ0JveExlZnQoKSArIHBh ZGRpbmdMZWZ0KCkudmFsdWVfb3IoMCk7IH0KICAgICBMYXlvdXRVbml0IGNvbnRlbnRCb3hCb3R0 b20oKSBjb25zdCB7IHJldHVybiBjb250ZW50Qm94VG9wKCkgKyBjb250ZW50Qm94SGVpZ2h0KCk7 IH0K