297143 2025-08-08 14:40:23 -0700 [orthogonal td] Add RenderTableSection::cellLogicalWidthInTableDirectionIncludingColumnSpan function 2025-08-11 06:24:12 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 297199 1 zalan zalan koivisto webkit-bug-importer oldest_to_newest 2135298 0 zalan 2025-08-08 14:40:23 -0700 ssia 2135304 1 476314 zalan 2025-08-08 14:44:21 -0700 Created attachment 476314 Patch 2135530 2 476328 zalan 2025-08-10 11:58:53 -0700 Created attachment 476328 [fast-cq]Patch 2135619 3 ews-feeder 2025-08-11 06:23:47 -0700 Committed 298499@main (5ab60c9ba49f): <https://commits.webkit.org/298499@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 476328. 2135620 4 webkit-bug-importer 2025-08-11 06:24:12 -0700 <rdar://problem/158037664> 476314 2025-08-08 14:44:21 -0700 2025-08-10 11:58:51 -0700 Patch bug-297143-20250808144420.patch text/plain 5031 zalan RnJvbSA1MmQyYTYwMTc0YmJiY2I4OTc2MTJlZjRmNmI4YzBmMDI1ZDU2ZDQxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IEZyaSwgOCBBdWcgMjAyNSAxNDo0MDozMSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFt3cml0aW5n LW1vZGVdIEFkZAogUmVuZGVyVGFibGVTZWN0aW9uOjpjZWxsTG9naWNhbFdpZHRoSW5jbHVkaW5n Q29sdW1uU3BhbiBmdW5jdGlvbgogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTI5NzE0MwoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpNb3ZlIG91dCB0aGlzIHdo aWxlIGxvb3AgdG8gYSBkZWRpY2F0ZWQgZnVuY3Rpb24uIFRoaXMgd2lsbCBiZSBjYWxsZWQgYnkg UmVuZGVyVGFibGVTZWN0aW9uOjpsYXlvdXRSb3dzIHdoZW4gY29tcHV0aW5nIGludHJpbnNpYyBw YWRkaW5nIG9uCm9ydGhvZ29uYWwgdGFibGUgY2VsbHMuCgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uY3BwOgooV2ViQ29yZTo6UmVuZGVyVGFibGVTZWN0aW9u OjpjZWxsTG9naWNhbFdpZHRoSW5jbHVkaW5nQ29sdW1uU3BhbiBjb25zdCk6CihXZWJDb3JlOjpS ZW5kZXJUYWJsZVNlY3Rpb246OmxheW91dCk6CiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRhYmxlU2VjdGlvbi5oOgotLS0KIC4uLi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJs ZVNlY3Rpb24uY3BwICB8IDUwICsrKysrKysrKysrLS0tLS0tLS0KIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uaCB8ICAyICsKIDIgZmlsZXMgY2hhbmdlZCwgMzIg aW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9uLmNwcAppbmRleCA3MGNmNzEzZjk5ZmEuLjRlODAxZWEw YzFlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2Vj dGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlv bi5jcHAKQEAgLTMzNCw2ICszMzQsMjYgQEAgTGF5b3V0VW5pdCBSZW5kZXJUYWJsZVNlY3Rpb246 OmNhbGNSb3dMb2dpY2FsSGVpZ2h0KCkKICAgICByZXR1cm4gbV9yb3dQb3NbbV9ncmlkLnNpemUo KV07CiB9CiAKK0xheW91dFVuaXQgUmVuZGVyVGFibGVTZWN0aW9uOjpjZWxsTG9naWNhbFdpZHRo SW5jbHVkaW5nQ29sdW1uU3Bhbihjb25zdCBSZW5kZXJUYWJsZUNlbGwmIGNlbGwsIHNpemVfdCBz dGFydENvbHVtbiwgc2l6ZV90IG51bWJlck9mQ29sdW1ucykgY29uc3QKK3sKKyAgICBBU1NFUlQo c3RhcnRDb2x1bW4gPCBudW1iZXJPZkNvbHVtbnMpOworCisgICAgYXV0byBlbmRDb2x1bW4gPSBz dGFydENvbHVtbjsKKyAgICBhdXRvIGNvbHVtblNwYW4gPSBjZWxsLmNvbFNwYW4oKTsKKyAgICBh dXRvJiBjb2x1bW5zID0gdGFibGUoKS0+Y29sdW1ucygpOworICAgIHdoaWxlIChjb2x1bW5TcGFu ICYmIGVuZENvbHVtbiA8IG51bWJlck9mQ29sdW1ucykgeworICAgICAgICBBU1NFUlQoZW5kQ29s dW1uIDwgY29sdW1ucy5zaXplKCkpOworICAgICAgICBjb2x1bW5TcGFuIC09IGNvbHVtbnNbZW5k Q29sdW1uXS5zcGFuOworICAgICAgICBlbmRDb2x1bW4rKzsKKyAgICB9CisgICAgYXV0byYgY29s dW1uUG9zaXRpb25zID0gdGFibGUoKS0+Y29sdW1uUG9zaXRpb25zKCk7CisgICAgaWYgKHN0YXJ0 Q29sdW1uID49IGNvbHVtblBvc2l0aW9ucy5zaXplKCkgfHwgZW5kQ29sdW1uID49IGNvbHVtblBv c2l0aW9ucy5zaXplKCkpIHsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAg IHJldHVybiB7IH07CisgICAgfQorICAgIHJldHVybiBjb2x1bW5Qb3NpdGlvbnNbZW5kQ29sdW1u XSAtIGNvbHVtblBvc2l0aW9uc1tzdGFydENvbHVtbl0gLSB0YWJsZSgpLT5oQm9yZGVyU3BhY2lu ZygpOworfQorCiB2b2lkIFJlbmRlclRhYmxlU2VjdGlvbjo6bGF5b3V0KCkKIHsKICAgICBTdGFj a1N0YXRzOjpMYXlvdXRDaGVja1BvaW50IGxheW91dENoZWNrUG9pbnQ7CkBAIC0zNDgsMzIgKzM2 OCwyMiBAQCB2b2lkIFJlbmRlclRhYmxlU2VjdGlvbjo6bGF5b3V0KCkKIAogICAgIExheW91dFN0 YXRlTWFpbnRhaW5lciBzdGF0ZVB1c2hlcigqdGhpcywgbG9jYXRpb25PZmZzZXQoKSwgaXNUcmFu c2Zvcm1lZCgpIHx8IGhhc1JlZmxlY3Rpb24oKSB8fCB3cml0aW5nTW9kZSgpLmlzQmxvY2tGbGlw cGVkKCkpOwogICAgIGJvb2wgcGFnaW5hdGVkID0gdmlldygpLmZyYW1lVmlldygpLmxheW91dENv bnRleHQoKS5sYXlvdXRTdGF0ZSgpLT5pc1BhZ2luYXRlZCgpOwotICAgIAotICAgIGNvbnN0IFZl Y3RvcjxMYXlvdXRVbml0PiYgY29sdW1uUG9zID0gdGFibGUoKS0+Y29sdW1uUG9zaXRpb25zKCk7 Ci0gICAgCi0gICAgZm9yICh1bnNpZ25lZCByID0gMDsgciA8IG1fZ3JpZC5zaXplKCk7ICsrcikg ewotICAgICAgICBSb3cmIHJvdyA9IG1fZ3JpZFtyXS5yb3c7Ci0gICAgICAgIHVuc2lnbmVkIGNv bHMgPSByb3cuc2l6ZSgpOworCisgICAgZm9yIChzaXplX3Qgcm93SW5kZXggPSAwOyByb3dJbmRl eCA8IG1fZ3JpZC5zaXplKCk7ICsrcm93SW5kZXgpIHsKKyAgICAgICAgYXV0byYgY29sdW1uTGlz dCA9IG1fZ3JpZFtyb3dJbmRleF0ucm93OworICAgICAgICBhdXRvIG51bWJlck9mQ29sdW1ucyA9 IGNvbHVtbkxpc3Quc2l6ZSgpOwogICAgICAgICAvLyBGaXJzdCwgcHJvcGFnYXRlIG91ciB0YWJs ZSBsYXlvdXQncyBpbmZvcm1hdGlvbiB0byB0aGUgY2VsbHMuIFRoaXMgd2lsbCBtYXJrIHRoZSBy b3cgYXMgbmVlZGluZyBsYXlvdXQKICAgICAgICAgLy8gaWYgdGhlcmUgd2FzIGEgY29sdW1uIGxv Z2ljYWwgd2lkdGggY2hhbmdlLgotICAgICAgICBmb3IgKHVuc2lnbmVkIHN0YXJ0Q29sdW1uID0g MDsgc3RhcnRDb2x1bW4gPCBjb2xzOyArK3N0YXJ0Q29sdW1uKSB7Ci0gICAgICAgICAgICBDZWxs U3RydWN0JiBjdXJyZW50ID0gcm93W3N0YXJ0Q29sdW1uXTsKLSAgICAgICAgICAgIFJlbmRlclRh YmxlQ2VsbCogY2VsbCA9IGN1cnJlbnQucHJpbWFyeUNlbGwoKTsKLSAgICAgICAgICAgIGlmICgh Y2VsbCB8fCBjdXJyZW50LmluQ29sU3BhbikKKyAgICAgICAgZm9yIChzaXplX3Qgc3RhcnRDb2x1 bW4gPSAwOyBzdGFydENvbHVtbiA8IG51bWJlck9mQ29sdW1uczsgKytzdGFydENvbHVtbikgewor ICAgICAgICAgICAgYXV0byYgY3VycmVudENvbHVtbiA9IGNvbHVtbkxpc3Rbc3RhcnRDb2x1bW5d OworICAgICAgICAgICAgYXV0byogY2VsbCA9IGN1cnJlbnRDb2x1bW4ucHJpbWFyeUNlbGwoKTsK KyAgICAgICAgICAgIGlmICghY2VsbCB8fCBjdXJyZW50Q29sdW1uLmluQ29sU3BhbikKICAgICAg ICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICAgICAgdW5zaWduZWQgZW5kQ29sID0gc3Rh cnRDb2x1bW47Ci0gICAgICAgICAgICB1bnNpZ25lZCBjc3BhbiA9IGNlbGwtPmNvbFNwYW4oKTsK LSAgICAgICAgICAgIHdoaWxlIChjc3BhbiAmJiBlbmRDb2wgPCBjb2xzKSB7Ci0gICAgICAgICAg ICAgICAgQVNTRVJUKGVuZENvbCA8IHRhYmxlKCktPmNvbHVtbnMoKS5zaXplKCkpOwotICAgICAg ICAgICAgICAgIGNzcGFuIC09IHRhYmxlKCktPmNvbHVtbnMoKVtlbmRDb2xdLnNwYW47Ci0gICAg ICAgICAgICAgICAgZW5kQ29sKys7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBMYXlvdXRV bml0IHRhYmxlTGF5b3V0TG9naWNhbFdpZHRoID0gY29sdW1uUG9zW2VuZENvbF0gLSBjb2x1bW5Q b3Nbc3RhcnRDb2x1bW5dIC0gdGFibGUoKS0+aEJvcmRlclNwYWNpbmcoKTsKLSAgICAgICAgICAg IGNlbGwtPnNldENlbGxMb2dpY2FsV2lkdGgodGFibGVMYXlvdXRMb2dpY2FsV2lkdGgpOworICAg ICAgICAgICAgY2VsbC0+c2V0Q2VsbExvZ2ljYWxXaWR0aChjZWxsTG9naWNhbFdpZHRoSW5jbHVk aW5nQ29sdW1uU3BhbigqY2VsbCwgc3RhcnRDb2x1bW4sIG51bWJlck9mQ29sdW1ucykpOwogICAg ICAgICB9CiAKLSAgICAgICAgaWYgKFJlbmRlclRhYmxlUm93KiByb3dSZW5kZXJlciA9IG1fZ3Jp ZFtyXS5yb3dSZW5kZXJlcikgeworICAgICAgICBpZiAoYXV0byogcm93UmVuZGVyZXIgPSBtX2dy aWRbcm93SW5kZXhdLnJvd1JlbmRlcmVyKSB7CiAgICAgICAgICAgICBpZiAoIXJvd1JlbmRlcmVy LT5uZWVkc0xheW91dCgpICYmIHBhZ2luYXRlZCAmJiB2aWV3KCkuZnJhbWVWaWV3KCkubGF5b3V0 Q29udGV4dCgpLmxheW91dFN0YXRlKCktPnBhZ2VMb2dpY2FsSGVpZ2h0Q2hhbmdlZCgpKQogICAg ICAgICAgICAgICAgIHJvd1JlbmRlcmVyLT5zZXRDaGlsZE5lZWRzTGF5b3V0KE1hcmtPbmx5VGhp cyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVNl Y3Rpb24uaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uaApp bmRleCBhMWZjODJlMDQxNWQuLmYwMmU5YmEwOTQzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uaApAQCAtMjE4LDYgKzIxOCw4IEBAIHByaXZhdGU6 CiAKICAgICB2b2lkIHNldExvZ2ljYWxQb3NpdGlvbkZvckNlbGwoUmVuZGVyVGFibGVDZWxsKiwg dW5zaWduZWQgZWZmZWN0aXZlQ29sdW1uKSBjb25zdDsKIAorICAgIExheW91dFVuaXQgY2VsbExv Z2ljYWxXaWR0aEluY2x1ZGluZ0NvbHVtblNwYW4oY29uc3QgUmVuZGVyVGFibGVDZWxsJiwgc2l6 ZV90IHN0YXJ0Q29sdW1uLCBzaXplX3QgbnVtYmVyT2ZDb2x1bW5zKSBjb25zdDsKKwogICAgIHZv aWQgZmlyc3RDaGlsZCgpIGNvbnN0ID0gZGVsZXRlOwogICAgIHZvaWQgbGFzdENoaWxkKCkgY29u c3QgPSBkZWxldGU7CiAK 476328 2025-08-10 11:58:53 -0700 2025-08-11 06:23:48 -0700 [fast-cq]Patch bug-297143-20250810115852.patch text/plain 5112 zalan RnJvbSBkZGEyZDRjY2ZmZDE5MzExM2M1OTkzNWYxYjM0Zjk2NzQwNWE4YjgzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IEZyaSwgOCBBdWcgMjAyNSAxNDo0MDozMSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtvcnRob2dv bmFsIHRkXSBBZGQKIFJlbmRlclRhYmxlU2VjdGlvbjo6Y2VsbExvZ2ljYWxXaWR0aEluVGFibGVE aXJlY3Rpb25JbmNsdWRpbmdDb2x1bW5TcGFuCiBmdW5jdGlvbiBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjk3MTQzCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K Ck1vdmUgb3V0IHRoaXMgd2hpbGUgbG9vcCB0byBhIGRlZGljYXRlZCBmdW5jdGlvbi4gVGhpcyB3 aWxsIGJlIGNhbGxlZCBieSBSZW5kZXJUYWJsZVNlY3Rpb246OmxheW91dFJvd3Mgd2hlbiBjb21w dXRpbmcgaW50cmluc2ljIHBhZGRpbmcgb24gb3J0aG9nb25hbCB0YWJsZSBjZWxscy4KCiogU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5jcHA6CihXZWJDb3JlOjpS ZW5kZXJUYWJsZVNlY3Rpb246OmNlbGxMb2dpY2FsV2lkdGhJblRhYmxlRGlyZWN0aW9uSW5jbHVk aW5nQ29sdW1uU3BhbiBjb25zdCk6CihXZWJDb3JlOjpSZW5kZXJUYWJsZVNlY3Rpb246OmxheW91 dCk6CiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5oOgotLS0K IC4uLi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uY3BwICB8IDUwICsrKysr KysrKysrLS0tLS0tLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rp b24uaCB8ICAyICsKIDIgZmlsZXMgY2hhbmdlZCwgMzIgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxl U2VjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9u LmNwcAppbmRleCA3MGNmNzEzZjk5ZmEuLjRlYWUzNWU0MmM0ZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5jcHAKQEAgLTMzNCw2ICszMzQsMjYg QEAgTGF5b3V0VW5pdCBSZW5kZXJUYWJsZVNlY3Rpb246OmNhbGNSb3dMb2dpY2FsSGVpZ2h0KCkK ICAgICByZXR1cm4gbV9yb3dQb3NbbV9ncmlkLnNpemUoKV07CiB9CiAKK0xheW91dFVuaXQgUmVu ZGVyVGFibGVTZWN0aW9uOjpjZWxsTG9naWNhbFdpZHRoSW5UYWJsZURpcmVjdGlvbkluY2x1ZGlu Z0NvbHVtblNwYW4oY29uc3QgUmVuZGVyVGFibGVDZWxsJiBjZWxsLCBzaXplX3Qgc3RhcnRDb2x1 bW4sIHNpemVfdCBudW1iZXJPZkNvbHVtbnMpIGNvbnN0Cit7CisgICAgQVNTRVJUKHN0YXJ0Q29s dW1uIDwgbnVtYmVyT2ZDb2x1bW5zKTsKKworICAgIGF1dG8gZW5kQ29sdW1uID0gc3RhcnRDb2x1 bW47CisgICAgYXV0byBjb2x1bW5TcGFuID0gY2VsbC5jb2xTcGFuKCk7CisgICAgYXV0byYgY29s dW1ucyA9IHRhYmxlKCktPmNvbHVtbnMoKTsKKyAgICB3aGlsZSAoY29sdW1uU3BhbiAmJiBlbmRD b2x1bW4gPCBudW1iZXJPZkNvbHVtbnMpIHsKKyAgICAgICAgQVNTRVJUKGVuZENvbHVtbiA8IGNv bHVtbnMuc2l6ZSgpKTsKKyAgICAgICAgY29sdW1uU3BhbiAtPSBjb2x1bW5zW2VuZENvbHVtbl0u c3BhbjsKKyAgICAgICAgZW5kQ29sdW1uKys7CisgICAgfQorICAgIGF1dG8mIGNvbHVtblBvc2l0 aW9ucyA9IHRhYmxlKCktPmNvbHVtblBvc2l0aW9ucygpOworICAgIGlmIChzdGFydENvbHVtbiA+ PSBjb2x1bW5Qb3NpdGlvbnMuc2l6ZSgpIHx8IGVuZENvbHVtbiA+PSBjb2x1bW5Qb3NpdGlvbnMu c2l6ZSgpKSB7CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm4g eyB9OworICAgIH0KKyAgICByZXR1cm4gY29sdW1uUG9zaXRpb25zW2VuZENvbHVtbl0gLSBjb2x1 bW5Qb3NpdGlvbnNbc3RhcnRDb2x1bW5dIC0gdGFibGUoKS0+aEJvcmRlclNwYWNpbmcoKTsKK30K Kwogdm9pZCBSZW5kZXJUYWJsZVNlY3Rpb246OmxheW91dCgpCiB7CiAgICAgU3RhY2tTdGF0czo6 TGF5b3V0Q2hlY2tQb2ludCBsYXlvdXRDaGVja1BvaW50OwpAQCAtMzQ4LDMyICszNjgsMjIgQEAg dm9pZCBSZW5kZXJUYWJsZVNlY3Rpb246OmxheW91dCgpCiAKICAgICBMYXlvdXRTdGF0ZU1haW50 YWluZXIgc3RhdGVQdXNoZXIoKnRoaXMsIGxvY2F0aW9uT2Zmc2V0KCksIGlzVHJhbnNmb3JtZWQo KSB8fCBoYXNSZWZsZWN0aW9uKCkgfHwgd3JpdGluZ01vZGUoKS5pc0Jsb2NrRmxpcHBlZCgpKTsK ICAgICBib29sIHBhZ2luYXRlZCA9IHZpZXcoKS5mcmFtZVZpZXcoKS5sYXlvdXRDb250ZXh0KCku bGF5b3V0U3RhdGUoKS0+aXNQYWdpbmF0ZWQoKTsKLSAgICAKLSAgICBjb25zdCBWZWN0b3I8TGF5 b3V0VW5pdD4mIGNvbHVtblBvcyA9IHRhYmxlKCktPmNvbHVtblBvc2l0aW9ucygpOwotICAgIAot ICAgIGZvciAodW5zaWduZWQgciA9IDA7IHIgPCBtX2dyaWQuc2l6ZSgpOyArK3IpIHsKLSAgICAg ICAgUm93JiByb3cgPSBtX2dyaWRbcl0ucm93OwotICAgICAgICB1bnNpZ25lZCBjb2xzID0gcm93 LnNpemUoKTsKKworICAgIGZvciAoc2l6ZV90IHJvd0luZGV4ID0gMDsgcm93SW5kZXggPCBtX2dy aWQuc2l6ZSgpOyArK3Jvd0luZGV4KSB7CisgICAgICAgIGF1dG8mIGNvbHVtbkxpc3QgPSBtX2dy aWRbcm93SW5kZXhdLnJvdzsKKyAgICAgICAgYXV0byBudW1iZXJPZkNvbHVtbnMgPSBjb2x1bW5M aXN0LnNpemUoKTsKICAgICAgICAgLy8gRmlyc3QsIHByb3BhZ2F0ZSBvdXIgdGFibGUgbGF5b3V0 J3MgaW5mb3JtYXRpb24gdG8gdGhlIGNlbGxzLiBUaGlzIHdpbGwgbWFyayB0aGUgcm93IGFzIG5l ZWRpbmcgbGF5b3V0CiAgICAgICAgIC8vIGlmIHRoZXJlIHdhcyBhIGNvbHVtbiBsb2dpY2FsIHdp ZHRoIGNoYW5nZS4KLSAgICAgICAgZm9yICh1bnNpZ25lZCBzdGFydENvbHVtbiA9IDA7IHN0YXJ0 Q29sdW1uIDwgY29sczsgKytzdGFydENvbHVtbikgewotICAgICAgICAgICAgQ2VsbFN0cnVjdCYg Y3VycmVudCA9IHJvd1tzdGFydENvbHVtbl07Ci0gICAgICAgICAgICBSZW5kZXJUYWJsZUNlbGwq IGNlbGwgPSBjdXJyZW50LnByaW1hcnlDZWxsKCk7Ci0gICAgICAgICAgICBpZiAoIWNlbGwgfHwg Y3VycmVudC5pbkNvbFNwYW4pCisgICAgICAgIGZvciAoc2l6ZV90IHN0YXJ0Q29sdW1uID0gMDsg c3RhcnRDb2x1bW4gPCBudW1iZXJPZkNvbHVtbnM7ICsrc3RhcnRDb2x1bW4pIHsKKyAgICAgICAg ICAgIGF1dG8mIGN1cnJlbnRDb2x1bW4gPSBjb2x1bW5MaXN0W3N0YXJ0Q29sdW1uXTsKKyAgICAg ICAgICAgIGF1dG8qIGNlbGwgPSBjdXJyZW50Q29sdW1uLnByaW1hcnlDZWxsKCk7CisgICAgICAg ICAgICBpZiAoIWNlbGwgfHwgY3VycmVudENvbHVtbi5pbkNvbFNwYW4pCiAgICAgICAgICAgICAg ICAgY29udGludWU7CiAKLSAgICAgICAgICAgIHVuc2lnbmVkIGVuZENvbCA9IHN0YXJ0Q29sdW1u OwotICAgICAgICAgICAgdW5zaWduZWQgY3NwYW4gPSBjZWxsLT5jb2xTcGFuKCk7Ci0gICAgICAg ICAgICB3aGlsZSAoY3NwYW4gJiYgZW5kQ29sIDwgY29scykgewotICAgICAgICAgICAgICAgIEFT U0VSVChlbmRDb2wgPCB0YWJsZSgpLT5jb2x1bW5zKCkuc2l6ZSgpKTsKLSAgICAgICAgICAgICAg ICBjc3BhbiAtPSB0YWJsZSgpLT5jb2x1bW5zKClbZW5kQ29sXS5zcGFuOwotICAgICAgICAgICAg ICAgIGVuZENvbCsrOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgTGF5b3V0VW5pdCB0YWJs ZUxheW91dExvZ2ljYWxXaWR0aCA9IGNvbHVtblBvc1tlbmRDb2xdIC0gY29sdW1uUG9zW3N0YXJ0 Q29sdW1uXSAtIHRhYmxlKCktPmhCb3JkZXJTcGFjaW5nKCk7Ci0gICAgICAgICAgICBjZWxsLT5z ZXRDZWxsTG9naWNhbFdpZHRoKHRhYmxlTGF5b3V0TG9naWNhbFdpZHRoKTsKKyAgICAgICAgICAg IGNlbGwtPnNldENlbGxMb2dpY2FsV2lkdGgoY2VsbExvZ2ljYWxXaWR0aEluVGFibGVEaXJlY3Rp b25JbmNsdWRpbmdDb2x1bW5TcGFuKCpjZWxsLCBzdGFydENvbHVtbiwgbnVtYmVyT2ZDb2x1bW5z KSk7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoUmVuZGVyVGFibGVSb3cqIHJvd1JlbmRlcmVy ID0gbV9ncmlkW3JdLnJvd1JlbmRlcmVyKSB7CisgICAgICAgIGlmIChhdXRvKiByb3dSZW5kZXJl ciA9IG1fZ3JpZFtyb3dJbmRleF0ucm93UmVuZGVyZXIpIHsKICAgICAgICAgICAgIGlmICghcm93 UmVuZGVyZXItPm5lZWRzTGF5b3V0KCkgJiYgcGFnaW5hdGVkICYmIHZpZXcoKS5mcmFtZVZpZXco KS5sYXlvdXRDb250ZXh0KCkubGF5b3V0U3RhdGUoKS0+cGFnZUxvZ2ljYWxIZWlnaHRDaGFuZ2Vk KCkpCiAgICAgICAgICAgICAgICAgcm93UmVuZGVyZXItPnNldENoaWxkTmVlZHNMYXlvdXQoTWFy a09ubHlUaGlzKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRhYmxlU2VjdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2Vj dGlvbi5oCmluZGV4IGExZmM4MmUwNDE1ZC4uOWQzYzcxZDkwZDY2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9uLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5oCkBAIC0yMTgsNiArMjE4LDggQEAg cHJpdmF0ZToKIAogICAgIHZvaWQgc2V0TG9naWNhbFBvc2l0aW9uRm9yQ2VsbChSZW5kZXJUYWJs ZUNlbGwqLCB1bnNpZ25lZCBlZmZlY3RpdmVDb2x1bW4pIGNvbnN0OwogCisgICAgTGF5b3V0VW5p dCBjZWxsTG9naWNhbFdpZHRoSW5UYWJsZURpcmVjdGlvbkluY2x1ZGluZ0NvbHVtblNwYW4oY29u c3QgUmVuZGVyVGFibGVDZWxsJiwgc2l6ZV90IHN0YXJ0Q29sdW1uLCBzaXplX3QgbnVtYmVyT2ZD b2x1bW5zKSBjb25zdDsKKwogICAgIHZvaWQgZmlyc3RDaGlsZCgpIGNvbnN0ID0gZGVsZXRlOwog ICAgIHZvaWQgbGFzdENoaWxkKCkgY29uc3QgPSBkZWxldGU7CiAK