212003 2020-05-17 15:26:24 -0700 [LFC][TFC] Add support for computing the collapsed table border 2020-05-18 07:02:15 -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 1653448 0 zalan 2020-05-17 15:26:24 -0700 this is just the table box part. cells needs to adapt to it. 1653449 1 399607 zalan 2020-05-17 15:34:06 -0700 Created attachment 399607 Patch 1653583 2 ews-feeder 2020-05-18 07:01:14 -0700 Committed r261810: <https://trac.webkit.org/changeset/261810> All reviewed patches have been landed. Closing bug and clearing flags on attachment 399607. 1653585 3 webkit-bug-importer 2020-05-18 07:02:15 -0700 <rdar://problem/63339436> 399607 2020-05-17 15:34:06 -0700 2020-05-18 07:01:14 -0700 Patch bug-212003-20200517153405.patch text/plain 17542 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxNzkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDFlNWRlZmFiZmM3ZGRj ZWQxMWIyNGNiYmJmZTJlOTMzMDA3YzdhZC4uOTM5NThiMTQ3ZmI5ZTJkODVmZTJhYjlmNDc1OGYy M2Q5YzliY2I3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIwLTA1LTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXSBBZGQgc3Vw cG9ydCBmb3IgY29tcHV0aW5nIHRoZSBjb2xsYXBzZWQgdGFibGUgYm9yZGVyCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTIwMDMKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVQXMgbXVzdCBjb21wdXRlIGFu IGluaXRpYWwgbGVmdCBhbmQgcmlnaHQgYm9yZGVyIHdpZHRoIGZvciB0aGUgdGFibGUgYnkgZXhh bWluaW5nCisgICAgICAgIHRoZSBmaXJzdCBhbmQgbGFzdCBjZWxscyBpbiB0aGUgZmlyc3Qgcm93 IG9mIHRoZSB0YWJsZS4KKyAgICAgICAgVGhlIGxlZnQgYm9yZGVyIHdpZHRoIG9mIHRoZSB0YWJs ZSBpcyBoYWxmIG9mIHRoZSBmaXJzdCBjZWxsJ3MgY29sbGFwc2VkIGxlZnQgYm9yZGVyLAorICAg ICAgICBhbmQgdGhlIHJpZ2h0IGJvcmRlciB3aWR0aCBvZiB0aGUgdGFibGUgaXMgaGFsZiBvZiB0 aGUgbGFzdCBjZWxsJ3MgY29sbGFwc2VkIHJpZ2h0IGJvcmRlci4KKyAgICAgICAgVGhlIHRvcCBi b3JkZXIgd2lkdGggb2YgdGhlIHRhYmxlIGlzIGNvbXB1dGVkIGJ5IGV4YW1pbmluZyBhbGwgY2Vs bHMgd2hvIGNvbGxhcHNlIHRoZWlyIHRvcAorICAgICAgICBib3JkZXJzIHdpdGggdGhlIHRvcCBi b3JkZXIgb2YgdGhlIHRhYmxlLiBUaGUgdG9wIGJvcmRlciB3aWR0aCBvZiB0aGUgdGFibGUgaXMg ZXF1YWwgdG8gaGFsZiBvZiB0aGUKKyAgICAgICAgbWF4aW11bSBjb2xsYXBzZWQgdG9wIGJvcmRl ci4gVGhlIGJvdHRvbSBib3JkZXIgd2lkdGggaXMgY29tcHV0ZWQgYnkgZXhhbWluaW5nIGFsbCBj ZWxscyB3aG9zZSBib3R0b20gYm9yZGVycyBjb2xsYXBzZQorICAgICAgICB3aXRoIHRoZSBib3R0 b20gb2YgdGhlIHRhYmxlLiBUaGUgYm90dG9tIGJvcmRlciB3aWR0aCBpcyBlcXVhbCB0byBoYWxm IG9mIHRoZSBtYXhpbXVtIGNvbGxhcHNlZCBib3R0b20gYm9yZGVyLgorCisgICAgICAgIGh0dHBz Oi8vd3d3LnczLm9yZy9UUi9DU1MyMi90YWJsZXMuaHRtbCNjb2xsYXBzaW5nLWJvcmRlcnMKKwor ICAgICAgICBUaGlzIHBhdGNoIGltcGxlbWVudHMgdGhlIHRhYmxlIGJveCBwYXJ0IG9mIHRoZSBi b3JkZXIgY29sbGFwc2luZy4gSW5uZXIgdGFibGUgZWxlbWVudHMgbmVlZCB0byBpbXBsZW1lbnQg Y29sbGFwc2luZyBhcyB3ZWxsLgorCisgICAgICAgICogbGF5b3V0L0xheW91dFN0YXRlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGF5b3V0U3RhdGU6OmVuc3VyZVRhYmxlRm9ybWF0 dGluZ1N0YXRlKToKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL3RhYmxld3JhcHBl ci9UYWJsZVdyYXBwZXJCbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6VGFibGVXcmFwcGVyQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0VGFi bGVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZVdyYXBwZXJCbG9ja0Zvcm1h dHRpbmdDb250ZXh0Ojpjb21wdXRlQm9yZGVyQW5kUGFkZGluZ0ZvclRhYmxlQm94KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVXcmFwcGVyQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6 Y29tcHV0ZVdpZHRoQW5kTWFyZ2luRm9yVGFibGVCb3gpOgorICAgICAgICAqIGxheW91dC9ibG9j a2Zvcm1hdHRpbmcvdGFibGV3cmFwcGVyL1RhYmxlV3JhcHBlckJsb2NrRm9ybWF0dGluZ0NvbnRl eHQuaDoKKyAgICAgICAgKiBsYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0Nv bnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250 ZXh0Ojpjb21wdXRlZEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjplbnN1cmVUYWJsZUdyaWQpOgorICAg ICAgICAqIGxheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5oOgor ICAgICAgICAqIGxheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nU3RhdGUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdTdGF0ZTo6VGFibGVG b3JtYXR0aW5nU3RhdGUpOgorICAgICAgICAqIGxheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVG b3JtYXR0aW5nU3RhdGUuaDoKKwogMjAyMC0wNS0xNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtMRkNdW0JGQ10gSW50cm9kdWNlIFRhYmxlV3JhcHBlckJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlv dXRTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0U3RhdGUuY3BwCmluZGV4 IDMxYTkwYTVhZjdlOTY1ODQ1NWNjNTM1OWU1ZTkxNTU2MTE4MjEzNGUuLjYzOWI4YzJiODM5MzMx ZjE5ZTE0NDlhZDYxOGIxYmE1YzhhOTRjNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9MYXlvdXRTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFN0 YXRlLmNwcApAQCAtMTg1LDcgKzE4NSw3IEBAIFRhYmxlRm9ybWF0dGluZ1N0YXRlJiBMYXlvdXRT dGF0ZTo6ZW5zdXJlVGFibGVGb3JtYXR0aW5nU3RhdGUoY29uc3QgQ29udGFpbmVyQm94CiAKICAg ICBhdXRvIGNyZWF0ZSA9IFsmXSB7CiAgICAgICAgIC8vIFRhYmxlIGZvcm1hdHRpbmcgY29udGV4 dCBhbHdheXMgZXN0YWJsaXNoZXMgYSBuZXcgZmxvYXRpbmcgc3RhdGUgLWFuZCBpdCBzdGF5cyBl bXB0eS4KLSAgICAgICAgcmV0dXJuIG1ha2VVbmlxdWU8VGFibGVGb3JtYXR0aW5nU3RhdGU+KEZs b2F0aW5nU3RhdGU6OmNyZWF0ZSgqdGhpcywgZm9ybWF0dGluZ0NvbnRleHRSb290KSwgKnRoaXMp OworICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZTxUYWJsZUZvcm1hdHRpbmdTdGF0ZT4oRmxvYXRp bmdTdGF0ZTo6Y3JlYXRlKCp0aGlzLCBmb3JtYXR0aW5nQ29udGV4dFJvb3QpLCAqdGhpcywgZm9y bWF0dGluZ0NvbnRleHRSb290KTsKICAgICB9OwogCiAgICAgcmV0dXJuICptX3RhYmxlRm9ybWF0 dGluZ1N0YXRlcy5lbnN1cmUoJmZvcm1hdHRpbmdDb250ZXh0Um9vdCwgY3JlYXRlKS5pdGVyYXRv ci0+dmFsdWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL3RhYmxld3JhcHBlci9UYWJsZVdyYXBwZXJCbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvdGFibGV3cmFwcGVyL1RhYmxl V3JhcHBlckJsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDQyMDlkMThmNzcwZWM4OGJh MDUwZjYxNDA4NDAyNTIwZDkyNDhkMTMuLjViY2I4MDkxZDA0NGRmZTVjMzMyYzRhMDY5YmFjZjU1 NjJhOGFlNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRp bmcvdGFibGV3cmFwcGVyL1RhYmxlV3JhcHBlckJsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvdGFibGV3cmFwcGVyL1Rh YmxlV3JhcHBlckJsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0yOCw2ICsyOCw5IEBACiAK ICNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkKIAorI2luY2x1ZGUgIlRhYmxl Rm9ybWF0dGluZ0NvbnRleHQuaCIKKyNpbmNsdWRlICJUYWJsZUZvcm1hdHRpbmdTdGF0ZS5oIgor CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKIApAQCAtNTcsOSArNjAs MTEgQEAgdm9pZCBUYWJsZVdyYXBwZXJCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZs b3dDb250ZW50KEludmFsaWRhdGlvblN0YXRlJiwKIAogdm9pZCBUYWJsZVdyYXBwZXJCbG9ja0Zv cm1hdHRpbmdDb250ZXh0OjpsYXlvdXRUYWJsZUJveChjb25zdCBDb250YWluZXJCb3gmIHRhYmxl Qm94LCBjb25zdCBDb25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQmIGNvbnN0cmFpbnRzKQogewot ICAgIGNvbXB1dGVCb3JkZXJBbmRQYWRkaW5nKHRhYmxlQm94LCBjb25zdHJhaW50cy5ob3Jpem9u dGFsKTsKKyAgICBsYXlvdXRTdGF0ZSgpLmVuc3VyZVRhYmxlRm9ybWF0dGluZ1N0YXRlKHRhYmxl Qm94KTsKKworICAgIGNvbXB1dGVCb3JkZXJBbmRQYWRkaW5nRm9yVGFibGVCb3godGFibGVCb3gs IGNvbnN0cmFpbnRzLmhvcml6b250YWwpOwogICAgIGNvbXB1dGVTdGF0aWNWZXJ0aWNhbFBvc2l0 aW9uKHRhYmxlQm94LCBjb25zdHJhaW50cy52ZXJ0aWNhbCk7Ci0gICAgY29tcHV0ZVdpZHRoQW5k TWFyZ2luRm9yVGFibGVCb3godGFibGVCb3gsIGNvbnN0cmFpbnRzKTsKKyAgICBjb21wdXRlV2lk dGhBbmRNYXJnaW5Gb3JUYWJsZUJveCh0YWJsZUJveCwgY29uc3RyYWludHMuaG9yaXpvbnRhbCk7 CiAgICAgY29tcHV0ZVN0YXRpY0hvcml6b250YWxQb3NpdGlvbih0YWJsZUJveCwgY29uc3RyYWlu dHMuaG9yaXpvbnRhbCk7CiAKICAgICBhdXRvIGludmFsaWRhdGlvblN0YXRlID0gSW52YWxpZGF0 aW9uU3RhdGUgeyB9OwpAQCAtNjgsMjcgKzczLDY4IEBAIHZvaWQgVGFibGVXcmFwcGVyQmxvY2tG b3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0VGFibGVCb3goY29uc3QgQ29udGFpbmVyQm94JiB0YWJs CiAgICAgY29tcHV0ZUhlaWdodEFuZE1hcmdpbkZvclRhYmxlQm94KHRhYmxlQm94LCBjb25zdHJh aW50cyk7CiB9CiAKLXZvaWQgVGFibGVXcmFwcGVyQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29t cHV0ZVdpZHRoQW5kTWFyZ2luRm9yVGFibGVCb3goY29uc3QgQ29udGFpbmVyQm94JiB0YWJsZUJv eCwgY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50JiBjb25zdHJhaW50cykKK3ZvaWQg VGFibGVXcmFwcGVyQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUJvcmRlckFuZFBhZGRp bmdGb3JUYWJsZUJveChjb25zdCBDb250YWluZXJCb3gmIHRhYmxlQm94LCBjb25zdCBIb3Jpem9u dGFsQ29uc3RyYWludHMmIGhvcml6b250YWxDb25zdHJhaW50cykKK3sKKyAgICBBU1NFUlQodGFi bGVCb3guaXNUYWJsZUJveCgpKTsKKyAgICBpZiAodGFibGVCb3guc3R5bGUoKS5ib3JkZXJDb2xs YXBzZSgpID09IEJvcmRlckNvbGxhcHNlOjpDb2xsYXBzZSkgeworICAgICAgICAvLyBVQXMgbXVz dCBjb21wdXRlIGFuIGluaXRpYWwgbGVmdCBhbmQgcmlnaHQgYm9yZGVyIHdpZHRoIGZvciB0aGUg dGFibGUgYnkgZXhhbWluaW5nCisgICAgICAgIC8vIHRoZSBmaXJzdCBhbmQgbGFzdCBjZWxscyBp biB0aGUgZmlyc3Qgcm93IG9mIHRoZSB0YWJsZS4KKyAgICAgICAgLy8gVGhlIGxlZnQgYm9yZGVy IHdpZHRoIG9mIHRoZSB0YWJsZSBpcyBoYWxmIG9mIHRoZSBmaXJzdCBjZWxsJ3MgY29sbGFwc2Vk IGxlZnQgYm9yZGVyLAorICAgICAgICAvLyBhbmQgdGhlIHJpZ2h0IGJvcmRlciB3aWR0aCBvZiB0 aGUgdGFibGUgaXMgaGFsZiBvZiB0aGUgbGFzdCBjZWxsJ3MgY29sbGFwc2VkIHJpZ2h0IGJvcmRl ci4KKyAgICAgICAgLy8gVGhlIHRvcCBib3JkZXIgd2lkdGggb2YgdGhlIHRhYmxlIGlzIGNvbXB1 dGVkIGJ5IGV4YW1pbmluZyBhbGwgY2VsbHMgd2hvIGNvbGxhcHNlIHRoZWlyIHRvcAorICAgICAg ICAvLyBib3JkZXJzIHdpdGggdGhlIHRvcCBib3JkZXIgb2YgdGhlIHRhYmxlLiBUaGUgdG9wIGJv cmRlciB3aWR0aCBvZiB0aGUgdGFibGUgaXMgZXF1YWwgdG8gaGFsZiBvZiB0aGUKKyAgICAgICAg Ly8gbWF4aW11bSBjb2xsYXBzZWQgdG9wIGJvcmRlci4gVGhlIGJvdHRvbSBib3JkZXIgd2lkdGgg aXMgY29tcHV0ZWQgYnkgZXhhbWluaW5nIGFsbCBjZWxscyB3aG9zZSBib3R0b20gYm9yZGVycyBj b2xsYXBzZQorICAgICAgICAvLyB3aXRoIHRoZSBib3R0b20gb2YgdGhlIHRhYmxlLiBUaGUgYm90 dG9tIGJvcmRlciB3aWR0aCBpcyBlcXVhbCB0byBoYWxmIG9mIHRoZSBtYXhpbXVtIGNvbGxhcHNl ZCBib3R0b20gYm9yZGVyLgorICAgICAgICBhdXRvJiBncmlkID0gbGF5b3V0U3RhdGUoKS5lc3Rh Ymxpc2hlZFRhYmxlRm9ybWF0dGluZ1N0YXRlKHRhYmxlQm94KS50YWJsZUdyaWQoKTsKKyAgICAg ICAgYXV0byB0YWJsZUJvcmRlciA9IGdlb21ldHJ5KCkuY29tcHV0ZWRCb3JkZXIodGFibGVCb3gp OworCisgICAgICAgIGF1dG8mIGZpcnN0Q29sdW1uRmlyc3RSb3dCb3ggPSBncmlkLnNsb3QoeyAw ICwgMCB9KS0+Y2VsbCgpLmJveCgpOworICAgICAgICBhdXRvIGxlZnRCb3JkZXIgPSBzdGQ6Om1h eCh0YWJsZUJvcmRlci5ob3Jpem9udGFsLmxlZnQsIGdlb21ldHJ5KCkuY29tcHV0ZWRCb3JkZXIo Zmlyc3RDb2x1bW5GaXJzdFJvd0JveCkuaG9yaXpvbnRhbC5sZWZ0KTsKKworICAgICAgICBhdXRv JiBsYXN0Q29sdW1uRmlyc3RSb3cgPSBncmlkLnNsb3QoeyBncmlkLmNvbHVtbnMoKS5zaXplKCkg LSAxLCAwIH0pLT5jZWxsKCkuYm94KCk7CisgICAgICAgIGF1dG8gcmlnaHRCb3JkZXIgPSBzdGQ6 Om1heCh0YWJsZUJvcmRlci5ob3Jpem9udGFsLnJpZ2h0LCBnZW9tZXRyeSgpLmNvbXB1dGVkQm9y ZGVyKGxhc3RDb2x1bW5GaXJzdFJvdykuaG9yaXpvbnRhbC5yaWdodCk7CisKKyAgICAgICAgYXV0 byB0b3BCb3JkZXIgPSB0YWJsZUJvcmRlci52ZXJ0aWNhbC50b3A7CisgICAgICAgIGF1dG8gYm90 dG9tQm9yZGVyID0gdGFibGVCb3JkZXIudmVydGljYWwuYm90dG9tOworICAgICAgICBhdXRvIGxh c3RSb3dJbmRleCA9IGdyaWQucm93cygpLnNpemUoKSAtIDE7CisgICAgICAgIGZvciAoc2l6ZV90 IGNvbHVtbkluZGV4ID0gMDsgY29sdW1uSW5kZXggPCBncmlkLmNvbHVtbnMoKS5zaXplKCk7ICsr Y29sdW1uSW5kZXgpIHsKKyAgICAgICAgICAgIGF1dG8mIGJveEluRmlyc3RSb3ggPSBncmlkLnNs b3QoeyBjb2x1bW5JbmRleCwgMCB9KS0+Y2VsbCgpLmJveCgpOworICAgICAgICAgICAgYXV0byYg Ym94SW5MYXN0Um93ID0gZ3JpZC5zbG90KHsgY29sdW1uSW5kZXgsIGxhc3RSb3dJbmRleCB9KS0+ Y2VsbCgpLmJveCgpOworCisgICAgICAgICAgICB0b3BCb3JkZXIgPSBzdGQ6Om1heCh0b3BCb3Jk ZXIsIGdlb21ldHJ5KCkuY29tcHV0ZWRCb3JkZXIoYm94SW5GaXJzdFJveCkudmVydGljYWwudG9w KTsKKyAgICAgICAgICAgIGJvdHRvbUJvcmRlciA9IHN0ZDo6bWF4KGJvdHRvbUJvcmRlciwgZ2Vv bWV0cnkoKS5jb21wdXRlZEJvcmRlcihib3hJbkxhc3RSb3cpLnZlcnRpY2FsLmJvdHRvbSk7Cisg ICAgICAgIH0KKyAgICAgICAgYXV0byBjb2xsYXBzZWRCb3JkZXIgPSBFZGdlcyB7IHsgbGVmdEJv cmRlciAvIDIsIHJpZ2h0Qm9yZGVyIC8gMiB9LCB7IHRvcEJvcmRlciAvIDIsIGJvdHRvbUJvcmRl ciAvIDIgfSB9OworCisgICAgICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBmb3JtYXR0aW5nU3RhdGUo KS5kaXNwbGF5Qm94KHRhYmxlQm94KTsKKyAgICAgICAgZGlzcGxheUJveC5zZXRCb3JkZXIoY29s bGFwc2VkQm9yZGVyKTsKKyAgICAgICAgZGlzcGxheUJveC5zZXRQYWRkaW5nKGdlb21ldHJ5KCku Y29tcHV0ZWRQYWRkaW5nKHRhYmxlQm94LCBob3Jpem9udGFsQ29uc3RyYWludHMubG9naWNhbFdp ZHRoKSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgQmxvY2tGb3JtYXR0aW5nQ29udGV4 dDo6Y29tcHV0ZUJvcmRlckFuZFBhZGRpbmcodGFibGVCb3gsIGhvcml6b250YWxDb25zdHJhaW50 cyk7Cit9CisKK3ZvaWQgVGFibGVXcmFwcGVyQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0 ZVdpZHRoQW5kTWFyZ2luRm9yVGFibGVCb3goY29uc3QgQ29udGFpbmVyQm94JiB0YWJsZUJveCwg Y29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJiBob3Jpem9udGFsQ29uc3RyYWludHMpCiB7CiAg ICAgQVNTRVJUKHRhYmxlQm94LmlzVGFibGVCb3goKSk7CiAgICAgLy8gVGhpcyBpcyBhIHNwZWNp YWwgdGFibGUgImZpdC1jb250ZW50IHNpemUiIGJlaGF2aW9yIGhhbmRsaW5nLiBOb3QgaW4gdGhl IHNwZWMgdGhvdWdoLgogICAgIC8vIFRhYmxlIHJldHVybnMgaXRzIGZpbmFsIHdpZHRoIGFzIG1p bi9tYXguIFVzZSB0aGlzIGZpbmFsIHdpZHRoIHZhbHVlIHRvIGNvbXB1dGVkIGhvcml6b250YWwg bWFyZ2lucyBldGMuCi0gICAgYXV0byYgZm9ybWF0dGluZ1N0YXRlRm9yVGFibGVCb3ggPSBsYXlv dXRTdGF0ZSgpLmVuc3VyZUZvcm1hdHRpbmdTdGF0ZSh0YWJsZUJveCk7CisgICAgYXV0byYgZm9y bWF0dGluZ1N0YXRlRm9yVGFibGVCb3ggPSBsYXlvdXRTdGF0ZSgpLmVzdGFibGlzaGVkVGFibGVG b3JtYXR0aW5nU3RhdGUodGFibGVCb3gpOwogICAgIGF1dG8gaW50cmluc2ljV2lkdGhDb25zdHJh aW50cyA9IEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgeyB9OwogICAgIGlmIChhdXRvIHByZWNv bXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyA9IGZvcm1hdHRpbmdTdGF0ZUZvclRhYmxl Qm94LmludHJpbnNpY1dpZHRoQ29uc3RyYWludHMoKSkKICAgICAgICAgaW50cmluc2ljV2lkdGhD b25zdHJhaW50cyA9ICpwcmVjb21wdXRlZEludHJpbnNpY1dpZHRoQ29uc3RyYWludHM7CiAgICAg ZWxzZQogICAgICAgICBpbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzID0gTGF5b3V0Q29udGV4dDo6 Y3JlYXRlRm9ybWF0dGluZ0NvbnRleHQodGFibGVCb3gsIGxheW91dFN0YXRlKCkpLT5jb21wdXRl ZEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMoKTsKLSAgICBhdXRvIGNvbXB1dGVkVGFibGVXaWR0 aCA9IGdlb21ldHJ5KCkuY29tcHV0ZWRXaWR0aCh0YWJsZUJveCwgY29uc3RyYWludHMuaG9yaXpv bnRhbC5sb2dpY2FsV2lkdGgpOworICAgIGF1dG8gY29tcHV0ZWRUYWJsZVdpZHRoID0gZ2VvbWV0 cnkoKS5jb21wdXRlZFdpZHRoKHRhYmxlQm94LCBob3Jpem9udGFsQ29uc3RyYWludHMubG9naWNh bFdpZHRoKTsKICAgICBhdXRvIHVzZWRXaWR0aCA9IGNvbXB1dGVkVGFibGVXaWR0aDsKICAgICBp ZiAoY29tcHV0ZWRUYWJsZVdpZHRoICYmIGludHJpbnNpY1dpZHRoQ29uc3RyYWludHMubWluaW11 bSA+IGNvbXB1dGVkVGFibGVXaWR0aCkgewogICAgICAgICAvLyBUYWJsZSBjb250ZW50IG5lZWRz IG1vcmUgc3BhY2UgdGhhbiB0aGUgdGFibGUgaGFzLgogICAgICAgICB1c2VkV2lkdGggPSBpbnRy aW5zaWNXaWR0aENvbnN0cmFpbnRzLm1pbmltdW07CiAgICAgfSBlbHNlIGlmICghY29tcHV0ZWRU YWJsZVdpZHRoKSB7CiAgICAgICAgIC8vIFVzZSB0aGUgZ2VuZXJpYyBzaHJpbmstdG8tZml0LXdp ZHRoIGxvZ2ljLgotICAgICAgICB1c2VkV2lkdGggPSBzdGQ6Om1pbihzdGQ6Om1heChpbnRyaW5z aWNXaWR0aENvbnN0cmFpbnRzLm1pbmltdW0sIGNvbnN0cmFpbnRzLmhvcml6b250YWwubG9naWNh bFdpZHRoKSwgaW50cmluc2ljV2lkdGhDb25zdHJhaW50cy5tYXhpbXVtKTsKKyAgICAgICAgdXNl ZFdpZHRoID0gc3RkOjptaW4oc3RkOjptYXgoaW50cmluc2ljV2lkdGhDb25zdHJhaW50cy5taW5p bXVtLCBob3Jpem9udGFsQ29uc3RyYWludHMubG9naWNhbFdpZHRoKSwgaW50cmluc2ljV2lkdGhD b25zdHJhaW50cy5tYXhpbXVtKTsKICAgICB9Ci0gICAgYXV0byBjb250ZW50V2lkdGhBbmRNYXJn aW4gPSBnZW9tZXRyeSgpLmluRmxvd1dpZHRoQW5kTWFyZ2luKHRhYmxlQm94LCBjb25zdHJhaW50 cy5ob3Jpem9udGFsLCBPdmVycmlkZUhvcml6b250YWxWYWx1ZXMgeyB1c2VkV2lkdGgsIHsgfSB9 KTsKKyAgICBhdXRvIGNvbnRlbnRXaWR0aEFuZE1hcmdpbiA9IGdlb21ldHJ5KCkuaW5GbG93V2lk dGhBbmRNYXJnaW4odGFibGVCb3gsIGhvcml6b250YWxDb25zdHJhaW50cywgT3ZlcnJpZGVIb3Jp em9udGFsVmFsdWVzIHsgdXNlZFdpZHRoLCB7IH0gfSk7CiAKICAgICBhdXRvJiBkaXNwbGF5Qm94 ID0gZm9ybWF0dGluZ1N0YXRlKCkuZGlzcGxheUJveCh0YWJsZUJveCk7CiAgICAgZGlzcGxheUJv eC5zZXRDb250ZW50Qm94V2lkdGgoY29udGVudFdpZHRoQW5kTWFyZ2luLmNvbnRlbnRXaWR0aCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL3RhYmxl d3JhcHBlci9UYWJsZVdyYXBwZXJCbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL3RhYmxld3JhcHBlci9UYWJsZVdyYXBwZXJCbG9j a0Zvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggN2YwZmZiNjhhY2Q4M2IwNmY4MDhiY2FlMzg0ZmEy ZGVkYzVkZDUxZi4uZWZmZjZiMDQyOWFiZWZhODlkMDdmMjE1MzEwODA4ZjllYmU2ODJkOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy90YWJsZXdyYXBw ZXIvVGFibGVXcmFwcGVyQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvdGFibGV3cmFwcGVyL1RhYmxlV3JhcHBlckJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQuaApAQCAtNDUsNyArNDUsOCBAQCBwdWJsaWM6CiBwcml2YXRlOgog ICAgIHZvaWQgbGF5b3V0VGFibGVCb3goY29uc3QgQ29udGFpbmVyQm94JiB0YWJsZUJveCwgY29u c3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50Jik7CiAKLSAgICB2b2lkIGNvbXB1dGVXaWR0 aEFuZE1hcmdpbkZvclRhYmxlQm94KGNvbnN0IENvbnRhaW5lckJveCYsIGNvbnN0IENvbnN0cmFp bnRzRm9ySW5GbG93Q29udGVudCYpOworICAgIHZvaWQgY29tcHV0ZUJvcmRlckFuZFBhZGRpbmdG b3JUYWJsZUJveChjb25zdCBDb250YWluZXJCb3gmLCBjb25zdCBIb3Jpem9udGFsQ29uc3RyYWlu dHMmKTsKKyAgICB2b2lkIGNvbXB1dGVXaWR0aEFuZE1hcmdpbkZvclRhYmxlQm94KGNvbnN0IENv bnRhaW5lckJveCYsIGNvbnN0IEhvcml6b250YWxDb25zdHJhaW50cyYpOwogICAgIHZvaWQgY29t cHV0ZUhlaWdodEFuZE1hcmdpbkZvclRhYmxlQm94KGNvbnN0IENvbnRhaW5lckJveCYsIGNvbnN0 IENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudCYpOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5n Q29udGV4dC5jcHAKaW5kZXggMTVhYzg3OTQ2OGYwMWI0NDY5MGU2ODc3Y2MzMGE5NTY0N2VkZmY5 Ni4uZmY5N2NiY2UxMmE0MmY4M2U4ZTFiMzhhNWUxYzQyNzY4MWJkOGY0MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250 ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxl Rm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0yMTcsMjIgKzIxNywxOSBAQCBGb3JtYXR0aW5nQ29u dGV4dDo6SW50cmluc2ljV2lkdGhDb25zdHJhaW50cyBUYWJsZUZvcm1hdHRpbmdDb250ZXh0Ojpj b21wdXRlZEludAogICAgIGlmIChhdXRvIGNvbXB1dGVkV2lkdGhDb25zdHJhaW50cyA9IGdyaWQu d2lkdGhDb25zdHJhaW50cygpKQogICAgICAgICByZXR1cm4gKmNvbXB1dGVkV2lkdGhDb25zdHJh aW50czsKIAotICAgIC8vIDEuIEVuc3VyZSBlYWNoIGNlbGwgc2xvdCBpcyBvY2N1cGllZCBieSBh dCBsZWFzdCBvbmUgY2VsbC4KLSAgICBlbnN1cmVUYWJsZUdyaWQoKTsKLSAgICAvLyAyLiBDb21w dXRlIHRoZSBtaW5pbXVtL21heGltdW0gd2lkdGggb2YgZWFjaCBjb2x1bW4uCisgICAgLy8gQ29t cHV0ZSB0aGUgbWluaW11bS9tYXhpbXVtIHdpZHRoIG9mIGVhY2ggY29sdW1uLgogICAgIGF1dG8g Y29tcHV0ZWRXaWR0aENvbnN0cmFpbnRzID0gY29tcHV0ZWRQcmVmZXJyZWRXaWR0aEZvckNvbHVt bnMoKTsKICAgICBncmlkLnNldFdpZHRoQ29uc3RyYWludHMoY29tcHV0ZWRXaWR0aENvbnN0cmFp bnRzKTsKICAgICByZXR1cm4gY29tcHV0ZWRXaWR0aENvbnN0cmFpbnRzOwogfQogCi12b2lkIFRh YmxlRm9ybWF0dGluZ0NvbnRleHQ6OmVuc3VyZVRhYmxlR3JpZCgpCitVbmlxdWVSZWY8VGFibGVH cmlkPiBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjplbnN1cmVUYWJsZUdyaWQoY29uc3QgQ29udGFp bmVyQm94JiB0YWJsZUJveCkKIHsKLSAgICBhdXRvJiB0YWJsZUJveCA9IHJvb3QoKTsKLSAgICBh dXRvJiB0YWJsZUdyaWQgPSBmb3JtYXR0aW5nU3RhdGUoKS50YWJsZUdyaWQoKTsKKyAgICBhdXRv IHRhYmxlR3JpZCA9IG1ha2VVbmlxdWVSZWY8VGFibGVHcmlkPigpOwogICAgIGF1dG8mIHRhYmxl U3R5bGUgPSB0YWJsZUJveC5zdHlsZSgpOwogICAgIGF1dG8gc2hvdWxkQXBwbHlCb3JkZXJTcGFj aW5nID0gdGFibGVTdHlsZS5ib3JkZXJDb2xsYXBzZSgpID09IEJvcmRlckNvbGxhcHNlOjpTZXBh cmF0ZTsKLSAgICB0YWJsZUdyaWQuc2V0SG9yaXpvbnRhbFNwYWNpbmcoTGF5b3V0VW5pdCB7IHNo b3VsZEFwcGx5Qm9yZGVyU3BhY2luZyA/IHRhYmxlU3R5bGUuaG9yaXpvbnRhbEJvcmRlclNwYWNp bmcoKSA6IDAgfSk7Ci0gICAgdGFibGVHcmlkLnNldFZlcnRpY2FsU3BhY2luZyhMYXlvdXRVbml0 IHsgc2hvdWxkQXBwbHlCb3JkZXJTcGFjaW5nID8gdGFibGVTdHlsZS52ZXJ0aWNhbEJvcmRlclNw YWNpbmcoKSA6IDAgfSk7CisgICAgdGFibGVHcmlkLT5zZXRIb3Jpem9udGFsU3BhY2luZyhMYXlv dXRVbml0IHsgc2hvdWxkQXBwbHlCb3JkZXJTcGFjaW5nID8gdGFibGVTdHlsZS5ob3Jpem9udGFs Qm9yZGVyU3BhY2luZygpIDogMCB9KTsKKyAgICB0YWJsZUdyaWQtPnNldFZlcnRpY2FsU3BhY2lu ZyhMYXlvdXRVbml0IHsgc2hvdWxkQXBwbHlCb3JkZXJTcGFjaW5nID8gdGFibGVTdHlsZS52ZXJ0 aWNhbEJvcmRlclNwYWNpbmcoKSA6IDAgfSk7CiAKICAgICBhdXRvKiBmaXJzdENoaWxkID0gdGFi bGVCb3guZmlyc3RDaGlsZCgpOwogICAgIGNvbnN0IEJveCogdGFibGVDYXB0aW9uID0gbnVsbHB0 cjsKQEAgLTI0OCw3ICsyNDUsNyBAQCB2b2lkIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OmVuc3Vy ZVRhYmxlR3JpZCgpCiAgICAgICAgIGNvbGdyb3VwID0gY29sZ3JvdXBDYW5kaWRhdGU7CiAKICAg ICBpZiAoY29sZ3JvdXApIHsKLSAgICAgICAgYXV0byYgY29sdW1ucyA9IHRhYmxlR3JpZC5jb2x1 bW5zKCk7CisgICAgICAgIGF1dG8mIGNvbHVtbnMgPSB0YWJsZUdyaWQtPmNvbHVtbnMoKTsKICAg ICAgICAgZm9yIChhdXRvKiBjb2x1bW4gPSBkb3duY2FzdDxDb250YWluZXJCb3g+KCpjb2xncm91 cCkuZmlyc3RDaGlsZCgpOyBjb2x1bW47IGNvbHVtbiA9IGNvbHVtbi0+bmV4dFNpYmxpbmcoKSkg ewogICAgICAgICAgICAgQVNTRVJUKGNvbHVtbi0+aXNUYWJsZUNvbHVtbigpKTsKICAgICAgICAg ICAgIGF1dG8gY29sdW1uU3BhbkNvdW50ID0gY29sdW1uLT5jb2x1bW5TcGFuKCk7CkBAIC0yNjUs MTAgKzI2MiwxMSBAQCB2b2lkIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OmVuc3VyZVRhYmxlR3Jp ZCgpCiAgICAgICAgICAgICBBU1NFUlQocm93LT5pc1RhYmxlUm93KCkpOwogICAgICAgICAgICAg Zm9yIChhdXRvKiBjZWxsID0gZG93bmNhc3Q8Q29udGFpbmVyQm94Pigqcm93KS5maXJzdENoaWxk KCk7IGNlbGw7IGNlbGwgPSBjZWxsLT5uZXh0U2libGluZygpKSB7CiAgICAgICAgICAgICAgICAg QVNTRVJUKGNlbGwtPmlzVGFibGVDZWxsKCkpOwotICAgICAgICAgICAgICAgIHRhYmxlR3JpZC5h cHBlbmRDZWxsKGRvd25jYXN0PENvbnRhaW5lckJveD4oKmNlbGwpKTsKKyAgICAgICAgICAgICAg ICB0YWJsZUdyaWQtPmFwcGVuZENlbGwoZG93bmNhc3Q8Q29udGFpbmVyQm94PigqY2VsbCkpOwog ICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQorICAgIHJldHVybiB0YWJsZUdyaWQ7CiB9 CiAKIEZvcm1hdHRpbmdDb250ZXh0OjpJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIFRhYmxlRm9y bWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVkUHJlZmVycmVkV2lkdGhGb3JDb2x1bW5zKCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0 aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJs ZUZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggOWEwYzU3YTZhM2UxZjA2ZGE2YjUwMzc0MmEwZDMw NzdjNzFkYzM0MS4uODMzMzI5ZDBiYTU3NzMzMjkxMTM2MzYyYzEzZDM2NWM4M2E4Y2RlNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1h dHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGlu Zy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJU YWJsZUZvcm1hdHRpbmdTdGF0ZS5oIgogI2luY2x1ZGUgIlRhYmxlR3JpZC5oIgogI2luY2x1ZGUg PHd0Zi9Jc29NYWxsb2MuaD4KKyNpbmNsdWRlIDx3dGYvVW5pcXVlUmVmLmg+CiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewpAQCAtNDQsNiArNDUsOCBAQCBwdWJsaWM6 CiAgICAgVGFibGVGb3JtYXR0aW5nQ29udGV4dChjb25zdCBDb250YWluZXJCb3gmIGZvcm1hdHRp bmdDb250ZXh0Um9vdCwgVGFibGVGb3JtYXR0aW5nU3RhdGUmKTsKICAgICB2b2lkIGxheW91dElu Rmxvd0NvbnRlbnQoSW52YWxpZGF0aW9uU3RhdGUmLCBjb25zdCBDb25zdHJhaW50c0ZvckluRmxv d0NvbnRlbnQmKSBvdmVycmlkZTsKIAorICAgIHN0YXRpYyBVbmlxdWVSZWY8VGFibGVHcmlkPiBl bnN1cmVUYWJsZUdyaWQoY29uc3QgQ29udGFpbmVyQm94JiB0YWJsZUJveCk7CisKIHByaXZhdGU6 CiAgICAgY2xhc3MgVGFibGVMYXlvdXQgewogICAgIHB1YmxpYzoKQEAgLTgyLDcgKzg1LDYgQEAg cHJpdmF0ZToKICAgICB2b2lkIHNldFVzZWRHZW9tZXRyeUZvclJvd3MoTGF5b3V0VW5pdCBhdmFp bGFibGVIb3Jpem9udGFsU3BhY2UpOwogICAgIHZvaWQgc2V0VXNlZEdlb21ldHJ5Rm9yU2VjdGlv bnMoY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50Jik7CiAKLSAgICB2b2lkIGVuc3Vy ZVRhYmxlR3JpZCgpOwogICAgIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgY29tcHV0ZWRQcmVm ZXJyZWRXaWR0aEZvckNvbHVtbnMoKTsKICAgICB2b2lkIGNvbXB1dGVBbmREaXN0cmlidXRlRXh0 cmFTcGFjZShMYXlvdXRVbml0IGF2YWlsYWJsZUhvcml6b250YWxTcGFjZSwgT3B0aW9uYWw8TGF5 b3V0VW5pdD4gYXZhaWxhYmxlVmVydGljYWxTcGFjZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nU3RhdGUuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdTdGF0 ZS5jcHAKaW5kZXggMDM3ZWQ1Y2IzZjg2Y2Y4N2E1NTE0ZjljMmQ5NDAzYzA3NmQ2YmZkZS4uYTU0 ZjcxNjE2ZTJkN2FkZTYzZWEyNjA5ZjNhM2M5OWM5NDVmODI0ZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdTdGF0ZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRp bmdTdGF0ZS5jcHAKQEAgLTM1LDggKzM1LDkgQEAgbmFtZXNwYWNlIExheW91dCB7CiAKIFdURl9N QUtFX0lTT19BTExPQ0FURURfSU1QTChUYWJsZUZvcm1hdHRpbmdTdGF0ZSk7CiAKLVRhYmxlRm9y bWF0dGluZ1N0YXRlOjpUYWJsZUZvcm1hdHRpbmdTdGF0ZShSZWY8RmxvYXRpbmdTdGF0ZT4mJiBm bG9hdGluZ1N0YXRlLCBMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUpCitUYWJsZUZvcm1hdHRpbmdT dGF0ZTo6VGFibGVGb3JtYXR0aW5nU3RhdGUoUmVmPEZsb2F0aW5nU3RhdGU+JiYgZmxvYXRpbmdT dGF0ZSwgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBjb25zdCBDb250YWluZXJCb3gmIHRhYmxl Qm94KQogICAgIDogRm9ybWF0dGluZ1N0YXRlKFdURk1vdmUoZmxvYXRpbmdTdGF0ZSksIFR5cGU6 OlRhYmxlLCBsYXlvdXRTdGF0ZSkKKyAgICAsIG1fdGFibGVHcmlkKFRhYmxlRm9ybWF0dGluZ0Nv bnRleHQ6OmVuc3VyZVRhYmxlR3JpZCh0YWJsZUJveCkpCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nU3RhdGUu aCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5n U3RhdGUuaAppbmRleCA1ZjAyOWZkNTYwNmY3MmE3MjZhMjEzNGIyYTIxODY4N2VkZGU4NjY0Li43 ZDFlNGFmMGI5NmFjYzRkMzQzNDVhYTljZjZkODNmNzhkNTNjNzZmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ1N0YXRlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRp bmdTdGF0ZS5oCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAiRm9ybWF0dGluZ1N0YXRlLmgi CiAjaW5jbHVkZSAiVGFibGVHcmlkLmgiCiAjaW5jbHVkZSA8d3RmL0lzb01hbGxvYy5oPgorI2lu Y2x1ZGUgPHd0Zi9VbmlxdWVSZWYuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNl IExheW91dCB7CkBAIC0zOCwxNCArMzksMTQgQEAgbmFtZXNwYWNlIExheW91dCB7CiBjbGFzcyBU YWJsZUZvcm1hdHRpbmdTdGF0ZSA6IHB1YmxpYyBGb3JtYXR0aW5nU3RhdGUgewogICAgIFdURl9N QUtFX0lTT19BTExPQ0FURUQoVGFibGVGb3JtYXR0aW5nU3RhdGUpOwogcHVibGljOgotICAgIFRh YmxlRm9ybWF0dGluZ1N0YXRlKFJlZjxGbG9hdGluZ1N0YXRlPiYmLCBMYXlvdXRTdGF0ZSYpOwor ICAgIFRhYmxlRm9ybWF0dGluZ1N0YXRlKFJlZjxGbG9hdGluZ1N0YXRlPiYmLCBMYXlvdXRTdGF0 ZSYsIGNvbnN0IENvbnRhaW5lckJveCYgdGFibGVCb3gpOwogICAgIH5UYWJsZUZvcm1hdHRpbmdT dGF0ZSgpOwogCiAgICAgVGFibGVHcmlkJiB0YWJsZUdyaWQoKSB7IHJldHVybiBtX3RhYmxlR3Jp ZDsgfQogICAgIGNvbnN0IFRhYmxlR3JpZCYgdGFibGVHcmlkKCkgY29uc3QgeyByZXR1cm4gbV90 YWJsZUdyaWQ7IH0KIAogcHJpdmF0ZToKLSAgICBUYWJsZUdyaWQgbV90YWJsZUdyaWQ7CisgICAg VW5pcXVlUmVmPFRhYmxlR3JpZD4gbV90YWJsZUdyaWQ7CiB9OwogCiB9Cg==