212135 2020-05-20 07:22:02 -0700 [LFC][TFC] Internal table boxes should take collapsed border into account 2020-05-20 08:35: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 1654413 0 zalan 2020-05-20 07:22:02 -0700 ssia 1654425 1 399837 zalan 2020-05-20 07:35:59 -0700 Created attachment 399837 Patch 1654450 2 ews-feeder 2020-05-20 08:34:28 -0700 Committed r261919: <https://trac.webkit.org/changeset/261919> All reviewed patches have been landed. Closing bug and clearing flags on attachment 399837. 1654451 3 webkit-bug-importer 2020-05-20 08:35:14 -0700 <rdar://problem/63448340> 399837 2020-05-20 07:35:59 -0700 2020-05-20 08:34:28 -0700 Patch bug-212135-20200520073558.patch text/plain 11500 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxODEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjEwMDUwZTFiM2M1ODgx MzIzNjY5ODRlZjJjYjQxNGQ5MzJkNGYzOS4uOGRiNTAwN2RlNWY2YTcwZDRiYWRiMjExYzhlYjJl MGYzMWRjOTM3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTA1LTIwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXSBJbnRlcm5h bCB0YWJsZSBib3hlcyBzaG91bGQgdGFrZSBjb2xsYXBzZWQgYm9yZGVyIGludG8gYWNjb3VudAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMTM1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIHRoZSBj b2xsYXBzZWQgYm9yZGVyIHZhbHVlIHRvIGNvbXB1dGUgdGhlIGJvcmRlcnMgZm9yIHNlY3Rpb25z LCByb3dzIGFuZCBjZWxscy4KKyAgICAgICAgVGhlIGNvbGxhcHNlZCBib3JkZXIgaXMgcHJvcGFn YXRlZCB0byB0aGUgdGFibGUgYm94IGFuZCB0aGUgYWRqYWNlbnQgY2VsbCBib3hlcy4gIAorCisg ICAgICAgIFRlc3Q6IGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc2ltcGxlLWJv cmRlci1jb2xsYXBzZS5odG1sCisKKyAgICAgICAgKiBsYXlvdXQvTGF5b3V0VW5pdHMuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6b3BlcmF0b3IvKToKKyAgICAgICAgKiBsYXlvdXQvYmxv Y2tmb3JtYXR0aW5nL3RhYmxld3JhcHBlci9UYWJsZVdyYXBwZXJCbG9ja0Zvcm1hdHRpbmdDb250 ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVXcmFwcGVyQmxvY2tGb3Jt YXR0aW5nQ29udGV4dDo6Y29tcHV0ZUJvcmRlckFuZFBhZGRpbmdGb3JUYWJsZUJveCk6CisgICAg ICAgICogbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nQ29udGV4dDo6c2V0VXNl ZEdlb21ldHJ5Rm9yUm93cyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlRhYmxlRm9ybWF0 dGluZ0NvbnRleHQ6OnNldFVzZWRHZW9tZXRyeUZvclNlY3Rpb25zKToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0Q2VsbCk6CisgICAgICAg ICogbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUdyaWQuaDoKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6VGFibGVHcmlkOjpzZXRDb2xsYXBzZWRCb3JkZXIpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpUYWJsZUdyaWQ6OmNvbGxhcHNlZEJvcmRlciBjb25zdCk6CisKIDIwMjAtMDUt MTggIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtURkNd IEFkZCBzdXBwb3J0IGZvciBjb21wdXRpbmcgdGhlIGNvbGxhcHNlZCB0YWJsZSBib3JkZXIKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRVbml0cy5oIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L0xheW91dFVuaXRzLmgKaW5kZXggNjI2MGY4YzBhYWI1MjIxNjI1NTY3NjY3 YWQ0MzEwZjE5NmFlODVkOS4uNThjMDk2ZGYyODEyOWJkZmUyODU1MTUxYTVkMGM3N2M3ZTUzYmVk YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFVuaXRzLmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFVuaXRzLmgKQEAgLTEzMSw2ICsxMzEsMTEgQEAg c3RydWN0IEVkZ2VzIHsKICAgICBWZXJ0aWNhbEVkZ2VzIHZlcnRpY2FsOwogfTsKIAoraW5saW5l IEVkZ2VzIG9wZXJhdG9yLyhjb25zdCBFZGdlcyYgZWRnZSwgc2l6ZV90IHZhbHVlKQoreworICAg IHJldHVybiB7IHsgZWRnZS5ob3Jpem9udGFsLmxlZnQgLyB2YWx1ZSwgZWRnZS5ob3Jpem9udGFs LnJpZ2h0IC8gdmFsdWUgfSwgeyBlZGdlLnZlcnRpY2FsLnRvcCAvIHZhbHVlLCBlZGdlLnZlcnRp Y2FsLmJvdHRvbSAvIHZhbHVlIH0gfTsKK30KKwogc3RydWN0IENvbnRlbnRXaWR0aEFuZE1hcmdp biB7CiAgICAgTGF5b3V0VW5pdCBjb250ZW50V2lkdGg7CiAgICAgVXNlZEhvcml6b250YWxNYXJn aW4gdXNlZE1hcmdpbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zv cm1hdHRpbmcvdGFibGV3cmFwcGVyL1RhYmxlV3JhcHBlckJsb2NrRm9ybWF0dGluZ0NvbnRleHQu Y3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy90YWJsZXdyYXBwZXIv VGFibGVXcmFwcGVyQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggNWJjYjgwOTFkMDQ0 ZGZlNWMzMzJjNGEwNjliYWNmNTU2MmE4YWU3Ni4uNzBkMTllNmFlMTdlMzBkZTcwMzBlNmEyZjdk OTFmMGE3Y2EyODlkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy90YWJsZXdyYXBwZXIvVGFibGVXcmFwcGVyQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy90YWJsZXdyYXBw ZXIvVGFibGVXcmFwcGVyQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTEwNCwxMCArMTA0 LDExIEBAIHZvaWQgVGFibGVXcmFwcGVyQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUJv cmRlckFuZFBhZGRpbmdGb3JUYWJsZUJveChjb25zCiAgICAgICAgICAgICB0b3BCb3JkZXIgPSBz dGQ6Om1heCh0b3BCb3JkZXIsIGdlb21ldHJ5KCkuY29tcHV0ZWRCb3JkZXIoYm94SW5GaXJzdFJv eCkudmVydGljYWwudG9wKTsKICAgICAgICAgICAgIGJvdHRvbUJvcmRlciA9IHN0ZDo6bWF4KGJv dHRvbUJvcmRlciwgZ2VvbWV0cnkoKS5jb21wdXRlZEJvcmRlcihib3hJbkxhc3RSb3cpLnZlcnRp Y2FsLmJvdHRvbSk7CiAgICAgICAgIH0KLSAgICAgICAgYXV0byBjb2xsYXBzZWRCb3JkZXIgPSBF ZGdlcyB7IHsgbGVmdEJvcmRlciAvIDIsIHJpZ2h0Qm9yZGVyIC8gMiB9LCB7IHRvcEJvcmRlciAv IDIsIGJvdHRvbUJvcmRlciAvIDIgfSB9OworICAgICAgICBhdXRvIGNvbGxhcHNlZEJvcmRlciA9 IEVkZ2VzIHsgeyBsZWZ0Qm9yZGVyLCByaWdodEJvcmRlciB9LCB7IHRvcEJvcmRlciwgYm90dG9t Qm9yZGVyIH0gfTsKKyAgICAgICAgZ3JpZC5zZXRDb2xsYXBzZWRCb3JkZXIoY29sbGFwc2VkQm9y ZGVyKTsKIAogICAgICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gZm9ybWF0dGluZ1N0YXRlKCkuZGlz cGxheUJveCh0YWJsZUJveCk7Ci0gICAgICAgIGRpc3BsYXlCb3guc2V0Qm9yZGVyKGNvbGxhcHNl ZEJvcmRlcik7CisgICAgICAgIGRpc3BsYXlCb3guc2V0Qm9yZGVyKGNvbGxhcHNlZEJvcmRlciAv IDIpOwogICAgICAgICBkaXNwbGF5Qm94LnNldFBhZGRpbmcoZ2VvbWV0cnkoKS5jb21wdXRlZFBh ZGRpbmcodGFibGVCb3gsIGhvcml6b250YWxDb25zdHJhaW50cy5sb2dpY2FsV2lkdGgpKTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90 YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4 IGZmOTdjYmNlMTJhNDJmODNlOGUxYjM4YTVlMWM0Mjc2ODFiZDhmNDEuLjJhOGIyZTc5YTg1ZGM4 MTg3MDI0Mzk5MjA0M2QyYmM1OTk2ZTJlYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0 LmNwcApAQCAtMTE1LDEwICsxMTUsMjUgQEAgdm9pZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0Ojpz ZXRVc2VkR2VvbWV0cnlGb3JSb3dzKExheW91dFVuaXQgYXZhaWxhYmxlSG9yaXpvbnQKIAogICAg IGF1dG8gcm93V2lkdGggPSBncmlkLmNvbHVtbnMoKS5sb2dpY2FsV2lkdGgoKSArIDIgKiBncmlk Lmhvcml6b250YWxTcGFjaW5nKCk7CiAgICAgYXV0byByb3dMb2dpY2FsVG9wID0gZ3JpZC52ZXJ0 aWNhbFNwYWNpbmcoKTsKLSAgICBmb3IgKGF1dG8mIHJvdyA6IHJvd3MpIHsKKyAgICBmb3IgKHNp emVfdCByb3dJbmRleCA9IDA7IHJvd0luZGV4IDwgcm93cy5zaXplKCk7ICsrcm93SW5kZXgpIHsK KyAgICAgICAgYXV0byYgcm93ID0gcm93c1tyb3dJbmRleF07CiAgICAgICAgIGF1dG8mIHJvd0Jv eCA9IHJvdy5ib3goKTsKICAgICAgICAgYXV0byYgcm93RGlzcGxheUJveCA9IGZvcm1hdHRpbmdT dGF0ZSgpLmRpc3BsYXlCb3gocm93Qm94KTsKLSAgICAgICAgY29tcHV0ZUJvcmRlckFuZFBhZGRp bmcocm93Qm94LCBIb3Jpem9udGFsQ29uc3RyYWludHMgeyB7IH0sIGF2YWlsYWJsZUhvcml6b250 YWxTcGFjZSB9KTsKKworICAgICAgICBhdXRvIGNvbXB1dGVkUm93Qm9yZGVyID0gWyZdIHsKKyAg ICAgICAgICAgIGF1dG8gYm9yZGVyID0gZ2VvbWV0cnkoKS5jb21wdXRlZEJvcmRlcihyb3dCb3gp OworICAgICAgICAgICAgaWYgKCFncmlkLmNvbGxhcHNlZEJvcmRlcigpKQorICAgICAgICAgICAg ICAgIHJldHVybiBib3JkZXI7CisgICAgICAgICAgICAvLyBCb3JkZXIgY29sbGFwc2luZyBkZWxl Z2F0ZXMgYm9yZGVycyB0byB0YWJsZS9jZWxscy4KKyAgICAgICAgICAgIGJvcmRlci5ob3Jpem9u dGFsID0geyB9OworICAgICAgICAgICAgaWYgKCFyb3dJbmRleCkKKyAgICAgICAgICAgICAgICBi b3JkZXIudmVydGljYWwudG9wID0geyB9OworICAgICAgICAgICAgaWYgKHJvd0luZGV4ID09IHJv d3Muc2l6ZSgpIC0gMSkKKyAgICAgICAgICAgICAgICBib3JkZXIudmVydGljYWwuYm90dG9tID0g eyB9OworICAgICAgICAgICAgcmV0dXJuIGJvcmRlcjsKKyAgICAgICAgfSgpOworICAgICAgICBy b3dEaXNwbGF5Qm94LnNldEJvcmRlcihjb21wdXRlZFJvd0JvcmRlcik7CisgICAgICAgIHJvd0Rp c3BsYXlCb3guc2V0UGFkZGluZyhnZW9tZXRyeSgpLmNvbXB1dGVkUGFkZGluZyhyb3dCb3gsIGF2 YWlsYWJsZUhvcml6b250YWxTcGFjZSkpOwogICAgICAgICAvLyBJbnRlcm5hbCB0YWJsZSBlbGVt ZW50cyBkbyBub3QgaGF2ZSBtYXJnaW5zLgogICAgICAgICByb3dEaXNwbGF5Qm94LnNldEhvcml6 b250YWxNYXJnaW4oeyB9KTsKICAgICAgICAgcm93RGlzcGxheUJveC5zZXRIb3Jpem9udGFsQ29t cHV0ZWRNYXJnaW4oeyB9KTsKQEAgLTE1OCw3ICsxNzMsOSBAQCB2b2lkIFRhYmxlRm9ybWF0dGlu Z0NvbnRleHQ6OnNldFVzZWRHZW9tZXRyeUZvclNlY3Rpb25zKGNvbnN0IENvbnN0cmFpbnRzRm9y SW5GbAogICAgIGF1dG8gbG9naWNhbFRvcCA9IGNvbnN0cmFpbnRzLnZlcnRpY2FsLmxvZ2ljYWxU b3A7CiAgICAgZm9yIChhdXRvJiBzZWN0aW9uIDogY2hpbGRyZW5PZlR5cGU8Q29udGFpbmVyQm94 Pihyb290KCkpKSB7CiAgICAgICAgIGF1dG8mIHNlY3Rpb25EaXNwbGF5Qm94ID0gZm9ybWF0dGlu Z1N0YXRlKCkuZGlzcGxheUJveChzZWN0aW9uKTsKLSAgICAgICAgY29tcHV0ZUJvcmRlckFuZFBh ZGRpbmcoc2VjdGlvbiwgSG9yaXpvbnRhbENvbnN0cmFpbnRzIHsgeyB9LCBjb25zdHJhaW50cy5o b3Jpem9udGFsLmxvZ2ljYWxXaWR0aCB9KTsKKyAgICAgICAgLy8gRklYTUU6IE11bHRpcGxlIHNl Y3Rpb25zIGNhbiBoYXZlIHRoZWlyIG93biBib3JkZXJzLgorICAgICAgICBzZWN0aW9uRGlzcGxh eUJveC5zZXRCb3JkZXIoZ3JpZC5jb2xsYXBzZWRCb3JkZXIoKSA/IEVkZ2VzKCk6IGdlb21ldHJ5 KCkuY29tcHV0ZWRCb3JkZXIoc2VjdGlvbikpOworICAgICAgICBzZWN0aW9uRGlzcGxheUJveC5z ZXRQYWRkaW5nKGdlb21ldHJ5KCkuY29tcHV0ZWRQYWRkaW5nKHNlY3Rpb24sIGNvbnN0cmFpbnRz Lmhvcml6b250YWwubG9naWNhbFdpZHRoKSk7CiAgICAgICAgIC8vIEludGVybmFsIHRhYmxlIGVs ZW1lbnRzIGRvIG5vdCBoYXZlIG1hcmdpbnMuCiAgICAgICAgIHNlY3Rpb25EaXNwbGF5Qm94LnNl dEhvcml6b250YWxNYXJnaW4oeyB9KTsKICAgICAgICAgc2VjdGlvbkRpc3BsYXlCb3guc2V0SG9y aXpvbnRhbENvbXB1dGVkTWFyZ2luKHsgfSk7CkBAIC0xNzgsMTcgKzE5NSwzNCBAQCB2b2lkIFRh YmxlRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dENlbGwoY29uc3QgVGFibGVHcmlkOjpDZWxsJiBj ZWxsLCBMYXlvdXRVbml0CiB7CiAgICAgQVNTRVJUKGNlbGwuYm94KCkuZXN0YWJsaXNoZXNCbG9j a0Zvcm1hdHRpbmdDb250ZXh0KCkpOwogCisgICAgYXV0byYgZ3JpZCA9IGZvcm1hdHRpbmdTdGF0 ZSgpLnRhYmxlR3JpZCgpOwogICAgIGF1dG8mIGNlbGxCb3ggPSBjZWxsLmJveCgpOwogICAgIGF1 dG8mIGNlbGxEaXNwbGF5Qm94ID0gZm9ybWF0dGluZ1N0YXRlKCkuZGlzcGxheUJveChjZWxsQm94 KTsKIAotICAgIGNvbXB1dGVCb3JkZXJBbmRQYWRkaW5nKGNlbGxCb3gsIEhvcml6b250YWxDb25z dHJhaW50cyB7IHsgfSwgYXZhaWxhYmxlSG9yaXpvbnRhbFNwYWNlIH0pOworICAgIGF1dG8gY29t cHV0ZWRDZWxsQm9yZGVyID0gWyZdIHsKKyAgICAgICAgYXV0byBib3JkZXIgPSBnZW9tZXRyeSgp LmNvbXB1dGVkQm9yZGVyKGNlbGxCb3gpOworICAgICAgICBhdXRvIGNvbGxhcHNlZEJvcmRlciA9 IGdyaWQuY29sbGFwc2VkQm9yZGVyKCk7CisgICAgICAgIGlmICghY29sbGFwc2VkQm9yZGVyKQor ICAgICAgICAgICAgcmV0dXJuIGJvcmRlcjsKKyAgICAgICAgYXV0byBjZWxsUG9zaXRpb24gPSBj ZWxsLnBvc2l0aW9uKCk7CisgICAgICAgIGlmICghY2VsbFBvc2l0aW9uLmNvbHVtbikKKyAgICAg ICAgICAgIGJvcmRlci5ob3Jpem9udGFsLmxlZnQgPSBjb2xsYXBzZWRCb3JkZXItPmhvcml6b250 YWwubGVmdCAvIDI7CisgICAgICAgIGlmIChjZWxsUG9zaXRpb24uY29sdW1uID09IGdyaWQuY29s dW1ucygpLnNpemUoKSAtIDEpCisgICAgICAgICAgICBib3JkZXIuaG9yaXpvbnRhbC5yaWdodCA9 IGNvbGxhcHNlZEJvcmRlci0+aG9yaXpvbnRhbC5yaWdodCAvIDI7CisgICAgICAgIGlmICghY2Vs bFBvc2l0aW9uLnJvdykKKyAgICAgICAgICAgIGJvcmRlci52ZXJ0aWNhbC50b3AgPSBjb2xsYXBz ZWRCb3JkZXItPnZlcnRpY2FsLnRvcCAvIDI7CisgICAgICAgIGlmIChjZWxsUG9zaXRpb24ucm93 ID09IGdyaWQucm93cygpLnNpemUoKSAtIDEpCisgICAgICAgICAgICBib3JkZXIudmVydGljYWwu Ym90dG9tID0gY29sbGFwc2VkQm9yZGVyLT52ZXJ0aWNhbC5ib3R0b20gLyAyOworICAgICAgICBy ZXR1cm4gYm9yZGVyOworICAgIH0oKTsKKyAgICBjZWxsRGlzcGxheUJveC5zZXRCb3JkZXIoY29t cHV0ZWRDZWxsQm9yZGVyKTsKKyAgICBjZWxsRGlzcGxheUJveC5zZXRQYWRkaW5nKGdlb21ldHJ5 KCkuY29tcHV0ZWRQYWRkaW5nKGNlbGxCb3gsIGF2YWlsYWJsZUhvcml6b250YWxTcGFjZSkpOwog ICAgIC8vIEludGVybmFsIHRhYmxlIGVsZW1lbnRzIGRvIG5vdCBoYXZlIG1hcmdpbnMuCiAgICAg Y2VsbERpc3BsYXlCb3guc2V0SG9yaXpvbnRhbE1hcmdpbih7IH0pOwogICAgIGNlbGxEaXNwbGF5 Qm94LnNldEhvcml6b250YWxDb21wdXRlZE1hcmdpbih7IH0pOwogICAgIGNlbGxEaXNwbGF5Qm94 LnNldFZlcnRpY2FsTWFyZ2luKHsgeyB9LCB7IH0gfSk7CiAKICAgICBhdXRvIGF2YWlsYWJsZVNw YWNlRm9yQ29udGVudCA9IFsmXSB7Ci0gICAgICAgIGF1dG8mIGdyaWQgPSBmb3JtYXR0aW5nU3Rh dGUoKS50YWJsZUdyaWQoKTsKICAgICAgICAgYXV0byYgY29sdW1uTGlzdCA9IGdyaWQuY29sdW1u cygpLmxpc3QoKTsKICAgICAgICAgYXV0byBsb2dpY2FsV2lkdGggPSBMYXlvdXRVbml0IHsgfTsK ICAgICAgICAgZm9yIChhdXRvIGNvbHVtbkluZGV4ID0gY2VsbC5zdGFydENvbHVtbigpOyBjb2x1 bW5JbmRleCA8IGNlbGwuZW5kQ29sdW1uKCk7ICsrY29sdW1uSW5kZXgpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlR3JpZC5oIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUdyaWQuaAppbmRleCAxNjI0OWI3 OGE4ZjFiYmI1MGZhMDQzZGIyYjFiNDQ0M2E0ZDI1NjM0Li5jM2RhMzczYWQ5OWRmYzhkMTYyODRk NTMxMWMwMWIwNzdkZjczYzQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFi bGVmb3JtYXR0aW5nL1RhYmxlR3JpZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJs ZWZvcm1hdHRpbmcvVGFibGVHcmlkLmgKQEAgLTU1LDYgKzU1LDkgQEAgcHVibGljOgogICAgIHZv aWQgc2V0VmVydGljYWxTcGFjaW5nKExheW91dFVuaXQgdmVydGljYWxTcGFjaW5nKSB7IG1fdmVy dGljYWxTcGFjaW5nID0gdmVydGljYWxTcGFjaW5nOyB9CiAgICAgTGF5b3V0VW5pdCB2ZXJ0aWNh bFNwYWNpbmcoKSBjb25zdCB7IHJldHVybiBtX3ZlcnRpY2FsU3BhY2luZzsgfQogCisgICAgdm9p ZCBzZXRDb2xsYXBzZWRCb3JkZXIoY29uc3QgRWRnZXMmIGNvbGxhcHNlZEJvcmRlcikgeyBtX2Nv bGxhcHNlZEJvcmRlciA9IGNvbGxhcHNlZEJvcmRlcjsgfQorICAgIE9wdGlvbmFsPEVkZ2VzPiBj b2xsYXBzZWRCb3JkZXIoKSBjb25zdCB7IHJldHVybiBtX2NvbGxhcHNlZEJvcmRlcjsgfQorCiAg ICAgdm9pZCBzZXRXaWR0aENvbnN0cmFpbnRzKEZvcm1hdHRpbmdDb250ZXh0OjpJbnRyaW5zaWNX aWR0aENvbnN0cmFpbnRzIGludHJpbnNpY1dpZHRoQ29uc3RyYWludHMpIHsgbV9pbnRyaW5zaWNX aWR0aENvbnN0cmFpbnRzID0gaW50cmluc2ljV2lkdGhDb25zdHJhaW50czsgfQogICAgIE9wdGlv bmFsPEZvcm1hdHRpbmdDb250ZXh0OjpJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzPiB3aWR0aENv bnN0cmFpbnRzKCkgY29uc3QgeyByZXR1cm4gbV9pbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzOyB9 CiAKQEAgLTIyOCw2ICsyMzEsNyBAQCBwcml2YXRlOgogICAgIExheW91dFVuaXQgbV9ob3Jpem9u dGFsU3BhY2luZzsKICAgICBMYXlvdXRVbml0IG1fdmVydGljYWxTcGFjaW5nOwogICAgIE9wdGlv bmFsPEZvcm1hdHRpbmdDb250ZXh0OjpJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzPiBtX2ludHJp bnNpY1dpZHRoQ29uc3RyYWludHM7CisgICAgT3B0aW9uYWw8RWRnZXM+IG1fY29sbGFwc2VkQm9y ZGVyOwogfTsKIAogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGY1ZWRjZGY5NzY2ZGJkNDU3NTEyNWFmZTM0ZWI3MGUyZDIx OGMxOTcuLmY5MzRlNjZlNDBhNWY1MDkwOTRlNTdkOTE2ZWJiNjY0OTA4YTA4NjQgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxMyBAQAorMjAyMC0wNS0yMCAgQWxhbiBLaW5zbGV5ICA8emFsYW5AYXBwbGUuY29t PgorCisgICAgICAgIFtMRkNdW1RGQ10gSW50ZXJuYWwgdGFibGUgYm94ZXMgc2hvdWxkIHRha2Ug Y29sbGFwc2VkIGJvcmRlciBpbnRvIGFjY291bnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjEzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJs ZS1zaW1wbGUtYm9yZGVyLWNvbGxhcHNlLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAq IGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc2ltcGxlLWJvcmRlci1jb2xsYXBz ZS5odG1sOiBBZGRlZC4KKwogMjAyMC0wNS0xOCAgRGllZ28gUGlubyBHYXJjaWEgIDxkcGlub0Bp Z2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIEdhcmRlbmluZywgdXBkYXRlIHRlc3QgZXhwZWN0 YXRpb25zIGFmdGVyIHIyNjE3NzkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0 Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc2ltcGxlLWJvcmRlci1jb2xsYXBzZS1leHBlY3RlZC5o dG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS1zaW1w bGUtYm9yZGVyLWNvbGxhcHNlLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMmRiNTI0YWU2Yzlj ZGJmNDNhNTBmNzBjMDA2ZmM3MjQ2YmQyOWM2ZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc2ltcGxlLWJvcmRlci1jb2xs YXBzZS1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsOSBAQAorPCFET0NUWVBFIGh0bWw+IDwhLS0g d2Via2l0LXRlc3QtcnVubmVyIFsgaW50ZXJuYWw6TGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRFbmFi bGVkPXRydWUgaW50ZXJuYWw6TGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRJbnRlZ3JhdGlvbkVuYWJs ZWQ9ZmFsc2UgXSAtLT4KKzxzdHlsZT4KK2RpdiB7CisgICAgaGVpZ2h0OiAxMHB4OworICAgIHdp ZHRoOiAxMHB4OworICAgIGJvcmRlcjogMjBweCBzb2xpZCBncmVlbjsKK30KKzwvc3R5bGU+Cis8 ZGl2PjwvZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5n Y29udGV4dC90YWJsZS1zaW1wbGUtYm9yZGVyLWNvbGxhcHNlLmh0bWwgYi9MYXlvdXRUZXN0cy9m YXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLXNpbXBsZS1ib3JkZXItY29sbGFwc2Uu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi5mNDUyZjdkMTBlNzk2OTI5MTM3YWE5ZjgwODVmMTg4YWQxNmYyOTY5 Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29u dGV4dC90YWJsZS1zaW1wbGUtYm9yZGVyLWNvbGxhcHNlLmh0bWwKQEAgLTAsMCArMSwxNSBAQAor PCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgaW50ZXJuYWw6TGF5b3V0 Rm9ybWF0dGluZ0NvbnRleHRFbmFibGVkPXRydWUgaW50ZXJuYWw6TGF5b3V0Rm9ybWF0dGluZ0Nv bnRleHRJbnRlZ3JhdGlvbkVuYWJsZWQ9ZmFsc2UgXSAtLT4KKzxzdHlsZT4KK3RhYmxlIHsKKyAg ICBib3JkZXItY29sbGFwc2U6IGNvbGxhcHNlOworICAgIGJvcmRlcjogMjBweCBzb2xpZCBncmVl bjsKK30KKwordGQgeworICAgIHdpZHRoOiAxMHB4OworICAgIGhlaWdodDogMTBweDsKKyAgICBi b3JkZXI6IDEwcHggc29saWQgZ3JlZW47CisgICAgcGFkZGluZzogMHB4OworfQorPC9zdHlsZT4K Kzx0YWJsZT48dHI+PHRkPjwvdGQ+PC90cj48L3Rib2R5PjwvdGFibGU+Cg==