239638 2022-04-21 21:00:21 -0700 Book content is clipped at page boundary when displaying list with bullet points 2022-04-22 06:28:54 -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 zalan oldest_to_newest 1863537 0 zalan 2022-04-21 21:00:21 -0700 <rdar://89257768> 1863538 1 458111 zalan 2022-04-21 21:08:28 -0700 Created attachment 458111 Patch 1863640 2 ews-feeder 2022-04-22 06:28:52 -0700 Committed r293218 (249887@main): <https://commits.webkit.org/249887@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 458111. 458111 2022-04-21 21:08:28 -0700 2022-04-22 06:28:53 -0700 Patch bug-239638-20220421210827.patch text/plain 14080 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzMTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDk4YjI0N2I2MmFiMWIw MTNhYWYxM2FmYjI0N2E1YmY5ODUzMjQ3Yy4uNjdiMWMxZGNkZTQ0ZGQzZGY4MTE4ODRmMmNmZDBm NTBiYzIzOWM4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIyLTA0LTIxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBCb29rIGNvbnRlbnQgaXMgY2xp cHBlZCBhdCBwYWdlIGJvdW5kYXJ5IHdoZW4gZGlzcGxheWluZyBsaXN0IHdpdGggYnVsbGV0IHBv aW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM5 NjM4CisgICAgICAgIDxyZGFyOi8vODkyNTc3Njg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGFibGUgY2VsbCBjb250ZW50IG5lZWRzIHNwZWNpYWwg aGFuZGxpbmcgd2hlbiBkb2VzIG5vdCBmaXQgdGhlIHBhZ2UuCisKKyAgICAgICAgV2hlbiBhIHRh YmxlIGNlbGwncyBmaXJzdCBsaW5lIGRvZXMgbm90IGZpdCB0aGUgcGFnZSwgaW5zdGVhZCBvZiB0 aGUgbm9ybWFsLCAibGV0J3MgYWRkIGEgZmxvdyBsZXZlbCBwYWdpbmF0aW9uIHN0cnV0IgorICAg ICAgICB3ZSBoYXZlIHRvIGhhbmRsZSBpdCBhcyBhIGxpbmUgbGV2ZWwgc3RydXQgKG5vdCBzdXJl IHdoeSBpdCBpcyBpbXBsZW10ZWQgdGhpcyB3YXkgYnV0IHRoaXMgaXMgdGhlIGV4cGVjdGVkIGJl aGF2aW9yKS4KKyAgICAgICAgLWFsc28gaW1wbG1lbnQgTGluZUJveEl0ZXJhdG9yTW9kZXJuUGF0 aDo6aXNGaXJzdEFmdGVyUGFnZUJyZWFrLgorCisgICAgICAgIFRlc3Q6IGZhc3QvbXVsdGljb2wv cGFnaW5hdGlvbi90YWJsZS1jZWxsLW9uZS1saW5lLXBhZ2luYXRpb24uaHRtbAorCisgICAgICAg ICogbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9JbmxpbmVJdGVyYXRvckxpbmVCb3hNb2Rlcm5Q YXRoLmg6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUJveEl0ZXJhdG9y TW9kZXJuUGF0aDo6aXNGaXJzdEFmdGVyUGFnZUJyZWFrIGNvbnN0KToKKyAgICAgICAgKiBsYXlv dXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uTGluZS5oOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmU6OkxpbmUpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmU6OmlzRmlyc3RBZnRlclBhZ2VCcmVhayBjb25zdCk6 CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvblBh Z2luYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OnNldFBh Z2VCcmVha0ZvckxpbmUpOiBBY2NvcmRpbmcgdG8gUmVuZGVyQmxvY2tGbG93OjphZGp1c3RMaW5l UG9zaXRpb25Gb3JQYWdpbmF0aW9uLCB3ZQorICAgICAgICBoYXZlIHRvIGNhbGwgc2V0UGFnZUJy ZWFrLCBldmVuIHdoZW4gdGhlIGZpcnN0IGxpbmUgZG9lcyBub3QgZml0LgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0SW50ZWdyYXRpb246Om1ha2VBZGp1c3RlZENvbnRlbnQpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OmFkanVzdExpbmVQb3NpdGlvbnNGb3JQYWdpbmF0 aW9uKToKKwogMjAyMi0wNC0yMSAgVGltIE5ndXllbiAgPG50aW1AYXBwbGUuY29tPgogCiAgICAg ICAgIFNtYWxsIGNsZWFudXBzIHRvIFN0eWxlQnVpbGRlckN1c3RvbS5jcHAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvSW5saW5lSXRlcmF0b3JM aW5lQm94TW9kZXJuUGF0aC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lu bGluZS9JbmxpbmVJdGVyYXRvckxpbmVCb3hNb2Rlcm5QYXRoLmgKaW5kZXggZDcxNDkxMTJlMjk2 NGU5MmU0ZTBlOGE4MDU3Yjg4YmNjYjVkOWYyNC4uNDIxNDY3YmNkMjBhNTVlYTIwOTZkMjc5ZGRj MTQ3MzY4MjJjNDBlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL2lubGluZS9JbmxpbmVJdGVyYXRvckxpbmVCb3hNb2Rlcm5QYXRoLmgKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9JbmxpbmVJdGVyYXRvckxpbmVCb3hN b2Rlcm5QYXRoLmgKQEAgLTY4LDcgKzY4LDcgQEAgcHVibGljOgogICAgIGNvbnN0IFJlbmRlckJs b2NrRmxvdyYgY29udGFpbmluZ0Jsb2NrKCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVDb250ZW50 LT5jb250YWluaW5nQmxvY2soKTsgfQogCiAgICAgUmVuZGVyRnJhZ21lbnRDb250YWluZXIqIGNv bnRhaW5pbmdGcmFnbWVudCgpIGNvbnN0IHsgcmV0dXJuIG51bGxwdHI7IH0KLSAgICBib29sIGlz Rmlyc3RBZnRlclBhZ2VCcmVhaygpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisgICAgYm9vbCBp c0ZpcnN0QWZ0ZXJQYWdlQnJlYWsoKSBjb25zdCB7IHJldHVybiBsaW5lKCkuaXNGaXJzdEFmdGVy UGFnZUJyZWFrKCk7IH0KIAogICAgIHZvaWQgdHJhdmVyc2VOZXh0KCkKICAgICB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVn cmF0aW9uTGluZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9M YXlvdXRJbnRlZ3JhdGlvbkxpbmUuaAppbmRleCAxYzgxYzRhZDQyYzI3MDVjNzg3NTZhMjQzOTMz MDIyZTJhZjRlMWZmLi4xNzQzYjFhMjlmODM1NGQyNjdiYjg1MjY4YWZkN2QzZTA2MjAxOTVlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91 dEludGVncmF0aW9uTGluZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlv bi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lLmgKQEAgLTM2LDcgKzM2LDcgQEAgbmFtZXNw YWNlIExheW91dEludGVncmF0aW9uIHsKIGNsYXNzIExpbmUgewogICAgIFdURl9NQUtFX0ZBU1Rf QUxMT0NBVEVEOwogcHVibGljOgotICAgIExpbmUoc2l6ZV90IGZpcnN0Qm94SW5kZXgsIHNpemVf dCBib3hDb3VudCwgY29uc3QgRmxvYXRSZWN0JiBsaW5lQm94UmVjdCwgZmxvYXQgZW5jbG9zaW5n Q29udGVudFRvcCwgZmxvYXQgZW5jbG9zaW5nQ29udGVudEJvdHRvbSwgY29uc3QgRmxvYXRSZWN0 JiBzY3JvbGxhYmxlT3ZlcmZsb3csIGNvbnN0IEZsb2F0UmVjdCYgaW5rT3ZlcmZsb3csIGZsb2F0 IGJhc2VsaW5lLCBGb250QmFzZWxpbmUgYmFzZWxpbmVUeXBlLCBmbG9hdCBjb250ZW50TG9naWNh bE9mZnNldCwgZmxvYXQgY29udGVudExvZ2ljYWxXaWR0aCwgYm9vbCBpc0hvcml6b250YWwpCisg ICAgTGluZShzaXplX3QgZmlyc3RCb3hJbmRleCwgc2l6ZV90IGJveENvdW50LCBjb25zdCBGbG9h dFJlY3QmIGxpbmVCb3hSZWN0LCBmbG9hdCBlbmNsb3NpbmdDb250ZW50VG9wLCBmbG9hdCBlbmNs b3NpbmdDb250ZW50Qm90dG9tLCBjb25zdCBGbG9hdFJlY3QmIHNjcm9sbGFibGVPdmVyZmxvdywg Y29uc3QgRmxvYXRSZWN0JiBpbmtPdmVyZmxvdywgZmxvYXQgYmFzZWxpbmUsIEZvbnRCYXNlbGlu ZSBiYXNlbGluZVR5cGUsIGZsb2F0IGNvbnRlbnRMb2dpY2FsT2Zmc2V0LCBmbG9hdCBjb250ZW50 TG9naWNhbFdpZHRoLCBib29sIGlzSG9yaXpvbnRhbCwgYm9vbCBpc0ZpcnN0QWZ0ZXJQYWdlQnJl YWsgPSBmYWxzZSkKICAgICAgICAgOiBtX2ZpcnN0Qm94SW5kZXgoZmlyc3RCb3hJbmRleCkKICAg ICAgICAgLCBtX2JveENvdW50KGJveENvdW50KQogICAgICAgICAsIG1fbGluZUJveFJlY3QobGlu ZUJveFJlY3QpCkBAIC00OSw2ICs0OSw3IEBAIHB1YmxpYzoKICAgICAgICAgLCBtX2NvbnRlbnRM b2dpY2FsV2lkdGgoY29udGVudExvZ2ljYWxXaWR0aCkKICAgICAgICAgLCBtX2Jhc2VsaW5lVHlw ZShiYXNlbGluZVR5cGUpCiAgICAgICAgICwgbV9pc0hvcml6b250YWwoaXNIb3Jpem9udGFsKQor ICAgICAgICAsIG1faXNGaXJzdEFmdGVyUGFnZUJyZWFrKGlzRmlyc3RBZnRlclBhZ2VCcmVhaykK ICAgICB7CiAgICAgfQogCkBAIC03Niw2ICs3Nyw4IEBAIHB1YmxpYzoKICAgICBmbG9hdCBjb250 ZW50TG9naWNhbE9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudExvZ2ljYWxPZmZzZXQ7 IH0KICAgICBmbG9hdCBjb250ZW50TG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9jb250 ZW50TG9naWNhbFdpZHRoOyB9CiAKKyAgICBib29sIGlzRmlyc3RBZnRlclBhZ2VCcmVhaygpIGNv bnN0IHsgcmV0dXJuIG1faXNGaXJzdEFmdGVyUGFnZUJyZWFrOyB9CisKIHByaXZhdGU6CiAgICAg c2l6ZV90IG1fZmlyc3RCb3hJbmRleCB7IDAgfTsKICAgICBzaXplX3QgbV9ib3hDb3VudCB7IDAg fTsKQEAgLTkzLDYgKzk2LDggQEAgcHJpdmF0ZToKICAgICBmbG9hdCBtX2NvbnRlbnRMb2dpY2Fs V2lkdGggeyAwIH07CiAgICAgRm9udEJhc2VsaW5lIG1fYmFzZWxpbmVUeXBlIHsgQWxwaGFiZXRp Y0Jhc2VsaW5lIH07CiAgICAgYm9vbCBtX2lzSG9yaXpvbnRhbCB7IHRydWUgfTsKKyAgICAvLyBG SVhNRTogVGhpcyBpcyB0byBtYXRjaCBwYWdpbmF0ZWQgbGVnYWN5IGxpbmVzLiBNb3ZlIGl0IHRv IHNvbWUgb3RoZXIsIHBhZ2luYXRlZCByZWxhdGVkIHN0cnVjdHVyZS4KKyAgICBib29sIG1faXNG aXJzdEFmdGVyUGFnZUJyZWFrIHsgZmFsc2UgfTsKIH07CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25QYWdp bmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5 b3V0SW50ZWdyYXRpb25QYWdpbmF0aW9uLmNwcAppbmRleCBmNjhhNjEzMmNkOWEzZDJjZTUzOTJl ZmQ5ODJkMzA2ODNmM2M1MzA5Li40MjY4NmJjNjViODU3NDBhZjkxMDViYmI5OGQ4NTQ5M2U2ZjE4 YWQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5l L0xheW91dEludGVncmF0aW9uUGFnaW5hdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRpb24uY3BwCkBA IC0zMCw2ICszMCw3IEBACiAKICNpbmNsdWRlICJGb250Q2FzY2FkZS5oIgogI2luY2x1ZGUgIlJl bmRlckJsb2NrRmxvdy5oIgorI2luY2x1ZGUgIlJlbmRlclRhYmxlQ2VsbC5oIgogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0SW50ZWdyYXRpb24gewpAQCAtODcsMjQgKzg4 LDI4IEBAIHN0YXRpYyBMYXlvdXRVbml0IGNvbXB1dGVPZmZzZXRBZnRlckxpbmVCcmVhayhMYXlv dXRVbml0IGxpbmVCcmVha1Bvc2l0aW9uLCBib29sCiAgICAgcmV0dXJuIG9mZnNldCArIGZsb3cu cGFnZVJlbWFpbmluZ0xvZ2ljYWxIZWlnaHRGb3JPZmZzZXQobGluZUJyZWFrUG9zaXRpb24sIFJl bmRlckJsb2NrRmxvdzo6RXhjbHVkZVBhZ2VCb3VuZGFyeSk7CiB9CiAKLXN0YXRpYyB2b2lkIHNl dFBhZ2VCcmVha0ZvckxpbmUodW5zaWduZWQgbGluZUJyZWFrSW5kZXgsIFBhZ2luYXRlZExpbmVz JiBsaW5lcywgUmVuZGVyQmxvY2tGbG93JiBmbG93LCBWZWN0b3I8U3RydXQ+JiBzdHJ1dHMsCi0g ICAgYm9vbCBhdFRoZVRvcE9mQ29sdW1uT3JQYWdlLCBib29sIGxpbmVEb2VzTm90Rml0KQorc3Rh dGljIHZvaWQgc2V0UGFnZUJyZWFrRm9yTGluZSh1bnNpZ25lZCBsaW5lQnJlYWtJbmRleCwgUGFn aW5hdGVkTGluZXMmIGxpbmVzLCBSZW5kZXJCbG9ja0Zsb3cmIGZsb3csIFZlY3RvcjxTdHJ1dD4m IHN0cnV0cywgYm9vbCBhdFRoZVRvcE9mQ29sdW1uT3JQYWdlLCBib29sIGxpbmVEb2VzTm90Rml0 LCBib29sJiBpc1BhZ2VCcmVha1dpdGhMaW5lU3RydXQpCiB7CiAgICAgYXV0byBsaW5lID0gbGlu ZXMuYXQobGluZUJyZWFrSW5kZXgpOwogICAgIGF1dG8gcmVtYWluaW5nTG9naWNhbEhlaWdodCA9 IGZsb3cucGFnZVJlbWFpbmluZ0xvZ2ljYWxIZWlnaHRGb3JPZmZzZXQobGluZS50b3AsIFJlbmRl ckJsb2NrRmxvdzo6RXhjbHVkZVBhZ2VCb3VuZGFyeSk7CisKKyAgICBpZiAoYXRUaGVUb3BPZkNv bHVtbk9yUGFnZSkKKyAgICAgICAgZmxvdy5zZXRQYWdlQnJlYWsobGluZS50b3AsIGxpbmUuaGVp Z2h0KTsKKyAgICBlbHNlCisgICAgICAgIGZsb3cuc2V0UGFnZUJyZWFrKGxpbmUudG9wLCBsaW5l LmhlaWdodCAtIHJlbWFpbmluZ0xvZ2ljYWxIZWlnaHQpOworCiAgICAgYXV0byYgc3R5bGUgPSBm bG93LnN0eWxlKCk7CiAgICAgYXV0byBmaXJzdExpbmVEb2VzTm90Rml0ID0gIWxpbmVCcmVha0lu ZGV4ICYmIGxpbmUuaGVpZ2h0IDwgZmxvdy5wYWdlTG9naWNhbEhlaWdodEZvck9mZnNldChsaW5l LnRvcCk7CiAgICAgYXV0byBtb3ZlT3JwaGFuVG9OZXh0Q29sdW1uID0gbGluZURvZXNOb3RGaXQg JiYgIXN0eWxlLmhhc0F1dG9PcnBoYW5zKCkgJiYgc3R5bGUub3JwaGFucygpID4gKHNob3J0KWxp bmVCcmVha0luZGV4OwotICAgIGlmIChmaXJzdExpbmVEb2VzTm90Rml0IHx8IG1vdmVPcnBoYW5U b05leHRDb2x1bW4pIHsKKyAgICAvLyBTcGVjaWFsIHRhYmxlIGNlbGwgaGFuZGxpbmcuIFNlZSBS ZW5kZXJCbG9ja0Zsb3c6OmFkanVzdExpbmVQb3NpdGlvbkZvclBhZ2luYXRpb24gZm9yIGRldGFp bHMuCisgICAgaWYgKChmaXJzdExpbmVEb2VzTm90Rml0IHx8IG1vdmVPcnBoYW5Ub05leHRDb2x1 bW4pICYmICFpczxSZW5kZXJUYWJsZUNlbGw+KGZsb3cpKSB7CiAgICAgICAgIGF1dG8gZmlyc3RM aW5lID0gbGluZXMuZmlyc3QoKTsKICAgICAgICAgYXV0byBmaXJzdExpbmVVcHBlck92ZXJoYW5n ID0gc3RkOjptYXgoTGF5b3V0VW5pdCgtZmlyc3RMaW5lLnRvcCksIDBfbHUpOwogICAgICAgICBm bG93LnNldFBhZ2luYXRpb25TdHJ1dChsaW5lLnRvcCArIHJlbWFpbmluZ0xvZ2ljYWxIZWlnaHQg KyBmaXJzdExpbmVVcHBlck92ZXJoYW5nKTsKKyAgICAgICAgaXNQYWdlQnJlYWtXaXRoTGluZVN0 cnV0ID0gZmFsc2U7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgaWYgKGF0VGhlVG9wT2ZD b2x1bW5PclBhZ2UpCi0gICAgICAgIGZsb3cuc2V0UGFnZUJyZWFrKGxpbmUudG9wLCBsaW5lLmhl aWdodCk7Ci0gICAgZWxzZQotICAgICAgICBmbG93LnNldFBhZ2VCcmVhayhsaW5lLnRvcCwgbGlu ZS5oZWlnaHQgLSByZW1haW5pbmdMb2dpY2FsSGVpZ2h0KTsKKyAgICBpc1BhZ2VCcmVha1dpdGhM aW5lU3RydXQgPSB0cnVlOwogICAgIHN0cnV0cy5hcHBlbmQoeyBsaW5lQnJlYWtJbmRleCwgY29t cHV0ZU9mZnNldEFmdGVyTGluZUJyZWFrKGxpbmVzW2xpbmVCcmVha0luZGV4XS50b3AsICFsaW5l QnJlYWtJbmRleCwgYXRUaGVUb3BPZkNvbHVtbk9yUGFnZSwgZmxvdykgfSk7CiB9CiAKQEAgLTEx NywxNSArMTIyLDE0IEBAIHN0YXRpYyB2b2lkIHVwZGF0ZU1pbmltdW1QYWdlSGVpZ2h0KFJlbmRl ckJsb2NrRmxvdyYgZmxvdywgY29uc3QgSW5saW5lQ29udGVudCYKICAgICBmbG93LnVwZGF0ZU1p bmltdW1QYWdlSGVpZ2h0KDAsIExheW91dFVuaXQoaW5saW5lQ29udGVudC5saW5lc1ttaW5pbXVt TGluZUNvdW50IC0gMV0ubGluZUJveEJvdHRvbSgpKSk7CiB9CiAKLXN0YXRpYyBzdGQ6OnVuaXF1 ZV9wdHI8SW5saW5lQ29udGVudD4gbWFrZUFkanVzdGVkQ29udGVudChjb25zdCBJbmxpbmVDb250 ZW50JiBpbmxpbmVDb250ZW50LCBWZWN0b3I8ZmxvYXQ+IGFkanVzdG1lbnRzKQorc3RhdGljIHN0 ZDo6dW5pcXVlX3B0cjxJbmxpbmVDb250ZW50PiBtYWtlQWRqdXN0ZWRDb250ZW50KGNvbnN0IElu bGluZUNvbnRlbnQmIGlubGluZUNvbnRlbnQsIFZlY3RvcjxmbG9hdD4gYWRqdXN0bWVudHMsIFZl Y3Rvcjxib29sPiBpc0ZpcnN0TGluZUFmdGVyUGFnZUJyZWFrTGlzdCkKIHsKICAgICBhdXRvIG1v dmVWZXJ0aWNhbGx5ID0gW10oRmxvYXRSZWN0IHJlY3QsIGZsb2F0IG9mZnNldCkgewogICAgICAg ICByZWN0Lm1vdmUoRmxvYXRTaXplKDAsIG9mZnNldCkpOwogICAgICAgICByZXR1cm4gcmVjdDsK ICAgICB9OwogCi0gICAgYXV0byBhZGp1c3RlZExpbmUgPSBbJl0oY29uc3QgTGluZSYgbGluZSwg ZmxvYXQgb2Zmc2V0KQotICAgIHsKKyAgICBhdXRvIGFkanVzdGVkTGluZSA9IFsmXSAoYXV0byYg bGluZSwgYXV0byBvZmZzZXQsIGF1dG8gaXNGaXJzdEFmdGVyUGFnZUJyZWFrKSB7CiAgICAgICAg IHJldHVybiBMaW5lIHsKICAgICAgICAgICAgIGxpbmUuZmlyc3RCb3hJbmRleCgpLAogICAgICAg ICAgICAgbGluZS5ib3hDb3VudCgpLApAQCAtMTM4LDEyICsxNDIsMTIgQEAgc3RhdGljIHN0ZDo6 dW5pcXVlX3B0cjxJbmxpbmVDb250ZW50PiBtYWtlQWRqdXN0ZWRDb250ZW50KGNvbnN0IElubGlu ZUNvbnRlbnQmIGkKICAgICAgICAgICAgIGxpbmUuYmFzZWxpbmVUeXBlKCksCiAgICAgICAgICAg ICBsaW5lLmNvbnRlbnRMb2dpY2FsT2Zmc2V0KCksCiAgICAgICAgICAgICBsaW5lLmNvbnRlbnRM b2dpY2FsV2lkdGgoKSwKLSAgICAgICAgICAgIGxpbmUuaXNIb3Jpem9udGFsKCkKKyAgICAgICAg ICAgIGxpbmUuaXNIb3Jpem9udGFsKCksCisgICAgICAgICAgICBpc0ZpcnN0QWZ0ZXJQYWdlQnJl YWsKICAgICAgICAgfTsKICAgICB9OwogCi0gICAgYXV0byBhZGp1c3RlZEJveCA9IFsmXShjb25z dCBJbmxpbmVEaXNwbGF5OjpCb3gmIGJveCwgZmxvYXQgb2Zmc2V0KQotICAgIHsKKyAgICBhdXRv IGFkanVzdGVkQm94ID0gWyZdKGF1dG8mIGJveCwgYXV0byBvZmZzZXQpIHsKICAgICAgICAgYXV0 byBhZGp1c3RlZEJveCA9IGJveDsKICAgICAgICAgYWRqdXN0ZWRCb3gubW92ZVZlcnRpY2FsbHko b2Zmc2V0KTsKICAgICAgICAgcmV0dXJuIGFkanVzdGVkQm94OwpAQCAtMTUyLDcgKzE1Niw3IEBA IHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8SW5saW5lQ29udGVudD4gbWFrZUFkanVzdGVkQ29udGVu dChjb25zdCBJbmxpbmVDb250ZW50JiBpCiAgICAgYXV0byBhZGp1c3RlZENvbnRlbnQgPSBtYWtl VW5pcXVlPElubGluZUNvbnRlbnQ+KGlubGluZUNvbnRlbnQubGluZUxheW91dCgpKTsKIAogICAg IGZvciAoc2l6ZV90IGxpbmVJbmRleCA9IDA7IGxpbmVJbmRleCA8IGlubGluZUNvbnRlbnQubGlu ZXMuc2l6ZSgpOyArK2xpbmVJbmRleCkKLSAgICAgICAgYWRqdXN0ZWRDb250ZW50LT5saW5lcy5h cHBlbmQoYWRqdXN0ZWRMaW5lKGlubGluZUNvbnRlbnQubGluZXNbbGluZUluZGV4XSwgYWRqdXN0 bWVudHNbbGluZUluZGV4XSkpOworICAgICAgICBhZGp1c3RlZENvbnRlbnQtPmxpbmVzLmFwcGVu ZChhZGp1c3RlZExpbmUoaW5saW5lQ29udGVudC5saW5lc1tsaW5lSW5kZXhdLCBhZGp1c3RtZW50 c1tsaW5lSW5kZXhdLCBpc0ZpcnN0TGluZUFmdGVyUGFnZUJyZWFrTGlzdFtsaW5lSW5kZXhdKSk7 CiAKICAgICBmb3IgKGF1dG8mIGJveCA6IGlubGluZUNvbnRlbnQuYm94ZXMpCiAgICAgICAgIGFk anVzdGVkQ29udGVudC0+Ym94ZXMuYXBwZW5kKGFkanVzdGVkQm94KGJveCwgYWRqdXN0bWVudHNb Ym94LmxpbmVJbmRleCgpXSkpOwpAQCAtMTcyLDcgKzE3Niw4IEBAIHN0ZDo6dW5pcXVlX3B0cjxJ bmxpbmVDb250ZW50PiBhZGp1c3RMaW5lUG9zaXRpb25zRm9yUGFnaW5hdGlvbihjb25zdCBJbmxp bmVDb250CiAgICAgYXV0byB3aWRvd3MgPSBmbG93LnN0eWxlKCkuaGFzQXV0b1dpZG93cygpID8g MSA6IHN0ZDo6bWF4PGludD4oZmxvdy5zdHlsZSgpLndpZG93cygpLCAxKTsKICAgICBhdXRvIG9y cGhhbnMgPSBmbG93LnN0eWxlKCkuaGFzQXV0b09ycGhhbnMoKSA/IDEgOiBzdGQ6Om1heDxpbnQ+ KGZsb3cuc3R5bGUoKS5vcnBoYW5zKCksIDEpOwogICAgIFBhZ2luYXRlZExpbmVzIGxpbmVzOwot ICAgIGZvciAodW5zaWduZWQgbGluZUluZGV4ID0gMDsgbGluZUluZGV4IDwgbGluZUNvdW50OyAr K2xpbmVJbmRleCkgeworICAgIGF1dG8gaXNGaXJzdExpbmVBZnRlclBhZ2VCcmVha0xpc3QgPSBW ZWN0b3I8Ym9vbD4obGluZUNvdW50LCBmYWxzZSk7CisgICAgZm9yIChzaXplX3QgbGluZUluZGV4 ID0gMDsgbGluZUluZGV4IDwgbGluZUNvdW50OyArK2xpbmVJbmRleCkgewogICAgICAgICBhdXRv IGxpbmUgPSBjb21wdXRlTGluZVRvcEFuZEJvdHRvbVdpdGhPdmVyZmxvdyhmbG93LCBpbmxpbmVD b250ZW50LmxpbmVzLCBsaW5lSW5kZXgsIHN0cnV0cyk7CiAgICAgICAgIGxpbmVzLmFwcGVuZChs aW5lKTsKICAgICAgICAgYXV0byByZW1haW5pbmdIZWlnaHQgPSBmbG93LnBhZ2VSZW1haW5pbmdM b2dpY2FsSGVpZ2h0Rm9yT2Zmc2V0KGxpbmUudG9wLCBSZW5kZXJCbG9ja0Zsb3c6OkV4Y2x1ZGVQ YWdlQm91bmRhcnkpOwpAQCAtMTgyLDcgKzE4Nyw5IEBAIHN0ZDo6dW5pcXVlX3B0cjxJbmxpbmVD b250ZW50PiBhZGp1c3RMaW5lUG9zaXRpb25zRm9yUGFnaW5hdGlvbihjb25zdCBJbmxpbmVDb250 CiAgICAgICAgICAgICBhdXRvIGxpbmVCcmVha0luZGV4ID0gY29tcHV0ZUxpbmVCcmVha0luZGV4 KGxpbmVJbmRleCwgbGluZUNvdW50LCBvcnBoYW5zLCB3aWRvd3MsIHN0cnV0cyk7CiAgICAgICAg ICAgICAvLyBBcmUgd2Ugc3RpbGwgYXQgdGhlIHRvcCBvZiB0aGUgY29sdW1uL3BhZ2U/CiAgICAg ICAgICAgICBhdFRoZVRvcE9mQ29sdW1uT3JQYWdlID0gYXRUaGVUb3BPZkNvbHVtbk9yUGFnZSA/ IGxpbmVJbmRleCA9PSBsaW5lQnJlYWtJbmRleCA6IGZhbHNlOwotICAgICAgICAgICAgc2V0UGFn ZUJyZWFrRm9yTGluZShsaW5lQnJlYWtJbmRleCwgbGluZXMsIGZsb3csIHN0cnV0cywgYXRUaGVU b3BPZkNvbHVtbk9yUGFnZSwgbGluZURvZXNOb3RGaXQpOworICAgICAgICAgICAgYXV0byBpc1Bh Z2VCcmVha1dpdGhMaW5lU3RydXQgPSBmYWxzZTsKKyAgICAgICAgICAgIHNldFBhZ2VCcmVha0Zv ckxpbmUobGluZUJyZWFrSW5kZXgsIGxpbmVzLCBmbG93LCBzdHJ1dHMsIGF0VGhlVG9wT2ZDb2x1 bW5PclBhZ2UsIGxpbmVEb2VzTm90Rml0LCBpc1BhZ2VCcmVha1dpdGhMaW5lU3RydXQpOworICAg ICAgICAgICAgaXNGaXJzdExpbmVBZnRlclBhZ2VCcmVha0xpc3RbbGluZUluZGV4XSA9IGlzUGFn ZUJyZWFrV2l0aExpbmVTdHJ1dDsKICAgICAgICAgICAgIC8vIFJlY29tcHV0ZSBsaW5lIHBvc2l0 aW9ucyB0aGF0IHdlIGFscmVhZHkgdmlzaXRlZCBidXQgd2lkb3cgYnJlYWsgcHVzaGVkIHRoZW0g dG8gYSBuZXcgcGFnZS4KICAgICAgICAgICAgIGZvciAoYXV0byBpID0gbGluZUJyZWFrSW5kZXg7 IGkgPCBsaW5lcy5zaXplKCk7ICsraSkKICAgICAgICAgICAgICAgICBsaW5lcy5hdChpKSA9IGNv bXB1dGVMaW5lVG9wQW5kQm90dG9tV2l0aE92ZXJmbG93KGZsb3csIGlubGluZUNvbnRlbnQubGlu ZXMsIGksIHN0cnV0cyk7CkBAIC0xOTgsNyArMjA1LDcgQEAgc3RkOjp1bmlxdWVfcHRyPElubGlu ZUNvbnRlbnQ+IGFkanVzdExpbmVQb3NpdGlvbnNGb3JQYWdpbmF0aW9uKGNvbnN0IElubGluZUNv bnQKICAgICAgICAgICAgIGFkanVzdG1lbnRzW2xpbmVJbmRleF0gKz0gc3RydXQub2Zmc2V0Owog ICAgIH0KIAotICAgIHJldHVybiBtYWtlQWRqdXN0ZWRDb250ZW50KGlubGluZUNvbnRlbnQsIGFk anVzdG1lbnRzKTsKKyAgICByZXR1cm4gbWFrZUFkanVzdGVkQ29udGVudChpbmxpbmVDb250ZW50 LCBhZGp1c3RtZW50cywgaXNGaXJzdExpbmVBZnRlclBhZ2VCcmVha0xpc3QpOwogfQogCiB9CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK aW5kZXggZjgyMjIzYTE4YzIxNDA4ZjRhNGJmNGU0NWNiZWE4YTAzMzhiOWY2ZS4uOWI0NDA1NDli YTY4NGM0ZDQxNTJlMDllMDc1YjExYjM2NGM5NDNlMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy MDIyLTA0LTIxICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBCb29r IGNvbnRlbnQgaXMgY2xpcHBlZCBhdCBwYWdlIGJvdW5kYXJ5IHdoZW4gZGlzcGxheWluZyBsaXN0 IHdpdGggYnVsbGV0IHBvaW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjM5NjM4CisgICAgICAgIDxyZGFyOi8vODkyNTc3Njg+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L211bHRpY29sL3Bh Z2luYXRpb24vdGFibGUtY2VsbC1vbmUtbGluZS1wYWdpbmF0aW9uLWV4cGVjdGVkLmh0bWw6IEFk ZGVkLgorICAgICAgICAqIGZhc3QvbXVsdGljb2wvcGFnaW5hdGlvbi90YWJsZS1jZWxsLW9uZS1s aW5lLXBhZ2luYXRpb24uaHRtbDogQWRkZWQuCisKIDIwMjItMDQtMjEgIFRpbSBOZ3V5ZW4gIDxu dGltQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBSZWJhc2VsaW5lIGZhc3QvYXR0YWNobWVu dC9hdHRhY2htZW50LWRpc2FibGVkLXJlbmRlcmluZy5odG1sIGV4cGVjdGF0aW9ucwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9wYWdpbmF0aW9uL3RhYmxlLWNlbGwtb25l LWxpbmUtcGFnaW5hdGlvbi1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNv bC9wYWdpbmF0aW9uL3RhYmxlLWNlbGwtb25lLWxpbmUtcGFnaW5hdGlvbi1leHBlY3RlZC5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjNjODE4MTkwNDMwZGIzMDg4YmUyMDQyNWRhZThhOGM3M2I3YjBjMTkKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL3BhZ2luYXRpb24vdGFi bGUtY2VsbC1vbmUtbGluZS1wYWdpbmF0aW9uLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwxOCBA QAorPHN0eWxlPgorZGl2IHsKKyAgZm9udC1zaXplOiA5MHB4OworfQorPC9zdHlsZT4KKzxzY3Jp cHQ+CisgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQorICAgIGludGVybmFscy5zZXRQYWdpbmF0aW9u KCJMZWZ0VG9SaWdodFBhZ2luYXRlZCIsIDApOworPC9zY3JpcHQ+Cis8ZGl2PlhYWFhYWFhYPC9k aXY+Cis8ZGl2PlhYWFhYWFhYPC9kaXY+Cis8ZGl2PlhYWFhYWFhYPC9kaXY+Cis8ZGl2PlhYWFhY WFhYPC9kaXY+Cis8ZGl2PlhYWFhYWFhYPC9kaXY+Cis8ZGl2PlhYWFhYWFhYPC9kaXY+Cis8ZGl2 PlhYWFhYWFhYPC9kaXY+Cis8ZGl2PlhYWFhYWFhYPC9kaXY+Cis8ZGl2PlhYWFhYWFhYPC9kaXY+ CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL3BhZ2luYXRpb24vdGFibGUt Y2VsbC1vbmUtbGluZS1wYWdpbmF0aW9uLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29s L3BhZ2luYXRpb24vdGFibGUtY2VsbC1vbmUtbGluZS1wYWdpbmF0aW9uLmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uNWZhOTI1YjUxMmQ0YWUyNDkyM2JjY2Q1MGYzZTc4MGJjMTM0ODI3YgotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvcGFnaW5hdGlvbi90YWJsZS1jZWxsLW9u ZS1saW5lLXBhZ2luYXRpb24uaHRtbApAQCAtMCwwICsxLDE5IEBACis8c3R5bGU+CitkaXYgewor ICBmb250LXNpemU6IDkwcHg7CisgIGRpc3BsYXk6IHRhYmxlOworfQorPC9zdHlsZT4KKzxzY3Jp cHQ+CisgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQorICAgIGludGVybmFscy5zZXRQYWdpbmF0aW9u KCJMZWZ0VG9SaWdodFBhZ2luYXRlZCIsIDApOworPC9zY3JpcHQ+Cis8ZGl2PlhYWFhYWFhYPC9k aXY+Cis8ZGl2PlhYWFhYWFhYPC9kaXY+Cis8ZGl2PlhYWFhYWFhYPC9kaXY+Cis8ZGl2PlhYWFhY WFhYPC9kaXY+Cis8ZGl2PlhYWFhYWFhYPC9kaXY+Cis8ZGl2PlhYWFhYWFhYPC9kaXY+Cis8ZGl2 PlhYWFhYWFhYPC9kaXY+Cis8ZGl2PlhYWFhYWFhYPC9kaXY+Cis8ZGl2PlhYWFhYWFhYPC9kaXY+ Cg==