224914 2021-04-21 20:58:39 -0700 [RenderTreeBuilder] Multi-column spanners are not part of the enclosing multi-column renderer's subtree 2021-04-22 15:02:25 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr simon.fraser zalan oldest_to_newest 1753032 0 zalan 2021-04-21 20:58:39 -0700 <rdar://76846946> 1753033 1 426769 zalan 2021-04-21 21:15:05 -0700 Created attachment 426769 Patch 1753038 2 426769 simon.fraser 2021-04-21 21:29:12 -0700 Comment on attachment 426769 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426769&action=review > Source/WebCore/rendering/updating/RenderTreeBuilder.cpp:749 > + // This child is a spanner so it is not in the subtree of the multicolumn renderer (parented directly under the block flow). The parenthetical adds confusion. Write it as a new sentence. 1753212 3 426826 zalan 2021-04-22 10:25:04 -0700 Created attachment 426826 Patch 1753308 4 ews-feeder 2021-04-22 15:02:23 -0700 Committed r276464 (236924@main): <https://commits.webkit.org/236924@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426826. 426769 2021-04-21 21:15:05 -0700 2021-04-22 10:25:02 -0700 Patch bug-224914-20210421211505.patch text/plain 6654 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MzQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzgyMDU0NzRhYmM2N2Ey OTFhYWI3OTY5ZGFjOWVjZmI5NDljMDg1Ny4uNDNkYzFiODFhNjAyYzg0Yjc1ZjY4ZmVmNjYwNjk3 ZjUwMTA0NzZhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIxLTA0LTIxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBNdWx0aS1jb2x1bW4gc3Bhbm5lcnMgYXJlIG5vdCBwYXJ0IG9mIHRoZSBlbmNsb3NpbmcgbXVs dGktY29sdW1uIHJlbmRlcmVyJ3Mgc3VidHJlZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0OTE0CisgICAgICAgIDxyZGFyOi8vNzY4NDY5NDY+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRj aCBoYW5kbGVzIHRoZSBjYXNlIHdoZW4gdGhlIG5ld2x5IGluc2VydGVkIHJlbmRlcmVyIGlzIGEg Y29sdW1uIHNwYW5uZXIgYW5kIGNoZWNraW5nIGVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93KCkKKyAg ICAgICAgb24gdGhlIHNwYW5uZXIncyBuZXcgcGFyZW50IHJldHVybnMgdGhlIGluY29ycmVjdCBl bmNsb3NpbmcgbXVsdGktY29sdW1uIHJlbmRlcmVyLgorICAgICAgICBUaGlzIGNhbiByZXN1bHQg aW4gaGF2aW5nIHRoZSBzcGFubmVyIGluIG11bHRpcGxlIG11bHRpLWNvbHVtbiBmbG93cy4KKyAg ICAgICAgCisgICAgICAgIChOb3RlIHRoYXQgdGhlIHNwYW5uZXJzIGFyZSBkaXJlY3RseSBhdHRh Y2hlZCB0byB0aGUgUmVuZGVyQmxvY2tGbG93IHRoYXQgZXN0YWJsaXNoZXMgdGhlIG11bHRpLWNv bHVtbiBjb250ZXh0LCB3aGlsZSBub24tc3Bhbm5lcgorICAgICAgICByZW5kZXJlcnMgYXJlIHBh cnQgb2YgdGhlIFJlbmRlck11bHRpQ29sdW1uRmxvdyBzdWJ0cmVlLiBlLmcKKyAgICAgICAgCisg ICAgICAgICAgUmVuZGVyQmxvY2tGbG93IDwtIHNwYW5uZXIncyBwYXJlbnQuCisgICAgICAgICAg ICBSZW5kZXJNdWx0aUNvbHVtbkZsb3cKKyAgICAgICAgICAgICAgTm9uLXNwYW5uZXIgcmVuZGVy ZXIKKyAgICAgICAgICAgIHNwYW5uZXIgcmVuZGVyZXIKKyAgICAgICAgCisgICAgICAgICAgY2Fs bGluZyBlbmNsb3NpbmdGcmFnbWVudGVkRmxvdygpIG9uIGEgc3Bhbm5lcidzIHBhcmVudCAoUmVu ZGVyQmxvY2tGbG93KSByZXR1cm5zIHRoZSBwYXJlbnQgbXVsdGktY29sdW0gZmxvdyAtYW5kCisg ICAgICAgICAgbm90IHRoZSBvbmUgaXQgZXN0YWJsaXNoZXMuIGUuZy4KKworICAgICAgICAgIFJl bmRlck11bHRpQ29sdW1uRmxvdyA8LSBwYXJlbnQgbXVsdGktY29sdW1uIGZsb3cgLWluIGNhc2Ug b2YgbmVzdGVkIGNvbHVtbnMuCisgICAgICAgICAgICBSZW5kZXJCbG9ja0Zsb3cgPC0gc3Bhbm5l cidzIHBhcmVudC4KKyAgICAgICAgICAgICAgUmVuZGVyTXVsdGlDb2x1bW5GbG93CisgICAgICAg ICAgICAgICAgTm9uLXNwYW5uZXIgcmVuZGVyZXIKKyAgICAgICAgICAgICAgc3Bhbm5lciByZW5k ZXJlcgorICAgICAgICApIAorCisgICAgICAgIFRlc3Q6IGZhc3QvbXVsdGljb2wvc3Bhbm5lci1p bnNlcnRlZC10by1tdWx0aXBsZS1tdWx0aWNvbHVtbnMuaHRtbAorCisgICAgICAgICogcmVuZGVy aW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRyZWVCdWlsZGVyOjpjaGlsZEZsb3dTdGF0ZUNoYW5nZXNBbmRBZmZlY3RzUGFyZW50Qmxv Y2spOgorCiAyMDIxLTA0LTIwICBCYXN1a2UgU3V6dWtpICA8YmFzdWtlLnN1enVraUBzb255LmNv bT4KIAogICAgICAgICBbY2xhbmddIFJlbW92ZSBpbXBsaWNpdCBjYXN0IHJlbGF0ZWQgd2Fybmlu Z3MuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVy VHJlZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRl clRyZWVCdWlsZGVyLmNwcAppbmRleCA4ODJhOWE2ZWU4MTAyZWUzZTE4ZGJmMjdlYzkyZTcxOTMx NTcwYWEzLi45ZmZjMGMzMDc5NzFiZmRjMmQ3YTU4NTU4YjhhODhlMzBjODFlNTcwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVp bGRlci5jcHAKQEAgLTczOCw5ICs3MzgsMjMgQEAgdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6Y2hp bGRGbG93U3RhdGVDaGFuZ2VzQW5kQWZmZWN0c1BhcmVudEJsb2NrKFJlbmRlckVsZW1lbnQKICAg ICAgICAgICAgICAgICAvLyBXZSBuZWVkIHRvIHJlLXJ1biB0aGUgZ3JpZCBpdGVtcyBwbGFjZW1l bnQgaWYgaXQgaGFkIGdhaW5lZCBhIG5ldyBpdGVtLgogICAgICAgICAgICAgICAgIGRvd25jYXN0 PFJlbmRlckdyaWQ+KCpuZXdQYXJlbnQpLmRpcnR5R3JpZCgpOwogICAgICAgICAgICAgfQotICAg ICAgICAgICAgaWYgKGF1dG8qIG5ld0VuY2xvc2luZ0ZyYWdtZW50ZWRGbG93ID0gbmV3UGFyZW50 LT5lbmNsb3NpbmdGcmFnbWVudGVkRmxvdygpOyBpczxSZW5kZXJNdWx0aUNvbHVtbkZsb3c+KG5l d0VuY2xvc2luZ0ZyYWdtZW50ZWRGbG93KSAmJiBjdXJyZW50RW5jbG9zaW5nRnJhZ21lbnQgIT0g bmV3RW5jbG9zaW5nRnJhZ21lbnRlZEZsb3cpIHsKKworICAgICAgICAgICAgYXV0byBjaGlsZE5l ZWRzTXVsdGlDb2x1bW5TdGF0ZVVwZGF0ZSA9IFsmXSB7CisgICAgICAgICAgICAgICAgYXV0byog bmV3RW5jbG9zaW5nRnJhZ21lbnRlZEZsb3cgPSBuZXdQYXJlbnQtPmVuY2xvc2luZ0ZyYWdtZW50 ZWRGbG93KCk7CisgICAgICAgICAgICAgICAgaWYgKGN1cnJlbnRFbmNsb3NpbmdGcmFnbWVudCA9 PSBuZXdFbmNsb3NpbmdGcmFnbWVudGVkRmxvdykKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICAgICAgICAgIGlmICghaXM8UmVuZGVyTXVsdGlDb2x1bW5GbG93Pihu ZXdFbmNsb3NpbmdGcmFnbWVudGVkRmxvdykpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKKyAgICAgICAgICAgICAgICBpZiAobmV3UGFyZW50LT5pc011bHRpQ29sdW1uQmxvY2tG bG93KCkgJiYgZG93bmNhc3Q8UmVuZGVyQmxvY2tGbG93PigqbmV3UGFyZW50KS5tdWx0aUNvbHVt bkZsb3coKSA9PSBjdXJyZW50RW5jbG9zaW5nRnJhZ21lbnQpIHsKKyAgICAgICAgICAgICAgICAg ICAgLy8gVGhpcyBjaGlsZCBpcyBhIHNwYW5uZXIgc28gaXQgaXMgbm90IGluIHRoZSBzdWJ0cmVl IG9mIHRoZSBtdWx0aWNvbHVtbiByZW5kZXJlciAocGFyZW50ZWQgZGlyZWN0bHkgdW5kZXIgdGhl IGJsb2NrIGZsb3cpLiAKKyAgICAgICAgICAgICAgICAgICAgQVNTRVJUKGlzPFJlbmRlckJveD4o Y2hpbGQpICYmIGRvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oKm5ld1BhcmVudCkubXVsdGlDb2x1 bW5GbG93KCktPnNwYW5uZXJNYXAoKS5jb250YWlucygmZG93bmNhc3Q8UmVuZGVyQm94PihjaGls ZCkpKTsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIH07CisgICAgICAg ICAgICBpZiAoY2hpbGROZWVkc011bHRpQ29sdW1uU3RhdGVVcGRhdGUoKSkgewogICAgICAgICAg ICAgICAgIC8vIExldCB0aGUgZnJhZ21lbnRlZCBmbG93IGtub3cgdGhhdCBpdCBoYXMgYSBuZXcg aW4tZmxvdyBkZXNjZW5kYW50LgotICAgICAgICAgICAgICAgIG11bHRpQ29sdW1uQnVpbGRlcigp Lm11bHRpQ29sdW1uRGVzY2VuZGFudEluc2VydGVkKGRvd25jYXN0PFJlbmRlck11bHRpQ29sdW1u Rmxvdz4oKm5ld0VuY2xvc2luZ0ZyYWdtZW50ZWRGbG93KSwgY2hpbGQpOworICAgICAgICAgICAg ICAgIG11bHRpQ29sdW1uQnVpbGRlcigpLm11bHRpQ29sdW1uRGVzY2VuZGFudEluc2VydGVkKGRv d25jYXN0PFJlbmRlck11bHRpQ29sdW1uRmxvdz4oKm5ld1BhcmVudC0+ZW5jbG9zaW5nRnJhZ21l bnRlZEZsb3coKSksIGNoaWxkKTsKICAgICAgICAgICAgICAgICBjaGlsZC5pbml0aWFsaXplRnJh Z21lbnRlZEZsb3dTdGF0ZU9uSW5zZXJ0aW9uKCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxNzU5NDFjYTkzODk2ZjNmMzcwMmQ2ZTI4ZDVkZDk3NTkwNzdkYmU5Li4xYjhkNzA0 NzU0ZWM3ODkyYjI3Y2NiMmM1NDUxNjU2ZDMyMDkwYjZiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMjEtMDQtMjEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBb UmVuZGVyVHJlZUJ1aWxkZXJdIE11bHRpLWNvbHVtbiBzcGFubmVycyBhcmUgbm90IHBhcnQgb2Yg dGhlIGVuY2xvc2luZyBtdWx0aS1jb2x1bW4gcmVuZGVyZXIncyBzdWJ0cmVlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ5MTQKKyAgICAgICAgPHJk YXI6Ly83Njg0Njk0Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIGZhc3QvbXVsdGljb2wvc3Bhbm5lci1pbnNlcnRlZC10by1tdWx0aXBsZS1tdWx0 aWNvbHVtbnMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L211bHRpY29sL3Nw YW5uZXItaW5zZXJ0ZWQtdG8tbXVsdGlwbGUtbXVsdGljb2x1bW5zLmh0bWw6IEFkZGVkLgorCiAy MDIxLTA0LTIwICBJYW4gR2lsYmVydCAgPGlhbmdAYXBwbGUuY29tPgogCiAgICAgICAgIENyYXNo IGR1ZSB0byBWZWN0b3JCdWZmZXIgcHJlLWFsbG9jYXRpb24gZmFpbHVyZQpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9zcGFubmVyLWluc2VydGVkLXRvLW11bHRpcGxlLW11 bHRpY29sdW1ucy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL3NwYW5u ZXItaW5zZXJ0ZWQtdG8tbXVsdGlwbGUtbXVsdGljb2x1bW5zLWV4cGVjdGVkLnR4dApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi44YjEzNzg5MTc5MWZlOTY5MjdhZDc4ZTY0YjBhYWQ3YmRlZDA4YmRjCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9zcGFubmVyLWluc2VydGVkLXRvLW11 bHRpcGxlLW11bHRpY29sdW1ucy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSBAQAorCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL3NwYW5uZXItaW5zZXJ0ZWQtdG8tbXVsdGlw bGUtbXVsdGljb2x1bW5zLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL3NwYW5uZXIt aW5zZXJ0ZWQtdG8tbXVsdGlwbGUtbXVsdGljb2x1bW5zLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZTYwYjAw NTZkYWUzMDVjYzZmNWYwMzc0ODYwZTg1ODVmZTlmODVkZgotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvc3Bhbm5lci1pbnNlcnRlZC10by1tdWx0aXBsZS1tdWx0 aWNvbHVtbnMuaHRtbApAQCAtMCwwICsxLDI3IEBACis8c3R5bGU+CisgIGRpdiB7CisgICAgY29s dW1uLXNwYW46IGFsbDsKKyAgfQorICA6bnRoLWxhc3QtY2hpbGQoMikgeworICAgIGZsb2F0OiBs ZWZ0OworICB9Cis8L3N0eWxlPgorPHNjcmlwdD4KKyAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQor ICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworICBvbmxvYWQgPSAoKSA9PiB7CisgICAgZG9j dW1lbnQuc3R5bGVTaGVldHNbMF0/Lmluc2VydFJ1bGUoYGh0bWwgeyBjb2x1bW4td2lkdGg6IDFw eDsgfWApOworICAgIGRvY3VtZW50LnN0eWxlU2hlZXRzWzBdPy5pbnNlcnRSdWxlKGBib2R5IHsg Y29sdW1uLXdpZHRoOiAxcHg7IH1gKTsKKyAgICBsZXQgbjAgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCdzcGFuJyk7CisgICAgZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChuMCk7CisgICAgbGV0 IG4xID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2Jyk7CisgICAgbjEuYXBwZW5kQ2hpbGQo ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2JykpOworICAgIG4wLmFwcGVuZENoaWxkKG4xKTsK KyAgICBuMC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdkaXYnKSk7CisgICAg ZG9jdW1lbnQuYm9keS5vZmZzZXRUb3A7CisgICAgbjAuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgnZGl2JykpOworICAgIGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJ3N0eWxlJyku YXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoJycpKTsKKyAgfTsKKzwvc2NyaXB0 PgorCis8IS0tICBQQVNTIGlmIG5vIGNyYXNoIG9yIGFzc2VydCAtLT4K 426826 2021-04-22 10:25:04 -0700 2021-04-22 15:02:24 -0700 Patch bug-224914-20210422102504.patch text/plain 6804 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjczODFhZmIwM2M5N2Vj ZmU4OTYyMjc4OWVjYjBjMjA2MTk5ZWMxZC4uZWVjYmU3ZGZlZGFkMzA1ZDM4YzhmZjk4YWFiZTdk MmI2OWJkMDllNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIxLTA0LTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBNdWx0aS1jb2x1bW4gc3Bhbm5lcnMgYXJlIG5vdCBwYXJ0IG9mIHRoZSBlbmNsb3NpbmcgbXVs dGktY29sdW1uIHJlbmRlcmVyJ3Mgc3VidHJlZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0OTE0CisgICAgICAgIDxyZGFyOi8vNzY4NDY5NDY+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIFRoaXMgcGF0Y2gg aGFuZGxlcyB0aGUgY2FzZSB3aGVuIHRoZSBuZXdseSBpbnNlcnRlZCByZW5kZXJlciBpcyBhIGNv bHVtbiBzcGFubmVyIGFuZCBjaGVja2luZyBlbmNsb3NpbmdGcmFnbWVudGVkRmxvdygpCisgICAg ICAgIG9uIHRoZSBzcGFubmVyJ3MgbmV3IHBhcmVudCByZXR1cm5zIHRoZSBpbmNvcnJlY3QgZW5j bG9zaW5nIG11bHRpLWNvbHVtbiByZW5kZXJlci4KKyAgICAgICAgVGhpcyBjYW4gcmVzdWx0IGlu IGhhdmluZyB0aGUgc3Bhbm5lciBpbiBtdWx0aXBsZSBtdWx0aS1jb2x1bW4gZmxvd3MuCisKKyAg ICAgICAgKE5vdGUgdGhhdCB0aGUgc3Bhbm5lcnMgYXJlIGRpcmVjdGx5IGF0dGFjaGVkIHRvIHRo ZSBSZW5kZXJCbG9ja0Zsb3cgdGhhdCBlc3RhYmxpc2hlcyB0aGUgbXVsdGktY29sdW1uIGNvbnRl eHQsIHdoaWxlIG5vbi1zcGFubmVyCisgICAgICAgIHJlbmRlcmVycyBhcmUgcGFydCBvZiB0aGUg UmVuZGVyTXVsdGlDb2x1bW5GbG93IHN1YnRyZWUuIGUuZworCisgICAgICAgICAgUmVuZGVyQmxv Y2tGbG93IDwtIHNwYW5uZXIncyBwYXJlbnQuCisgICAgICAgICAgICBSZW5kZXJNdWx0aUNvbHVt bkZsb3cKKyAgICAgICAgICAgICAgTm9uLXNwYW5uZXIgcmVuZGVyZXIKKyAgICAgICAgICAgIHNw YW5uZXIgcmVuZGVyZXIKKworICAgICAgICAgIGNhbGxpbmcgZW5jbG9zaW5nRnJhZ21lbnRlZEZs b3coKSBvbiBhIHNwYW5uZXIncyBwYXJlbnQgKFJlbmRlckJsb2NrRmxvdykgcmV0dXJucyB0aGUg cGFyZW50IG11bHRpLWNvbHVtbiBmbG93IC1hbmQKKyAgICAgICAgICBub3QgdGhlIG9uZSBpdCBl c3RhYmxpc2hlcy4gZS5nLgorCisgICAgICAgICAgUmVuZGVyTXVsdGlDb2x1bW5GbG93IDwtIHBh cmVudCBtdWx0aS1jb2x1bW4gZmxvdyAtaW4gY2FzZSBvZiBuZXN0ZWQgY29sdW1ucy4KKyAgICAg ICAgICAgIFJlbmRlckJsb2NrRmxvdyA8LSBzcGFubmVyJ3MgcGFyZW50LgorICAgICAgICAgICAg ICBSZW5kZXJNdWx0aUNvbHVtbkZsb3cKKyAgICAgICAgICAgICAgICBOb24tc3Bhbm5lciByZW5k ZXJlcgorICAgICAgICAgICAgICBzcGFubmVyIHJlbmRlcmVyCisgICAgICAgICkKKworICAgICAg ICBUZXN0OiBmYXN0L211bHRpY29sL3NwYW5uZXItaW5zZXJ0ZWQtdG8tbXVsdGlwbGUtbXVsdGlj b2x1bW5zLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVp bGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRlcjo6Y2hpbGRGbG93 U3RhdGVDaGFuZ2VzQW5kQWZmZWN0c1BhcmVudEJsb2NrKToKKwogMjAyMS0wNC0yMSAgWmFsYW4g QnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIElnbm9yZSBjb2x1bW4gc3Bhbm5l ciBwcm9wZXJ0eSBmb3IgdGhlIGlubmVyIHBhcnQgb2YgYSB0ZXh0IGNvbnRyb2wuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVy LmNwcAppbmRleCA4ODJhOWE2ZWU4MTAyZWUzZTE4ZGJmMjdlYzkyZTcxOTMxNTcwYWEzLi44MmEy YmJmMDg5ZWJmYzY5NmZlZDQyNjY1NjczMGI3OTgzMTU1YjE2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHAKQEAg LTczOCw5ICs3MzgsMjEgQEAgdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6Y2hpbGRGbG93U3RhdGVD aGFuZ2VzQW5kQWZmZWN0c1BhcmVudEJsb2NrKFJlbmRlckVsZW1lbnQKICAgICAgICAgICAgICAg ICAvLyBXZSBuZWVkIHRvIHJlLXJ1biB0aGUgZ3JpZCBpdGVtcyBwbGFjZW1lbnQgaWYgaXQgaGFk IGdhaW5lZCBhIG5ldyBpdGVtLgogICAgICAgICAgICAgICAgIGRvd25jYXN0PFJlbmRlckdyaWQ+ KCpuZXdQYXJlbnQpLmRpcnR5R3JpZCgpOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgaWYg KGF1dG8qIG5ld0VuY2xvc2luZ0ZyYWdtZW50ZWRGbG93ID0gbmV3UGFyZW50LT5lbmNsb3NpbmdG cmFnbWVudGVkRmxvdygpOyBpczxSZW5kZXJNdWx0aUNvbHVtbkZsb3c+KG5ld0VuY2xvc2luZ0Zy YWdtZW50ZWRGbG93KSAmJiBjdXJyZW50RW5jbG9zaW5nRnJhZ21lbnQgIT0gbmV3RW5jbG9zaW5n RnJhZ21lbnRlZEZsb3cpIHsKKworICAgICAgICAgICAgYXV0byBuZXdNdWx0aUNvbHVtbkZvckNo aWxkUmVuZGVyZXIgPSBbJl0oKSAtPiBSZW5kZXJNdWx0aUNvbHVtbkZsb3cqIHsKKyAgICAgICAg ICAgICAgICAvLyBVcGRhdGUgdGhlIHN0YXRlIHdoZW4gdGhlIGNoaWxkIGhhcyBtb3ZlZCBmcm9t IG9uZSBtdWx0aS1jb2x1bW4gZmxvdyB0byBhbm90aGVyLgorICAgICAgICAgICAgICAgIGF1dG8q IG5ld0VuY2xvc2luZ0ZyYWdtZW50ZWRGbG93ID0gbmV3UGFyZW50LT5lbmNsb3NpbmdGcmFnbWVu dGVkRmxvdygpOworICAgICAgICAgICAgICAgIGlmIChuZXdQYXJlbnQtPmlzTXVsdGlDb2x1bW5C bG9ja0Zsb3coKSkgeworICAgICAgICAgICAgICAgICAgICAvLyBUaGlzIGNoaWxkIGlzIGEgc3Bh bm5lciBzbyBpdCBpcyBub3QgaW4gdGhlIHN1YnRyZWUgb2YgdGhlIG11bHRpY29sdW1uIHJlbmRl cmVyLiBJdCBpcyBwYXJlbnRlZCBkaXJlY3RseSB1bmRlciB0aGUgYmxvY2sgZmxvdyBzbworICAg ICAgICAgICAgICAgICAgICAvLyBlbmNsb3NpbmdGcmFnbWVudGVkRmxvdygpIHJldHVybnMgdGhl IHBhcmVudCBlbmNsb3NpbmcgZmxvdy4KKyAgICAgICAgICAgICAgICAgICAgQVNTRVJUKGlzPFJl bmRlckJveD4oY2hpbGQpICYmIGRvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oKm5ld1BhcmVudCku bXVsdGlDb2x1bW5GbG93KCktPnNwYW5uZXJNYXAoKS5jb250YWlucygmZG93bmNhc3Q8UmVuZGVy Qm94PihjaGlsZCkpKTsKKyAgICAgICAgICAgICAgICAgICAgbmV3RW5jbG9zaW5nRnJhZ21lbnRl ZEZsb3cgPSBkb3duY2FzdDxSZW5kZXJCbG9ja0Zsb3c+KCpuZXdQYXJlbnQpLm11bHRpQ29sdW1u RmxvdygpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICByZXR1cm4gbmV3RW5j bG9zaW5nRnJhZ21lbnRlZEZsb3cgIT0gY3VycmVudEVuY2xvc2luZ0ZyYWdtZW50ICYmIGlzPFJl bmRlck11bHRpQ29sdW1uRmxvdz4obmV3RW5jbG9zaW5nRnJhZ21lbnRlZEZsb3cpID8gZG93bmNh c3Q8UmVuZGVyTXVsdGlDb2x1bW5GbG93PihuZXdFbmNsb3NpbmdGcmFnbWVudGVkRmxvdykgOiBu dWxscHRyOworICAgICAgICAgICAgfTsKKyAgICAgICAgICAgIGlmIChhdXRvKiBuZXdFbmNsb3Np bmdNdWx0aUNvbHVtbiA9IG5ld011bHRpQ29sdW1uRm9yQ2hpbGRSZW5kZXJlcigpKSB7CiAgICAg ICAgICAgICAgICAgLy8gTGV0IHRoZSBmcmFnbWVudGVkIGZsb3cga25vdyB0aGF0IGl0IGhhcyBh IG5ldyBpbi1mbG93IGRlc2NlbmRhbnQuCi0gICAgICAgICAgICAgICAgbXVsdGlDb2x1bW5CdWls ZGVyKCkubXVsdGlDb2x1bW5EZXNjZW5kYW50SW5zZXJ0ZWQoZG93bmNhc3Q8UmVuZGVyTXVsdGlD b2x1bW5GbG93PigqbmV3RW5jbG9zaW5nRnJhZ21lbnRlZEZsb3cpLCBjaGlsZCk7CisgICAgICAg ICAgICAgICAgbXVsdGlDb2x1bW5CdWlsZGVyKCkubXVsdGlDb2x1bW5EZXNjZW5kYW50SW5zZXJ0 ZWQoKm5ld0VuY2xvc2luZ011bHRpQ29sdW1uLCBjaGlsZCk7CiAgICAgICAgICAgICAgICAgY2hp bGQuaW5pdGlhbGl6ZUZyYWdtZW50ZWRGbG93U3RhdGVPbkluc2VydGlvbigpOwogICAgICAgICAg ICAgfQogICAgICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYmEzMWRiZjQ2ODEyMzg2MzI2ODg2ODhhZGMzZmRlMDhh MTg4NmRiMC4uZTU1MjliYWI3ZGQzM2U0NzZhOWNjOWNjYzY0ODk0NDBhMjY1MTA4MCAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE0IEBACisyMDIxLTA0LTIyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j b20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVyXSBNdWx0aS1jb2x1bW4gc3Bhbm5lcnMg YXJlIG5vdCBwYXJ0IG9mIHRoZSBlbmNsb3NpbmcgbXVsdGktY29sdW1uIHJlbmRlcmVyJ3Mgc3Vi dHJlZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0 OTE0CisgICAgICAgIDxyZGFyOi8vNzY4NDY5NDY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2lt b24gRnJhc2VyLgorCisgICAgICAgICogZmFzdC9tdWx0aWNvbC9zcGFubmVyLWluc2VydGVkLXRv LW11bHRpcGxlLW11bHRpY29sdW1ucy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZh c3QvbXVsdGljb2wvc3Bhbm5lci1pbnNlcnRlZC10by1tdWx0aXBsZS1tdWx0aWNvbHVtbnMuaHRt bDogQWRkZWQuCisKIDIwMjEtMDQtMjEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K IAogICAgICAgICBJZ25vcmUgY29sdW1uIHNwYW5uZXIgcHJvcGVydHkgZm9yIHRoZSBpbm5lciBw YXJ0IG9mIGEgdGV4dCBjb250cm9sLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tdWx0 aWNvbC9zcGFubmVyLWluc2VydGVkLXRvLW11bHRpcGxlLW11bHRpY29sdW1ucy1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL3NwYW5uZXItaW5zZXJ0ZWQtdG8tbXVsdGlw bGUtbXVsdGljb2x1bW5zLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44YjEzNzg5MTc5MWZlOTY5 MjdhZDc4ZTY0YjBhYWQ3YmRlZDA4YmRjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9tdWx0aWNvbC9zcGFubmVyLWluc2VydGVkLXRvLW11bHRpcGxlLW11bHRpY29sdW1ucy1l eHBlY3RlZC50eHQKQEAgLTAsMCArMSBAQAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L211bHRpY29sL3NwYW5uZXItaW5zZXJ0ZWQtdG8tbXVsdGlwbGUtbXVsdGljb2x1bW5zLmh0bWwg Yi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL3NwYW5uZXItaW5zZXJ0ZWQtdG8tbXVsdGlwbGUt bXVsdGljb2x1bW5zLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZTYwYjAwNTZkYWUzMDVjYzZmNWYwMzc0ODYw ZTg1ODVmZTlmODVkZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGlj b2wvc3Bhbm5lci1pbnNlcnRlZC10by1tdWx0aXBsZS1tdWx0aWNvbHVtbnMuaHRtbApAQCAtMCww ICsxLDI3IEBACis8c3R5bGU+CisgIGRpdiB7CisgICAgY29sdW1uLXNwYW46IGFsbDsKKyAgfQor ICA6bnRoLWxhc3QtY2hpbGQoMikgeworICAgIGZsb2F0OiBsZWZ0OworICB9Cis8L3N0eWxlPgor PHNjcmlwdD4KKyAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5uZXIuZHVtcEFz VGV4dCgpOworICBvbmxvYWQgPSAoKSA9PiB7CisgICAgZG9jdW1lbnQuc3R5bGVTaGVldHNbMF0/ Lmluc2VydFJ1bGUoYGh0bWwgeyBjb2x1bW4td2lkdGg6IDFweDsgfWApOworICAgIGRvY3VtZW50 LnN0eWxlU2hlZXRzWzBdPy5pbnNlcnRSdWxlKGBib2R5IHsgY29sdW1uLXdpZHRoOiAxcHg7IH1g KTsKKyAgICBsZXQgbjAgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdzcGFuJyk7CisgICAgZG9j dW1lbnQuYm9keS5hcHBlbmRDaGlsZChuMCk7CisgICAgbGV0IG4xID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgnZGl2Jyk7CisgICAgbjEuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgnZGl2JykpOworICAgIG4wLmFwcGVuZENoaWxkKG4xKTsKKyAgICBuMC5hcHBlbmRDaGlsZChk b2N1bWVudC5jcmVhdGVFbGVtZW50KCdkaXYnKSk7CisgICAgZG9jdW1lbnQuYm9keS5vZmZzZXRU b3A7CisgICAgbjAuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2JykpOwor ICAgIGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJ3N0eWxlJykuYXBwZW5kQ2hpbGQoZG9jdW1lbnQu Y3JlYXRlVGV4dE5vZGUoJycpKTsKKyAgfTsKKzwvc2NyaXB0PgorCis8IS0tICBQQVNTIGlmIG5v IGNyYXNoIG9yIGFzc2VydCAtLT4K