212971 2020-06-09 08:03:38 -0700 [LFC][TFC] Add support for empty table 2020-06-09 09:00:23 -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 1660689 0 zalan 2020-06-09 08:03:38 -0700 ssia 1660690 1 401439 zalan 2020-06-09 08:08:18 -0700 Created attachment 401439 Patch 1660706 2 ews-feeder 2020-06-09 08:59:33 -0700 Committed r262795: <https://trac.webkit.org/changeset/262795> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401439. 1660707 3 webkit-bug-importer 2020-06-09 09:00:23 -0700 <rdar://problem/64166079> 401439 2020-06-09 08:08:18 -0700 2020-06-09 08:59:33 -0700 Patch bug-212971-20200609080817.patch text/plain 15016 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDVkOWExZjE4MWJjYTY2 OTk4NzdlNjU5MWJhZDQ0MDk5NWFkOTg5ZS4uYjk2YWNiNWVkNmVmYjYwOTEzZTI5YzY4OGRiMzEy ZjMyZmI5NGM5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA2LTA5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXSBBZGQgc3Vw cG9ydCBmb3IgZW1wdHkgdGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxMjk3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE5vIG5lZWQgdG8gcnVuIGZvcm1hdHRpbmcgY29udGV4dCBsYXlvdXQgd2hl biB0aGUgdGFibGUgYm94IGhhcyBubyBkZXNjZW5kYW50LgorCisgICAgICAgIFRlc3Q6IGZhc3Qv bGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvZW1wdHktdGFibGUtYm94Lmh0bWwKKworICAgICAgICAq IGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvdGFibGV3cmFwcGVyL1RhYmxlV3JhcHBlckJsb2NrRm9y bWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZVdyYXBw ZXJCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRUYWJsZUJveCk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OlRhYmxlV3JhcHBlckJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVC b3JkZXJBbmRQYWRkaW5nRm9yVGFibGVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpU YWJsZVdyYXBwZXJCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlV2lkdGhBbmRNYXJnaW5G b3JUYWJsZUJveCk6CisgICAgICAgICogbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1h dHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0 aW5nQ29udGV4dDo6ZW5zdXJlVGFibGVHcmlkKToKKyAgICAgICAgKiBsYXlvdXQvdGFibGVmb3Jt YXR0aW5nL1RhYmxlR3JpZC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUdyaWQ6 OmlzRW1wdHkgY29uc3QpOgorCiAyMDIwLTA2LTA4ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3VwcG9ydCBmb3IgbWluL21heC13aWR0 aC9oZWlnaHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRp bmcvdGFibGV3cmFwcGVyL1RhYmxlV3JhcHBlckJsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy90YWJsZXdyYXBwZXIvVGFibGVX cmFwcGVyQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggNjQ1YWQ3MGQ1YzViOGRiZGVi YjZhOGI2OTE5NjQwYjQ1YjE1MDJhYy4uNmVmZWZlNzQ0YzM2N2VhOWI1M2UxNmExMmU3ODlmZDc3 MTc0ZTEwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGlu Zy90YWJsZXdyYXBwZXIvVGFibGVXcmFwcGVyQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy90YWJsZXdyYXBwZXIvVGFi bGVXcmFwcGVyQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTczLDggKzczLDEwIEBAIHZv aWQgVGFibGVXcmFwcGVyQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0VGFibGVCb3goY29u c3QgQ29udGFpbmVyQm94JiB0YWJsCiAgICAgY29tcHV0ZVdpZHRoQW5kTWFyZ2luRm9yVGFibGVC b3godGFibGVCb3gsIGNvbnN0cmFpbnRzLmhvcml6b250YWwpOwogICAgIGNvbXB1dGVTdGF0aWNI b3Jpem9udGFsUG9zaXRpb24odGFibGVCb3gsIGNvbnN0cmFpbnRzLmhvcml6b250YWwpOwogCi0g ICAgYXV0byBpbnZhbGlkYXRpb25TdGF0ZSA9IEludmFsaWRhdGlvblN0YXRlIHsgfTsKLSAgICBM YXlvdXRDb250ZXh0OjpjcmVhdGVGb3JtYXR0aW5nQ29udGV4dCh0YWJsZUJveCwgbGF5b3V0U3Rh dGUoKSktPmxheW91dEluRmxvd0NvbnRlbnQoaW52YWxpZGF0aW9uU3RhdGUsIGdlb21ldHJ5KCku Y29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50KHRhYmxlQm94KSk7CisgICAgaWYgKHRhYmxlQm94 Lmhhc0NoaWxkKCkpIHsKKyAgICAgICAgYXV0byBpbnZhbGlkYXRpb25TdGF0ZSA9IEludmFsaWRh dGlvblN0YXRlIHsgfTsKKyAgICAgICAgTGF5b3V0Q29udGV4dDo6Y3JlYXRlRm9ybWF0dGluZ0Nv bnRleHQodGFibGVCb3gsIGxheW91dFN0YXRlKCkpLT5sYXlvdXRJbkZsb3dDb250ZW50KGludmFs aWRhdGlvblN0YXRlLCBnZW9tZXRyeSgpLmNvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudCh0YWJs ZUJveCkpOworICAgIH0KIAogICAgIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW5Gb3JUYWJsZUJveCh0 YWJsZUJveCwgY29uc3RyYWludHMpOwogfQpAQCAtODIsNjYgKzg0LDc1IEBAIHZvaWQgVGFibGVX cmFwcGVyQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0VGFibGVCb3goY29uc3QgQ29udGFp bmVyQm94JiB0YWJsCiB2b2lkIFRhYmxlV3JhcHBlckJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNv bXB1dGVCb3JkZXJBbmRQYWRkaW5nRm9yVGFibGVCb3goY29uc3QgQ29udGFpbmVyQm94JiB0YWJs ZUJveCwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJiBob3Jpem9udGFsQ29uc3RyYWludHMp CiB7CiAgICAgQVNTRVJUKHRhYmxlQm94LmlzVGFibGVCb3goKSk7Ci0gICAgaWYgKHRhYmxlQm94 LnN0eWxlKCkuYm9yZGVyQ29sbGFwc2UoKSA9PSBCb3JkZXJDb2xsYXBzZTo6Q29sbGFwc2UpIHsK LSAgICAgICAgLy8gVUFzIG11c3QgY29tcHV0ZSBhbiBpbml0aWFsIGxlZnQgYW5kIHJpZ2h0IGJv cmRlciB3aWR0aCBmb3IgdGhlIHRhYmxlIGJ5IGV4YW1pbmluZwotICAgICAgICAvLyB0aGUgZmly c3QgYW5kIGxhc3QgY2VsbHMgaW4gdGhlIGZpcnN0IHJvdyBvZiB0aGUgdGFibGUuCi0gICAgICAg IC8vIFRoZSBsZWZ0IGJvcmRlciB3aWR0aCBvZiB0aGUgdGFibGUgaXMgaGFsZiBvZiB0aGUgZmly c3QgY2VsbCdzIGNvbGxhcHNlZCBsZWZ0IGJvcmRlciwKLSAgICAgICAgLy8gYW5kIHRoZSByaWdo dCBib3JkZXIgd2lkdGggb2YgdGhlIHRhYmxlIGlzIGhhbGYgb2YgdGhlIGxhc3QgY2VsbCdzIGNv bGxhcHNlZCByaWdodCBib3JkZXIuCi0gICAgICAgIC8vIFRoZSB0b3AgYm9yZGVyIHdpZHRoIG9m IHRoZSB0YWJsZSBpcyBjb21wdXRlZCBieSBleGFtaW5pbmcgYWxsIGNlbGxzIHdobyBjb2xsYXBz ZSB0aGVpciB0b3AKLSAgICAgICAgLy8gYm9yZGVycyB3aXRoIHRoZSB0b3AgYm9yZGVyIG9mIHRo ZSB0YWJsZS4gVGhlIHRvcCBib3JkZXIgd2lkdGggb2YgdGhlIHRhYmxlIGlzIGVxdWFsIHRvIGhh bGYgb2YgdGhlCi0gICAgICAgIC8vIG1heGltdW0gY29sbGFwc2VkIHRvcCBib3JkZXIuIFRoZSBi b3R0b20gYm9yZGVyIHdpZHRoIGlzIGNvbXB1dGVkIGJ5IGV4YW1pbmluZyBhbGwgY2VsbHMgd2hv c2UgYm90dG9tIGJvcmRlcnMgY29sbGFwc2UKLSAgICAgICAgLy8gd2l0aCB0aGUgYm90dG9tIG9m IHRoZSB0YWJsZS4gVGhlIGJvdHRvbSBib3JkZXIgd2lkdGggaXMgZXF1YWwgdG8gaGFsZiBvZiB0 aGUgbWF4aW11bSBjb2xsYXBzZWQgYm90dG9tIGJvcmRlci4KLSAgICAgICAgYXV0byYgZ3JpZCA9 IGxheW91dFN0YXRlKCkuZXN0YWJsaXNoZWRUYWJsZUZvcm1hdHRpbmdTdGF0ZSh0YWJsZUJveCku dGFibGVHcmlkKCk7Ci0gICAgICAgIGF1dG8gdGFibGVCb3JkZXIgPSBnZW9tZXRyeSgpLmNvbXB1 dGVkQm9yZGVyKHRhYmxlQm94KTsKLQotICAgICAgICBhdXRvJiBmaXJzdENvbHVtbkZpcnN0Um93 Qm94ID0gZ3JpZC5zbG90KHsgMCAsIDAgfSktPmNlbGwoKS5ib3goKTsKLSAgICAgICAgYXV0byBs ZWZ0Qm9yZGVyID0gc3RkOjptYXgodGFibGVCb3JkZXIuaG9yaXpvbnRhbC5sZWZ0LCBnZW9tZXRy eSgpLmNvbXB1dGVkQm9yZGVyKGZpcnN0Q29sdW1uRmlyc3RSb3dCb3gpLmhvcml6b250YWwubGVm dCk7Ci0KLSAgICAgICAgYXV0byYgbGFzdENvbHVtbkZpcnN0Um93ID0gZ3JpZC5zbG90KHsgZ3Jp ZC5jb2x1bW5zKCkuc2l6ZSgpIC0gMSwgMCB9KS0+Y2VsbCgpLmJveCgpOwotICAgICAgICBhdXRv IHJpZ2h0Qm9yZGVyID0gc3RkOjptYXgodGFibGVCb3JkZXIuaG9yaXpvbnRhbC5yaWdodCwgZ2Vv bWV0cnkoKS5jb21wdXRlZEJvcmRlcihsYXN0Q29sdW1uRmlyc3RSb3cpLmhvcml6b250YWwucmln aHQpOwotCi0gICAgICAgIGF1dG8gdG9wQm9yZGVyID0gdGFibGVCb3JkZXIudmVydGljYWwudG9w OwotICAgICAgICBhdXRvIGJvdHRvbUJvcmRlciA9IHRhYmxlQm9yZGVyLnZlcnRpY2FsLmJvdHRv bTsKLSAgICAgICAgYXV0byBsYXN0Um93SW5kZXggPSBncmlkLnJvd3MoKS5zaXplKCkgLSAxOwot ICAgICAgICBmb3IgKHNpemVfdCBjb2x1bW5JbmRleCA9IDA7IGNvbHVtbkluZGV4IDwgZ3JpZC5j b2x1bW5zKCkuc2l6ZSgpOyArK2NvbHVtbkluZGV4KSB7Ci0gICAgICAgICAgICBhdXRvJiBib3hJ bkZpcnN0Um94ID0gZ3JpZC5zbG90KHsgY29sdW1uSW5kZXgsIDAgfSktPmNlbGwoKS5ib3goKTsK LSAgICAgICAgICAgIGF1dG8mIGJveEluTGFzdFJvdyA9IGdyaWQuc2xvdCh7IGNvbHVtbkluZGV4 LCBsYXN0Um93SW5kZXggfSktPmNlbGwoKS5ib3goKTsKLQotICAgICAgICAgICAgdG9wQm9yZGVy ID0gc3RkOjptYXgodG9wQm9yZGVyLCBnZW9tZXRyeSgpLmNvbXB1dGVkQm9yZGVyKGJveEluRmly c3RSb3gpLnZlcnRpY2FsLnRvcCk7Ci0gICAgICAgICAgICBib3R0b21Cb3JkZXIgPSBzdGQ6Om1h eChib3R0b21Cb3JkZXIsIGdlb21ldHJ5KCkuY29tcHV0ZWRCb3JkZXIoYm94SW5MYXN0Um93KS52 ZXJ0aWNhbC5ib3R0b20pOwotICAgICAgICB9Ci0KLSAgICAgICAgdG9wQm9yZGVyID0gc3RkOjpt YXgodG9wQm9yZGVyLCBnZW9tZXRyeSgpLmNvbXB1dGVkQm9yZGVyKCp0YWJsZUJveC5maXJzdENo aWxkKCkpLnZlcnRpY2FsLnRvcCk7Ci0gICAgICAgIGZvciAoYXV0byYgc2VjdGlvbiA6IGNoaWxk cmVuT2ZUeXBlPENvbnRhaW5lckJveD4odGFibGVCb3gpKSB7Ci0gICAgICAgICAgICBhdXRvIGhv cml6dG9uYWxCb3JkZXIgPSBnZW9tZXRyeSgpLmNvbXB1dGVkQm9yZGVyKHNlY3Rpb24pLmhvcml6 b250YWw7Ci0gICAgICAgICAgICBsZWZ0Qm9yZGVyID0gc3RkOjptYXgobGVmdEJvcmRlciwgaG9y aXp0b25hbEJvcmRlci5sZWZ0KTsKLSAgICAgICAgICAgIHJpZ2h0Qm9yZGVyID0gc3RkOjptYXgo cmlnaHRCb3JkZXIsIGhvcml6dG9uYWxCb3JkZXIucmlnaHQpOwotICAgICAgICB9Ci0gICAgICAg IGJvdHRvbUJvcmRlciA9IHN0ZDo6bWF4KGJvdHRvbUJvcmRlciwgZ2VvbWV0cnkoKS5jb21wdXRl ZEJvcmRlcigqdGFibGVCb3gubGFzdENoaWxkKCkpLnZlcnRpY2FsLmJvdHRvbSk7Ci0KLSAgICAg ICAgYXV0byYgcm93cyA9IGdyaWQucm93cygpLmxpc3QoKTsKLSAgICAgICAgdG9wQm9yZGVyID0g c3RkOjptYXgodG9wQm9yZGVyLCBnZW9tZXRyeSgpLmNvbXB1dGVkQm9yZGVyKHJvd3MuZmlyc3Qo KS5ib3goKSkudmVydGljYWwudG9wKTsKLSAgICAgICAgZm9yIChhdXRvJiByb3cgOiByb3dzKSB7 Ci0gICAgICAgICAgICBhdXRvIGhvcml6dG9uYWxCb3JkZXIgPSBnZW9tZXRyeSgpLmNvbXB1dGVk Qm9yZGVyKHJvdy5ib3goKSkuaG9yaXpvbnRhbDsKLSAgICAgICAgICAgIGxlZnRCb3JkZXIgPSBz dGQ6Om1heChsZWZ0Qm9yZGVyLCBob3JpenRvbmFsQm9yZGVyLmxlZnQpOwotICAgICAgICAgICAg cmlnaHRCb3JkZXIgPSBzdGQ6Om1heChyaWdodEJvcmRlciwgaG9yaXp0b25hbEJvcmRlci5yaWdo dCk7Ci0gICAgICAgIH0KLSAgICAgICAgYm90dG9tQm9yZGVyID0gc3RkOjptYXgoYm90dG9tQm9y ZGVyLCBnZW9tZXRyeSgpLmNvbXB1dGVkQm9yZGVyKHJvd3MubGFzdCgpLmJveCgpKS52ZXJ0aWNh bC5ib3R0b20pOwotCi0gICAgICAgIGF1dG8gY29sbGFwc2VkQm9yZGVyID0gRWRnZXMgeyB7IGxl ZnRCb3JkZXIsIHJpZ2h0Qm9yZGVyIH0sIHsgdG9wQm9yZGVyLCBib3R0b21Cb3JkZXIgfSB9Owot ICAgICAgICBncmlkLnNldENvbGxhcHNlZEJvcmRlcihjb2xsYXBzZWRCb3JkZXIpOwotCi0gICAg ICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBmb3JtYXR0aW5nU3RhdGUoKS5kaXNwbGF5Qm94KHRhYmxl Qm94KTsKLSAgICAgICAgZGlzcGxheUJveC5zZXRCb3JkZXIoY29sbGFwc2VkQm9yZGVyIC8gMik7 Ci0gICAgICAgIGRpc3BsYXlCb3guc2V0UGFkZGluZyhnZW9tZXRyeSgpLmNvbXB1dGVkUGFkZGlu Zyh0YWJsZUJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLmxvZ2ljYWxXaWR0aCkpOworICAgIGlm ICghdGFibGVCb3guaGFzQ2hpbGQoKSB8fCB0YWJsZUJveC5zdHlsZSgpLmJvcmRlckNvbGxhcHNl KCkgPT0gQm9yZGVyQ29sbGFwc2U6OlNlcGFyYXRlKSB7CisgICAgICAgIEJsb2NrRm9ybWF0dGlu Z0NvbnRleHQ6OmNvbXB1dGVCb3JkZXJBbmRQYWRkaW5nKHRhYmxlQm94LCBob3Jpem9udGFsQ29u c3RyYWludHMpOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIEJsb2NrRm9ybWF0dGluZ0Nv bnRleHQ6OmNvbXB1dGVCb3JkZXJBbmRQYWRkaW5nKHRhYmxlQm94LCBob3Jpem9udGFsQ29uc3Ry YWludHMpOworICAgIC8vIFVBcyBtdXN0IGNvbXB1dGUgYW4gaW5pdGlhbCBsZWZ0IGFuZCByaWdo dCBib3JkZXIgd2lkdGggZm9yIHRoZSB0YWJsZSBieSBleGFtaW5pbmcKKyAgICAvLyB0aGUgZmly c3QgYW5kIGxhc3QgY2VsbHMgaW4gdGhlIGZpcnN0IHJvdyBvZiB0aGUgdGFibGUuCisgICAgLy8g VGhlIGxlZnQgYm9yZGVyIHdpZHRoIG9mIHRoZSB0YWJsZSBpcyBoYWxmIG9mIHRoZSBmaXJzdCBj ZWxsJ3MgY29sbGFwc2VkIGxlZnQgYm9yZGVyLAorICAgIC8vIGFuZCB0aGUgcmlnaHQgYm9yZGVy IHdpZHRoIG9mIHRoZSB0YWJsZSBpcyBoYWxmIG9mIHRoZSBsYXN0IGNlbGwncyBjb2xsYXBzZWQg cmlnaHQgYm9yZGVyLgorICAgIC8vIFRoZSB0b3AgYm9yZGVyIHdpZHRoIG9mIHRoZSB0YWJsZSBp cyBjb21wdXRlZCBieSBleGFtaW5pbmcgYWxsIGNlbGxzIHdobyBjb2xsYXBzZSB0aGVpciB0b3AK KyAgICAvLyBib3JkZXJzIHdpdGggdGhlIHRvcCBib3JkZXIgb2YgdGhlIHRhYmxlLiBUaGUgdG9w IGJvcmRlciB3aWR0aCBvZiB0aGUgdGFibGUgaXMgZXF1YWwgdG8gaGFsZiBvZiB0aGUKKyAgICAv LyBtYXhpbXVtIGNvbGxhcHNlZCB0b3AgYm9yZGVyLiBUaGUgYm90dG9tIGJvcmRlciB3aWR0aCBp cyBjb21wdXRlZCBieSBleGFtaW5pbmcgYWxsIGNlbGxzIHdob3NlIGJvdHRvbSBib3JkZXJzIGNv bGxhcHNlCisgICAgLy8gd2l0aCB0aGUgYm90dG9tIG9mIHRoZSB0YWJsZS4gVGhlIGJvdHRvbSBi b3JkZXIgd2lkdGggaXMgZXF1YWwgdG8gaGFsZiBvZiB0aGUgbWF4aW11bSBjb2xsYXBzZWQgYm90 dG9tIGJvcmRlci4KKyAgICBhdXRvJiBncmlkID0gbGF5b3V0U3RhdGUoKS5lc3RhYmxpc2hlZFRh YmxlRm9ybWF0dGluZ1N0YXRlKHRhYmxlQm94KS50YWJsZUdyaWQoKTsKKyAgICBhdXRvIHRhYmxl Qm9yZGVyID0gZ2VvbWV0cnkoKS5jb21wdXRlZEJvcmRlcih0YWJsZUJveCk7CisKKyAgICBhdXRv JiBmaXJzdENvbHVtbkZpcnN0Um93Qm94ID0gZ3JpZC5zbG90KHsgMCAsIDAgfSktPmNlbGwoKS5i b3goKTsKKyAgICBhdXRvIGxlZnRCb3JkZXIgPSBzdGQ6Om1heCh0YWJsZUJvcmRlci5ob3Jpem9u dGFsLmxlZnQsIGdlb21ldHJ5KCkuY29tcHV0ZWRCb3JkZXIoZmlyc3RDb2x1bW5GaXJzdFJvd0Jv eCkuaG9yaXpvbnRhbC5sZWZ0KTsKKworICAgIGF1dG8mIGxhc3RDb2x1bW5GaXJzdFJvdyA9IGdy aWQuc2xvdCh7IGdyaWQuY29sdW1ucygpLnNpemUoKSAtIDEsIDAgfSktPmNlbGwoKS5ib3goKTsK KyAgICBhdXRvIHJpZ2h0Qm9yZGVyID0gc3RkOjptYXgodGFibGVCb3JkZXIuaG9yaXpvbnRhbC5y aWdodCwgZ2VvbWV0cnkoKS5jb21wdXRlZEJvcmRlcihsYXN0Q29sdW1uRmlyc3RSb3cpLmhvcml6 b250YWwucmlnaHQpOworCisgICAgYXV0byB0b3BCb3JkZXIgPSB0YWJsZUJvcmRlci52ZXJ0aWNh bC50b3A7CisgICAgYXV0byBib3R0b21Cb3JkZXIgPSB0YWJsZUJvcmRlci52ZXJ0aWNhbC5ib3R0 b207CisgICAgYXV0byBsYXN0Um93SW5kZXggPSBncmlkLnJvd3MoKS5zaXplKCkgLSAxOworICAg IGZvciAoc2l6ZV90IGNvbHVtbkluZGV4ID0gMDsgY29sdW1uSW5kZXggPCBncmlkLmNvbHVtbnMo KS5zaXplKCk7ICsrY29sdW1uSW5kZXgpIHsKKyAgICAgICAgYXV0byYgYm94SW5GaXJzdFJveCA9 IGdyaWQuc2xvdCh7IGNvbHVtbkluZGV4LCAwIH0pLT5jZWxsKCkuYm94KCk7CisgICAgICAgIGF1 dG8mIGJveEluTGFzdFJvdyA9IGdyaWQuc2xvdCh7IGNvbHVtbkluZGV4LCBsYXN0Um93SW5kZXgg fSktPmNlbGwoKS5ib3goKTsKKworICAgICAgICB0b3BCb3JkZXIgPSBzdGQ6Om1heCh0b3BCb3Jk ZXIsIGdlb21ldHJ5KCkuY29tcHV0ZWRCb3JkZXIoYm94SW5GaXJzdFJveCkudmVydGljYWwudG9w KTsKKyAgICAgICAgYm90dG9tQm9yZGVyID0gc3RkOjptYXgoYm90dG9tQm9yZGVyLCBnZW9tZXRy eSgpLmNvbXB1dGVkQm9yZGVyKGJveEluTGFzdFJvdykudmVydGljYWwuYm90dG9tKTsKKyAgICB9 CisKKyAgICB0b3BCb3JkZXIgPSBzdGQ6Om1heCh0b3BCb3JkZXIsIGdlb21ldHJ5KCkuY29tcHV0 ZWRCb3JkZXIoKnRhYmxlQm94LmZpcnN0Q2hpbGQoKSkudmVydGljYWwudG9wKTsKKyAgICBmb3Ig KGF1dG8mIHNlY3Rpb24gOiBjaGlsZHJlbk9mVHlwZTxDb250YWluZXJCb3g+KHRhYmxlQm94KSkg eworICAgICAgICBhdXRvIGhvcml6dG9uYWxCb3JkZXIgPSBnZW9tZXRyeSgpLmNvbXB1dGVkQm9y ZGVyKHNlY3Rpb24pLmhvcml6b250YWw7CisgICAgICAgIGxlZnRCb3JkZXIgPSBzdGQ6Om1heChs ZWZ0Qm9yZGVyLCBob3JpenRvbmFsQm9yZGVyLmxlZnQpOworICAgICAgICByaWdodEJvcmRlciA9 IHN0ZDo6bWF4KHJpZ2h0Qm9yZGVyLCBob3JpenRvbmFsQm9yZGVyLnJpZ2h0KTsKKyAgICB9Cisg ICAgYm90dG9tQm9yZGVyID0gc3RkOjptYXgoYm90dG9tQm9yZGVyLCBnZW9tZXRyeSgpLmNvbXB1 dGVkQm9yZGVyKCp0YWJsZUJveC5sYXN0Q2hpbGQoKSkudmVydGljYWwuYm90dG9tKTsKKworICAg IGF1dG8mIHJvd3MgPSBncmlkLnJvd3MoKS5saXN0KCk7CisgICAgdG9wQm9yZGVyID0gc3RkOjpt YXgodG9wQm9yZGVyLCBnZW9tZXRyeSgpLmNvbXB1dGVkQm9yZGVyKHJvd3MuZmlyc3QoKS5ib3go KSkudmVydGljYWwudG9wKTsKKyAgICBmb3IgKGF1dG8mIHJvdyA6IHJvd3MpIHsKKyAgICAgICAg YXV0byBob3JpenRvbmFsQm9yZGVyID0gZ2VvbWV0cnkoKS5jb21wdXRlZEJvcmRlcihyb3cuYm94 KCkpLmhvcml6b250YWw7CisgICAgICAgIGxlZnRCb3JkZXIgPSBzdGQ6Om1heChsZWZ0Qm9yZGVy LCBob3JpenRvbmFsQm9yZGVyLmxlZnQpOworICAgICAgICByaWdodEJvcmRlciA9IHN0ZDo6bWF4 KHJpZ2h0Qm9yZGVyLCBob3JpenRvbmFsQm9yZGVyLnJpZ2h0KTsKKyAgICB9CisgICAgYm90dG9t Qm9yZGVyID0gc3RkOjptYXgoYm90dG9tQm9yZGVyLCBnZW9tZXRyeSgpLmNvbXB1dGVkQm9yZGVy KHJvd3MubGFzdCgpLmJveCgpKS52ZXJ0aWNhbC5ib3R0b20pOworCisgICAgYXV0byBjb2xsYXBz ZWRCb3JkZXIgPSBFZGdlcyB7IHsgbGVmdEJvcmRlciwgcmlnaHRCb3JkZXIgfSwgeyB0b3BCb3Jk ZXIsIGJvdHRvbUJvcmRlciB9IH07CisgICAgZ3JpZC5zZXRDb2xsYXBzZWRCb3JkZXIoY29sbGFw c2VkQm9yZGVyKTsKKworICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBmb3JtYXR0aW5nU3RhdGUoKS5k aXNwbGF5Qm94KHRhYmxlQm94KTsKKyAgICBkaXNwbGF5Qm94LnNldEJvcmRlcihjb2xsYXBzZWRC b3JkZXIgLyAyKTsKKyAgICBkaXNwbGF5Qm94LnNldFBhZGRpbmcoZ2VvbWV0cnkoKS5jb21wdXRl ZFBhZGRpbmcodGFibGVCb3gsIGhvcml6b250YWxDb25zdHJhaW50cy5sb2dpY2FsV2lkdGgpKTsK IH0KIAogdm9pZCBUYWJsZVdyYXBwZXJCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlV2lk dGhBbmRNYXJnaW5Gb3JUYWJsZUJveChjb25zdCBDb250YWluZXJCb3gmIHRhYmxlQm94LCBjb25z dCBIb3Jpem9udGFsQ29uc3RyYWludHMmIGhvcml6b250YWxDb25zdHJhaW50cykKIHsKICAgICBB U1NFUlQodGFibGVCb3guaXNUYWJsZUJveCgpKTsKKyAgICBpZiAoIXRhYmxlQm94Lmhhc0NoaWxk KCkpIHsKKyAgICAgICAgYXV0byBjb250ZW50V2lkdGhBbmRNYXJnaW4gPSBnZW9tZXRyeSgpLmlu Rmxvd1dpZHRoQW5kTWFyZ2luKHRhYmxlQm94LCBob3Jpem9udGFsQ29uc3RyYWludHMsIHsgfSk7 CisgICAgICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBmb3JtYXR0aW5nU3RhdGUoKS5kaXNwbGF5Qm94 KHRhYmxlQm94KTsKKyAgICAgICAgZGlzcGxheUJveC5zZXRDb250ZW50Qm94V2lkdGgoY29udGVu dFdpZHRoQW5kTWFyZ2luLmNvbnRlbnRXaWR0aCk7CisgICAgICAgIGRpc3BsYXlCb3guc2V0SG9y aXpvbnRhbE1hcmdpbihjb250ZW50V2lkdGhBbmRNYXJnaW4udXNlZE1hcmdpbik7CisgICAgICAg IGRpc3BsYXlCb3guc2V0SG9yaXpvbnRhbENvbXB1dGVkTWFyZ2luKGNvbnRlbnRXaWR0aEFuZE1h cmdpbi5jb21wdXRlZE1hcmdpbik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICAvLyBU aGlzIGlzIGEgc3BlY2lhbCB0YWJsZSAiZml0LWNvbnRlbnQgc2l6ZSIgYmVoYXZpb3IgaGFuZGxp bmcuIE5vdCBpbiB0aGUgc3BlYyB0aG91Z2guCiAgICAgLy8gVGFibGUgcmV0dXJucyBpdHMgZmlu YWwgd2lkdGggYXMgbWluL21heC4gVXNlIHRoaXMgZmluYWwgd2lkdGggdmFsdWUgdG8gY29tcHV0 ZWQgaG9yaXpvbnRhbCBtYXJnaW5zIGV0Yy4KICAgICBhdXRvJiBmb3JtYXR0aW5nU3RhdGVGb3JU YWJsZUJveCA9IGxheW91dFN0YXRlKCkuZXN0YWJsaXNoZWRUYWJsZUZvcm1hdHRpbmdTdGF0ZSh0 YWJsZUJveCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0 aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3Rh YmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA2MThlM2M1NGI3 MjhiNzRmMTZkMmE0NWRlZmMwMWI5MDFlMjVhNDQ2Li5kMjNhM2QxNGYzNDg1MDdlYjU0NDNjYjJh MDY3YjU2NWRlNTA4MTk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVm b3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTI5 Nyw2ICsyOTcsMTEgQEAgVW5pcXVlUmVmPFRhYmxlR3JpZD4gVGFibGVGb3JtYXR0aW5nQ29udGV4 dDo6ZW5zdXJlVGFibGVHcmlkKGNvbnN0IENvbnRhaW5lckJveCYKICAgICB0YWJsZUdyaWQtPnNl dFZlcnRpY2FsU3BhY2luZyhMYXlvdXRVbml0IHsgc2hvdWxkQXBwbHlCb3JkZXJTcGFjaW5nID8g dGFibGVTdHlsZS52ZXJ0aWNhbEJvcmRlclNwYWNpbmcoKSA6IDAgfSk7CiAKICAgICBhdXRvKiBm aXJzdENoaWxkID0gdGFibGVCb3guZmlyc3RDaGlsZCgpOworICAgIGlmICghZmlyc3RDaGlsZCkg eworICAgICAgICAvLyBUaGUgcmFyZSBjYXNlIG9mIGVtcHR5IHRhYmxlLgorICAgICAgICByZXR1 cm4gdGFibGVHcmlkOworICAgIH0KKwogICAgIGNvbnN0IEJveCogdGFibGVDYXB0aW9uID0gbnVs bHB0cjsKICAgICBjb25zdCBCb3gqIGNvbGdyb3VwID0gbnVsbHB0cjsKICAgICAvLyBUYWJsZSBj YXB0aW9uIGlzIGFuIG9wdGlvbmFsIGVsZW1lbnQ7IGlmIHVzZWQsIGl0IGlzIGFsd2F5cyB0aGUg Zmlyc3QgY2hpbGQgb2YgYSA8dGFibGU+LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUdyaWQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC90 YWJsZWZvcm1hdHRpbmcvVGFibGVHcmlkLmgKaW5kZXggOWE5MmY4YjMxM2UyNzg1ZTQzZDUxODQ3 ZjhlOTMwMjQ2MTBlZjI1Yi4uZDYzNDU5ODhlZWZlZmE2MmJhODM5M2VlZjE2ZTQ4Yjg0MDJkNTIw ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJs ZUdyaWQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxl R3JpZC5oCkBAIC02MSw2ICs2MSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFdpZHRoQ29uc3Ry YWludHMoRm9ybWF0dGluZ0NvbnRleHQ6OkludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgaW50cmlu c2ljV2lkdGhDb25zdHJhaW50cykgeyBtX2ludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgPSBpbnRy aW5zaWNXaWR0aENvbnN0cmFpbnRzOyB9CiAgICAgT3B0aW9uYWw8Rm9ybWF0dGluZ0NvbnRleHQ6 OkludHJpbnNpY1dpZHRoQ29uc3RyYWludHM+IHdpZHRoQ29uc3RyYWludHMoKSBjb25zdCB7IHJl dHVybiBtX2ludHJpbnNpY1dpZHRoQ29uc3RyYWludHM7IH0KIAorICAgIGJvb2wgaXNFbXB0eSgp IGNvbnN0IHsgcmV0dXJuIG1fc2xvdE1hcC5pc0VtcHR5KCk7IH0KICAgICAvLyBDb2x1bW4gcmVw cmVzZW50cyBhIHZlcnRpY2FsIHNldCBvZiBzbG90cyBpbiB0aGUgZ3JpZC4gQSBjb2x1bW4gaGFz IGhvcml6b250YWwgcG9zaXRpb24gYW5kIHdpZHRoLgogICAgIGNsYXNzIENvbHVtbiB7CiAgICAg cHVibGljOgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCmluZGV4IGMyMGEyMTFjZjY4NDkyNGEwNWZlM2YwMjk5MmQ5YzYxMDM1M2M3ZDEu LjJiYTVmZjc1YWM3MDBlNWE0OGU5MjljYTRlOTI3MTk2NDM0OTg2ZDIgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxMyBAQAorMjAyMC0wNi0wOSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisg ICAgICAgIFtMRkNdW1RGQ10gQWRkIHN1cHBvcnQgZm9yIGVtcHR5IHRhYmxlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTI5NzEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvbGF5b3V0Zm9ybWF0 dGluZ2NvbnRleHQvZW1wdHktdGFibGUtYm94LWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAg ICAqIGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvZW1wdHktdGFibGUtYm94Lmh0bWw6IEFk ZGVkLgorCiAyMDIwLTA2LTA4ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAg ICAgICAgW0xGQ11bSUZDXSBBZGQgc3VwcG9ydCBmb3IgbWluL21heC13aWR0aC9oZWlnaHQKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvZW1wdHkt dGFibGUtYm94LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRp bmdjb250ZXh0L2VtcHR5LXRhYmxlLWJveC1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjM1MWQ3 ZjllYWJjNDVlZTQxMjM4ZjY1ODJjNzg0ZDk4YzQ4MThmZDQKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2VtcHR5LXRhYmxlLWJveC1l eHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsOSBAQAorPCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBp bnRlcm5hbDpMYXlvdXRGb3JtYXR0aW5nQ29udGV4dEVuYWJsZWQ9dHJ1ZSBpbnRlcm5hbDpMYXlv dXRGb3JtYXR0aW5nQ29udGV4dEludGVncmF0aW9uRW5hYmxlZD1mYWxzZSBdIC0tPgorPHN0eWxl PgorZGl2IHsKKyAgICB3aWR0aDogMTAwcHg7CisgICAgaGVpZ2h0OiAxMDBweDsKK30KKzwvc3R5 bGU+Cis8ZGl2IHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsiPjwvZGl2PgorPGRpdiBz dHlsZT0iYmFja2dyb3VuZC1jb2xvcjogYmx1ZTsgaGVpZ2h0OiAxMHB4OyBtYXJnaW4tdG9wOiAt MTAwcHgiPjwvZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0 aW5nY29udGV4dC9lbXB0eS10YWJsZS1ib3guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0 Zm9ybWF0dGluZ2NvbnRleHQvZW1wdHktdGFibGUtYm94Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDU5ZGQw ZGFjZDZhYTk5OTRkNWEzMDJjNGM1NmFlYWM4NTYzODU2ZQotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvZW1wdHktdGFibGUtYm94Lmh0 bWwKQEAgLTAsMCArMSwxNyBAQAorPCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBpbnRlcm5hbDpM YXlvdXRGb3JtYXR0aW5nQ29udGV4dEVuYWJsZWQ9dHJ1ZSBpbnRlcm5hbDpMYXlvdXRGb3JtYXR0 aW5nQ29udGV4dEludGVncmF0aW9uRW5hYmxlZD1mYWxzZSBdIC0tPgorPHN0eWxlPgorLmNvbnRh aW5lciB7CisgICAgd2lkdGg6IDEwMHB4OworICAgIGhlaWdodDogMTAwcHg7CisgICAgYmFja2dy b3VuZDogZ3JlZW47Cit9CisuZW1wdHlfdGFibGUgeworICAgIGRpc3BsYXk6IHRhYmxlOworICAg IHdpZHRoOiA5MHB4OworICAgIGhlaWdodDogNTBweDsKKyAgICBib3JkZXI6IDVweCBzb2xpZCBi bHVlOworfQorPC9zdHlsZT4KKzxkaXYgY2xhc3M9Y29udGFpbmVyPgorICA8ZGl2IGNsYXNzPWVt cHR5X3RhYmxlPjwvZGl2PgorPC9kaXY+Cg==