241254 2022-06-02 20:46:19 -0700 [LFC][FFC] FlexLayout::LogicalFlexItem should provide setters and getters 2022-06-03 05:44:14 -0700 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 1873780 0 zalan 2022-06-02 20:46:19 -0700 ssia 1873781 1 459981 zalan 2022-06-02 20:55:14 -0700 Created attachment 459981 [fast-cq]Patch 1873865 2 ews-feeder 2022-06-03 05:43:20 -0700 Committed r295201 (251258@main): <https://commits.webkit.org/251258@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459981. 1873866 3 webkit-bug-importer 2022-06-03 05:44:14 -0700 <rdar://problem/94342137> 459981 2022-06-02 20:55:14 -0700 2022-06-03 05:43:21 -0700 [fast-cq]Patch bug-241254-20220602205513.patch text/plain 17586 zalan RnJvbSBjMWQ1MjE5MzkyNmFjMDk0NjU1ZDk0YjQ4NDBhNTRlZTA4MzViYWU3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBU aHUsIDIgSnVuIDIwMjIgMjA6NDY6MzcgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbTEZDXVtGRkNd IEZsZXhMYXlvdXQ6OkxvZ2ljYWxGbGV4SXRlbSBzaG91bGQgcHJvdmlkZSBzZXR0ZXJzCiBhbmQg Z2V0dGVycyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQxMjU0CgpS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGFk ZGluZyBtb3JlIG1lbWJlcnMgdG8gc3RydWN0IExvZ2ljYWxGbGV4SXRlbS4KCiogU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4 dC5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OkZsZXhGb3JtYXR0aW5nQ29udGV4dDo6Y29udmVydEZs ZXhJdGVtc1RvTG9naWNhbFNwYWNlKToKKFdlYkNvcmU6OkxheW91dDo6RmxleEZvcm1hdHRpbmdD b250ZXh0OjpzZXRGbGV4SXRlbXNHZW9tZXRyeSk6CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhMYXlvdXQuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpG bGV4TGF5b3V0Ojpjb21wdXRlQXZhaWxhYmxlTG9naWNhbFZlcnRpY2FsU3BhY2UgY29uc3QpOgoo V2ViQ29yZTo6TGF5b3V0OjpGbGV4TGF5b3V0Ojpjb21wdXRlQXZhaWxhYmxlTG9naWNhbEhvcml6 b250YWxTcGFjZSBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXQ6OkZsZXhMYXlvdXQ6OmNvbXB1dGVM b2dpY2FsV2lkdGhGb3JTaHJpbmtpbmdGbGV4SXRlbXMpOgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4 TGF5b3V0Ojpjb21wdXRlTG9naWNhbFdpZHRoRm9yU3RyZXRjaGluZ0ZsZXhJdGVtcyk6CihXZWJD b3JlOjpMYXlvdXQ6OkZsZXhMYXlvdXQ6OmNvbXB1dGVMb2dpY2FsV2lkdGhGb3JGbGV4SXRlbXMp OgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4TGF5b3V0Ojpjb21wdXRlTG9naWNhbEhlaWdodEZvckZs ZXhJdGVtcyk6CihXZWJDb3JlOjpMYXlvdXQ6OkZsZXhMYXlvdXQ6OmFsaWduRmxleEl0ZW1zKToK KFdlYkNvcmU6OkxheW91dDo6RmxleExheW91dDo6anVzdGlmeUZsZXhJdGVtcyk6CiogU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhMYXlvdXQuaDoKKFdl YkNvcmU6OkxheW91dDo6RmxleExheW91dDo6TG9naWNhbEZsZXhJdGVtOjpzZXRUb3ApOgooV2Vi Q29yZTo6TGF5b3V0OjpGbGV4TGF5b3V0OjpMb2dpY2FsRmxleEl0ZW06OnNldExlZnQpOgooV2Vi Q29yZTo6TGF5b3V0OjpGbGV4TGF5b3V0OjpMb2dpY2FsRmxleEl0ZW06OnNldFdpZHRoKToKKFdl YkNvcmU6OkxheW91dDo6RmxleExheW91dDo6TG9naWNhbEZsZXhJdGVtOjpzZXRIZWlnaHQpOgoo V2ViQ29yZTo6TGF5b3V0OjpGbGV4TGF5b3V0OjpMb2dpY2FsRmxleEl0ZW06OnJlY3QgY29uc3Qp OgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4TGF5b3V0OjpMb2dpY2FsRmxleEl0ZW06OnRvcExlZnQg Y29uc3QpOgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4TGF5b3V0OjpMb2dpY2FsRmxleEl0ZW06OnRv cCBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXQ6OkZsZXhMYXlvdXQ6OkxvZ2ljYWxGbGV4SXRlbTo6 Ym90dG9tIGNvbnN0KToKKFdlYkNvcmU6OkxheW91dDo6RmxleExheW91dDo6TG9naWNhbEZsZXhJ dGVtOjpsZWZ0IGNvbnN0KToKKFdlYkNvcmU6OkxheW91dDo6RmxleExheW91dDo6TG9naWNhbEZs ZXhJdGVtOjpyaWdodCBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXQ6OkZsZXhMYXlvdXQ6OkxvZ2lj YWxGbGV4SXRlbTo6d2lkdGggY29uc3QpOgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4TGF5b3V0OjpM b2dpY2FsRmxleEl0ZW06OmhlaWdodCBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXQ6OkZsZXhMYXlv dXQ6OkxvZ2ljYWxGbGV4SXRlbTo6c3R5bGUgY29uc3QpOgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4 TGF5b3V0OjpMb2dpY2FsRmxleEl0ZW06OmxheW91dEJveCBjb25zdCk6CihXZWJDb3JlOjpMYXlv dXQ6OkZsZXhMYXlvdXQ6OkxvZ2ljYWxGbGV4SXRlbTo6TG9naWNhbEZsZXhJdGVtKToKLS0tCiAu Li4vZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwICAgICAgICAgICAgfCAyOCArKysrKyst LS0tLS0tCiAuLi4vZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleExheW91dC5jcHAgICAgfCA0 MiArKysrKysrKystLS0tLS0tLS0tCiAuLi4vZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleExh eW91dC5oICAgICAgfCAzMiArKysrKysrKysrKysrLQogMyBmaWxlcyBjaGFuZ2VkLCA2NSBpbnNl cnRpb25zKCspLCAzNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0 dGluZ0NvbnRleHQuY3BwCmluZGV4IDcxNDE0YzQwMTJiNy4uMjY2ZGVkOWE3OWNlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZv cm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMjE5LDM0ICsyMTks MzQgQEAgRmxleExheW91dDo6TG9naWNhbEZsZXhJdGVtcyBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6 OmNvbnZlcnRGbGV4SXRlbXNUb0xvZ2ljYWxTcGEKIAogICAgIGF1dG8gbG9naWNhbEZsZXhJdGVt TGlzdCA9IEZsZXhMYXlvdXQ6OkxvZ2ljYWxGbGV4SXRlbXMoZmxleEl0ZW1MaXN0LnNpemUoKSk7 CiAgICAgZm9yIChzaXplX3QgaW5kZXggPSAwOyBpbmRleCA8IGZsZXhJdGVtTGlzdC5zaXplKCk7 ICsraW5kZXgpCi0gICAgICAgIGxvZ2ljYWxGbGV4SXRlbUxpc3RbaW5kZXhdID0geyBmbGV4SXRl bUxpc3RbaW5kZXhdLm1hcmdpblJlY3QsIGZsZXhJdGVtTGlzdFtpbmRleF0ubGF5b3V0Qm94IH07 CisgICAgICAgIGxvZ2ljYWxGbGV4SXRlbUxpc3RbaW5kZXhdID0geyBmbGV4SXRlbUxpc3RbaW5k ZXhdLm1hcmdpblJlY3QsICpmbGV4SXRlbUxpc3RbaW5kZXhdLmxheW91dEJveCB9OwogICAgIHJl dHVybiBsb2dpY2FsRmxleEl0ZW1MaXN0OwogfQogCiB2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4 dDo6c2V0RmxleEl0ZW1zR2VvbWV0cnkoY29uc3QgRmxleExheW91dDo6TG9naWNhbEZsZXhJdGVt cyYgbG9naWNhbEZsZXhJdGVtTGlzdCwgY29uc3QgQ29uc3RyYWludHNGb3JGbGV4Q29udGVudCYg Y29uc3RyYWludHMpCiB7CiAgICAgYXV0byYgZm9ybWF0dGluZ1N0YXRlID0gdGhpcy0+Zm9ybWF0 dGluZ1N0YXRlKCk7Ci0gICAgYXV0byBsb2dpY2FsV2lkdGggPSBsb2dpY2FsRmxleEl0ZW1MaXN0 Lmxhc3QoKS5tYXJnaW5SZWN0LnJpZ2h0KCkgLSBsb2dpY2FsRmxleEl0ZW1MaXN0LmZpcnN0KCku bWFyZ2luUmVjdC5sZWZ0KCk7CisgICAgYXV0byBsb2dpY2FsV2lkdGggPSBsb2dpY2FsRmxleEl0 ZW1MaXN0Lmxhc3QoKS5yaWdodCgpIC0gbG9naWNhbEZsZXhJdGVtTGlzdC5maXJzdCgpLmxlZnQo KTsKICAgICBhdXRvIGRpcmVjdGlvbiA9IHJvb3QoKS5zdHlsZSgpLmZsZXhEaXJlY3Rpb24oKTsK ICAgICBmb3IgKGF1dG8mIGxvZ2ljYWxGbGV4SXRlbSA6IGxvZ2ljYWxGbGV4SXRlbUxpc3QpIHsK LSAgICAgICAgYXV0byYgZmxleEl0ZW1HZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZS5ib3hHZW9t ZXRyeSgqbG9naWNhbEZsZXhJdGVtLmxheW91dEJveCk7CisgICAgICAgIGF1dG8mIGZsZXhJdGVt R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkobG9naWNhbEZsZXhJdGVtLmxh eW91dEJveCgpKTsKICAgICAgICAgYXV0byBib3JkZXJCb3hUb3BMZWZ0ID0gTGF5b3V0UG9pbnQg eyB9OwogCiAgICAgICAgIHN3aXRjaCAoZGlyZWN0aW9uKSB7CiAgICAgICAgIGNhc2UgRmxleERp cmVjdGlvbjo6Um93OgogICAgICAgICAgICAgYm9yZGVyQm94VG9wTGVmdCA9IHsKLSAgICAgICAg ICAgICAgICBjb25zdHJhaW50cy5ob3Jpem9udGFsKCkubG9naWNhbExlZnQgKyBsb2dpY2FsRmxl eEl0ZW0ubWFyZ2luUmVjdC5sZWZ0KCkgKyBmbGV4SXRlbUdlb21ldHJ5Lm1hcmdpblN0YXJ0KCks Ci0gICAgICAgICAgICAgICAgY29uc3RyYWludHMubG9naWNhbFRvcCgpICsgbG9naWNhbEZsZXhJ dGVtLm1hcmdpblJlY3QudG9wKCkKKyAgICAgICAgICAgICAgICBjb25zdHJhaW50cy5ob3Jpem9u dGFsKCkubG9naWNhbExlZnQgKyBsb2dpY2FsRmxleEl0ZW0ubGVmdCgpICsgZmxleEl0ZW1HZW9t ZXRyeS5tYXJnaW5TdGFydCgpLAorICAgICAgICAgICAgICAgIGNvbnN0cmFpbnRzLmxvZ2ljYWxU b3AoKSArIGxvZ2ljYWxGbGV4SXRlbS50b3AoKQogICAgICAgICAgICAgfTsKICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICBjYXNlIEZsZXhEaXJlY3Rpb246OlJvd1JldmVyc2U6CiAgICAgICAg ICAgICBib3JkZXJCb3hUb3BMZWZ0ID0gewotICAgICAgICAgICAgICAgIGNvbnN0cmFpbnRzLmhv cml6b250YWwoKS5sb2dpY2FsUmlnaHQoKSAtIGxvZ2ljYWxGbGV4SXRlbS5tYXJnaW5SZWN0LnJp Z2h0KCkgKyBmbGV4SXRlbUdlb21ldHJ5Lm1hcmdpblN0YXJ0KCksCi0gICAgICAgICAgICAgICAg Y29uc3RyYWludHMubG9naWNhbFRvcCgpICsgbG9naWNhbEZsZXhJdGVtLm1hcmdpblJlY3QudG9w KCkKKyAgICAgICAgICAgICAgICBjb25zdHJhaW50cy5ob3Jpem9udGFsKCkubG9naWNhbFJpZ2h0 KCkgLSBsb2dpY2FsRmxleEl0ZW0ucmlnaHQoKSArIGZsZXhJdGVtR2VvbWV0cnkubWFyZ2luU3Rh cnQoKSwKKyAgICAgICAgICAgICAgICBjb25zdHJhaW50cy5sb2dpY2FsVG9wKCkgKyBsb2dpY2Fs RmxleEl0ZW0udG9wKCkKICAgICAgICAgICAgIH07CiAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgY2FzZSBGbGV4RGlyZWN0aW9uOjpDb2x1bW46IHsKLSAgICAgICAgICAgIGF1dG8gZmxpcHBl ZFRvcExlZnQgPSBsb2dpY2FsRmxleEl0ZW0ubWFyZ2luUmVjdC50b3BMZWZ0KCkudHJhbnNwb3Nl ZFBvaW50KCk7CisgICAgICAgICAgICBhdXRvIGZsaXBwZWRUb3BMZWZ0ID0gbG9naWNhbEZsZXhJ dGVtLnRvcExlZnQoKS50cmFuc3Bvc2VkUG9pbnQoKTsKICAgICAgICAgICAgIGJvcmRlckJveFRv cExlZnQgPSB7CiAgICAgICAgICAgICAgICAgY29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2lj YWxMZWZ0ICsgZmxpcHBlZFRvcExlZnQueCgpLAogICAgICAgICAgICAgICAgIGNvbnN0cmFpbnRz LmxvZ2ljYWxUb3AoKSArIGZsaXBwZWRUb3BMZWZ0LnkoKSArIGZsZXhJdGVtR2VvbWV0cnkubWFy Z2luQmVmb3JlKCkKQEAgLTI1NSw4ICsyNTUsOCBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4 dDo6c2V0RmxleEl0ZW1zR2VvbWV0cnkoY29uc3QgRmxleExheW91dDo6TG9naWNhbEZsZXhJdAog ICAgICAgICB9CiAgICAgICAgIGNhc2UgRmxleERpcmVjdGlvbjo6Q29sdW1uUmV2ZXJzZToKICAg ICAgICAgICAgIGJvcmRlckJveFRvcExlZnQgPSB7Ci0gICAgICAgICAgICAgICAgY29uc3RyYWlu dHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxMZWZ0ICsgbG9naWNhbEZsZXhJdGVtLm1hcmdpblJlY3Qu dG9wKCksCi0gICAgICAgICAgICAgICAgY29uc3RyYWludHMubG9naWNhbFRvcCgpICsgbG9naWNh bFdpZHRoIC0gbG9naWNhbEZsZXhJdGVtLm1hcmdpblJlY3QucmlnaHQoKSArIGZsZXhJdGVtR2Vv bWV0cnkubWFyZ2luQmVmb3JlKCkKKyAgICAgICAgICAgICAgICBjb25zdHJhaW50cy5ob3Jpem9u dGFsKCkubG9naWNhbExlZnQgKyBsb2dpY2FsRmxleEl0ZW0udG9wKCksCisgICAgICAgICAgICAg ICAgY29uc3RyYWludHMubG9naWNhbFRvcCgpICsgbG9naWNhbFdpZHRoIC0gbG9naWNhbEZsZXhJ dGVtLnJpZ2h0KCkgKyBmbGV4SXRlbUdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpCiAgICAgICAgICAg ICB9OwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGRlZmF1bHQ6CkBAIC0yNjUsMTEgKzI2 NSwxMSBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6c2V0RmxleEl0ZW1zR2VvbWV0cnko Y29uc3QgRmxleExheW91dDo6TG9naWNhbEZsZXhJdAogICAgICAgICB9CiAgICAgICAgIGZsZXhJ dGVtR2VvbWV0cnkuc2V0TG9naWNhbFRvcExlZnQoYm9yZGVyQm94VG9wTGVmdCk7CiAgICAgICAg IGlmIChkaXJlY3Rpb24gPT0gRmxleERpcmVjdGlvbjo6Um93IHx8IGRpcmVjdGlvbiA9PSBGbGV4 RGlyZWN0aW9uOjpSb3dSZXZlcnNlKSB7Ci0gICAgICAgICAgICBmbGV4SXRlbUdlb21ldHJ5LnNl dENvbnRlbnRCb3hXaWR0aChsb2dpY2FsRmxleEl0ZW0ubWFyZ2luUmVjdC53aWR0aCgpIC0gZmxl eEl0ZW1HZW9tZXRyeS5ob3Jpem9udGFsTWFyZ2luQm9yZGVyQW5kUGFkZGluZygpKTsKLSAgICAg ICAgICAgIGZsZXhJdGVtR2VvbWV0cnkuc2V0Q29udGVudEJveEhlaWdodChsb2dpY2FsRmxleEl0 ZW0ubWFyZ2luUmVjdC5oZWlnaHQoKSAtIGZsZXhJdGVtR2VvbWV0cnkudmVydGljYWxNYXJnaW5C b3JkZXJBbmRQYWRkaW5nKCkpOworICAgICAgICAgICAgZmxleEl0ZW1HZW9tZXRyeS5zZXRDb250 ZW50Qm94V2lkdGgobG9naWNhbEZsZXhJdGVtLndpZHRoKCkgLSBmbGV4SXRlbUdlb21ldHJ5Lmhv cml6b250YWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKCkpOworICAgICAgICAgICAgZmxleEl0ZW1H ZW9tZXRyeS5zZXRDb250ZW50Qm94SGVpZ2h0KGxvZ2ljYWxGbGV4SXRlbS5oZWlnaHQoKSAtIGZs ZXhJdGVtR2VvbWV0cnkudmVydGljYWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKCkpOwogICAgICAg ICB9IGVsc2UgewotICAgICAgICAgICAgZmxleEl0ZW1HZW9tZXRyeS5zZXRDb250ZW50Qm94V2lk dGgobG9naWNhbEZsZXhJdGVtLm1hcmdpblJlY3QuaGVpZ2h0KCkgLSBmbGV4SXRlbUdlb21ldHJ5 Lmhvcml6b250YWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKCkpOwotICAgICAgICAgICAgZmxleEl0 ZW1HZW9tZXRyeS5zZXRDb250ZW50Qm94SGVpZ2h0KGxvZ2ljYWxGbGV4SXRlbS5tYXJnaW5SZWN0 LndpZHRoKCkgLSBmbGV4SXRlbUdlb21ldHJ5LnZlcnRpY2FsTWFyZ2luQm9yZGVyQW5kUGFkZGlu ZygpKTsKKyAgICAgICAgICAgIGZsZXhJdGVtR2VvbWV0cnkuc2V0Q29udGVudEJveFdpZHRoKGxv Z2ljYWxGbGV4SXRlbS5oZWlnaHQoKSAtIGZsZXhJdGVtR2VvbWV0cnkuaG9yaXpvbnRhbE1hcmdp bkJvcmRlckFuZFBhZGRpbmcoKSk7CisgICAgICAgICAgICBmbGV4SXRlbUdlb21ldHJ5LnNldENv bnRlbnRCb3hIZWlnaHQobG9naWNhbEZsZXhJdGVtLndpZHRoKCkgLSBmbGV4SXRlbUdlb21ldHJ5 LnZlcnRpY2FsTWFyZ2luQm9yZGVyQW5kUGFkZGluZygpKTsKICAgICAgICAgfQogICAgIH0KIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxl eC9GbGV4TGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvZmxleC9GbGV4TGF5b3V0LmNwcAppbmRleCAyNTY1NGIzMzA3YjMuLjFhYTEyMzAwMDE0MSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4 L0ZsZXhMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvZmxleC9GbGV4TGF5b3V0LmNwcApAQCAtNTUsNyArNTUsNyBAQCBMYXlvdXRVbml0IEZs ZXhMYXlvdXQ6OmNvbXB1dGVBdmFpbGFibGVMb2dpY2FsVmVydGljYWxTcGFjZShMb2dpY2FsRmxl eEl0ZW1zJiBmbAogCiAgICAgYXV0byBhdmFpbGFibGVTcGFjZSA9IExheW91dFVuaXQgeyB9Owog ICAgIGZvciAoYXV0byYgZmxleEl0ZW0gOiBmbGV4SXRlbXMpCi0gICAgICAgIGF2YWlsYWJsZVNw YWNlID0gc3RkOjptYXgoYXZhaWxhYmxlU3BhY2UsIGZsZXhJdGVtLm1hcmdpblJlY3QuaGVpZ2h0 KCkpOworICAgICAgICBhdmFpbGFibGVTcGFjZSA9IHN0ZDo6bWF4KGF2YWlsYWJsZVNwYWNlLCBm bGV4SXRlbS5oZWlnaHQoKSk7CiAgICAgcmV0dXJuIGF2YWlsYWJsZVNwYWNlOwogfQogCkBAIC03 NCw3ICs3NCw3IEBAIExheW91dFVuaXQgRmxleExheW91dDo6Y29tcHV0ZUF2YWlsYWJsZUxvZ2lj YWxIb3Jpem9udGFsU3BhY2UoTG9naWNhbEZsZXhJdGVtcyYKIAogICAgIGF1dG8gYXZhaWxhYmxl U3BhY2UgPSBMYXlvdXRVbml0IHsgfTsKICAgICBmb3IgKGF1dG8mIGZsZXhJdGVtIDogZmxleEl0 ZW1zKQotICAgICAgICBhdmFpbGFibGVTcGFjZSArPSBmbGV4SXRlbS5tYXJnaW5SZWN0LndpZHRo KCk7CisgICAgICAgIGF2YWlsYWJsZVNwYWNlICs9IGZsZXhJdGVtLndpZHRoKCk7CiAgICAgcmV0 dXJuIGF2YWlsYWJsZVNwYWNlOwogfQogCkBAIC05OSwxMSArOTksMTEgQEAgdm9pZCBGbGV4TGF5 b3V0Ojpjb21wdXRlTG9naWNhbFdpZHRoRm9yU2hyaW5raW5nRmxleEl0ZW1zKExvZ2ljYWxGbGV4 SXRlbXMmIGZsZXgKICAgICAgICAgLy8gQ29sbGVjdCBmbGV4IGl0ZW1zIHdpdGggbm9uLXplcm8g ZmxleC1zaHJpbmsgdmFsdWUuIGZsZXgtc2hyaW5rOiAwIGZsZXggaXRlbXMKICAgICAgICAgLy8g ZG9uJ3QgcGFydGljaXBhdGUgaW4gY29udGVudCBmbGV4aW5nLgogICAgICAgICBmb3IgKGF1dG8m IGZsZXhJdGVtIDogZmxleEl0ZW1zKSB7Ci0gICAgICAgICAgICBhdXRvJiBzdHlsZSA9IGZsZXhJ dGVtLmxheW91dEJveC0+c3R5bGUoKTsKLSAgICAgICAgICAgIGF1dG8gYmFzZVNpemUgPSBzdHls ZS5mbGV4QmFzaXMoKS5pc0ZpeGVkKCkgPyBMYXlvdXRVbml0IHsgc3R5bGUuZmxleEJhc2lzKCku dmFsdWUoKSB9IDogZmxleEl0ZW0ubWFyZ2luUmVjdC53aWR0aCgpOworICAgICAgICAgICAgYXV0 byYgc3R5bGUgPSBmbGV4SXRlbS5zdHlsZSgpOworICAgICAgICAgICAgYXV0byBiYXNlU2l6ZSA9 IHN0eWxlLmZsZXhCYXNpcygpLmlzRml4ZWQoKSA/IExheW91dFVuaXQgeyBzdHlsZS5mbGV4QmFz aXMoKS52YWx1ZSgpIH0gOiBmbGV4SXRlbS53aWR0aCgpOwogICAgICAgICAgICAgaWYgKGF1dG8g c2hyaW5rVmFsdWUgPSBzdHlsZS5mbGV4U2hyaW5rKCkpIHsKICAgICAgICAgICAgICAgICBhdXRv IGZsZXhTaHJpbmsgPSBzaHJpbmtWYWx1ZSAqIGJhc2VTaXplOwotICAgICAgICAgICAgICAgIHNo cmlua2luZ0l0ZW1zLmFwcGVuZCh7IGZsZXhTaHJpbmssIGZvcm1hdHRpbmdTdGF0ZS5pbnRyaW5z aWNXaWR0aENvbnN0cmFpbnRzRm9yQm94KCpmbGV4SXRlbS5sYXlvdXRCb3gpLT5taW5pbXVtLCBi YXNlU2l6ZSwgZmxleEl0ZW0sIHsgfSB9KTsKKyAgICAgICAgICAgICAgICBzaHJpbmtpbmdJdGVt cy5hcHBlbmQoeyBmbGV4U2hyaW5rLCBmb3JtYXR0aW5nU3RhdGUuaW50cmluc2ljV2lkdGhDb25z dHJhaW50c0ZvckJveChmbGV4SXRlbS5sYXlvdXRCb3goKSktPm1pbmltdW0sIGJhc2VTaXplLCBm bGV4SXRlbSwgeyB9IH0pOwogICAgICAgICAgICAgICAgIHRvdGFsU2hyaW5rICs9IGZsZXhTaHJp bms7CiAgICAgICAgICAgICAgICAgdG90YWxGbGV4aWJsZVNwYWNlICs9IGJhc2VTaXplOwogICAg ICAgICAgICAgfSBlbHNlCkBAIC0xNDAsNyArMTQwLDcgQEAgdm9pZCBGbGV4TGF5b3V0Ojpjb21w dXRlTG9naWNhbFdpZHRoRm9yU2hyaW5raW5nRmxleEl0ZW1zKExvZ2ljYWxGbGV4SXRlbXMmIGZs ZXgKICAgICAgICAgLy8gQWRqdXN0IHRoZSB0b3RhbCBncm93IHdpZHRoIGJ5IHRoZSBvdmVyZmxv dyB2YWx1ZSAoc2hyaW5rKSBleGNlcHQgd2hlbiBtaW4gY29udGVudCB3aXRoIGRpc2FncmVlcy4K ICAgICAgICAgZm9yIChhdXRvJiBzaGlyaW5raW5nRmxleCA6IHNocmlua2luZ0l0ZW1zKSB7CiAg ICAgICAgICAgICBhdXRvIGZsZXhlZFNpemUgPSBMYXlvdXRVbml0IHsgc2hpcmlua2luZ0ZsZXgu ZmxleEJhc2lzIC0gKHNoaXJpbmtpbmdGbGV4LmZsZXhTaHJpbmsgKiBmbGV4U2hyaW5rQmFzZSkg fTsKLSAgICAgICAgICAgIHNoaXJpbmtpbmdGbGV4LmZsZXhJdGVtLm1hcmdpblJlY3Quc2V0V2lk dGgoc3RkOjptYXgoc2hpcmlua2luZ0ZsZXgubWluaW11bVNpemUsIGZsZXhlZFNpemUpKTsKKyAg ICAgICAgICAgIHNoaXJpbmtpbmdGbGV4LmZsZXhJdGVtLnNldFdpZHRoKHN0ZDo6bWF4KHNoaXJp bmtpbmdGbGV4Lm1pbmltdW1TaXplLCBmbGV4ZWRTaXplKSk7CiAgICAgICAgIH0KICAgICB9Owog ICAgIGNvbXB1dGVMb2dpY2FsV2lkdGgoKTsKQEAgLTE2NiwxMSArMTY2LDExIEBAIHZvaWQgRmxl eExheW91dDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZvclN0cmV0Y2hpbmdGbGV4SXRlbXMoTG9naWNh bEZsZXhJdGVtcyYgZmxlCiAgICAgICAgIC8vIENvbGxlY3QgZmxleCBpdGVtcyB3aXRoIG5vbi16 ZXJvIGZsZXgtZ3JvdyB2YWx1ZS4gZmxleC1ncm93OiAwIChpbml0aWFsKSBmbGV4IGl0ZW1zCiAg ICAgICAgIC8vIGRvbid0IHBhcnRpY2lwYXRlIGluIGF2YWlsYWJsZSBzcGFjZSBkaXN0cmlidXRp b24uCiAgICAgICAgIGZvciAoYXV0byYgZmxleEl0ZW0gOiBmbGV4SXRlbXMpIHsKLSAgICAgICAg ICAgIGF1dG8mIHN0eWxlID0gZmxleEl0ZW0ubGF5b3V0Qm94LT5zdHlsZSgpOwotICAgICAgICAg ICAgYXV0byBiYXNlU2l6ZSA9IHN0eWxlLmZsZXhCYXNpcygpLmlzRml4ZWQoKSA/IExheW91dFVu aXQgeyBzdHlsZS5mbGV4QmFzaXMoKS52YWx1ZSgpIH0gOiBmbGV4SXRlbS5tYXJnaW5SZWN0Lndp ZHRoKCk7CisgICAgICAgICAgICBhdXRvJiBzdHlsZSA9IGZsZXhJdGVtLnN0eWxlKCk7CisgICAg ICAgICAgICBhdXRvIGJhc2VTaXplID0gc3R5bGUuZmxleEJhc2lzKCkuaXNGaXhlZCgpID8gTGF5 b3V0VW5pdCB7IHN0eWxlLmZsZXhCYXNpcygpLnZhbHVlKCkgfSA6IGZsZXhJdGVtLndpZHRoKCk7 CiAgICAgICAgICAgICBpZiAoYXV0byBncm93VmFsdWUgPSBzdHlsZS5mbGV4R3JvdygpKSB7CiAg ICAgICAgICAgICAgICAgYXV0byBmbGV4R3JvdyA9IGdyb3dWYWx1ZSAqIGJhc2VTaXplOwotICAg ICAgICAgICAgICAgIHN0cmV0Y2hpbmdJdGVtcy5hcHBlbmQoeyBmbGV4R3JvdywgZm9ybWF0dGlu Z1N0YXRlLmludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JCb3goKmZsZXhJdGVtLmxheW91dEJv eCktPm1pbmltdW0sIGJhc2VTaXplLCBmbGV4SXRlbSwgeyB9IH0pOworICAgICAgICAgICAgICAg IHN0cmV0Y2hpbmdJdGVtcy5hcHBlbmQoeyBmbGV4R3JvdywgZm9ybWF0dGluZ1N0YXRlLmludHJp bnNpY1dpZHRoQ29uc3RyYWludHNGb3JCb3goZmxleEl0ZW0ubGF5b3V0Qm94KCkpLT5taW5pbXVt LCBiYXNlU2l6ZSwgZmxleEl0ZW0sIHsgfSB9KTsKICAgICAgICAgICAgICAgICB0b3RhbEdyb3d0 aCArPSBmbGV4R3JvdzsKICAgICAgICAgICAgICAgICB0b3RhbEZsZXhpYmxlU3BhY2UgKz0gYmFz ZVNpemU7CiAgICAgICAgICAgICB9IGVsc2UKQEAgLTIxMSw3ICsyMTEsNyBAQCB2b2lkIEZsZXhM YXlvdXQ6OmNvbXB1dGVMb2dpY2FsV2lkdGhGb3JTdHJldGNoaW5nRmxleEl0ZW1zKExvZ2ljYWxG bGV4SXRlbXMmIGZsZQogICAgICAgICAvLyBBZGp1c3QgdGhlIHRvdGFsIGdyb3cgd2lkdGggYnkg dGhlIG92ZXJmbG93IHZhbHVlIChzaHJpbmspIGV4Y2VwdCB3aGVuIG1pbiBjb250ZW50IHdpdGgg ZGlzYWdyZWVzLgogICAgICAgICBmb3IgKGF1dG8mIHN0cmV0Y2hpbmdGbGV4IDogc3RyZXRjaGlu Z0l0ZW1zKSB7CiAgICAgICAgICAgICBhdXRvIGZsZXhlZFNpemUgPSBMYXlvdXRVbml0IHsgc3Ry ZXRjaGluZ0ZsZXguZmxleEJhc2lzICsgKHN0cmV0Y2hpbmdGbGV4LmZsZXhHcm93ICogZmxleEdy b3dCYXNlKSB9OwotICAgICAgICAgICAgc3RyZXRjaGluZ0ZsZXguZmxleEl0ZW0ubWFyZ2luUmVj dC5zZXRXaWR0aChzdGQ6Om1heChzdHJldGNoaW5nRmxleC5taW5pbXVtU2l6ZSwgZmxleGVkU2l6 ZSkpOworICAgICAgICAgICAgc3RyZXRjaGluZ0ZsZXguZmxleEl0ZW0uc2V0V2lkdGgoc3RkOjpt YXgoc3RyZXRjaGluZ0ZsZXgubWluaW11bVNpemUsIGZsZXhlZFNpemUpKTsKICAgICAgICAgfQog ICAgIH07CiAgICAgY29tcHV0ZUxvZ2ljYWxXaWR0aCgpOwpAQCAtMjIyLDcgKzIyMiw3IEBAIHZv aWQgRmxleExheW91dDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZvckZsZXhJdGVtcyhMb2dpY2FsRmxl eEl0ZW1zJiBmbGV4SXRlbXMsIExhCiAgICAgYXV0byBjb250ZW50TG9naWNhbFdpZHRoID0gWyZd IHsKICAgICAgICAgYXV0byBsb2dpY2FsV2lkdGggPSBMYXlvdXRVbml0IHsgfTsKICAgICAgICAg Zm9yIChhdXRvJiBmbGV4SXRlbSA6IGZsZXhJdGVtcykKLSAgICAgICAgICAgIGxvZ2ljYWxXaWR0 aCArPSBmbGV4SXRlbS5tYXJnaW5SZWN0LndpZHRoKCk7CisgICAgICAgICAgICBsb2dpY2FsV2lk dGggKz0gZmxleEl0ZW0ud2lkdGgoKTsKICAgICAgICAgcmV0dXJuIGxvZ2ljYWxXaWR0aDsKICAg ICB9KCk7CiAKQEAgLTIzNywxMyArMjM3LDEzIEBAIHZvaWQgRmxleExheW91dDo6Y29tcHV0ZUxv Z2ljYWxIZWlnaHRGb3JGbGV4SXRlbXMoTG9naWNhbEZsZXhJdGVtcyYgZmxleEl0ZW1zLCBMCiAg ICAgYXV0byBhbGlnbkl0ZW1zID0gZmxleEJveFN0eWxlKCkuYWxpZ25JdGVtcygpOwogCiAgICAg Zm9yIChhdXRvJiBmbGV4SXRlbSA6IGZsZXhJdGVtcykgewotICAgICAgICBhdXRvJiBoZWlnaHQg PSBmbGV4SXRlbS5sYXlvdXRCb3gtPnN0eWxlKCkuaGVpZ2h0KCk7CisgICAgICAgIGF1dG8mIGhl aWdodCA9IGZsZXhJdGVtLnN0eWxlKCkuaGVpZ2h0KCk7CiAgICAgICAgIGlmICghaGVpZ2h0Lmlz QXV0bygpKQogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIHN3aXRjaCAoYWxpZ25JdGVt cy5wb3NpdGlvbigpKSB7CiAgICAgICAgIGNhc2UgSXRlbVBvc2l0aW9uOjpOb3JtYWw6CiAgICAg ICAgIGNhc2UgSXRlbVBvc2l0aW9uOjpTdHJldGNoOgotICAgICAgICAgICAgZmxleEl0ZW0ubWFy Z2luUmVjdC5zZXRIZWlnaHQoYXZhaWxhYmxlU3BhY2UpOworICAgICAgICAgICAgZmxleEl0ZW0u c2V0SGVpZ2h0KGF2YWlsYWJsZVNwYWNlKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBj YXNlIEl0ZW1Qb3NpdGlvbjo6Q2VudGVyOgogICAgICAgICBjYXNlIEl0ZW1Qb3NpdGlvbjo6U3Rh cnQ6CkBAIC0yNjQsMjMgKzI2NCwyMyBAQCB2b2lkIEZsZXhMYXlvdXQ6OmFsaWduRmxleEl0ZW1z KExvZ2ljYWxGbGV4SXRlbXMmIGZsZXhJdGVtcywgTGF5b3V0VW5pdCBhdmFpbGFibAogICAgIGF1 dG8gZmxleEJveEFsaWduSXRlbXMgPSBmbGV4Qm94U3R5bGUoKS5hbGlnbkl0ZW1zKCk7CiAKICAg ICBmb3IgKGF1dG8mIGZsZXhJdGVtIDogZmxleEl0ZW1zKSB7Ci0gICAgICAgIGF1dG8mIGZsZXhJ dGVtQWxpZ25TZWxmID0gZmxleEl0ZW0ubGF5b3V0Qm94LT5zdHlsZSgpLmFsaWduU2VsZigpOwor ICAgICAgICBhdXRvJiBmbGV4SXRlbUFsaWduU2VsZiA9IGZsZXhJdGVtLnN0eWxlKCkuYWxpZ25T ZWxmKCk7CiAgICAgICAgIGF1dG8gYWxpZ25WYWx1ZSA9IGZsZXhJdGVtQWxpZ25TZWxmLnBvc2l0 aW9uKCkgIT0gSXRlbVBvc2l0aW9uOjpBdXRvID8gZmxleEl0ZW1BbGlnblNlbGYgOiBmbGV4Qm94 QWxpZ25JdGVtczsKICAgICAgICAgc3dpdGNoIChhbGlnblZhbHVlLnBvc2l0aW9uKCkpIHsKICAg ICAgICAgY2FzZSBJdGVtUG9zaXRpb246Ok5vcm1hbDoKICAgICAgICAgY2FzZSBJdGVtUG9zaXRp b246OlN0cmV0Y2g6Ci0gICAgICAgICAgICBmbGV4SXRlbS5tYXJnaW5SZWN0LnNldFRvcCh7IH0p OworICAgICAgICAgICAgZmxleEl0ZW0uc2V0VG9wKHsgfSk7CiAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgY2FzZSBJdGVtUG9zaXRpb246OkNlbnRlcjoKLSAgICAgICAgICAgIGZsZXhJdGVt Lm1hcmdpblJlY3Quc2V0VG9wKHsgYXZhaWxhYmxlU3BhY2UgLyAyIC0gIGZsZXhJdGVtLm1hcmdp blJlY3QuaGVpZ2h0KCkgLyAyIH0pOworICAgICAgICAgICAgZmxleEl0ZW0uc2V0VG9wKHsgYXZh aWxhYmxlU3BhY2UgLyAyIC0gIGZsZXhJdGVtLmhlaWdodCgpIC8gMiB9KTsKICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICBjYXNlIEl0ZW1Qb3NpdGlvbjo6U3RhcnQ6CiAgICAgICAgIGNhc2Ug SXRlbVBvc2l0aW9uOjpGbGV4U3RhcnQ6Ci0gICAgICAgICAgICBmbGV4SXRlbS5tYXJnaW5SZWN0 LnNldFRvcCh7IH0pOworICAgICAgICAgICAgZmxleEl0ZW0uc2V0VG9wKHsgfSk7CiAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgY2FzZSBJdGVtUG9zaXRpb246OkVuZDoKICAgICAgICAgY2Fz ZSBJdGVtUG9zaXRpb246OkZsZXhFbmQ6Ci0gICAgICAgICAgICBmbGV4SXRlbS5tYXJnaW5SZWN0 LnNldFRvcCh7IGF2YWlsYWJsZVNwYWNlIC0gZmxleEl0ZW0ubWFyZ2luUmVjdC5oZWlnaHQoKSB9 KTsKKyAgICAgICAgICAgIGZsZXhJdGVtLnNldFRvcCh7IGF2YWlsYWJsZVNwYWNlIC0gZmxleEl0 ZW0uaGVpZ2h0KCkgfSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgZGVmYXVsdDoKICAg ICAgICAgICAgIEFTU0VSVF9OT1RfSU1QTEVNRU5URURfWUVUKCk7CkBAIC0yOTYsNyArMjk2LDcg QEAgdm9pZCBGbGV4TGF5b3V0OjpqdXN0aWZ5RmxleEl0ZW1zKExvZ2ljYWxGbGV4SXRlbXMmIGZs ZXhJdGVtcywgTGF5b3V0VW5pdCBhdmFpbGEKICAgICBhdXRvIGNvbnRlbnRMb2dpY2FsV2lkdGgg PSBbJl0gewogICAgICAgICBhdXRvIGxvZ2ljYWxXaWR0aCA9IExheW91dFVuaXQgeyB9OwogICAg ICAgICBmb3IgKGF1dG8mIGZsZXhJdGVtIDogZmxleEl0ZW1zKQotICAgICAgICAgICAgbG9naWNh bFdpZHRoICs9IGZsZXhJdGVtLm1hcmdpblJlY3Qud2lkdGgoKTsKKyAgICAgICAgICAgIGxvZ2lj YWxXaWR0aCArPSBmbGV4SXRlbS53aWR0aCgpOwogICAgICAgICByZXR1cm4gbG9naWNhbFdpZHRo OwogICAgIH0oKTsKIApAQCAtMzU5LDggKzM1OSw4IEBAIHZvaWQgRmxleExheW91dDo6anVzdGlm eUZsZXhJdGVtcyhMb2dpY2FsRmxleEl0ZW1zJiBmbGV4SXRlbXMsIExheW91dFVuaXQgYXZhaWxh CiAgICAgYXV0byBsb2dpY2FsTGVmdCA9IGluaXRpYWxPZmZzZXQoKTsKICAgICBhdXRvIGdhcCA9 IGdhcEJldHdlZW5JdGVtcygpOwogICAgIGZvciAoYXV0byYgZmxleEl0ZW0gOiBmbGV4SXRlbXMp IHsKLSAgICAgICAgZmxleEl0ZW0ubWFyZ2luUmVjdC5zZXRMZWZ0KGxvZ2ljYWxMZWZ0KTsKLSAg ICAgICAgbG9naWNhbExlZnQgPSBmbGV4SXRlbS5tYXJnaW5SZWN0LnJpZ2h0KCkgKyBnYXA7Cisg ICAgICAgIGZsZXhJdGVtLnNldExlZnQobG9naWNhbExlZnQpOworICAgICAgICBsb2dpY2FsTGVm dCA9IGZsZXhJdGVtLnJpZ2h0KCkgKyBnYXA7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleExheW91dC5oIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhMYXlvdXQu aAppbmRleCBhNWIzNWU3Y2YxMDQuLjljNzdkOGIyNjc0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhMYXlvdXQuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleExheW91dC5o CkBAIC00MSw4ICs0MSwzMCBAQCBwdWJsaWM6CiAgICAgRmxleExheW91dChjb25zdCBGbGV4Rm9y bWF0dGluZ1N0YXRlJiwgY29uc3QgUmVuZGVyU3R5bGUmIGZsZXhCb3hTdHlsZSk7CiAKICAgICBz dHJ1Y3QgTG9naWNhbEZsZXhJdGVtIHsKLSAgICAgICAgRmxleFJlY3QgbWFyZ2luUmVjdDsKLSAg ICAgICAgQ2hlY2tlZFB0cjxjb25zdCBDb250YWluZXJCb3g+IGxheW91dEJveDsgICAgICAgIAor ICAgIHB1YmxpYzoKKyAgICAgICAgTG9naWNhbEZsZXhJdGVtKGNvbnN0IEZsZXhSZWN0JiwgY29u c3QgQ29udGFpbmVyQm94Jik7CisgICAgICAgIExvZ2ljYWxGbGV4SXRlbSgpID0gZGVmYXVsdDsK KworICAgICAgICB2b2lkIHNldFRvcChMYXlvdXRVbml0IHRvcCkgeyBtX21hcmdpblJlY3Quc2V0 VG9wKHRvcCk7IH0KKyAgICAgICAgdm9pZCBzZXRMZWZ0KExheW91dFVuaXQgbGVmdCkgeyBtX21h cmdpblJlY3Quc2V0TGVmdChsZWZ0KTsgfQorICAgICAgICB2b2lkIHNldFdpZHRoKExheW91dFVu aXQgd2lkdGgpIHsgbV9tYXJnaW5SZWN0LnNldFdpZHRoKHdpZHRoKTsgfQorICAgICAgICB2b2lk IHNldEhlaWdodChMYXlvdXRVbml0IGhlaWdodCkgeyBtX21hcmdpblJlY3Quc2V0SGVpZ2h0KGhl aWdodCk7IH0KKworICAgICAgICBGbGV4UmVjdCByZWN0KCkgY29uc3QgeyByZXR1cm4gbV9tYXJn aW5SZWN0OyB9CisgICAgICAgIExheW91dFBvaW50IHRvcExlZnQoKSBjb25zdCB7IHJldHVybiBt X21hcmdpblJlY3QudG9wTGVmdCgpOyB9CisgICAgICAgIExheW91dFVuaXQgdG9wKCkgY29uc3Qg eyByZXR1cm4gbV9tYXJnaW5SZWN0LnRvcCgpOyB9CisgICAgICAgIExheW91dFVuaXQgYm90dG9t KCkgY29uc3QgeyByZXR1cm4gbV9tYXJnaW5SZWN0LmJvdHRvbSgpOyB9CisgICAgICAgIExheW91 dFVuaXQgbGVmdCgpIGNvbnN0IHsgcmV0dXJuIG1fbWFyZ2luUmVjdC5sZWZ0KCk7IH0KKyAgICAg ICAgTGF5b3V0VW5pdCByaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fbWFyZ2luUmVjdC5yaWdodCgp OyB9CisgICAgICAgIExheW91dFVuaXQgd2lkdGgoKSBjb25zdCB7IHJldHVybiBtX21hcmdpblJl Y3Qud2lkdGgoKTsgfQorICAgICAgICBMYXlvdXRVbml0IGhlaWdodCgpIGNvbnN0IHsgcmV0dXJu IG1fbWFyZ2luUmVjdC5oZWlnaHQoKTsgfQorCisgICAgICAgIGNvbnN0IFJlbmRlclN0eWxlJiBz dHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1fbGF5b3V0Qm94LT5zdHlsZSgpOyB9CisgICAgICAgIGNv bnN0IENvbnRhaW5lckJveCYgbGF5b3V0Qm94KCkgY29uc3QgeyByZXR1cm4gKm1fbGF5b3V0Qm94 OyB9CisKKyAgICBwcml2YXRlOgorICAgICAgICBGbGV4UmVjdCBtX21hcmdpblJlY3Q7CisgICAg ICAgIENoZWNrZWRQdHI8Y29uc3QgQ29udGFpbmVyQm94PiBtX2xheW91dEJveDsgICAgICAgIAog ICAgIH07CiAgICAgdXNpbmcgTG9naWNhbEZsZXhJdGVtcyA9IFZlY3RvcjxMb2dpY2FsRmxleEl0 ZW0+OyAgICAKICAgICB2b2lkIGxheW91dChjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250ZW50 JiwgTG9naWNhbEZsZXhJdGVtcyYpOwpAQCAtNjQsNiArODYsMTIgQEAgcHJpdmF0ZToKICAgICBj b25zdCBSZW5kZXJTdHlsZSYgbV9mbGV4Qm94U3R5bGU7CiB9OwogCitpbmxpbmUgRmxleExheW91 dDo6TG9naWNhbEZsZXhJdGVtOjpMb2dpY2FsRmxleEl0ZW0oY29uc3QgRmxleFJlY3QmIG1hcmdp blJlY3QsIGNvbnN0IENvbnRhaW5lckJveCYgbGF5b3V0Qm94KQorICAgIDogbV9tYXJnaW5SZWN0 KG1hcmdpblJlY3QpCisgICAgLCBtX2xheW91dEJveChsYXlvdXRCb3gpCit7Cit9CisKIH0KIH0K IAotLSAKMi4zMi4wIChBcHBsZSBHaXQtMTMyKQoK