231356 2021-10-07 06:00:47 -0700 [LFC][Integration] Optimize InlineContent::boxesForRect 2021-10-07 08:03:32 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto koivisto bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1801571 0 koivisto 2021-10-07 06:00:47 -0700 Approximate the box range from average line height. 1801577 1 440497 koivisto 2021-10-07 06:20:51 -0700 Created attachment 440497 Patch 1801589 2 440497 zalan 2021-10-07 07:15:21 -0700 Comment on attachment 440497 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=440497&action=review > Source/WebCore/layout/integration/LayoutIntegrationInlineContent.h:64 > + bool hasMultilineInkOverflow { false }; this could also be triggered by just normal (non-ink)overlap with line-height other than normal. 1801592 3 440501 koivisto 2021-10-07 07:27:06 -0700 Created attachment 440501 Patch 1801603 4 ews-feeder 2021-10-07 08:02:04 -0700 Committed r283711 (242637@main): <https://commits.webkit.org/242637@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440501. 1801606 5 webkit-bug-importer 2021-10-07 08:03:32 -0700 <rdar://problem/83981134> 440497 2021-10-07 06:20:51 -0700 2021-10-07 07:27:02 -0700 Patch bug-231356-20211007162050.patch text/plain 5392 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNzA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzczZWE3ODRiMjc4Mzgy NzM2ODg1NzdmN2IzMDAyNzQ2OGM3YTUzMi4uMmIxMzJiOGI2YTFjOTZlNDNlN2M1Yjc1NTc2ZTM4 OWJlMmYyOGRhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTEwLTA3ICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlv bl0gT3B0aW1pemUgSW5saW5lQ29udGVudDo6Ym94ZXNGb3JSZWN0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzEzNTYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlv dXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 SW50ZWdyYXRpb246OklubGluZUNvbnRlbnQ6OmJveGVzRm9yUmVjdCBjb25zdCk6CisKKyAgICAg ICAgQXBwcm94aW1hdGUgdGhlIHN0YXJ0aW5nIHBvaW50IHVzaW5nIGF2ZXJhZ2UgbGluZSBoZWln aHQKKyAgICAgICAgYW5kIHRoZW4gc2VhcmNoIGZvciB0aGUgZmlyc3QvbGFzdCBsaW5lIG91dHNp ZGUgdGhlIHJlY3QuCisKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25JbmxpbmVDb250ZW50Lmg6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91 dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0SW50ZWdyYXRpb246OklubGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5TGlu ZXMgY29uc3QpOgorCisgICAgICAgIEFkZCBhIGJpdCB0aGF0IHRlbGxzIGlmIHRoZSBjb250ZW50 IGhhcyBsaW5lcyB3aXRoIG92ZXJmbG93IHRoYXQgZXhjZWVkcyB0aGUgcHJldmlvdXMgb3IgbmV4 dCBsaW5lcyBvdmVyZmxvdy4KKyAgICAgICAgV2UgY2FuJ3QgdXNlIHRoZSBvcHRpbWl6YXRpb24g aW4gdGhpcyByYXJlIGNhc2UuCisKIDIwMjEtMTAtMDcgIEtpbW1vIEtpbm51bmVuICA8a2tpbm51 bmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBTY29wZWRFR0xEZWZhdWx0RGlzcGxheSBzaG91bGQg YmUgcmVtb3ZlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50LmNwcAppbmRleCAw OTJjOGFkOTlmOGQ3NGJmM2JmODM5YTVkMjg5ZDZmYjEzYTMyMTc4Li5jMzlhNWUzMTc3NWUwNWU2 ZDE5NDJkZGVhYmZhYWFhMjJiMzQxYTM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVD b250ZW50LmNwcApAQCAtNDcsMTIgKzQ3LDQyIEBAIGJvb2wgSW5saW5lQ29udGVudDo6aGFzQ29u dGVudCgpIGNvbnN0CiAgICAgcmV0dXJuIGJveGVzLnNpemUoKSA+IDE7CiB9OwogCi1XVEY6Okl0 ZXJhdG9yUmFuZ2U8Y29uc3QgSW5saW5lRGlzcGxheTo6Qm94Kj4gSW5saW5lQ29udGVudDo6Ym94 ZXNGb3JSZWN0KGNvbnN0IExheW91dFJlY3QmKSBjb25zdAorV1RGOjpJdGVyYXRvclJhbmdlPGNv bnN0IElubGluZURpc3BsYXk6OkJveCo+IElubGluZUNvbnRlbnQ6OmJveGVzRm9yUmVjdChjb25z dCBMYXlvdXRSZWN0JiByZWN0KSBjb25zdAogewotICAgIC8vIEZJWE1FOiBEbyBzb21ldGhpbmcg ZWZmaWNpZW50IGUuZy4gdXNpbmcgbGluZSBib3hlcy4KICAgICBpZiAoYm94ZXMuaXNFbXB0eSgp KQogICAgICAgICByZXR1cm4geyBudWxscHRyLCBudWxscHRyIH07Ci0gICAgcmV0dXJuIHsgJmJv eGVzLmZpcnN0KCksICZib3hlcy5sYXN0KCkgKyAxIH07CisKKyAgICBpZiAobGluZXMuZmlyc3Qo KS5pbmtPdmVyZmxvdygpLm1heFkoKSA+IHJlY3QueSgpICYmIGxpbmVzLmxhc3QoKS5pbmtPdmVy ZmxvdygpLnkoKSA8IHJlY3QubWF4WSgpKQorICAgICAgICByZXR1cm4geyAmYm94ZXMuZmlyc3Qo KSwgJmJveGVzLmxhc3QoKSArIDEgfTsKKworICAgIC8vIFRoZSBvcHRpbWl6YXRpb24gYmVsb3cg cmVsaWVzIG9uIGxpbmUgb3ZlcmZsb3cgbm90IGV4ZWVkaW5nIHRoZSBvdmVyZmxvdyBvZiBwcmV2 aW91cyBvciBuZXh0IGxpbmUuCisgICAgaWYgKGhhc011bHRpbGluZUlua092ZXJmbG93KQorICAg ICAgICByZXR1cm4geyAmYm94ZXMuZmlyc3QoKSwgJmJveGVzLmxhc3QoKSArIDEgfTsKKworICAg IGF1dG8gaGVpZ2h0ID0gbGluZXMubGFzdCgpLmxpbmVCb3hCb3R0b20oKSAtIGxpbmVzLmZpcnN0 KCkubGluZUJveFRvcCgpOworICAgIGF1dG8gYXZlcmFnZUxpbmVIZWlnaHQgPSBoZWlnaHQgLyBs aW5lcy5zaXplKCk7CisKKyAgICBhdXRvIGFwcHJveGltYXRlTGluZSA9IFsmXShMYXlvdXRVbml0 IHkpIHsKKyAgICAgICAgeSA9IHN0ZDo6bWF4KHksIDBfbHUpOworICAgICAgICByZXR1cm4gc3Rk OjptaW4oc3RhdGljX2Nhc3Q8c2l6ZV90Pih5IC8gYXZlcmFnZUxpbmVIZWlnaHQpLCBsaW5lcy5z aXplKCkgLSAxKTsKKyAgICB9OworCisgICAgYXV0byBzdGFydExpbmUgPSBhcHByb3hpbWF0ZUxp bmUocmVjdC55KCkpOworICAgIGZvciAoOyBzdGFydExpbmU7IC0tc3RhcnRMaW5lKSB7CisgICAg ICAgIGlmIChsaW5lc1tzdGFydExpbmUgLSAxXS5pbmtPdmVyZmxvdygpLm1heFkoKSA8IHJlY3Qu eSgpKQorICAgICAgICAgICAgYnJlYWs7CisgICAgfQorCisgICAgYXV0byBlbmRMaW5lID0gYXBw cm94aW1hdGVMaW5lKHJlY3QubWF4WSgpKTsKKyAgICBmb3IgKDsgZW5kTGluZSA8IGxpbmVzLnNp emUoKSAtIDE7ICsrZW5kTGluZSkgeworICAgICAgICBpZiAobGluZXNbZW5kTGluZSArIDFdLmlu a092ZXJmbG93KCkueSgpID4gcmVjdC5tYXhZKCkpCisgICAgICAgICAgICBicmVhazsKKyAgICB9 CisKKyAgICBhdXRvIGZpcnN0Qm94ID0gbGluZXNbc3RhcnRMaW5lXS5maXJzdEJveEluZGV4KCk7 CisgICAgYXV0byBsYXN0Qm94ID0gbGluZXNbZW5kTGluZV0uZmlyc3RCb3hJbmRleCgpICsgbGlu ZXNbZW5kTGluZV0uYm94Q291bnQoKSAtIDE7CisKKyAgICByZXR1cm4geyAmYm94ZXNbZmlyc3RC b3hdLCAmYm94ZXNbbGFzdEJveF0gKyAxIH07CiB9CiAKIElubGluZUNvbnRlbnQ6On5JbmxpbmVD b250ZW50KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9M YXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnQuaAppbmRleCBmYzMxMjU4 NDc1ZDUxNjI2ZmVlNDNiMmIyZjkwZmI5NDNjY2UyNTkxLi5lNzhjMmE4NDgzM2FhMTQ2MWMxMzVj NTkzNTYxMzY3M2U5YjRhODQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50LmgKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5o CkBAIC02MSw2ICs2MSw3IEBAIHN0cnVjdCBJbmxpbmVDb250ZW50IDogcHVibGljIFJlZkNvdW50 ZWQ8SW5saW5lQ29udGVudD4gewogICAgIExpbmVzIGxpbmVzOwogCiAgICAgZmxvYXQgY2xlYXJH YXBBZnRlckxhc3RMaW5lIHsgMCB9OworICAgIGJvb2wgaGFzTXVsdGlsaW5lSW5rT3ZlcmZsb3cg eyBmYWxzZSB9OwogCiAgICAgYm9vbCBoYXNDb250ZW50KCkgY29uc3Q7CiAgICAgCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25J bmxpbmVDb250ZW50QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAKaW5kZXggMzEzM2Qz YmRkZTUzMmI3NzgxNmNjYzcxNDUyNjRkNDJiOTMxNzg4Ni4uYzg0ODkwY2I2NGE2NzgzZTA2NTM3 OWJlM2EyYjhmOTlmMTY5NGMwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGlu ZUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtMTA1LDYgKzEwNSwxMyBAQCB2b2lkIElubGluZUNvbnRl bnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5TGluZXMoTGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nU3Rh dGUmIGlubAogICAgICAgICAgICAgICAgIHNjcm9sbGFibGVPdmVyZmxvd1JlY3QudW5pdGUoY2hp bGRTY3JvbGxhYmxlT3ZlcmZsb3cpOwogICAgICAgICAgICAgfQogICAgICAgICB9CisKKyAgICAg ICAgaWYgKCFpbmxpbmVDb250ZW50LmxpbmVzLmlzRW1wdHkoKSkgeworICAgICAgICAgICAgYXV0 byYgbGFzdElua092ZXJmbG93ID0gaW5saW5lQ29udGVudC5saW5lcy5sYXN0KCkuaW5rT3ZlcmZs b3coKTsKKyAgICAgICAgICAgIGlmIChsaW5lSW5rT3ZlcmZsb3dSZWN0LnkoKSA8PSBsYXN0SW5r T3ZlcmZsb3cueSgpIHx8IGxhc3RJbmtPdmVyZmxvdy5tYXhZKCkgPj0gbGluZUlua092ZXJmbG93 UmVjdC5tYXhZKCkpCisgICAgICAgICAgICAgICAgaW5saW5lQ29udGVudC5oYXNNdWx0aWxpbmVJ bmtPdmVyZmxvdyA9IHRydWU7CisgICAgICAgIH0KKwogICAgICAgICBhdXRvIGxpbmVCb3hMb2dp Y2FsUmVjdCA9IEZsb2F0UmVjdCB7IGxpbmUubGluZUJveExvZ2ljYWxSZWN0KCkgfTsKICAgICAg ICAgYXV0byBib3hDb3VudCA9IGJveEluZGV4IC0gZmlyc3RCb3hJbmRleDsKICAgICAgICAgaW5s aW5lQ29udGVudC5saW5lcy5hcHBlbmQoeyBmaXJzdEJveEluZGV4LCBib3hDb3VudCwgbGluZUJv eExvZ2ljYWxSZWN0LCBsaW5lLmVuY2xvc2luZ1RvcEFuZEJvdHRvbSgpLnRvcCwgbGluZS5lbmNs b3NpbmdUb3BBbmRCb3R0b20oKS5ib3R0b20sIHNjcm9sbGFibGVPdmVyZmxvd1JlY3QsIGxpbmVJ bmtPdmVyZmxvd1JlY3QsIGxpbmUuYmFzZWxpbmUoKSwgbGluZS5jb250ZW50TG9naWNhbExlZnQo KSwgbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCkgfSk7Cg== 440501 2021-10-07 07:27:06 -0700 2021-10-07 08:02:05 -0700 Patch bug-231356-20211007172705.patch text/plain 5422 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNzA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzczZWE3ODRiMjc4Mzgy NzM2ODg1NzdmN2IzMDAyNzQ2OGM3YTUzMi4uOGE4ZDc3YzI4OThmNjZiMGFkYTU4NTY2ZjIyMzMz N2RlZjFjNjY1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTEwLTA3ICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlv bl0gT3B0aW1pemUgSW5saW5lQ29udGVudDo6Ym94ZXNGb3JSZWN0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzEzNTYKKworICAgICAgICBSZXZpZXdl ZCBieSBBbGFuIEJ1anRhcy4KKworICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJ bnRlZ3JhdGlvbklubGluZUNvbnRlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50 ZWdyYXRpb246OklubGluZUNvbnRlbnQ6OmJveGVzRm9yUmVjdCBjb25zdCk6CisKKyAgICAgICAg QXBwcm94aW1hdGUgdGhlIHN0YXJ0aW5nIHBvaW50cyBmcm9tIHRoZSByZWN0IHVzaW5nIHRoZSBh dmVyYWdlIGxpbmUgaGVpZ2h0IGFuZCB0aGVuIHNlYXJjaCBmb3IKKyAgICAgICAgdGhlIGZpcnN0 IGFuZCBsYXN0IGxpbmUgdGhhdCBwYWludCBmdWxseSBvdXRzaWRlIHRoZSByZWN0LgorCisgICAg ICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5o OgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNv bnRlbnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpJ bmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVzIGNvbnN0KToKKworICAgICAg ICBBZGQgYSBiaXQgdGhhdCB0ZWxscyBpZiB0aGUgY29udGVudCBoYXMgbGluZXMgd2l0aCBwYWlu dCBhcmVhIGV4Y2VlZGluZyB0aG9zZSBvZiB0aGUgbmVpZ2hib3JpbmcgbGluZXMuCisgICAgICAg IFdlIGNhbid0IHVzZSB0aGUgb3B0aW1pemF0aW9uIGluIHRoaXMgcmFyZSBjYXNlLgorCiAyMDIx LTEwLTA3ICBLaW1tbyBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CiAKICAgICAgICAg U2NvcGVkRUdMRGVmYXVsdERpc3BsYXkgc2hvdWxkIGJlIHJlbW92ZWQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNv bnRlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVn cmF0aW9uSW5saW5lQ29udGVudC5jcHAKaW5kZXggMDkyYzhhZDk5ZjhkNzRiZjNiZjgzOWE1ZDI4 OWQ2ZmIxM2EzMjE3OC4uNDY1MzJlNjYzYzg3ZWRmYTdmZmZlYjUyMjRmMDMwNTJhOTZjYTYzYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVn cmF0aW9uSW5saW5lQ29udGVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5jcHAKQEAgLTQ3LDEyICs0Nyw0 MiBAQCBib29sIElubGluZUNvbnRlbnQ6Omhhc0NvbnRlbnQoKSBjb25zdAogICAgIHJldHVybiBi b3hlcy5zaXplKCkgPiAxOwogfTsKIAotV1RGOjpJdGVyYXRvclJhbmdlPGNvbnN0IElubGluZURp c3BsYXk6OkJveCo+IElubGluZUNvbnRlbnQ6OmJveGVzRm9yUmVjdChjb25zdCBMYXlvdXRSZWN0 JikgY29uc3QKK1dURjo6SXRlcmF0b3JSYW5nZTxjb25zdCBJbmxpbmVEaXNwbGF5OjpCb3gqPiBJ bmxpbmVDb250ZW50Ojpib3hlc0ZvclJlY3QoY29uc3QgTGF5b3V0UmVjdCYgcmVjdCkgY29uc3QK IHsKLSAgICAvLyBGSVhNRTogRG8gc29tZXRoaW5nIGVmZmljaWVudCBlLmcuIHVzaW5nIGxpbmUg Ym94ZXMuCiAgICAgaWYgKGJveGVzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIHsgbnVsbHB0 ciwgbnVsbHB0ciB9OwotICAgIHJldHVybiB7ICZib3hlcy5maXJzdCgpLCAmYm94ZXMubGFzdCgp ICsgMSB9OworCisgICAgaWYgKGxpbmVzLmZpcnN0KCkuaW5rT3ZlcmZsb3coKS5tYXhZKCkgPiBy ZWN0LnkoKSAmJiBsaW5lcy5sYXN0KCkuaW5rT3ZlcmZsb3coKS55KCkgPCByZWN0Lm1heFkoKSkK KyAgICAgICAgcmV0dXJuIHsgJmJveGVzLmZpcnN0KCksICZib3hlcy5sYXN0KCkgKyAxIH07CisK KyAgICAvLyBUaGUgb3B0aW1pemF0aW9uIGJlbG93IHJlbGllcyBvbiBsaW5lIHBhaW50IGJvdW5k cyBub3QgZXhlZWRpbmcgdGhvc2Ugb2YgdGhlIG5laWdoYm9yaW5nIGxpbmVzCisgICAgaWYgKGhh c011bHRpbGluZVBhaW50T3ZlcmxhcCkKKyAgICAgICAgcmV0dXJuIHsgJmJveGVzLmZpcnN0KCks ICZib3hlcy5sYXN0KCkgKyAxIH07CisKKyAgICBhdXRvIGhlaWdodCA9IGxpbmVzLmxhc3QoKS5s aW5lQm94Qm90dG9tKCkgLSBsaW5lcy5maXJzdCgpLmxpbmVCb3hUb3AoKTsKKyAgICBhdXRvIGF2 ZXJhZ2VMaW5lSGVpZ2h0ID0gaGVpZ2h0IC8gbGluZXMuc2l6ZSgpOworCisgICAgYXV0byBhcHBy b3hpbWF0ZUxpbmUgPSBbJl0oTGF5b3V0VW5pdCB5KSB7CisgICAgICAgIHkgPSBzdGQ6Om1heCh5 LCAwX2x1KTsKKyAgICAgICAgcmV0dXJuIHN0ZDo6bWluKHN0YXRpY19jYXN0PHNpemVfdD4oeSAv IGF2ZXJhZ2VMaW5lSGVpZ2h0KSwgbGluZXMuc2l6ZSgpIC0gMSk7CisgICAgfTsKKworICAgIGF1 dG8gc3RhcnRMaW5lID0gYXBwcm94aW1hdGVMaW5lKHJlY3QueSgpKTsKKyAgICBmb3IgKDsgc3Rh cnRMaW5lOyAtLXN0YXJ0TGluZSkgeworICAgICAgICBpZiAobGluZXNbc3RhcnRMaW5lIC0gMV0u aW5rT3ZlcmZsb3coKS5tYXhZKCkgPCByZWN0LnkoKSkKKyAgICAgICAgICAgIGJyZWFrOworICAg IH0KKworICAgIGF1dG8gZW5kTGluZSA9IGFwcHJveGltYXRlTGluZShyZWN0Lm1heFkoKSk7Cisg ICAgZm9yICg7IGVuZExpbmUgPCBsaW5lcy5zaXplKCkgLSAxOyArK2VuZExpbmUpIHsKKyAgICAg ICAgaWYgKGxpbmVzW2VuZExpbmUgKyAxXS5pbmtPdmVyZmxvdygpLnkoKSA+IHJlY3QubWF4WSgp KQorICAgICAgICAgICAgYnJlYWs7CisgICAgfQorCisgICAgYXV0byBmaXJzdEJveCA9IGxpbmVz W3N0YXJ0TGluZV0uZmlyc3RCb3hJbmRleCgpOworICAgIGF1dG8gbGFzdEJveCA9IGxpbmVzW2Vu ZExpbmVdLmZpcnN0Qm94SW5kZXgoKSArIGxpbmVzW2VuZExpbmVdLmJveENvdW50KCkgLSAxOwor CisgICAgcmV0dXJuIHsgJmJveGVzW2ZpcnN0Qm94XSwgJmJveGVzW2xhc3RCb3hdICsgMSB9Owog fQogCiBJbmxpbmVDb250ZW50Ojp+SW5saW5lQ29udGVudCgpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50 LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25J bmxpbmVDb250ZW50LmgKaW5kZXggZmMzMTI1ODQ3NWQ1MTYyNmZlZTQzYjJiMmY5MGZiOTQzY2Nl MjU5MS4uZjZkNmM1ZGY4MThmNzVlNTVjMTA4ZWZlYjIyNTY4Zjc4YzBmYWQ1NSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5s aW5lQ29udGVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlv dXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnQuaApAQCAtNjEsNiArNjEsNyBAQCBzdHJ1Y3QgSW5s aW5lQ29udGVudCA6IHB1YmxpYyBSZWZDb3VudGVkPElubGluZUNvbnRlbnQ+IHsKICAgICBMaW5l cyBsaW5lczsKIAogICAgIGZsb2F0IGNsZWFyR2FwQWZ0ZXJMYXN0TGluZSB7IDAgfTsKKyAgICBi b29sIGhhc011bHRpbGluZVBhaW50T3ZlcmxhcCB7IGZhbHNlIH07CiAKICAgICBib29sIGhhc0Nv bnRlbnQoKSBjb25zdDsKICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNv bnRlbnRCdWlsZGVyLmNwcAppbmRleCAzMTMzZDNiZGRlNTMyYjc3ODE2Y2NjNzE0NTI2NGQ0MmI5 MzE3ODg2Li5jYzI4YTBiZjNkNTIzMzhiN2MyNDk3Njk0OTRhNmFkMDFjNWVjM2RiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25J bmxpbmVDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCkBAIC0xMDUs NiArMTA1LDEzIEBAIHZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0ZURpc3BsYXlMaW5l cyhMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdTdGF0ZSYgaW5sCiAgICAgICAgICAgICAgICAgc2Ny b2xsYWJsZU92ZXJmbG93UmVjdC51bml0ZShjaGlsZFNjcm9sbGFibGVPdmVyZmxvdyk7CiAgICAg ICAgICAgICB9CiAgICAgICAgIH0KKworICAgICAgICBpZiAoIWlubGluZUNvbnRlbnQubGluZXMu aXNFbXB0eSgpKSB7CisgICAgICAgICAgICBhdXRvJiBsYXN0SW5rT3ZlcmZsb3cgPSBpbmxpbmVD b250ZW50LmxpbmVzLmxhc3QoKS5pbmtPdmVyZmxvdygpOworICAgICAgICAgICAgaWYgKGxpbmVJ bmtPdmVyZmxvd1JlY3QueSgpIDw9IGxhc3RJbmtPdmVyZmxvdy55KCkgfHwgbGFzdElua092ZXJm bG93Lm1heFkoKSA+PSBsaW5lSW5rT3ZlcmZsb3dSZWN0Lm1heFkoKSkKKyAgICAgICAgICAgICAg ICBpbmxpbmVDb250ZW50Lmhhc011bHRpbGluZVBhaW50T3ZlcmxhcCA9IHRydWU7CisgICAgICAg IH0KKwogICAgICAgICBhdXRvIGxpbmVCb3hMb2dpY2FsUmVjdCA9IEZsb2F0UmVjdCB7IGxpbmUu bGluZUJveExvZ2ljYWxSZWN0KCkgfTsKICAgICAgICAgYXV0byBib3hDb3VudCA9IGJveEluZGV4 IC0gZmlyc3RCb3hJbmRleDsKICAgICAgICAgaW5saW5lQ29udGVudC5saW5lcy5hcHBlbmQoeyBm aXJzdEJveEluZGV4LCBib3hDb3VudCwgbGluZUJveExvZ2ljYWxSZWN0LCBsaW5lLmVuY2xvc2lu Z1RvcEFuZEJvdHRvbSgpLnRvcCwgbGluZS5lbmNsb3NpbmdUb3BBbmRCb3R0b20oKS5ib3R0b20s IHNjcm9sbGFibGVPdmVyZmxvd1JlY3QsIGxpbmVJbmtPdmVyZmxvd1JlY3QsIGxpbmUuYmFzZWxp bmUoKSwgbGluZS5jb250ZW50TG9naWNhbExlZnQoKSwgbGluZS5jb250ZW50TG9naWNhbFdpZHRo KCkgfSk7Cg==