210712 2020-04-18 20:55:07 -0700 [LFC][TFC] Take border spacing into account when distributing column spanners width. 2020-04-19 10:50:18 -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 1643150 0 zalan 2020-04-18 20:55:07 -0700 <table style="border-spacing: 50px"><tr><td colspan=2>long long text</td></tr><tr><td>lo</td><td>xt</td><tr></table> [long long text] [lo] [xt] While it looks like the spanning cell has to distribute all its spanning width, the border-spacing takes most of the space and no distribution is needed at all. 1643152 1 396890 zalan 2020-04-18 21:07:24 -0700 Created attachment 396890 Patch 1643224 2 ews-feeder 2020-04-19 10:49:05 -0700 Committed r260337: <https://trac.webkit.org/changeset/260337> All reviewed patches have been landed. Closing bug and clearing flags on attachment 396890. 1643225 3 webkit-bug-importer 2020-04-19 10:50:18 -0700 <rdar://problem/62023939> 396890 2020-04-18 21:07:24 -0700 2020-04-19 10:49:06 -0700 Patch bug-210712-20200418210724.patch text/plain 9688 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTUwMTRhNjQyOWMxOTk2 ODE0NTk0YTRjZTM3NTQwNzU3ZDhhNjAyMy4uNDE2NDdhNTczMDY4YmYxZDZmNmU3MmIxM2EwYjli YzMyODA5YjE3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA0LTE4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXSBUYWtlIGJv cmRlciBzcGFjaW5nIGludG8gYWNjb3VudCB3aGVuIGRpc3RyaWJ1dGluZyBjb2x1bW4gc3Bhbm5l cnMgd2lkdGguCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTA3MTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXaGlsZSBkaXN0cmlidXRpbmcgdGhlIGNvbHVtbiBzcGFubmVyIGV4dHJhIHNwYWNlIGFtb25n IGluZGl2aWR1YWwgY29sdW1ucywKKyAgICAgICAgdGhlIHNwYWNpbmcgYmV0d2VlbiB0aGVzZSBj b2x1bW5zIChzZXQgYnkgYm9yZGVyLXNwYWNpbmcpIHNob3VsZCBiZSB0YWtlbiBpbnRvCisgICAg ICAgIGFjY291bnQgYW5kIHN1YnRyYWN0IGl0IGZyb20gdGhlIHdpZHRoIHRvIGRpc3RyaWJ1dGUu CisKKyAgICAgICAgPHRhYmxlIHN0eWxlPSJib3JkZXItc3BhY2luZzogNTBweCI+PHRyPjx0ZCBj b2xzcGFuPTI+bG9uZyBsb25nIHRleHQ8L3RkPjwvdHI+PHRyPjx0ZD5sbzwvdGQ+PHRkPnh0PC90 ZD48dHI+PC90YWJsZT4KKyAgICAgICAgW2xvbmcgbG9uZyB0ZXh0XQorICAgICAgICBbbG9dICAg ICAgICBbeHRdCisgICAgICAgIFRoZSBpbmRpdmlkdWFsIGNvbHVtbnMgZG9uJ3QgcmVxdWlyZSBh bnkgZXh0cmEgc3BhY2UgZnJvbSB0aGUgc3Bhbm5lci4KKyAKKyAgICAgICAgKiBsYXlvdXQvRm9y bWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0Nv bnRleHQ6OkludHJpbnNpY1dpZHRoQ29uc3RyYWludHM6Om9wZXJhdG9yKz0pOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6SW50cmluc2ljV2lkdGhDb25zdHJh aW50czo6b3BlcmF0b3ItPSk6CisgICAgICAgICogbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJs ZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVG b3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZWRQ cmVmZXJyZWRXaWR0aEZvckNvbHVtbnMpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJs ZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlQW5kRGlzdHJpYnV0ZUV4dHJhSG9yaXpvbnRhbFNw YWNlKToKKyAgICAgICAgKiBsYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlR3JpZC5oOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUdyaWQ6Omhvcml6b250YWxTcGFjaW5nIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVHcmlkOjp0b3RhbEhvcml6b250YWxT cGFjaW5nIGNvbnN0KTogRGVsZXRlZC4KKwogMjAyMC0wNC0xNyAgWmFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW1RGQ10gUmVzb2x2ZSB0aGUgbWluaW11bSB3 aWR0aCBmb3Igb3ZlcmxhcHBpbmcgc3Bhbm5lciBjb2x1bW5zCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9Gb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IDFjNTI5NDAzYjhjZDBiOWZjNjE1NWM2MTM5Yzgx M2ViODk1MDI2YzEuLjc5NjdlN2Y4YTQxY2Q2NzFkYzdlMTQ1OWE2MTE4N2ZjNTFlZTQwZmYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCkBAIC03MSw2ICs3MSw3 IEBAIHB1YmxpYzoKICAgICBzdHJ1Y3QgSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyB7CiAgICAg ICAgIHZvaWQgZXhwYW5kKExheW91dFVuaXQgaG9yaXpvbnRhbFZhbHVlKTsKICAgICAgICAgSW50 cmluc2ljV2lkdGhDb25zdHJhaW50cyYgb3BlcmF0b3IrPShjb25zdCBJbnRyaW5zaWNXaWR0aENv bnN0cmFpbnRzJik7CisgICAgICAgIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMmIG9wZXJhdG9y Kz0oTGF5b3V0VW5pdCk7CiAgICAgICAgIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMmIG9wZXJh dG9yLT0oY29uc3QgSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyYpOwogICAgICAgICBJbnRyaW5z aWNXaWR0aENvbnN0cmFpbnRzJiBvcGVyYXRvci09KExheW91dFVuaXQpOwogCkBAIC0yMzAsNiAr MjMxLDEyIEBAIGlubGluZSBGb3JtYXR0aW5nQ29udGV4dDo6SW50cmluc2ljV2lkdGhDb25zdHJh aW50cyYgRm9ybWF0dGluZ0NvbnRleHQ6OkludHJpbnNpCiAgICAgcmV0dXJuICp0aGlzOwogfQog CitpbmxpbmUgRm9ybWF0dGluZ0NvbnRleHQ6OkludHJpbnNpY1dpZHRoQ29uc3RyYWludHMmIEZv cm1hdHRpbmdDb250ZXh0OjpJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzOjpvcGVyYXRvcis9KExh eW91dFVuaXQgdmFsdWUpCit7CisgICAgZXhwYW5kKHZhbHVlKTsKKyAgICByZXR1cm4gKnRoaXM7 Cit9CisKIGlubGluZSBGb3JtYXR0aW5nQ29udGV4dDo6SW50cmluc2ljV2lkdGhDb25zdHJhaW50 cyYgRm9ybWF0dGluZ0NvbnRleHQ6OkludHJpbnNpY1dpZHRoQ29uc3RyYWludHM6Om9wZXJhdG9y LT0oY29uc3QgSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyYgb3RoZXIpCiB7CiAgICAgbWluaW11 bSAtPSBvdGhlci5taW5pbXVtOwpAQCAtMjM5LDggKzI0Niw3IEBAIGlubGluZSBGb3JtYXR0aW5n Q29udGV4dDo6SW50cmluc2ljV2lkdGhDb25zdHJhaW50cyYgRm9ybWF0dGluZ0NvbnRleHQ6Oklu dHJpbnNpCiAKIGlubGluZSBGb3JtYXR0aW5nQ29udGV4dDo6SW50cmluc2ljV2lkdGhDb25zdHJh aW50cyYgRm9ybWF0dGluZ0NvbnRleHQ6OkludHJpbnNpY1dpZHRoQ29uc3RyYWludHM6Om9wZXJh dG9yLT0oTGF5b3V0VW5pdCB2YWx1ZSkKIHsKLSAgICBtaW5pbXVtIC09IHZhbHVlOwotICAgIG1h eGltdW0gLT0gdmFsdWU7CisgICAgZXhwYW5kKC12YWx1ZSk7CiAgICAgcmV0dXJuICp0aGlzOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1Rh YmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9y bWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA3Y2Q4YzM1YTkxN2IyNzVk ZWI2ZWJlZTc2NGFlYWUzNjQyZjk3ODBiLi40MTk2OTdiYWE0MmE2ZTBkNTJkYWM0YmUwMmM4YWU3 NThmMjgzYWJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0 aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTE4Niw3ICsx ODYsNiBAQCBGb3JtYXR0aW5nQ29udGV4dDo6SW50cmluc2ljV2lkdGhDb25zdHJhaW50cyBUYWJs ZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZEludAogICAgIGVuc3VyZVRhYmxlR3JpZCgpOwog ICAgIC8vIDIuIENvbXB1dGUgdGhlIG1pbmltdW0vbWF4aW11bSB3aWR0aCBvZiBlYWNoIGNvbHVt bi4KICAgICBhdXRvIGNvbXB1dGVkV2lkdGhDb25zdHJhaW50cyA9IGNvbXB1dGVkUHJlZmVycmVk V2lkdGhGb3JDb2x1bW5zKCk7Ci0gICAgY29tcHV0ZWRXaWR0aENvbnN0cmFpbnRzLmV4cGFuZChn cmlkLnRvdGFsSG9yaXpvbnRhbFNwYWNpbmcoKSk7CiAgICAgZ3JpZC5zZXRXaWR0aENvbnN0cmFp bnRzKGNvbXB1dGVkV2lkdGhDb25zdHJhaW50cyk7CiAgICAgcmV0dXJuIGNvbXB1dGVkV2lkdGhD b25zdHJhaW50czsKIH0KQEAgLTI4MCwyMCArMjc5LDI1IEBAIEZvcm1hdHRpbmdDb250ZXh0OjpJ bnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVk UHJlCiAgICAgVmVjdG9yPEZvcm1hdHRpbmdDb250ZXh0OjpJbnRyaW5zaWNXaWR0aENvbnN0cmFp bnRzPiBjb2x1bW5JbnRyaW5zaWNXaWR0aHMoY29sdW1uTGlzdC5zaXplKCkpOwogICAgIC8vIDMu IENvbGxlY3QgaGUgbWluL21heCB3aWR0aCBmb3IgZWFjaCBjb2x1bW4gYnV0IGlnbm9yZSBjb2x1 bW4gc3BhbnMgZm9yIG5vdy4KICAgICBWZWN0b3I8U2xvdFBvc2l0aW9uPiBzcGFubmluZ0NlbGxQ b3NpdGlvbkxpc3Q7CisgICAgc2l6ZV90IG51bWJlck9mQWN0dWFsQ29sdW1ucyA9IDA7CiAgICAg Zm9yIChzaXplX3QgY29sdW1uSW5kZXggPSAwOyBjb2x1bW5JbmRleCA8IGNvbHVtbkxpc3Quc2l6 ZSgpOyArK2NvbHVtbkluZGV4KSB7CisgICAgICAgIGF1dG8gY29sdW1uSGFzTm9uU3Bhbm5lZENl bGwgPSBmYWxzZTsKICAgICAgICAgZm9yIChzaXplX3Qgcm93SW5kZXggPSAwOyByb3dJbmRleCA8 IGdyaWQucm93cygpLnNpemUoKTsgKytyb3dJbmRleCkgewogICAgICAgICAgICAgYXV0byYgc2xv dCA9ICpncmlkLnNsb3QoeyBjb2x1bW5JbmRleCwgcm93SW5kZXggfSk7CisgICAgICAgICAgICBp ZiAoc2xvdC5pc0NvbHVtblNwYW5uZWQoKSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAg ICAgICAgICAgIGNvbHVtbkhhc05vblNwYW5uZWRDZWxsID0gdHJ1ZTsKICAgICAgICAgICAgIGlm IChzbG90Lmhhc0NvbHVtblNwYW4oKSkgewogICAgICAgICAgICAgICAgIHNwYW5uaW5nQ2VsbFBv c2l0aW9uTGlzdC5hcHBlbmQoeyBjb2x1bW5JbmRleCwgcm93SW5kZXggfSk7CiAgICAgICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBpZiAoc2xvdC5pc0Nv bHVtblNwYW5uZWQoKSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIGF1 dG8gY29sdW1uRml4ZWRXaWR0aCA9IGZpeGVkV2lkdGhDb2x1bW5zW2NvbHVtbkluZGV4XTsKICAg ICAgICAgICAgIGF1dG8gd2lkdGhDb25zdHJhaW50cyA9ICFjb2x1bW5GaXhlZFdpZHRoID8gc2xv dC53aWR0aENvbnN0cmFpbnRzKCkgOiBGb3JtYXR0aW5nQ29udGV4dDo6SW50cmluc2ljV2lkdGhD b25zdHJhaW50cyB7ICpjb2x1bW5GaXhlZFdpZHRoLCAqY29sdW1uRml4ZWRXaWR0aCB9OwogICAg ICAgICAgICAgY29sdW1uSW50cmluc2ljV2lkdGhzW2NvbHVtbkluZGV4XS5taW5pbXVtID0gc3Rk OjptYXgod2lkdGhDb25zdHJhaW50cy5taW5pbXVtLCBjb2x1bW5JbnRyaW5zaWNXaWR0aHNbY29s dW1uSW5kZXhdLm1pbmltdW0pOwogICAgICAgICAgICAgY29sdW1uSW50cmluc2ljV2lkdGhzW2Nv bHVtbkluZGV4XS5tYXhpbXVtID0gc3RkOjptYXgod2lkdGhDb25zdHJhaW50cy5tYXhpbXVtLCBj b2x1bW5JbnRyaW5zaWNXaWR0aHNbY29sdW1uSW5kZXhdLm1heGltdW0pOwogICAgICAgICB9Cisg ICAgICAgIGlmIChjb2x1bW5IYXNOb25TcGFubmVkQ2VsbCkKKyAgICAgICAgICAgICsrbnVtYmVy T2ZBY3R1YWxDb2x1bW5zOwogICAgIH0KIAogICAgIC8vIDQuIERpc3RyaWJ1dGUgdGhlIHNwYW5u aW5nIG1pbi9tYXggd2lkdGhzLgpAQCAtMzA0LDYgKzMwOCwxMiBAQCBGb3JtYXR0aW5nQ29udGV4 dDo6SW50cmluc2ljV2lkdGhDb25zdHJhaW50cyBUYWJsZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21w dXRlZFByZQogICAgICAgICBhdXRvIHdpZHRoQ29uc3RyYWludHNUb0Rpc3RyaWJ1dGUgPSBzbG90 LndpZHRoQ29uc3RyYWludHMoKTsKICAgICAgICAgZm9yIChzaXplX3QgY29sdW1uU3BhbkluZGV4 ID0gY2VsbC5zdGFydENvbHVtbigpOyBjb2x1bW5TcGFuSW5kZXggPCBjZWxsLmVuZENvbHVtbigp OyArK2NvbHVtblNwYW5JbmRleCkKICAgICAgICAgICAgIHdpZHRoQ29uc3RyYWludHNUb0Rpc3Ry aWJ1dGUgLT0gY29sdW1uSW50cmluc2ljV2lkdGhzW2NvbHVtblNwYW5JbmRleF07CisgICAgICAg IC8vIDx0YWJsZSBzdHlsZT0iYm9yZGVyLXNwYWNpbmc6IDUwcHgiPjx0cj48dGQgY29sc3Bhbj0y PmxvbmcgbG9uZyB0ZXh0PC90ZD48L3RyPjx0cj48dGQ+bG88L3RkPjx0ZD54dDwvdGQ+PHRyPjwv dGFibGU+CisgICAgICAgIC8vIFtsb25nIGxvbmcgdGV4dF0KKyAgICAgICAgLy8gW2xvXSAgICAg ICAgW3h0XQorICAgICAgICAvLyBXaGlsZSBpdCBsb29rcyBsaWtlIHRoZSBzcGFubmluZyBjZWxs IGhhcyB0byBkaXN0cmlidXRlIGFsbCBpdHMgc3Bhbm5pbmcgd2lkdGgsIHRoZSBib3JkZXItc3Bh Y2luZyB0YWtlcyBtb3N0IG9mIHRoZSBzcGFjZSBhbmQKKyAgICAgICAgLy8gbm8gZGlzdHJpYnV0 aW9uIGlzIG5lZWRlZCBhdCBhbGwuCisgICAgICAgIHdpZHRoQ29uc3RyYWludHNUb0Rpc3RyaWJ1 dGUgLT0gKGNlbGwuY29sdW1uU3BhbigpIC0gMSkgKiBncmlkLmhvcml6b250YWxTcGFjaW5nKCk7 CiAgICAgICAgIC8vIEZJWE1FOiBDaGVjayBpZiBmaXhlZCB3aWR0aCBjb2x1bW5zIHNob3VsZCBi ZSBza2lwcGVkIGhlcmUuCiAgICAgICAgIHdpZHRoQ29uc3RyYWludHNUb0Rpc3RyaWJ1dGUubWlu aW11bSA9IHN0ZDo6bWF4KExheW91dFVuaXQgeyB9LCB3aWR0aENvbnN0cmFpbnRzVG9EaXN0cmli dXRlLm1pbmltdW0gLyBjZWxsLmNvbHVtblNwYW4oKSk7CiAgICAgICAgIHdpZHRoQ29uc3RyYWlu dHNUb0Rpc3RyaWJ1dGUubWF4aW11bSA9IHN0ZDo6bWF4KExheW91dFVuaXQgeyB9LCB3aWR0aENv bnN0cmFpbnRzVG9EaXN0cmlidXRlLm1heGltdW0gLyBjZWxsLmNvbHVtblNwYW4oKSk7CkBAIC0z MTcsNiArMzI3LDggQEAgRm9ybWF0dGluZ0NvbnRleHQ6OkludHJpbnNpY1dpZHRoQ29uc3RyYWlu dHMgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZWRQcmUKICAgICBhdXRvIHRhYmxlV2lk dGhDb25zdHJhaW50cyA9IEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgeyB9OwogICAgIGZvciAo YXV0byYgY29sdW1uSW50cmluc2ljV2lkdGggOiBjb2x1bW5JbnRyaW5zaWNXaWR0aHMpCiAgICAg ICAgIHRhYmxlV2lkdGhDb25zdHJhaW50cyArPSBjb2x1bW5JbnRyaW5zaWNXaWR0aDsKKyAgICAv LyBFeGFwYW5kIHRoZSBwcmVmZXJyZWQgd2lkdGggd2l0aCBsZWFkaW5nIGFuZCB0cmFpbGluZyBj ZWxsIHNwYWNpbmcgKG5vdGUgdGhhdCBjb2x1bW4gc3Bhbm5lcnMgY291bnQgYXMgb25lIGNlbGwp LgorICAgIHRhYmxlV2lkdGhDb25zdHJhaW50cyArPSAobnVtYmVyT2ZBY3R1YWxDb2x1bW5zICsg MSkgKiBncmlkLmhvcml6b250YWxTcGFjaW5nKCk7CiAgICAgcmV0dXJuIHRhYmxlV2lkdGhDb25z dHJhaW50czsKIH0KIApAQCAtNDE4LDkgKzQzMCwxMSBAQCB2b2lkIFRhYmxlRm9ybWF0dGluZ0Nv bnRleHQ6OmNvbXB1dGVBbmREaXN0cmlidXRlRXh0cmFIb3Jpem9udGFsU3BhY2UoTGF5b3V0VW5p dAogICAgICAgICAgICAgICAgIC8vIDIuIERpc3RyaWJ1dGUgdGhlIGV4dHJhIG1pbmltdW0gd2lk dGggYW1vbmcgdGhlIHNwYW5uZWQgY29sdW1ucyBiYXNlZCBvbiB0aGUgbWluaW11bSBjb2xtbiB3 aWR0aC4KICAgICAgICAgICAgICAgICAvLyBlLmcuIHNwYW5uaW5nIG1pbWltdW0gd2lkdGg6IFsg ICA5ICAgXS4gQ3VycmVudCBtaW5pbXVtIHdpZHRocyBmb3IgdGhlIHNwYW5uZWQgY29sdW1uczog WyAxIF0gWyAyIF0KICAgICAgICAgICAgICAgICAvLyBOZXcgbWluaW11bSB3aWR0aHM6IFsgMyBd IFsgNiBdLgotICAgICAgICAgICAgICAgIGF1dG8gc3BhY2VUb0Rpc3RyaWJ1dGUgPSBzcGFubmlu Z01pbmltdW1XaWR0aCAtIGN1cnJlbnRTcGFubmluZ01pbmltdW1XaWR0aDsKLSAgICAgICAgICAg ICAgICBmb3IgKGF1dG8gY29sdW1uSW5kZXggPSBjZWxsLnN0YXJ0Q29sdW1uKCk7IGNvbHVtbklu ZGV4IDwgY2VsbC5lbmRDb2x1bW4oKTsgKytjb2x1bW5JbmRleCkKLSAgICAgICAgICAgICAgICAg ICAgY29sdW1uTWluaW11bVdpZHRoc1tjb2x1bW5JbmRleF0tPnZhbHVlICs9IHNwYWNlVG9EaXN0 cmlidXRlIC8gY3VycmVudFNwYW5uaW5nTWluaW11bVdpZHRoICogY29sdW1uTWluaW11bVdpZHRo c1tjb2x1bW5JbmRleF0tPnZhbHVlOworICAgICAgICAgICAgICAgIGF1dG8gc3BhY2VUb0Rpc3Ry aWJ1dGUgPSBzdGQ6Om1heCgwLjBmLCBzcGFubmluZ01pbmltdW1XaWR0aCAtIChjZWxsLmNvbHVt blNwYW4oKSAtIDEpICogZ3JpZC5ob3Jpem9udGFsU3BhY2luZygpIC0gY3VycmVudFNwYW5uaW5n TWluaW11bVdpZHRoKTsKKyAgICAgICAgICAgICAgICBpZiAoc3BhY2VUb0Rpc3RyaWJ1dGUpIHsK KyAgICAgICAgICAgICAgICAgICAgZm9yIChhdXRvIGNvbHVtbkluZGV4ID0gY2VsbC5zdGFydENv bHVtbigpOyBjb2x1bW5JbmRleCA8IGNlbGwuZW5kQ29sdW1uKCk7ICsrY29sdW1uSW5kZXgpCisg ICAgICAgICAgICAgICAgICAgICAgICBjb2x1bW5NaW5pbXVtV2lkdGhzW2NvbHVtbkluZGV4XS0+ dmFsdWUgKz0gc3BhY2VUb0Rpc3RyaWJ1dGUgLyBjdXJyZW50U3Bhbm5pbmdNaW5pbXVtV2lkdGgg KiBjb2x1bW5NaW5pbXVtV2lkdGhzW2NvbHVtbkluZGV4XS0+dmFsdWU7CisgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIC8vIDMuIERpc3RyaWJ1dGUg dGhlIGV4dHJhIHNwYWNlIHVzaW5nIHRoZSBmaW5hbCBtaW5pbXVtIHdpZHRocy4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVHcmlkLmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlR3JpZC5oCmluZGV4IGM4 M2ZiYTQzZmRiZDQ1NTc0YzAyMWRhMDg0MTExYmRlMGU0ZDFlZmYuLjYzNDM2ZWMwNmEzM2Q3N2Qz MGNkMmU5NzQ3N2Q2NjgzNTFlNzg2MDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC90YWJsZWZvcm1hdHRpbmcvVGFibGVHcmlkLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L3RhYmxlZm9ybWF0dGluZy9UYWJsZUdyaWQuaApAQCAtNTEsNyArNTEsNiBAQCBwdWJsaWM6CiAK ICAgICB2b2lkIHNldEhvcml6b250YWxTcGFjaW5nKExheW91dFVuaXQgaG9yaXpvbnRhbFNwYWNp bmcpIHsgbV9ob3Jpem9udGFsU3BhY2luZyA9IGhvcml6b250YWxTcGFjaW5nOyB9CiAgICAgTGF5 b3V0VW5pdCBob3Jpem9udGFsU3BhY2luZygpIGNvbnN0IHsgcmV0dXJuIG1faG9yaXpvbnRhbFNw YWNpbmc7IH0KLSAgICBMYXlvdXRVbml0IHRvdGFsSG9yaXpvbnRhbFNwYWNpbmcoKSBjb25zdCB7 IHJldHVybiAoY29sdW1ucygpLnNpemUoKSArIDEpICogaG9yaXpvbnRhbFNwYWNpbmcoKTsgfQog CiAgICAgdm9pZCBzZXRWZXJ0aWNhbFNwYWNpbmcoTGF5b3V0VW5pdCB2ZXJ0aWNhbFNwYWNpbmcp IHsgbV92ZXJ0aWNhbFNwYWNpbmcgPSB2ZXJ0aWNhbFNwYWNpbmc7IH0KICAgICBMYXlvdXRVbml0 IHZlcnRpY2FsU3BhY2luZygpIGNvbnN0IHsgcmV0dXJuIG1fdmVydGljYWxTcGFjaW5nOyB9Cg==