203131 2019-10-17 19:35:12 -0700 [LFC][BFC] TableFormattingContext::computedIntrinsicWidthConstraints should not expect a valid containing block's width 2019-10-18 09:10:07 -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 1581264 0 zalan 2019-10-17 19:35:12 -0700 when it is called by the preferred width computation path. 1581265 1 webkit-bug-importer 2019-10-17 19:35:31 -0700 <rdar://problem/56394676> 1581271 2 381263 zalan 2019-10-17 19:46:56 -0700 Created attachment 381263 Patch 1581418 3 381263 koivisto 2019-10-18 09:07:17 -0700 Comment on attachment 381263 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=381263&action=review > Source/WebCore/layout/tableformatting/TableFormattingContext.cpp:66 > + // 1. Position each column. Are these references to a spec algorithm? Maybe a link? 1581419 4 zalan 2019-10-18 09:09:47 -0700 Committed r251281: <https://trac.webkit.org/changeset/251281> 1581420 5 zalan 2019-10-18 09:10:07 -0700 (In reply to Antti Koivisto from comment #3) > Comment on attachment 381263 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=381263&action=review > > > Source/WebCore/layout/tableformatting/TableFormattingContext.cpp:66 > > + // 1. Position each column. > > Are these references to a spec algorithm? Maybe a link? good point. I'll add them. 381263 2019-10-17 19:46:56 -0700 2019-10-18 09:07:17 -0700 Patch bug-203131-20191017194651.patch text/plain 14630 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxMjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjBlYmJmZGYxMWNmYzY3 MzQwODc5NTFjMTliZDgwZTZiZTY2YjQzNS4uNzg4M2Y2YThjYWY4ODA3MmQ0ZDYyMmUyOTEyMzU3 NDFiMzIwMjE3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTEwLTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXSBUYWJsZUZv cm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgc2hvdWxk IG5vdCBleHBlY3QgYSB2YWxpZCBjb250YWluaW5nIGJsb2NrJ3Mgd2lkdGgKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzEzMQorICAgICAgICA8cmRh cjovL3Byb2JsZW0vNTYzOTQ2NzY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2hlbiBUYWJsZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZEludHJp bnNpY1dpZHRoQ29uc3RyYWludHMgaXMgY2FsbGVkIGJ5IHRoZSBwcmVmZXJyZWQgd2lkdGggY29t cHV0YXRpb24gKDxkaXYgc3R5bGU9ImZsb2F0OiBsZWZ0Ij48dGFibGU+KQorICAgICAgICB0aGUg Y29udGFpbmluZyBibG9jaydzIHdpZHRoIGlzIG5vdCB5ZXQgc2V0IChpdCBnZXRzIGNvbXB1dGVk IGJhc2VkIG9uIHRoZSBwcmVmZXJyZWQgd2lkdGgpIHNvIGNvbXB1dGVkSW50cmluc2ljV2lkdGhD b25zdHJhaW50cyBzaG91bGQgbm90IGJlIHJlbHlpbmcKKyAgICAgICAgb24gaXQuIExldCdzIG1v dmUgdGhhdCBsb2dpYyBvdXQgdG8gVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93 Q29udGVudCgpIHdoZXJlIGl0IGJlbG9uZ3MuIAorCisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93V2lk dGhBbmRNYXJnaW4pOgorICAgICAgICAqIGxheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3Jt YXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlRhYmxlRm9ybWF0 dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZEludHJpbnNpY1dpZHRoQ29uc3Ry YWludHMpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0 OjplbnN1cmVUYWJsZUdyaWQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1h dHRpbmdDb250ZXh0Ojpjb21wdXRlQW5kRGlzdHJpYnV0ZUV4dHJhSG9yaXpvbnRhbFNwYWNlKToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0 ZWRUYWJsZVdpZHRoKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVG b3JtYXR0aW5nQ29udGV4dDo6ZGlzdHJpYnV0ZUV4dHJhSG9yaXpvbnRhbFNwYWNlKTogRGVsZXRl ZC4KKyAgICAgICAgKiBsYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRl eHQuaDoKKwogMjAxOS0xMC0xNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFtMRkNdW0JGQ10gRml4IGJsb2NrIGxldmVsIGZvcm1hdHRpbmcgcm9vdCBpbmZsb3cg Ym94IGhlaWdodCBjb21wdXRhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0 R2VvbWV0cnkuY3BwCmluZGV4IGVmNjg4YWY0OWVmMDAzZWIzZWRiNDNjY2U1ODNhNWI0MGFlNDM0 ZTkuLmVkMzM0OGRkYjI5M2E5NzVmN2QyOTdiMmM5YjBkNWY4NzI4ZjlhZDUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29u dGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKQEAgLTI4Miw3ICsyODIsNyBA QCBDb250ZW50V2lkdGhBbmRNYXJnaW4gQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6 OmluRmxvd1dpZHRoQW5kTWFyZ2luKGNvbgogICAgICAgICBpZiAobGF5b3V0Qm94LmVzdGFibGlz aGVzVGFibGVGb3JtYXR0aW5nQ29udGV4dCgpKSB7CiAgICAgICAgICAgICAvLyBUaGlzIGlzIGEg c3BlY2lhbCB0YWJsZSAiZml0LWNvbnRlbnQgc2l6ZSIgYmVoYXZpb3IgaGFuZGxpbmcuIE5vdCBp biB0aGUgc3BlYyB0aG91Z2guCiAgICAgICAgICAgICAvLyBUYWJsZSByZXR1cm5zIGl0cyBmaW5h bCB3aWR0aCBhcyBtaW4vbWF4LiBVc2UgdGhpcyBmaW5hbCB3aWR0aCB2YWx1ZSB0byBjb21wdXRl ZCBob3Jpem9udGFsIG1hcmdpbnMgZXRjLgotICAgICAgICAgICAgdXNlZEhvcml6b250YWxWYWx1 ZXMud2lkdGggPSBzaHJpbmtUb0ZpdFdpZHRoKGxheW91dEJveCwgdXNlZEhvcml6b250YWxWYWx1 ZXMuY29uc3RyYWludHMud2lkdGgpOworICAgICAgICAgICAgdXNlZEhvcml6b250YWxWYWx1ZXMu d2lkdGggPSB1c2VkSG9yaXpvbnRhbFZhbHVlcy53aWR0aCA/IHVzZWRIb3Jpem9udGFsVmFsdWVz LndpZHRoIDogc2hyaW5rVG9GaXRXaWR0aChsYXlvdXRCb3gsIHVzZWRIb3Jpem9udGFsVmFsdWVz LmNvbnN0cmFpbnRzLndpZHRoKTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gaW5GbG93Tm9u UmVwbGFjZWRXaWR0aEFuZE1hcmdpbihsYXlvdXRCb3gsIHVzZWRIb3Jpem9udGFsVmFsdWVzKTsK ICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5n L1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxl Zm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCBhMWM4YjNmNWUzNTJl MjBkNTUzNmY3NWEzNTQ3NTg1Y2RlNGZhZmMyLi4yNjc5NmNiOTIzNWQ5ZjM0ZWYyODcyMzA3ZmJh NjJhYmZkZDQ2ZDg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3Jt YXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTYwLDEw ICs2MCwyMiBAQCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0 KGNvbnN0IENvbnRhaW5lciYgZm9ybWF0dGluZ0NvbnRleAogdm9pZCBUYWJsZUZvcm1hdHRpbmdD b250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50KCkKIHsKICAgICBhdXRvJiBncmlkID0gZm9ybWF0 dGluZ1N0YXRlKCkudGFibGVHcmlkKCk7CisgICAgYXV0byYgY29sdW1uc0NvbnRleHQgPSBncmlk LmNvbHVtbnNDb250ZXh0KCk7CisKKyAgICBjb21wdXRlQW5kRGlzdHJpYnV0ZUV4dHJhSG9yaXpv bnRhbFNwYWNlKCk7CisgICAgLy8gMS4gUG9zaXRpb24gZWFjaCBjb2x1bW4uCisgICAgLy8gRklY TUU6IFRoaXMgc2hvdWxkIGFsc28gZGVhbCB3aXRoIGNvbGxhcHNpbmcgYm9yZGVycyBldGMuCisg ICAgYXV0byBob3Jpem9udGFsU3BhY2luZyA9IGdyaWQuaG9yaXpvbnRhbFNwYWNpbmcoKTsKKyAg ICBhdXRvIGNvbHVtbkxvZ2ljYWxMZWZ0ID0gaG9yaXpvbnRhbFNwYWNpbmc7CisgICAgZm9yIChh dXRvJiBjb2x1bW4gOiBjb2x1bW5zQ29udGV4dC5jb2x1bW5zKCkpIHsKKyAgICAgICAgY29sdW1u LnNldExvZ2ljYWxMZWZ0KGNvbHVtbkxvZ2ljYWxMZWZ0KTsKKyAgICAgICAgY29sdW1uTG9naWNh bExlZnQgKz0gKGNvbHVtbi5sb2dpY2FsV2lkdGgoKSArIGhvcml6b250YWxTcGFjaW5nKTsKKyAg ICB9CisKKyAgICAvLyAyLiBMYXlvdXQgZWFjaCB0YWJsZSBjZWxsIChhbmQgY29tcHV0ZSByb3cg aGVpZ2h0IGFzIHdlbGwpLgorICAgIGF1dG8mIGNvbHVtbkxpc3QgPSBjb2x1bW5zQ29udGV4dC5j b2x1bW5zKCk7CiAgICAgYXV0byYgY2VsbExpc3QgPSBncmlkLmNlbGxzKCk7Ci0gICAgYXV0byYg Y29sdW1uTGlzdCA9IGdyaWQuY29sdW1uc0NvbnRleHQoKS5jb2x1bW5zKCk7CiAgICAgQVNTRVJU KCFjZWxsTGlzdC5pc0VtcHR5KCkpOwotICAgIC8vIExheW91dCBhbmQgcG9zaXRpb24gZWFjaCB0 YWJsZSBjZWxsIChhbmQgY29tcHV0ZSByb3cgaGVpZ2h0IGFzIHdlbGwpLgogICAgIGZvciAoYXV0 byYgY2VsbCA6IGNlbGxMaXN0KSB7CiAgICAgICAgIGF1dG8mIGNlbGxMYXlvdXRCb3ggPSBjZWxs LT50YWJsZUNlbGxCb3g7CiAgICAgICAgIGxheW91dFRhYmxlQ2VsbEJveChjZWxsTGF5b3V0Qm94 LCBjb2x1bW5MaXN0LmF0KGNlbGwtPnBvc2l0aW9uLngoKSkpOwpAQCAtNzgsNyArOTAsNyBAQCB2 b2lkIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQoKQogICAgICAg ICByb3dMb2dpY2FsVG9wICs9IChyb3cubG9naWNhbEhlaWdodCgpICsgZ3JpZC52ZXJ0aWNhbFNw YWNpbmcoKSk7CiAgICAgfQogCi0gICAgLy8gRmluYWxpemUgc2l6ZSBhbmQgcG9zaXRpb24uCisg ICAgLy8gMy4gRmluYWxpemUgc2l6ZSBhbmQgcG9zaXRpb24uCiAgICAgcG9zaXRpb25UYWJsZUNl bGxzKCk7CiAgICAgc2V0Q29tcHV0ZWRHZW9tZXRyeUZvclNlY3Rpb25zKCk7CiAgICAgc2V0Q29t cHV0ZWRHZW9tZXRyeUZvclJvd3MoKTsKQEAgLTE1MiwyMyArMTY0LDIzIEBAIEZvcm1hdHRpbmdD b250ZXh0OjpJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6 OmNvbXB1dGVkSW50CiAKICAgICAvLyAxLiBFbnN1cmUgZWFjaCBjZWxsIHNsb3QgaXMgb2NjdXBp ZWQgYnkgYXQgbGVhc3Qgb25lIGNlbGwuCiAgICAgZW5zdXJlVGFibGVHcmlkKCk7Ci0gICAgLy8g Mi4gQ29tcHV0ZSB0aGUgbWluaW11bSB3aWR0aCBvZiBlYWNoIGNvbHVtbi4KKyAgICAvLyAyLiBD b21wdXRlIHRoZSBtaW5pbXVtL21heGltdW0gd2lkdGggb2YgZWFjaCBjb2x1bW4uCiAgICAgY29t cHV0ZVByZWZlcnJlZFdpZHRoRm9yQ29sdW1ucygpOwotICAgIC8vIDMuIENvbXB1dGUgdGhlIHdp ZHRoIG9mIHRoZSB0YWJsZS4KLSAgICBhdXRvIHdpZHRoID0gY29tcHV0ZWRUYWJsZVdpZHRoKCk7 Ci0gICAgLy8gVGhpcyBpcyB0aGUgYWN0dWFsIGNvbXB1dGVkIHRhYmxlIHdpZHRoIHRoYXQgd2Ug d2FudCB0byBwcmVzZW50IGFzIG1pbi9tYXggd2lkdGguCi0gICAgZm9ybWF0dGluZ1N0YXRlKCku c2V0SW50cmluc2ljV2lkdGhDb25zdHJhaW50cyh7IHdpZHRoLCB3aWR0aCB9KTsKLSAgICByZXR1 cm4geyB3aWR0aCwgd2lkdGggfTsKKyAgICAvLyAzLiBDb21wdXRlIHRoZSBtaW5pbXVtL21heGlt dW0gd2lkdGggb2YgdGhlIHRhYmxlIGJveC4KKyAgICBhdXRvJiBncmlkID0gZm9ybWF0dGluZ1N0 YXRlKCkudGFibGVHcmlkKCk7CisgICAgYXV0byB0YWJsZVdpZHRoQ29uc3RyYWludHMgPSBncmlk LndpZHRoQ29uc3RyYWludHMoKTsKKyAgICB0YWJsZVdpZHRoQ29uc3RyYWludHMuZXhwYW5kKGdy aWQudG90YWxIb3Jpem9udGFsU3BhY2luZygpKTsKKyAgICByZXR1cm4gdGFibGVXaWR0aENvbnN0 cmFpbnRzOwogfQogCiB2b2lkIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OmVuc3VyZVRhYmxlR3Jp ZCgpCiB7Ci0gICAgYXV0byYgdGFibGVXcmFwcGVyQm94ID0gcm9vdCgpOworICAgIGF1dG8mIHRh YmxlQm94ID0gcm9vdCgpOwogICAgIGF1dG8mIHRhYmxlR3JpZCA9IGZvcm1hdHRpbmdTdGF0ZSgp LnRhYmxlR3JpZCgpOwotICAgIHRhYmxlR3JpZC5zZXRIb3Jpem9udGFsU3BhY2luZyhMYXlvdXRV bml0IHsgdGFibGVXcmFwcGVyQm94LnN0eWxlKCkuaG9yaXpvbnRhbEJvcmRlclNwYWNpbmcoKSB9 KTsKLSAgICB0YWJsZUdyaWQuc2V0VmVydGljYWxTcGFjaW5nKExheW91dFVuaXQgeyB0YWJsZVdy YXBwZXJCb3guc3R5bGUoKS52ZXJ0aWNhbEJvcmRlclNwYWNpbmcoKSB9KTsKKyAgICB0YWJsZUdy aWQuc2V0SG9yaXpvbnRhbFNwYWNpbmcoTGF5b3V0VW5pdCB7IHRhYmxlQm94LnN0eWxlKCkuaG9y aXpvbnRhbEJvcmRlclNwYWNpbmcoKSB9KTsKKyAgICB0YWJsZUdyaWQuc2V0VmVydGljYWxTcGFj aW5nKExheW91dFVuaXQgeyB0YWJsZUJveC5zdHlsZSgpLnZlcnRpY2FsQm9yZGVyU3BhY2luZygp IH0pOwogCi0gICAgYXV0byogZmlyc3RDaGlsZCA9IHRhYmxlV3JhcHBlckJveC5maXJzdENoaWxk KCk7CisgICAgYXV0byogZmlyc3RDaGlsZCA9IHRhYmxlQm94LmZpcnN0Q2hpbGQoKTsKICAgICBj b25zdCBCb3gqIHRhYmxlQ2FwdGlvbiA9IG51bGxwdHI7CiAgICAgY29uc3QgQm94KiBjb2xncm91 cCA9IG51bGxwdHI7CiAgICAgLy8gVGFibGUgY2FwdGlvbiBpcyBhbiBvcHRpb25hbCBlbGVtZW50 OyBpZiB1c2VkLCBpdCBpcyBhbHdheXMgdGhlIGZpcnN0IGNoaWxkIG9mIGEgPHRhYmxlPi4KQEAg LTI2MCw4ICsyNzIsMTIgQEAgdm9pZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlUHJl ZmVycmVkV2lkdGhGb3JDb2x1bW5zKCkKICAgICB9CiB9CiAKLUxheW91dFVuaXQgVGFibGVGb3Jt YXR0aW5nQ29udGV4dDo6Y29tcHV0ZWRUYWJsZVdpZHRoKCkKK3ZvaWQgVGFibGVGb3JtYXR0aW5n Q29udGV4dDo6Y29tcHV0ZUFuZERpc3RyaWJ1dGVFeHRyYUhvcml6b250YWxTcGFjZSgpCiB7Cisg ICAgYXV0byYgZ3JpZCA9IGZvcm1hdHRpbmdTdGF0ZSgpLnRhYmxlR3JpZCgpOworICAgIGF1dG8g dGFibGVXaWR0aENvbnN0cmFpbnRzID0gZ3JpZC53aWR0aENvbnN0cmFpbnRzKCk7CisgICAgYXV0 byB0YWJsZU1pbmltdW1Db250ZW50V2lkdGggPSB0YWJsZVdpZHRoQ29uc3RyYWludHMubWluaW11 bSAtIGdyaWQudG90YWxIb3Jpem9udGFsU3BhY2luZygpOworCiAgICAgLy8gQ29sdW1uIGFuZCBj YXB0aW9uIHdpZHRocyBpbmZsdWVuY2UgdGhlIGZpbmFsIHRhYmxlIHdpZHRoIGFzIGZvbGxvd3M6 CiAgICAgLy8gSWYgdGhlICd0YWJsZScgb3IgJ2lubGluZS10YWJsZScgZWxlbWVudCdzICd3aWR0 aCcgcHJvcGVydHkgaGFzIGEgY29tcHV0ZWQgdmFsdWUgKFcpIG90aGVyIHRoYW4gJ2F1dG8nLCB0 aGUgdXNlZCB3aWR0aCBpcyB0aGUgZ3JlYXRlciBvZgogICAgIC8vIFcsIENBUE1JTiwgYW5kIHRo ZSBtaW5pbXVtIHdpZHRoIHJlcXVpcmVkIGJ5IGFsbCB0aGUgY29sdW1ucyBwbHVzIGNlbGwgc3Bh Y2luZyBvciBib3JkZXJzIChNSU4pLgpAQCAtMjY5LDc5ICsyODUsNDggQEAgTGF5b3V0VW5pdCBU YWJsZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZFRhYmxlV2lkdGgoKQogICAgIC8vIElmIHRo ZSAndGFibGUnIG9yICdpbmxpbmUtdGFibGUnIGVsZW1lbnQgaGFzICd3aWR0aDogYXV0bycsIHRo ZSB1c2VkIHdpZHRoIGlzIHRoZSBncmVhdGVyIG9mIHRoZSB0YWJsZSdzIGNvbnRhaW5pbmcgYmxv Y2sgd2lkdGgsCiAgICAgLy8gQ0FQTUlOLCBhbmQgTUlOLiBIb3dldmVyLCBpZiBlaXRoZXIgQ0FQ TUlOIG9yIHRoZSBtYXhpbXVtIHdpZHRoIHJlcXVpcmVkIGJ5IHRoZSBjb2x1bW5zIHBsdXMgY2Vs bCBzcGFjaW5nIG9yIGJvcmRlcnMgKE1BWCkgaXMKICAgICAvLyBsZXNzIHRoYW4gdGhhdCBvZiB0 aGUgY29udGFpbmluZyBibG9jaywgdXNlIG1heChNQVgsIENBUE1JTikuCisgICAgYXV0byBkaXN0 cmlidXRlRXh0cmFIb3Jpem9udGFsU3BhY2UgPSBbJl0oYXV0byBleHRyYUhvcml6b250YWxTcGFj ZSkgeworICAgICAgICBhdXRvJiBjb2x1bW5zID0gZ3JpZC5jb2x1bW5zQ29udGV4dCgpLmNvbHVt bnMoKTsKKyAgICAgICAgQVNTRVJUKCFjb2x1bW5zLmlzRW1wdHkoKSk7CisKKyAgICAgICAgYXV0 byBhZGp1c3RhYmxlZEhvcml6b250YWxTcGFjZSA9IHRhYmxlTWluaW11bUNvbnRlbnRXaWR0aDsK KyAgICAgICAgYXV0byBudW1iZXJPZkNvbHVtbnMgPSBjb2x1bW5zLnNpemUoKTsKKyAgICAgICAg Ly8gRml4ZWQgd2lkdGggY29sdW1ucyBkb24ndCBwYXJ0aWNpcGF0ZSBpbiBhdmFpbGFibGUgc3Bh Y2UgZGlzdHJpYnV0aW9uLgorICAgICAgICBmb3IgKGF1dG8mIGNvbHVtbiA6IGNvbHVtbnMpIHsK KyAgICAgICAgICAgIGlmICghY29sdW1uLmhhc0ZpeGVkV2lkdGgoKSkKKyAgICAgICAgICAgICAg ICBjb250aW51ZTsKKyAgICAgICAgICAgIGF1dG8gY29sdW1uRml4ZWRXaWR0aCA9ICpjb2x1bW4u Y29sdW1uQm94KCktPmNvbHVtbldpZHRoKCk7CisgICAgICAgICAgICBjb2x1bW4uc2V0TG9naWNh bFdpZHRoKGNvbHVtbkZpeGVkV2lkdGgpOworCisgICAgICAgICAgICAtLW51bWJlck9mQ29sdW1u czsKKyAgICAgICAgICAgIGFkanVzdGFibGVkSG9yaXpvbnRhbFNwYWNlIC09IGNvbHVtbkZpeGVk V2lkdGg7CisgICAgICAgIH0KKyAgICAgICAgaWYgKCFudW1iZXJPZkNvbHVtbnMgfHwgIWFkanVz dGFibGVkSG9yaXpvbnRhbFNwYWNlKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAvLyBG SVhNRTogUmlnaHQgbm93IGp1c3QgZGlzdHJpYnV0ZSB0aGUgZXh0cmEgc3BhY2UgZXF1YWx5IGFt b25nIHRoZSBjb2x1bW5zIHVzaW5nIHRoZSBtaW5pbXVtIHdpZHRoLgorICAgICAgICBBU1NFUlQo YWRqdXN0YWJsZWRIb3Jpem9udGFsU3BhY2UgPiAwKTsKKyAgICAgICAgZm9yIChhdXRvJiBjb2x1 bW4gOiBjb2x1bW5zKSB7CisgICAgICAgICAgICBpZiAoY29sdW1uLmhhc0ZpeGVkV2lkdGgoKSkK KyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIGF1dG8gY29sdW1uRXh0cmFT cGFjZSA9IGV4dHJhSG9yaXpvbnRhbFNwYWNlIC8gYWRqdXN0YWJsZWRIb3Jpem9udGFsU3BhY2Ug KiBjb2x1bW4ud2lkdGhDb25zdHJhaW50cygpLm1pbmltdW07CisgICAgICAgICAgICBjb2x1bW4u c2V0TG9naWNhbFdpZHRoKGNvbHVtbi53aWR0aENvbnN0cmFpbnRzKCkubWluaW11bSArIGNvbHVt bkV4dHJhU3BhY2UpOworICAgICAgICB9CisgICAgfTsKIAotICAgIC8vIEZJWE1FOiBUaGlzIGtp bmQgb2YgY29kZSB1c3VhbGx5IGxpdmVzIGluICpGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5IGNs YXNzLgotICAgIGF1dG8mIHRhYmxlV3JhcHBlckJveCA9IHJvb3QoKTsKLSAgICBhdXRvJiBzdHls ZSA9IHRhYmxlV3JhcHBlckJveC5zdHlsZSgpOwotICAgIGF1dG8mIGNvbnRhaW5pbmdCbG9jayA9 ICp0YWJsZVdyYXBwZXJCb3guY29udGFpbmluZ0Jsb2NrKCk7Ci0gICAgYXV0byBjb250YWluaW5n QmxvY2tXaWR0aCA9IGdlb21ldHJ5Rm9yQm94KGNvbnRhaW5pbmdCbG9jaywgRXNjYXBlVHlwZTo6 VGFibGVGb3JtYXR0aW5nQ29udGV4dEFjY2Vzc1BhcmVudFRhYmxlV3JhcHBlckJsb2NrRm9ybWF0 dGluZ0NvbnRleHQpLmNvbnRlbnRCb3hXaWR0aCgpOwotCi0gICAgYXV0byYgZ3JpZCA9IGZvcm1h dHRpbmdTdGF0ZSgpLnRhYmxlR3JpZCgpOwotICAgIGF1dG8mIGNvbHVtbnNDb250ZXh0ID0gZ3Jp ZC5jb2x1bW5zQ29udGV4dCgpOwotICAgIGF1dG8gdGFibGVXaWR0aENvbnN0cmFpbnRzID0gZ3Jp ZC53aWR0aENvbnN0cmFpbnRzKCk7Ci0gICAgYXV0byB0b3RhbEhvcml6b250YWxTcGFjaW5nID0g Z3JpZC50b3RhbEhvcml6b250YWxTcGFjaW5nKCk7Ci0KLSAgICBhdXRvIHdpZHRoID0gZ2VvbWV0 cnkoKS5jb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxlLndpZHRoKCksIGNvbnRhaW5pbmdCbG9j a1dpZHRoKTsKLSAgICBMYXlvdXRVbml0IHVzZWRXaWR0aDsKKyAgICBhdXRvIGNvbnRhaW5pbmdC bG9ja1dpZHRoID0gZ2VvbWV0cnlGb3JCb3goKnJvb3QoKS5jb250YWluaW5nQmxvY2soKSwgRXNj YXBlVHlwZTo6VGFibGVGb3JtYXR0aW5nQ29udGV4dEFjY2Vzc1BhcmVudFRhYmxlV3JhcHBlckJs b2NrRm9ybWF0dGluZ0NvbnRleHQpLmNvbnRlbnRCb3hXaWR0aCgpOworICAgIGF1dG8gd2lkdGgg PSBnZW9tZXRyeSgpLmNvbXB1dGVkVmFsdWVJZk5vdEF1dG8ocm9vdCgpLnN0eWxlKCkud2lkdGgo KSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOwogICAgIGlmICh3aWR0aCkgewotICAgICAgICBpZiAo KndpZHRoID4gdGFibGVXaWR0aENvbnN0cmFpbnRzLm1pbmltdW0pIHsKLSAgICAgICAgICAgIGRp c3RyaWJ1dGVFeHRyYUhvcml6b250YWxTcGFjZSgqd2lkdGggLSB0b3RhbEhvcml6b250YWxTcGFj aW5nLCB0YWJsZVdpZHRoQ29uc3RyYWludHMubWluaW11bSAtIHRvdGFsSG9yaXpvbnRhbFNwYWNp bmcpOwotICAgICAgICAgICAgdXNlZFdpZHRoID0gKndpZHRoOwotICAgICAgICB9IGVsc2Ugewot ICAgICAgICAgICAgdXNlZFdpZHRoID0gdGFibGVXaWR0aENvbnN0cmFpbnRzLm1pbmltdW07Cisg ICAgICAgIGlmICgqd2lkdGggPiB0YWJsZU1pbmltdW1Db250ZW50V2lkdGgpCisgICAgICAgICAg ICBkaXN0cmlidXRlRXh0cmFIb3Jpem9udGFsU3BhY2UoKndpZHRoIC0gdGFibGVNaW5pbXVtQ29u dGVudFdpZHRoKTsKKyAgICAgICAgZWxzZQogICAgICAgICAgICAgdXNlQXNDb250ZW50TG9naWNh bFdpZHRoKFdpZHRoQ29uc3RyYWludHNUeXBlOjpNaW5pbXVtKTsKLSAgICAgICAgfQogICAgIH0g ZWxzZSB7Ci0gICAgICAgIGlmICh0YWJsZVdpZHRoQ29uc3RyYWludHMubWluaW11bSA+IGNvbnRh aW5pbmdCbG9ja1dpZHRoKSB7Ci0gICAgICAgICAgICB1c2VkV2lkdGggPSB0YWJsZVdpZHRoQ29u c3RyYWludHMubWluaW11bTsKKyAgICAgICAgaWYgKHRhYmxlTWluaW11bUNvbnRlbnRXaWR0aCA+ IGNvbnRhaW5pbmdCbG9ja1dpZHRoKQogICAgICAgICAgICAgdXNlQXNDb250ZW50TG9naWNhbFdp ZHRoKFdpZHRoQ29uc3RyYWludHNUeXBlOjpNaW5pbXVtKTsKLSAgICAgICAgfSBlbHNlIGlmICh0 YWJsZVdpZHRoQ29uc3RyYWludHMubWF4aW11bSA8IGNvbnRhaW5pbmdCbG9ja1dpZHRoKSB7Ci0g ICAgICAgICAgICB1c2VkV2lkdGggPSB0YWJsZVdpZHRoQ29uc3RyYWludHMubWF4aW11bTsKKyAg ICAgICAgZWxzZSBpZiAodGFibGVXaWR0aENvbnN0cmFpbnRzLm1heGltdW0gPCBjb250YWluaW5n QmxvY2tXaWR0aCkKICAgICAgICAgICAgIHVzZUFzQ29udGVudExvZ2ljYWxXaWR0aChXaWR0aENv bnN0cmFpbnRzVHlwZTo6TWF4aW11bSk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICB1 c2VkV2lkdGggPSBjb250YWluaW5nQmxvY2tXaWR0aDsKLSAgICAgICAgICAgIGRpc3RyaWJ1dGVF eHRyYUhvcml6b250YWxTcGFjZSh1c2VkV2lkdGggLSB0b3RhbEhvcml6b250YWxTcGFjaW5nLCB0 YWJsZVdpZHRoQ29uc3RyYWludHMubWluaW11bSAtIHRvdGFsSG9yaXpvbnRhbFNwYWNpbmcpOwot ICAgICAgICB9Ci0gICAgfQotICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBhbHNvIGRlYWwgd2l0 aCBjb2xsYXBzaW5nIGJvcmRlcnMgZXRjLgotICAgIGF1dG8gaG9yaXpvbnRhbFNwYWNpbmcgPSBn cmlkLmhvcml6b250YWxTcGFjaW5nKCk7Ci0gICAgYXV0byBjb2x1bW5Mb2dpY2FsTGVmdCA9IGhv cml6b250YWxTcGFjaW5nOwotICAgIGZvciAoYXV0byYgY29sdW1uIDogY29sdW1uc0NvbnRleHQu Y29sdW1ucygpKSB7Ci0gICAgICAgIGNvbHVtbi5zZXRMb2dpY2FsTGVmdChjb2x1bW5Mb2dpY2Fs TGVmdCk7Ci0gICAgICAgIGNvbHVtbkxvZ2ljYWxMZWZ0ICs9IChjb2x1bW4ubG9naWNhbFdpZHRo KCkgKyBob3Jpem9udGFsU3BhY2luZyk7Ci0gICAgfQotICAgIHJldHVybiB1c2VkV2lkdGg7Ci19 Ci0KLXZvaWQgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6ZGlzdHJpYnV0ZUV4dHJhSG9yaXpvbnRh bFNwYWNlKExheW91dFVuaXQgYXZhaWxhYmxlQ29udGVudFdpZHRoLCBMYXlvdXRVbml0IHRhYmxl TWluaW11bUNvbnRlbnRXaWR0aCkKLXsKLSAgICBBU1NFUlQoYXZhaWxhYmxlQ29udGVudFdpZHRo ID49IHRhYmxlTWluaW11bUNvbnRlbnRXaWR0aCk7Ci0gICAgYXV0byYgZ3JpZCA9IGZvcm1hdHRp bmdTdGF0ZSgpLnRhYmxlR3JpZCgpOwotICAgIGF1dG8mIGNvbHVtbnMgPSBncmlkLmNvbHVtbnND b250ZXh0KCkuY29sdW1ucygpOwotICAgIEFTU0VSVCghY29sdW1ucy5pc0VtcHR5KCkpOwotCi0g ICAgYXV0byBleHRyYUhvcml6b250YWxTcGFjZSA9IGF2YWlsYWJsZUNvbnRlbnRXaWR0aCAtIHRh YmxlTWluaW11bUNvbnRlbnRXaWR0aDsKLSAgICBhdXRvIGFkanVzdGFibGVkSG9yaXpvbnRhbFNw YWNlID0gdGFibGVNaW5pbXVtQ29udGVudFdpZHRoOwotICAgIGF1dG8gbnVtYmVyT2ZDb2x1bW5z ID0gY29sdW1ucy5zaXplKCk7Ci0gICAgLy8gRml4ZWQgd2lkdGggY29sdW1ucyBkb24ndCBwYXJ0 aWNpcGF0ZSBpbiBhdmFpbGFibGUgc3BhY2UgZGlzdHJpYnV0aW9uLgotICAgIGZvciAoYXV0byYg Y29sdW1uIDogY29sdW1ucykgewotICAgICAgICBpZiAoIWNvbHVtbi5oYXNGaXhlZFdpZHRoKCkp Ci0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgYXV0byBjb2x1bW5GaXhlZFdpZHRoID0g KmNvbHVtbi5jb2x1bW5Cb3goKS0+Y29sdW1uV2lkdGgoKTsKLSAgICAgICAgY29sdW1uLnNldExv Z2ljYWxXaWR0aChjb2x1bW5GaXhlZFdpZHRoKTsKLQotICAgICAgICAtLW51bWJlck9mQ29sdW1u czsKLSAgICAgICAgYWRqdXN0YWJsZWRIb3Jpem9udGFsU3BhY2UgLT0gY29sdW1uRml4ZWRXaWR0 aDsKLSAgICB9Ci0gICAgaWYgKCFudW1iZXJPZkNvbHVtbnMgfHwgIWFkanVzdGFibGVkSG9yaXpv bnRhbFNwYWNlKQotICAgICAgICByZXR1cm47Ci0gICAgLy8gRklYTUU6IFJpZ2h0IG5vdyBqdXN0 IGRpc3RyaWJ1dGUgdGhlIGV4dHJhIHNwYWNlIGVxdWFseSBhbW9uZyB0aGUgY29sdW1ucyB1c2lu ZyB0aGUgbWluaW11bSB3aWR0aC4KLSAgICBBU1NFUlQoYWRqdXN0YWJsZWRIb3Jpem9udGFsU3Bh Y2UgPiAwKTsKLSAgICBmb3IgKGF1dG8mIGNvbHVtbiA6IGNvbHVtbnMpIHsKLSAgICAgICAgaWYg KGNvbHVtbi5oYXNGaXhlZFdpZHRoKCkpCi0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAg YXV0byBjb2x1bW5FeHRyYVNwYWNlID0gZXh0cmFIb3Jpem9udGFsU3BhY2UgLyBhZGp1c3RhYmxl ZEhvcml6b250YWxTcGFjZSAqIGNvbHVtbi53aWR0aENvbnN0cmFpbnRzKCkubWluaW11bTsKLSAg ICAgICAgY29sdW1uLnNldExvZ2ljYWxXaWR0aChjb2x1bW4ud2lkdGhDb25zdHJhaW50cygpLm1p bmltdW0gKyBjb2x1bW5FeHRyYVNwYWNlKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgZGlz dHJpYnV0ZUV4dHJhSG9yaXpvbnRhbFNwYWNlKGNvbnRhaW5pbmdCbG9ja1dpZHRoIC0gdGFibGVN aW5pbXVtQ29udGVudFdpZHRoKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0 LmgKaW5kZXggZmEzODZhMWZlMWI1YTA0ODIyZmQ0MWYwMTViOGZjZjA2NzZmNzFiMi4uZTljYTU1 MzgzYzMzYTA3N2QwMmE0NWJhZmRmNWY4MTRkN2M4MDRhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmgKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdD b250ZXh0LmgKQEAgLTU4LDcgKzU4LDYgQEAgcHJpdmF0ZToKICAgICBUYWJsZUZvcm1hdHRpbmdD b250ZXh0OjpHZW9tZXRyeSBnZW9tZXRyeSgpIGNvbnN0IHsgcmV0dXJuIEdlb21ldHJ5KCp0aGlz KTsgfQogCiAgICAgSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyBjb21wdXRlZEludHJpbnNpY1dp ZHRoQ29uc3RyYWludHMoKSBvdmVycmlkZTsKLSAgICBMYXlvdXRVbml0IGNvbXB1dGVkVGFibGVX aWR0aCgpOwogICAgIHZvaWQgbGF5b3V0VGFibGVDZWxsQm94KGNvbnN0IEJveCYgY2VsbExheW91 dEJveCwgY29uc3QgVGFibGVHcmlkOjpDb2x1bW4mKTsKICAgICB2b2lkIHBvc2l0aW9uVGFibGVD ZWxscygpOwogICAgIHZvaWQgc2V0Q29tcHV0ZWRHZW9tZXRyeUZvclJvd3MoKTsKQEAgLTY2LDcg KzY1LDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgZW5zdXJlVGFibGVHcmlkKCk7CiAgICAgdm9p ZCBjb21wdXRlUHJlZmVycmVkV2lkdGhGb3JDb2x1bW5zKCk7Ci0gICAgdm9pZCBkaXN0cmlidXRl RXh0cmFIb3Jpem9udGFsU3BhY2UoTGF5b3V0VW5pdCBhdmFpbGFibGVDb250ZW50V2lkdGgsIExh eW91dFVuaXQgdGFibGVNaW5pbXVtQ29udGVudFdpZHRoKTsKKyAgICB2b2lkIGNvbXB1dGVBbmRE aXN0cmlidXRlRXh0cmFIb3Jpem9udGFsU3BhY2UoKTsKICAgICBlbnVtIGNsYXNzIFdpZHRoQ29u c3RyYWludHNUeXBlIHsgTWluaW11bSwgTWF4aW11bSB9OwogICAgIHZvaWQgdXNlQXNDb250ZW50 TG9naWNhbFdpZHRoKFdpZHRoQ29uc3RyYWludHNUeXBlKTsKIAo=