229967 2021-09-06 11:38:57 -0700 [LFC][Integration] Remove redundant NonRootInlineBox 2021-09-06 20:27:16 -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 1790752 0 zalan 2021-09-06 11:38:57 -0700 we don't need it anymore. 1790753 1 437431 zalan 2021-09-06 11:42:48 -0700 Created attachment 437431 Patch 1790855 2 ews-feeder 2021-09-06 20:26:09 -0700 Committed r282072 (241372@main): <https://commits.webkit.org/241372@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437431. 1790856 3 webkit-bug-importer 2021-09-06 20:27:16 -0700 <rdar://problem/82805208> 437431 2021-09-06 11:42:48 -0700 2021-09-06 20:26:10 -0700 Patch bug-229967-20210906114247.patch text/plain 11516 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjUyYmJlYTQyMWNkN2Qy OWMyZDNiZjgxZmIwOTM5MWIyOTA5YTAzZi4uMDQzMDBmMTQ3YzgyMjVjNGMxMWVlNTRhZjRlNTRm NmI4YjU5MGQ2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA5LTA2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0g UmVtb3ZlIHJlZHVuZGFudCBOb25Sb290SW5saW5lQm94CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjk5NjcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOb3cgdGhhdCBhbGwgdGhlIGlubGluZSBib3hlcyBn ZW5lcmF0ZSBydW5zLCBhbmQgd2UgdXNlIHRob3NlIHJ1bnMgdG8gZG8gcGFpbmludC9oaXR0ZXN0 LCB0aGlzCisgICAgICAgIGhlbHBlciBzdHJ1Y3R1cmUgaXMgbm90IG5lZWRlZCBhbnltb3JlLgor CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29u dGVudC5oOgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklu bGluZUNvbnRlbnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0 aW9uOjpJbmxpbmVDb250ZW50QnVpbGRlcjo6YnVpbGQgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0SW50ZWdyYXRpb246OklubGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5 TGluZXMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OklubGlu ZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5UnVucyBjb25zdCk6IERlbGV0ZWQuCisgICAg ICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1 aWxkZXIuaDoKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25M aW5lLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6Tm9uUm9vdElubGlu ZUJveDo6Tm9uUm9vdElubGluZUJveCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlv dXRJbnRlZ3JhdGlvbjo6Tm9uUm9vdElubGluZUJveDo6bGF5b3V0Qm94IGNvbnN0KTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpOb25Sb290SW5saW5lQm94 OjpzdHlsZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3Jh dGlvbjo6Tm9uUm9vdElubGluZUJveDo6bGluZUluZGV4IGNvbnN0KTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpOb25Sb290SW5saW5lQm94OjpyZWN0IGNv bnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpOb25S b290SW5saW5lQm94OjpzZXRWZXJ0aWNhbFBvc2l0aW9uSW50ZWdyYWwpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246Ok5vblJvb3RJbmxpbmVCb3g6Omhhc1Nj cm9sbGFibGVDb250ZW50IGNvbnN0KTogRGVsZXRlZC4KKwogMjAyMS0wOS0wNiAgQW50dGkgS29p dmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25dIFVz ZSBpbmxpbmUgYm94ZXMgaW4gcnVuIHZlY3RvciBmb3IgaGl0IHRlc3RpbmcKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGlu ZUNvbnRlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvbklubGluZUNvbnRlbnQuaAppbmRleCBiNTc0MDI2MmE2ZjRkOTAwNTY3YTlmODc1YzY3 NmQ1NGE5OGE5Mjk4Li5hMjRkZTc0YmUxNjY4Zjc0M2ZkM2JjZGRlNmQ2OTFiZWE0ODNiMGY0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25JbmxpbmVDb250ZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5oCkBAIC01OSw3ICs1OSw2IEBAIHN0 cnVjdCBJbmxpbmVDb250ZW50IDogcHVibGljIFJlZkNvdW50ZWQ8SW5saW5lQ29udGVudD4gewog CiAgICAgUnVucyBydW5zOwogICAgIExpbmVzIGxpbmVzOwotICAgIFZlY3RvcjxOb25Sb290SW5s aW5lQm94PiBub25Sb290SW5saW5lQm94ZXM7CiAKICAgICBmbG9hdCBjbGVhckdhcEFmdGVyTGFz dExpbmUgeyAwIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRC dWlsZGVyLmNwcAppbmRleCBhZmFlZmQzZWRlYWFlODhmYjljYzgyY2M5YWE1OWFkYTA4MWE4OTIy Li5jOTYyZjJlMzg0MjI3NjNhN2M2YzE0YTNhOTUxMTlkY2JhYTBlYjQ4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVD b250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCkBAIC02Nyw0MiArNjcs MTYgQEAgSW5saW5lQ29udGVudEJ1aWxkZXI6OklubGluZUNvbnRlbnRCdWlsZGVyKGNvbnN0IExh eW91dDo6TGF5b3V0U3RhdGUmIGxheW91dFN0YXQKIAogdm9pZCBJbmxpbmVDb250ZW50QnVpbGRl cjo6YnVpbGQoTGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nU3RhdGUmIGlubGluZUZvcm1hdHRpbmdT dGF0ZSwgSW5saW5lQ29udGVudCYgaW5saW5lQ29udGVudCkgY29uc3QKIHsKLSAgICBjcmVhdGVE aXNwbGF5UnVucyhpbmxpbmVGb3JtYXR0aW5nU3RhdGUsIGlubGluZUNvbnRlbnQpOwotICAgIGNy ZWF0ZURpc3BsYXlMaW5lcyhpbmxpbmVGb3JtYXR0aW5nU3RhdGUubGluZXMoKSwgaW5saW5lQ29u dGVudCk7Ci19Ci0KLXZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0ZURpc3BsYXlSdW5z KExheW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXRlJiBpbmxpbmVGb3JtYXR0aW5nU3RhdGUsIElu bGluZUNvbnRlbnQmIGlubGluZUNvbnRlbnQpIGNvbnN0Ci17Ci0gICAgLy8gRklYTUU6IFJlbW92 ZSB0aGlzIGxvb3Agd2hlbiB3ZSB0cmFuc2l0aW9uZWQgdG8gdGhlICJydW4gb25seSIgc2V0dXAg KGkuZS4gZWFjaCBpbmxpbmUgYm94IGlzIHJlcHJlc2VudGVkIGFzIGEgcnVuIGFzIHdlbGwpCi0g ICAgYXV0byYgbGluZUJveGVzID0gY29uc3RfY2FzdDxMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdT dGF0ZSY+KGlubGluZUZvcm1hdHRpbmdTdGF0ZSkubGluZUJveGVzKCk7Ci0gICAgZm9yIChzaXpl X3QgbGluZUluZGV4ID0gMDsgbGluZUluZGV4IDwgbGluZUJveGVzLnNpemUoKTsgKytsaW5lSW5k ZXgpIHsKLSAgICAgICAgYXV0byYgbGluZUJveCA9IGxpbmVCb3hlc1tsaW5lSW5kZXhdOwotICAg ICAgICBhdXRvIGxpbmVCb3hMb2dpY2FsVG9wTGVmdCA9IGlubGluZUZvcm1hdHRpbmdTdGF0ZS5s aW5lcygpW2xpbmVJbmRleF0ubGluZUJveExvZ2ljYWxSZWN0KCkudG9wTGVmdCgpOwotICAgICAg ICBmb3IgKGF1dG8mIG5vblJvb3RJbmxpbmVMZXZlbEJveCA6IGxpbmVCb3gubm9uUm9vdElubGlu ZUxldmVsQm94ZXMoKSkgewotICAgICAgICAgICAgaWYgKCFub25Sb290SW5saW5lTGV2ZWxCb3gu aXNJbmxpbmVCb3goKSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIGF1 dG8mIGxheW91dEJveCA9IG5vblJvb3RJbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKTsKLSAgICAg ICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gaW5saW5lRm9ybWF0dGluZ1N0YXRlLmJveEdlb21l dHJ5KGxheW91dEJveCk7Ci0gICAgICAgICAgICBhdXRvIGhhc1Njcm9sbGFibGVDb250ZW50ID0g WyZdIHsKLSAgICAgICAgICAgICAgICAvLyBJbiBzdGFuZGFyZHMgbW9kZSwgaW5saW5lIGJveGVz IGFsd2F5cyBzdGFydCB3aXRoIGFuIGltYWdpbmFyeSBzdHJ1dC4KLSAgICAgICAgICAgICAgICBy ZXR1cm4gbV9sYXlvdXRTdGF0ZS5pblN0YW5kYXJkc01vZGUoKSB8fCBub25Sb290SW5saW5lTGV2 ZWxCb3guaGFzQ29udGVudCgpIHx8IGJveEdlb21ldHJ5Lmhvcml6b250YWxCb3JkZXIoKSB8fCAo Ym94R2VvbWV0cnkuaG9yaXpvbnRhbFBhZGRpbmcoKSAmJiBib3hHZW9tZXRyeS5ob3Jpem9udGFs UGFkZGluZygpLnZhbHVlKCkpOwotICAgICAgICAgICAgfTsKLSAgICAgICAgICAgIC8vIElubGlu ZSBib3hlcyBtYXkgb3IgbWF5IG5vdCBiZSB3cmFwcGVkIGFuZCBoYXZlIHJ1bnMgb24gbXVsdGlw bGUgbGluZXMgKGUuZy4gPHNwYW4+Zmlyc3QgbGluZTxicj5zZWNvbmQgbGluZTxicj50aGlyZCBs aW5lPC9zcGFuPikKLSAgICAgICAgICAgIGF1dG8gaW5saW5lQm94Qm9yZGVyQm94ID0gbGluZUJv eC5sb2dpY2FsQm9yZGVyQm94Rm9ySW5saW5lQm94KGxheW91dEJveCwgYm94R2VvbWV0cnkpOwot ICAgICAgICAgICAgaW5saW5lQm94Qm9yZGVyQm94Lm1vdmVCeShsaW5lQm94TG9naWNhbFRvcExl ZnQpOwotICAgICAgICAgICAgaW5saW5lQ29udGVudC5ub25Sb290SW5saW5lQm94ZXMuYXBwZW5k KHsgbGluZUluZGV4LCBsYXlvdXRCb3gsIGlubGluZUJveEJvcmRlckJveCwgaGFzU2Nyb2xsYWJs ZUNvbnRlbnQoKSB9KTsKLSAgICAgICAgfQotICAgIH0KICAgICAvLyBGSVhNRTogVGhpcyBtaWdo dCBuZWVkIGEgZGlmZmVyZW50IGFwcHJvYWNoIHdpdGggcGFydGlhbCBsYXlvdXQgd2hlcmUgdGhl IGxheW91dCBjb2RlIG5lZWRzIHRvIGtub3cgYWJvdXQgdGhlIHJ1bnMuCiAgICAgaW5saW5lQ29u dGVudC5ydW5zID0gV1RGTW92ZShpbmxpbmVGb3JtYXR0aW5nU3RhdGUucnVucygpKTsKKyAgICBj cmVhdGVEaXNwbGF5TGluZXMoaW5saW5lRm9ybWF0dGluZ1N0YXRlLCBpbmxpbmVDb250ZW50KTsK IH0KIAotdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVzKGNvbnN0 IExheW91dDo6SW5saW5lTGluZXMmIGxpbmVzLCBJbmxpbmVDb250ZW50JiBpbmxpbmVDb250ZW50 KSBjb25zdAordm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVzKExh eW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXRlJiBpbmxpbmVGb3JtYXR0aW5nU3RhdGUsIElubGlu ZUNvbnRlbnQmIGlubGluZUNvbnRlbnQpIGNvbnN0CiB7CisgICAgYXV0byYgbGluZXMgPSBpbmxp bmVGb3JtYXR0aW5nU3RhdGUubGluZXMoKTsKICAgICBhdXRvJiBydW5zID0gaW5saW5lQ29udGVu dC5ydW5zOwotICAgIGF1dG8mIG5vblJvb3RJbmxpbmVCb3hlcyA9IGlubGluZUNvbnRlbnQubm9u Um9vdElubGluZUJveGVzOwogICAgIHNpemVfdCBydW5JbmRleCA9IDA7Ci0gICAgc2l6ZV90IGlu bGluZUJveEluZGV4ID0gMDsKICAgICBpbmxpbmVDb250ZW50LmxpbmVzLnJlc2VydmVJbml0aWFs Q2FwYWNpdHkobGluZXMuc2l6ZSgpKTsKICAgICBmb3IgKHNpemVfdCBsaW5lSW5kZXggPSAwOyBs aW5lSW5kZXggPCBsaW5lcy5zaXplKCk7ICsrbGluZUluZGV4KSB7CiAgICAgICAgIGF1dG8mIGxp bmUgPSBsaW5lc1tsaW5lSW5kZXhdOwpAQCAtMTIxLDMwICs5NSwzMSBAQCB2b2lkIElubGluZUNv bnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5TGluZXMoY29uc3QgTGF5b3V0OjpJbmxpbmVMaW5l cyYgbGluZXMsCiAgICAgICAgICAgICBsaW5lSW5rT3ZlcmZsb3dSZWN0LnVuaXRlKHJ1bi5pbmtP dmVyZmxvdygpKTsKIAogICAgICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gcnVuLmxheW91dEJv eCgpOwotICAgICAgICAgICAgaWYgKCFsYXlvdXRCb3guaXNSZXBsYWNlZEJveCgpKQorICAgICAg ICAgICAgaWYgKHJ1bi5pc05vblJvb3RJbmxpbmVCb3goKSkgeworICAgICAgICAgICAgICAgIC8v IENvbGxlY3Qgc2Nyb2xsYWJsZSBvdmVyZmxvdyBmcm9tIGlubGluZSBib3hlcy4gQWxsIG90aGVy IGlubGluZSBsZXZlbCBib3hlcyAoZS5nIGF0b21pYyBpbmxpbmUgbGV2ZWwgYm94ZXMpIHN0cmV0 Y2ggdGhlIGxpbmUuCisgICAgICAgICAgICAgICAgYXV0byBoYXNTY3JvbGxhYmxlQ29udGVudCA9 IFsmXSB7CisgICAgICAgICAgICAgICAgICAgIC8vIEluIHN0YW5kYXJkcyBtb2RlLCBpbmxpbmUg Ym94ZXMgYWx3YXlzIHN0YXJ0IHdpdGggYW4gaW1hZ2luYXJ5IHN0cnV0LgorICAgICAgICAgICAg ICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGlubGluZUZvcm1hdHRpbmdTdGF0ZS5ib3hHZW9t ZXRyeShsYXlvdXRCb3gpOworICAgICAgICAgICAgICAgICAgICByZXR1cm4gbV9sYXlvdXRTdGF0 ZS5pblN0YW5kYXJkc01vZGUoKSB8fCBydW4uaGFzQ29udGVudCgpIHx8IGJveEdlb21ldHJ5Lmhv cml6b250YWxCb3JkZXIoKSB8fCAoYm94R2VvbWV0cnkuaG9yaXpvbnRhbFBhZGRpbmcoKSAmJiBi b3hHZW9tZXRyeS5ob3Jpem9udGFsUGFkZGluZygpLnZhbHVlKCkpOworICAgICAgICAgICAgICAg IH07CisgICAgICAgICAgICAgICAgaWYgKGhhc1Njcm9sbGFibGVDb250ZW50KCkpCisgICAgICAg ICAgICAgICAgICAgIHNjcm9sbGFibGVPdmVyZmxvd1JlY3QudW5pdGUocnVuLmxvZ2ljYWxSZWN0 KCkpOworICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgfQorICAgICAgICAg ICAgaWYgKGxheW91dEJveC5pc1JlcGxhY2VkQm94KCkpIHsKKyAgICAgICAgICAgICAgICAvLyBT aW1pbGFyIHRvIExlZ2FjeUlubGluZUZsb3dCb3g6OmFkZFJlcGxhY2VkQ2hpbGRPdmVyZmxvdy4K KyAgICAgICAgICAgICAgICBhdXRvJiBib3ggPSBkb3duY2FzdDxSZW5kZXJCb3g+KG1fYm94VHJl ZS5yZW5kZXJlckZvckxheW91dEJveChsYXlvdXRCb3gpKTsKKyAgICAgICAgICAgICAgICBhdXRv IHJ1bkxvZ2ljYWxSZWN0ID0gcnVuLmxvZ2ljYWxSZWN0KCk7CisgICAgICAgICAgICAgICAgaWYg KCFib3guaGFzU2VsZlBhaW50aW5nTGF5ZXIoKSkgeworICAgICAgICAgICAgICAgICAgICBhdXRv IGNoaWxkSW5rT3ZlcmZsb3cgPSBib3gubG9naWNhbFZpc3VhbE92ZXJmbG93UmVjdEZvclByb3Bh Z2F0aW9uKCZib3gucGFyZW50KCktPnN0eWxlKCkpOworICAgICAgICAgICAgICAgICAgICBjaGls ZElua092ZXJmbG93Lm1vdmUocnVuTG9naWNhbFJlY3QubGVmdCgpLCBydW5Mb2dpY2FsUmVjdC50 b3AoKSk7CisgICAgICAgICAgICAgICAgICAgIGxpbmVJbmtPdmVyZmxvd1JlY3QudW5pdGUoY2hp bGRJbmtPdmVyZmxvdyk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGF1dG8g Y2hpbGRTY3JvbGxhYmxlT3ZlcmZsb3cgPSBib3gubG9naWNhbExheW91dE92ZXJmbG93UmVjdEZv clByb3BhZ2F0aW9uKCZib3gucGFyZW50KCktPnN0eWxlKCkpOworICAgICAgICAgICAgICAgIGNo aWxkU2Nyb2xsYWJsZU92ZXJmbG93Lm1vdmUocnVuTG9naWNhbFJlY3QubGVmdCgpLCBydW5Mb2dp Y2FsUmVjdC50b3AoKSk7CisgICAgICAgICAgICAgICAgc2Nyb2xsYWJsZU92ZXJmbG93UmVjdC51 bml0ZShjaGlsZFNjcm9sbGFibGVPdmVyZmxvdyk7CiAgICAgICAgICAgICAgICAgY29udGludWU7 Ci0KLSAgICAgICAgICAgIC8vIFNpbWlsYXIgdG8gTGVnYWN5SW5saW5lRmxvd0JveDo6YWRkUmVw bGFjZWRDaGlsZE92ZXJmbG93LgotICAgICAgICAgICAgYXV0byYgYm94ID0gZG93bmNhc3Q8UmVu ZGVyQm94PihtX2JveFRyZWUucmVuZGVyZXJGb3JMYXlvdXRCb3gobGF5b3V0Qm94KSk7Ci0gICAg ICAgICAgICBhdXRvIHJ1bkxvZ2ljYWxSZWN0ID0gcnVuLmxvZ2ljYWxSZWN0KCk7Ci0gICAgICAg ICAgICBpZiAoIWJveC5oYXNTZWxmUGFpbnRpbmdMYXllcigpKSB7Ci0gICAgICAgICAgICAgICAg YXV0byBjaGlsZElua092ZXJmbG93ID0gYm94LmxvZ2ljYWxWaXN1YWxPdmVyZmxvd1JlY3RGb3JQ cm9wYWdhdGlvbigmYm94LnBhcmVudCgpLT5zdHlsZSgpKTsKLSAgICAgICAgICAgICAgICBjaGls ZElua092ZXJmbG93Lm1vdmUocnVuTG9naWNhbFJlY3QubGVmdCgpLCBydW5Mb2dpY2FsUmVjdC50 b3AoKSk7Ci0gICAgICAgICAgICAgICAgbGluZUlua092ZXJmbG93UmVjdC51bml0ZShjaGlsZElu a092ZXJmbG93KTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGF1dG8gY2hpbGRTY3JvbGxh YmxlT3ZlcmZsb3cgPSBib3gubG9naWNhbExheW91dE92ZXJmbG93UmVjdEZvclByb3BhZ2F0aW9u KCZib3gucGFyZW50KCktPnN0eWxlKCkpOwotICAgICAgICAgICAgY2hpbGRTY3JvbGxhYmxlT3Zl cmZsb3cubW92ZShydW5Mb2dpY2FsUmVjdC5sZWZ0KCksIHJ1bkxvZ2ljYWxSZWN0LnRvcCgpKTsK LSAgICAgICAgICAgIHNjcm9sbGFibGVPdmVyZmxvd1JlY3QudW5pdGUoY2hpbGRTY3JvbGxhYmxl T3ZlcmZsb3cpOwotICAgICAgICB9Ci0gICAgICAgIC8vIENvbGxlY3Qgc2Nyb2xsYWJsZSBvdmVy ZmxvdyBmcm9tIGlubGluZSBib3hlcy4gQWxsIG90aGVyIGlubGluZSBsZXZlbCBib3hlcyAoZS5n IGF0b21pYyBpbmxpbmUgbGV2ZWwgYm94ZXMpIHN0cmV0Y2ggdGhlIGxpbmUuCi0gICAgICAgIHdo aWxlIChpbmxpbmVCb3hJbmRleCA8IG5vblJvb3RJbmxpbmVCb3hlcy5zaXplKCkgJiYgbm9uUm9v dElubGluZUJveGVzW2lubGluZUJveEluZGV4XS5saW5lSW5kZXgoKSA9PSBsaW5lSW5kZXgpIHsK LSAgICAgICAgICAgIGF1dG8mIGlubGluZUJveCA9IG5vblJvb3RJbmxpbmVCb3hlc1tpbmxpbmVC b3hJbmRleCsrXTsKLQotICAgICAgICAgICAgaWYgKGxpbmUubmVlZHNJbnRlZ3JhbFBvc2l0aW9u KCkpCi0gICAgICAgICAgICAgICAgaW5saW5lQm94LnNldFZlcnRpY2FsUG9zaXRpb25JbnRlZ3Jh bCgpOwotCi0gICAgICAgICAgICBpZiAoaW5saW5lQm94Lmhhc1Njcm9sbGFibGVDb250ZW50KCkp Ci0gICAgICAgICAgICAgICAgc2Nyb2xsYWJsZU92ZXJmbG93UmVjdC51bml0ZShpbmxpbmVCb3gu cmVjdCgpKTsKICAgICAgICAgfQogCiAgICAgICAgIGF1dG8gYWRqdXN0ZWRMaW5lQm94UmVjdCA9 IEZsb2F0UmVjdCB7IGxpbmVCb3hMb2dpY2FsUmVjdCB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1 aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmgKaW5kZXggMjBkZTNkZGVkYjhlMGRjMTc1M2M2OTJh ZDMyMjMzN2RjNTM1OGZlMy4uMzMyMDQ1ZGM3OTRkNWU1YTM0MjlhZDFmZjU1OTE0ZDIyNTY5MDM1 ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dElu dGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5oCkBA IC00Niw4ICs0Niw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGJ1aWxkKExheW91dDo6SW5saW5lRm9y bWF0dGluZ1N0YXRlJiwgSW5saW5lQ29udGVudCYpIGNvbnN0OwogCiBwcml2YXRlOgotICAgIHZv aWQgY3JlYXRlRGlzcGxheVJ1bnMoTGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nU3RhdGUmLCBJbmxp bmVDb250ZW50JikgY29uc3Q7Ci0gICAgdm9pZCBjcmVhdGVEaXNwbGF5TGluZXMoY29uc3QgTGF5 b3V0OjpJbmxpbmVMaW5lcyYsIElubGluZUNvbnRlbnQmKSBjb25zdDsKKyAgICB2b2lkIGNyZWF0 ZURpc3BsYXlMaW5lcyhMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdTdGF0ZSYsIElubGluZUNvbnRl bnQmKSBjb25zdDsKIAogICAgIGNvbnN0IExheW91dDo6TGF5b3V0U3RhdGUmIG1fbGF5b3V0U3Rh dGU7CiAgICAgY29uc3QgUmVuZGVyQmxvY2tGbG93JiBtX2Jsb2NrRmxvdzsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmUu aCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxp bmUuaAppbmRleCA5MGRlZThkOTU3ZjA5YzFjNjBhOTBiNWJmNWEwZWMwOTQ3ZGZiOWVmLi4zOTI2 NzNlOWVkMzFjNzdjMTgwMjMyNjJmY2U4OTA5MGUyZjVmNzhkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lLmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZS5o CkBAIC04NiwzNCArODYsNiBAQCBwcml2YXRlOgogICAgIGZsb2F0IG1fY29udGVudFdpZHRoIHsg MCB9OwogfTsKIAotY2xhc3MgTm9uUm9vdElubGluZUJveCB7Ci1wdWJsaWM6Ci0gICAgTm9uUm9v dElubGluZUJveChzaXplX3QgbGluZUluZGV4LCBjb25zdCBMYXlvdXQ6OkJveCYgbGF5b3V0Qm94 LCBjb25zdCBGbG9hdFJlY3QmIHJlY3QsIGJvb2wgaGFzU2Nyb2xsYWJsZUNvbnRlbnQpCi0gICAg ICAgIDogbV9saW5lSW5kZXgobGluZUluZGV4KQotICAgICAgICAsIG1fbGF5b3V0Qm94KG1ha2VX ZWFrUHRyKGxheW91dEJveCkpCi0gICAgICAgICwgbV9yZWN0KHJlY3QpCi0gICAgICAgICwgbV9o YXNTY3JvbGxhYmxlQ29udGVudChoYXNTY3JvbGxhYmxlQ29udGVudCkKLSAgICB7Ci0gICAgfQot Ci0gICAgY29uc3QgTGF5b3V0OjpCb3gmIGxheW91dEJveCgpIGNvbnN0IHsgcmV0dXJuICptX2xh eW91dEJveDsgfQotICAgIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSgpIGNvbnN0IHsgcmV0dXJu IG1fbGF5b3V0Qm94LT5zdHlsZSgpOyB9Ci0KLSAgICBzaXplX3QgbGluZUluZGV4KCkgY29uc3Qg eyByZXR1cm4gbV9saW5lSW5kZXg7IH0KLQotICAgIEZsb2F0UmVjdCByZWN0KCkgY29uc3QgeyBy ZXR1cm4gbV9yZWN0OyB9Ci0KLSAgICB2b2lkIHNldFZlcnRpY2FsUG9zaXRpb25JbnRlZ3JhbCgp IHsgbV9yZWN0LnNldFkocm91bmRUb0ludChtX3JlY3QueSgpKSk7IH0KLQotICAgIGJvb2wgaGFz U2Nyb2xsYWJsZUNvbnRlbnQoKSBjb25zdCB7IHJldHVybiBtX2hhc1Njcm9sbGFibGVDb250ZW50 OyB9Ci0KLXByaXZhdGU6Ci0gICAgY29uc3Qgc2l6ZV90IG1fbGluZUluZGV4OwotICAgIFdlYWtQ dHI8Y29uc3QgTGF5b3V0OjpCb3g+IG1fbGF5b3V0Qm94OwotICAgIEZsb2F0UmVjdCBtX3JlY3Q7 Ci0gICAgYm9vbCBtX2hhc1Njcm9sbGFibGVDb250ZW50IHsgZmFsc2UgfTsKLX07Ci0KIH0KIH0K IAo=