232509 2021-10-29 15:04:10 -0700 [LFC][IFC] InlineItem should not cross bidi level boundary 2021-10-30 06:45:20 -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 1810271 0 zalan 2021-10-29 15:04:10 -0700 let's add bidi level information 1810277 1 442869 zalan 2021-10-29 15:09:34 -0700 Created attachment 442869 Patch 1810419 2 ews-feeder 2021-10-30 06:44:46 -0700 Committed r285079 (243721@main): <https://commits.webkit.org/243721@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442869. 1810420 3 webkit-bug-importer 2021-10-30 06:45:20 -0700 <rdar://problem/84838869> 442869 2021-10-29 15:09:34 -0700 2021-10-30 06:44:47 -0700 Patch bug-232509-20211029150933.patch text/plain 13898 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjU4N2EyMzQwZTQ3OGE3 Y2U5NTlmNDc1YjRjZWUzYzNmYzg1ZDJkMy4uNThjMTBhMjAxNjc2OGEzNGVmOGY2YzFiYmIzOWQ1 YTRmNGQzYzc5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTEwLTI5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIElubGluZUl0 ZW0gc2hvdWxkIG5vdCBjcm9zcyBiaWRpIGxldmVsIGJvdW5kYXJ5CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI1MDkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFdmVyeSBpbmxpbmUgaXRlbSBoYXMgYSBi aWRpIGxldmVsIGV2ZW4gd2hlbiB0aGUgY29udGVudCBpcyBub3QgY29uc2lkZXJlZCBzdHJpY3Rs eSBhcyBiaWRpIChpLmUuIHdlIGRvbid0IGNhbGwgaW50byB1YmlkaSB0byBmaWd1cmUgbGV2ZWwg aW5mb3JtYXRpb24pLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lSXRlbS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtOjpi aWRpTGV2ZWwgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtOjpJ bmxpbmVJdGVtKToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVJdGVtc0J1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJ dGVtc0J1aWxkZXI6OmNyZWF0ZUFuZEFwcGVuZFRleHRJdGVtcyk6CisgICAgICAgICogbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lU29mdExpbmVCcmVha0l0ZW0uaDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lU29mdExpbmVCcmVha0l0ZW06OmNyZWF0ZVNv ZnRMaW5lQnJlYWtJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lU29mdExp bmVCcmVha0l0ZW06OklubGluZVNvZnRMaW5lQnJlYWtJdGVtKToKKyAgICAgICAgKiBsYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVUZXh0SXRlbS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OklubGluZVRleHRJdGVtOjpJbmxpbmVUZXh0SXRlbSk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVRleHRJdGVtOjpsZWZ0IGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OnJpZ2h0IGNvbnN0KToKKyAgICAgICAg KiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVUZXh0SXRlbS5oOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlV2hpdGVzcGFjZUl0 ZW0pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlTm9u V2hpdGVzcGFjZUl0ZW0pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVUZXh0SXRl bTo6Y3JlYXRlRW1wdHlJdGVtKToKKwogMjAyMS0xMC0yOSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBh cHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIElubGluZVRleHRJdGVtIGNvbnN0 cnVjdGlvbiB0byBJbmxpbmVJdGVtc0J1aWxkZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW0uaCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW0uaAppbmRl eCAyY2EzYmE0NTViZTYzYmQ0YmIzMDQ3OWMyMWViMjE2ZDMwNzdlODE5Li4zODdlNmZhM2E2NGRl YTY4NGQ3Nzg5ZmI3NmVlOGFlNzY3OWU0OWU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtLmgKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbS5oCkBA IC0yOSw2ICsyOSw3IEBACiAKICNpbmNsdWRlICJMYXlvdXRCb3guaCIKICNpbmNsdWRlICJMYXlv dXRVbml0cy5oIgorI2luY2x1ZGUgPHVuaWNvZGUvdWJpZGkuaD4KIAogbmFtZXNwYWNlIFdlYkNv cmUgewogbmFtZXNwYWNlIExheW91dCB7CkBAIC00NSw5ICs0NiwxMCBAQCBwdWJsaWM6CiAgICAg ICAgIElubGluZUJveEVuZCwKICAgICAgICAgRmxvYXQKICAgICB9OwotICAgIElubGluZUl0ZW0o Y29uc3QgQm94JiBsYXlvdXRCb3gsIFR5cGUpOworICAgIElubGluZUl0ZW0oY29uc3QgQm94JiBs YXlvdXRCb3gsIFR5cGUsIFVCaURpTGV2ZWwgPSBVQklESV9ERUZBVUxUX0xUUik7CiAKICAgICBU eXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBtX3R5cGU7IH0KKyAgICBVQmlEaUxldmVsIGJpZGlM ZXZlbCgpIGNvbnN0IHsgcmV0dXJuIG1fYmlkaUxldmVsOyB9CiAgICAgY29uc3QgQm94JiBsYXlv dXRCb3goKSBjb25zdCB7IHJldHVybiAqbV9sYXlvdXRCb3g7IH0KICAgICBjb25zdCBSZW5kZXJT dHlsZSYgc3R5bGUoKSBjb25zdCB7IHJldHVybiBsYXlvdXRCb3goKS5zdHlsZSgpOyB9CiAgICAg Y29uc3QgUmVuZGVyU3R5bGUmIGZpcnN0TGluZVN0eWxlKCkgY29uc3QgeyByZXR1cm4gbGF5b3V0 Qm94KCkuZmlyc3RMaW5lU3R5bGUoKTsgfQpAQCAtNjUsNiArNjcsNyBAQCBwdWJsaWM6CiBwcml2 YXRlOgogICAgIGNvbnN0IEJveCogbV9sYXlvdXRCb3ggeyBudWxscHRyIH07CiAgICAgVHlwZSBt X3R5cGUgeyB9OworICAgIFVCaURpTGV2ZWwgbV9iaWRpTGV2ZWwgeyBVQklESV9ERUZBVUxUX0xU UiB9OwogCiBwcm90ZWN0ZWQ6CiAgICAgLy8gRm9yIElubGluZVRleHRJdGVtCkBAIC04MCw5ICs4 MywxMCBAQCBwcm90ZWN0ZWQ6CiAgICAgdW5zaWduZWQgbV9zdGFydE9yUG9zaXRpb24geyAwIH07 CiB9OwogCi1pbmxpbmUgSW5saW5lSXRlbTo6SW5saW5lSXRlbShjb25zdCBCb3gmIGxheW91dEJv eCwgVHlwZSB0eXBlKQoraW5saW5lIElubGluZUl0ZW06OklubGluZUl0ZW0oY29uc3QgQm94JiBs YXlvdXRCb3gsIFR5cGUgdHlwZSwgVUJpRGlMZXZlbCBiaWRpTGV2ZWwpCiAgICAgOiBtX2xheW91 dEJveCgmbGF5b3V0Qm94KQogICAgICwgbV90eXBlKHR5cGUpCisgICAgLCBtX2JpZGlMZXZlbChi aWRpTGV2ZWwpCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIu Y3BwCmluZGV4IDZjNTVjYTAwYmI3NjY4N2E4M2IyZjJjYjU4M2I3NzhmYzE5M2ZiMmIuLjc3ZTdi N2E5NmQyNDg1Y2ZjZDhjZmZlOWZiNjRjNjFhN2M5NmNmMGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcApAQCAtMTcwLDcgKzE3MCw3IEBAIHZvaWQgSW5saW5l SXRlbXNCdWlsZGVyOjpjcmVhdGVBbmRBcHBlbmRUZXh0SXRlbXMoY29uc3QgSW5saW5lVGV4dEJv eCYgaW5saW5lVGV4CiAgICAgICAgICAgICBhdXRvIGFwcGVuZFdoaXRlc3BhY2VJdGVtID0gWyZd IChhdXRvIHN0YXJ0UG9zaXRpb24sIGF1dG8gaXRlbUxlbmd0aCkgewogICAgICAgICAgICAgICAg IGF1dG8gc2ltcGxlU2luZ2xlV2hpdGVzcGFjZUNvbnRlbnQgPSBpbmxpbmVUZXh0Qm94LmNhblVz ZVNpbXBsaWZpZWRDb250ZW50TWVhc3VyaW5nKCkgJiYgKGl0ZW1MZW5ndGggPT0gMSB8fCB3aGl0 ZXNwYWNlQ29udGVudElzVHJlYXRlZEFzU2luZ2xlU3BhY2UpOwogICAgICAgICAgICAgICAgIGF1 dG8gd2lkdGggPSBzaW1wbGVTaW5nbGVXaGl0ZXNwYWNlQ29udGVudCA/IHN0ZDo6bWFrZV9vcHRp b25hbChJbmxpbmVMYXlvdXRVbml0IHsgZm9udENhc2NhZGUuc3BhY2VXaWR0aCgpIH0pIDogaW5s aW5lSXRlbVdpZHRoKHN0YXJ0UG9zaXRpb24sIGl0ZW1MZW5ndGgpOwotICAgICAgICAgICAgICAg IGZvcm1hdHRpbmdTdGF0ZS5hZGRJbmxpbmVJdGVtKElubGluZVRleHRJdGVtOjpjcmVhdGVXaGl0 ZXNwYWNlSXRlbShpbmxpbmVUZXh0Qm94LCBzdGFydFBvc2l0aW9uLCBpdGVtTGVuZ3RoLCB3aGl0 ZXNwYWNlQ29udGVudC0+aXNXb3JkU2VwYXJhdG9yLCB3aWR0aCkpOworICAgICAgICAgICAgICAg IGZvcm1hdHRpbmdTdGF0ZS5hZGRJbmxpbmVJdGVtKElubGluZVRleHRJdGVtOjpjcmVhdGVXaGl0 ZXNwYWNlSXRlbShpbmxpbmVUZXh0Qm94LCBzdGFydFBvc2l0aW9uLCBpdGVtTGVuZ3RoLCBVQklE SV9ERUZBVUxUX0xUUiwgd2hpdGVzcGFjZUNvbnRlbnQtPmlzV29yZFNlcGFyYXRvciwgd2lkdGgp KTsKICAgICAgICAgICAgIH07CiAgICAgICAgICAgICBpZiAoc3R5bGUud2hpdGVTcGFjZSgpID09 IFdoaXRlU3BhY2U6OkJyZWFrU3BhY2VzKSB7CiAgICAgICAgICAgICAgICAgLy8gaHR0cHM6Ly93 d3cudzMub3JnL1RSL2Nzcy10ZXh0LTMvI3doaXRlLXNwYWNlLXBoYXNlLTEKQEAgLTIwNyw3ICsy MDcsNyBAQCB2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6Y3JlYXRlQW5kQXBwZW5kVGV4dEl0ZW1z KGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleAogICAgICAgICBBU1NFUlQoaW5pdGlhbE5v bldoaXRlc3BhY2VQb3NpdGlvbiA8IGN1cnJlbnRQb3NpdGlvbik7CiAgICAgICAgIEFTU0VSVF9J TVBMSUVTKHN0eWxlLmh5cGhlbnMoKSA9PSBIeXBoZW5zOjpOb25lLCAhaGFzVHJhaWxpbmdTb2Z0 SHlwaGVuKTsKICAgICAgICAgYXV0byBsZW5ndGggPSBjdXJyZW50UG9zaXRpb24gLSBpbml0aWFs Tm9uV2hpdGVzcGFjZVBvc2l0aW9uOwotICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkSW5saW5l SXRlbShJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlTm9uV2hpdGVzcGFjZUl0ZW0oaW5saW5lVGV4dEJv eCwgaW5pdGlhbE5vbldoaXRlc3BhY2VQb3NpdGlvbiwgbGVuZ3RoLCBoYXNUcmFpbGluZ1NvZnRI eXBoZW4sIGlubGluZUl0ZW1XaWR0aChpbml0aWFsTm9uV2hpdGVzcGFjZVBvc2l0aW9uLCBsZW5n dGgpKSk7CisgICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5hZGRJbmxpbmVJdGVtKElubGluZVRleHRJ dGVtOjpjcmVhdGVOb25XaGl0ZXNwYWNlSXRlbShpbmxpbmVUZXh0Qm94LCBpbml0aWFsTm9uV2hp dGVzcGFjZVBvc2l0aW9uLCBsZW5ndGgsIFVCSURJX0RFRkFVTFRfTFRSLCBoYXNUcmFpbGluZ1Nv ZnRIeXBoZW4sIGlubGluZUl0ZW1XaWR0aChpbml0aWFsTm9uV2hpdGVzcGFjZVBvc2l0aW9uLCBs ZW5ndGgpKSk7CiAgICAgfQogfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lU29mdExpbmVCcmVha0l0ZW0uaCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZVNvZnRM aW5lQnJlYWtJdGVtLmgKaW5kZXggOWVhMDZmYmNkZDE3ODI0MmJhYjU0NzNhOTRhMTNhYzMwYmM3 OTcwYi4uOTRjMGM4Y2M4OWYxY2Y4NTVkMjlhMzNhMjkwYmRiMDFlODljYWRhMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l U29mdExpbmVCcmVha0l0ZW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVTb2Z0TGluZUJyZWFrSXRlbS5oCkBAIC0zNCwyMSArMzQs MjIgQEAgbmFtZXNwYWNlIExheW91dCB7CiAKIGNsYXNzIElubGluZVNvZnRMaW5lQnJlYWtJdGVt IDogcHVibGljIElubGluZUl0ZW0gewogcHVibGljOgotICAgIHN0YXRpYyBJbmxpbmVTb2Z0TGlu ZUJyZWFrSXRlbSBjcmVhdGVTb2Z0TGluZUJyZWFrSXRlbShjb25zdCBJbmxpbmVUZXh0Qm94Jiwg dW5zaWduZWQgcG9zaXRpb24pOworICAgIHN0YXRpYyBJbmxpbmVTb2Z0TGluZUJyZWFrSXRlbSBj cmVhdGVTb2Z0TGluZUJyZWFrSXRlbShjb25zdCBJbmxpbmVUZXh0Qm94JiwgdW5zaWduZWQgcG9z aXRpb24sIFVCaURpTGV2ZWwgPSBVQklESV9ERUZBVUxUX0xUUik7CiAKICAgICB1bnNpZ25lZCBw b3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fc3RhcnRPclBvc2l0aW9uOyB9CiAgICAgY29uc3Qg SW5saW5lVGV4dEJveCYgaW5saW5lVGV4dEJveCgpIGNvbnN0IHsgcmV0dXJuIGRvd25jYXN0PElu bGluZVRleHRCb3g+KGxheW91dEJveCgpKTsgfQogCi0gICAgSW5saW5lU29mdExpbmVCcmVha0l0 ZW0oY29uc3QgSW5saW5lVGV4dEJveCYsIHVuc2lnbmVkIHBvc2l0aW9uKTsKK3ByaXZhdGU6Cisg ICAgSW5saW5lU29mdExpbmVCcmVha0l0ZW0oY29uc3QgSW5saW5lVGV4dEJveCYsIHVuc2lnbmVk IHBvc2l0aW9uLCBVQmlEaUxldmVsKTsKIH07CiAKLWlubGluZSBJbmxpbmVTb2Z0TGluZUJyZWFr SXRlbSBJbmxpbmVTb2Z0TGluZUJyZWFrSXRlbTo6Y3JlYXRlU29mdExpbmVCcmVha0l0ZW0oY29u c3QgSW5saW5lVGV4dEJveCYgaW5saW5lVGV4dEJveCwgdW5zaWduZWQgcG9zaXRpb24pCitpbmxp bmUgSW5saW5lU29mdExpbmVCcmVha0l0ZW0gSW5saW5lU29mdExpbmVCcmVha0l0ZW06OmNyZWF0 ZVNvZnRMaW5lQnJlYWtJdGVtKGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gsIHVu c2lnbmVkIHBvc2l0aW9uLCBVQmlEaUxldmVsIGJpZGlMZXZlbCkKIHsKLSAgICByZXR1cm4geyBp bmxpbmVUZXh0Qm94LCBwb3NpdGlvbiB9OworICAgIHJldHVybiB7IGlubGluZVRleHRCb3gsIHBv c2l0aW9uLCBiaWRpTGV2ZWwgfTsKIH0KIAotaW5saW5lIElubGluZVNvZnRMaW5lQnJlYWtJdGVt OjpJbmxpbmVTb2Z0TGluZUJyZWFrSXRlbShjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0 Qm94LCB1bnNpZ25lZCBwb3NpdGlvbikKLSAgICA6IElubGluZUl0ZW0oaW5saW5lVGV4dEJveCwg VHlwZTo6U29mdExpbmVCcmVhaykKK2lubGluZSBJbmxpbmVTb2Z0TGluZUJyZWFrSXRlbTo6SW5s aW5lU29mdExpbmVCcmVha0l0ZW0oY29uc3QgSW5saW5lVGV4dEJveCYgaW5saW5lVGV4dEJveCwg dW5zaWduZWQgcG9zaXRpb24sIFVCaURpTGV2ZWwgYmlkaUxldmVsKQorICAgIDogSW5saW5lSXRl bShpbmxpbmVUZXh0Qm94LCBUeXBlOjpTb2Z0TGluZUJyZWFrLCBiaWRpTGV2ZWwpCiB7CiAgICAg bV9zdGFydE9yUG9zaXRpb24gPSBwb3NpdGlvbjsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZVRleHRJdGVtLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZVRl eHRJdGVtLmNwcAppbmRleCA2MjEzNTI2NGFlODNjOWUzNzI1YmMxNWQ0YzY4NDU2ZTA2ZjI4MDM2 Li5kNzUzZDUwNDljMzdjODllOTYzM2Y4MjZlNjJlMWIyYWEyZGZmN2QwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVUZXh0 SXRlbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lVGV4dEl0ZW0uY3BwCkBAIC0zOCw4ICszOCw4IEBAIG5hbWVzcGFjZSBMYXlv dXQgewogCiBzdGF0aWNfYXNzZXJ0KHNpemVvZihJbmxpbmVJdGVtKSA9PSBzaXplb2YoSW5saW5l VGV4dEl0ZW0pLCAiIik7CiAKLUlubGluZVRleHRJdGVtOjpJbmxpbmVUZXh0SXRlbShjb25zdCBJ bmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCB1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgbGVu Z3RoLCBib29sIGhhc1RyYWlsaW5nU29mdEh5cGhlbiwgYm9vbCBpc1dvcmRTZXBhcmF0b3IsIHN0 ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gd2lkdGgsIFRleHRJdGVtVHlwZSB0ZXh0SXRl bVR5cGUpCi0gICAgOiBJbmxpbmVJdGVtKGlubGluZVRleHRCb3gsIFR5cGU6OlRleHQpCitJbmxp bmVUZXh0SXRlbTo6SW5saW5lVGV4dEl0ZW0oY29uc3QgSW5saW5lVGV4dEJveCYgaW5saW5lVGV4 dEJveCwgdW5zaWduZWQgc3RhcnQsIHVuc2lnbmVkIGxlbmd0aCwgVUJpRGlMZXZlbCBiaWRpTGV2 ZWwsIGJvb2wgaGFzVHJhaWxpbmdTb2Z0SHlwaGVuLCBib29sIGlzV29yZFNlcGFyYXRvciwgc3Rk OjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB3aWR0aCwgVGV4dEl0ZW1UeXBlIHRleHRJdGVt VHlwZSkKKyAgICA6IElubGluZUl0ZW0oaW5saW5lVGV4dEJveCwgVHlwZTo6VGV4dCwgYmlkaUxl dmVsKQogewogICAgIG1fc3RhcnRPclBvc2l0aW9uID0gc3RhcnQ7CiAgICAgbV9sZW5ndGggPSBs ZW5ndGg7CkBAIC01MCw4ICs1MCw4IEBAIElubGluZVRleHRJdGVtOjpJbmxpbmVUZXh0SXRlbShj b25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCB1bnNpZ25lZCBzdGFyCiAgICAgbV90 ZXh0SXRlbVR5cGUgPSB0ZXh0SXRlbVR5cGU7CiB9CiAKLUlubGluZVRleHRJdGVtOjpJbmxpbmVU ZXh0SXRlbShjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94KQotICAgIDogSW5saW5l SXRlbShpbmxpbmVUZXh0Qm94LCBUeXBlOjpUZXh0KQorSW5saW5lVGV4dEl0ZW06OklubGluZVRl eHRJdGVtKGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gsIFVCaURpTGV2ZWwgYmlk aUxldmVsKQorICAgIDogSW5saW5lSXRlbShpbmxpbmVUZXh0Qm94LCBUeXBlOjpUZXh0LCBiaWRp TGV2ZWwpCiB7CiB9CiAKQEAgLTYwLDcgKzYwLDcgQEAgSW5saW5lVGV4dEl0ZW0gSW5saW5lVGV4 dEl0ZW06OmxlZnQodW5zaWduZWQgbGVuZ3RoKSBjb25zdAogICAgIFJFTEVBU0VfQVNTRVJUKGxl bmd0aCA8PSB0aGlzLT5sZW5ndGgoKSk7CiAgICAgQVNTRVJUKG1fdGV4dEl0ZW1UeXBlICE9IFRl eHRJdGVtVHlwZTo6VW5kZWZpbmVkKTsKICAgICBBU1NFUlQobGVuZ3RoKTsKLSAgICByZXR1cm4g eyBpbmxpbmVUZXh0Qm94KCksIHN0YXJ0KCksIGxlbmd0aCwgZmFsc2UsIGlzV29yZFNlcGFyYXRv cigpLCBzdGQ6Om51bGxvcHQsIG1fdGV4dEl0ZW1UeXBlIH07CisgICAgcmV0dXJuIHsgaW5saW5l VGV4dEJveCgpLCBzdGFydCgpLCBsZW5ndGgsIGJpZGlMZXZlbCgpLCBmYWxzZSwgaXNXb3JkU2Vw YXJhdG9yKCksIHN0ZDo6bnVsbG9wdCwgbV90ZXh0SXRlbVR5cGUgfTsKIH0KIAogSW5saW5lVGV4 dEl0ZW0gSW5saW5lVGV4dEl0ZW06OnJpZ2h0KHVuc2lnbmVkIGxlbmd0aCwgc3RkOjpvcHRpb25h bDxJbmxpbmVMYXlvdXRVbml0PiB3aWR0aCkgY29uc3QKQEAgLTY4LDcgKzY4LDcgQEAgSW5saW5l VGV4dEl0ZW0gSW5saW5lVGV4dEl0ZW06OnJpZ2h0KHVuc2lnbmVkIGxlbmd0aCwgc3RkOjpvcHRp b25hbDxJbmxpbmVMYXlvdXQKICAgICBSRUxFQVNFX0FTU0VSVChsZW5ndGggPD0gdGhpcy0+bGVu Z3RoKCkpOwogICAgIEFTU0VSVChtX3RleHRJdGVtVHlwZSAhPSBUZXh0SXRlbVR5cGU6OlVuZGVm aW5lZCk7CiAgICAgQVNTRVJUKGxlbmd0aCk7Ci0gICAgcmV0dXJuIHsgaW5saW5lVGV4dEJveCgp LCBlbmQoKSAtIGxlbmd0aCwgbGVuZ3RoLCBoYXNUcmFpbGluZ1NvZnRIeXBoZW4oKSwgaXNXb3Jk U2VwYXJhdG9yKCksIHdpZHRoLCBtX3RleHRJdGVtVHlwZSB9OworICAgIHJldHVybiB7IGlubGlu ZVRleHRCb3goKSwgZW5kKCkgLSBsZW5ndGgsIGxlbmd0aCwgYmlkaUxldmVsKCksIGhhc1RyYWls aW5nU29mdEh5cGhlbigpLCBpc1dvcmRTZXBhcmF0b3IoKSwgd2lkdGgsIG1fdGV4dEl0ZW1UeXBl IH07CiB9CiAKIGJvb2wgSW5saW5lVGV4dEl0ZW06OmlzWmVyb1dpZHRoU3BhY2VTZXBhcmF0b3Io KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lVGV4dEl0ZW0uaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZVRleHRJdGVtLmgKaW5kZXggMWY4MGY3N2M5OTNk MTgzMTQzMmE5MDVlMWM0ZTgyNjlkMjBmYmE2Ni4uNDMzODc5YjBiYjgyMWM3YWNjNTNhYzc0Zjg5 OGQ2NDA1NzEzY2I1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lVGV4dEl0ZW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVUZXh0SXRlbS5oCkBAIC0zNyw5 ICszNyw5IEBAIHVzaW5nIElubGluZUl0ZW1zID0gVmVjdG9yPElubGluZUl0ZW0+OwogCiBjbGFz cyBJbmxpbmVUZXh0SXRlbSA6IHB1YmxpYyBJbmxpbmVJdGVtIHsKIHB1YmxpYzoKLSAgICBzdGF0 aWMgSW5saW5lVGV4dEl0ZW0gY3JlYXRlV2hpdGVzcGFjZUl0ZW0oY29uc3QgSW5saW5lVGV4dEJv eCYsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBsZW5ndGgsIGJvb2wgaXNXb3JkU2VwYXJhdG9y LCBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IHdpZHRoKTsKLSAgICBzdGF0aWMgSW5s aW5lVGV4dEl0ZW0gY3JlYXRlTm9uV2hpdGVzcGFjZUl0ZW0oY29uc3QgSW5saW5lVGV4dEJveCYs IHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBsZW5ndGgsIGJvb2wgaGFzVHJhaWxpbmdTb2Z0SHlw aGVuLCBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IHdpZHRoKTsKLSAgICBzdGF0aWMg SW5saW5lVGV4dEl0ZW0gY3JlYXRlRW1wdHlJdGVtKGNvbnN0IElubGluZVRleHRCb3gmKTsKKyAg ICBzdGF0aWMgSW5saW5lVGV4dEl0ZW0gY3JlYXRlV2hpdGVzcGFjZUl0ZW0oY29uc3QgSW5saW5l VGV4dEJveCYsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBsZW5ndGgsIFVCaURpTGV2ZWwsIGJv b2wgaXNXb3JkU2VwYXJhdG9yLCBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IHdpZHRo KTsKKyAgICBzdGF0aWMgSW5saW5lVGV4dEl0ZW0gY3JlYXRlTm9uV2hpdGVzcGFjZUl0ZW0oY29u c3QgSW5saW5lVGV4dEJveCYsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBsZW5ndGgsIFVCaURp TGV2ZWwsIGJvb2wgaGFzVHJhaWxpbmdTb2Z0SHlwaGVuLCBzdGQ6Om9wdGlvbmFsPElubGluZUxh eW91dFVuaXQ+IHdpZHRoKTsKKyAgICBzdGF0aWMgSW5saW5lVGV4dEl0ZW0gY3JlYXRlRW1wdHlJ dGVtKGNvbnN0IElubGluZVRleHRCb3gmLCBVQmlEaUxldmVsID0gVUJJRElfREVGQVVMVF9MVFIp OwogCiAgICAgdW5zaWduZWQgc3RhcnQoKSBjb25zdCB7IHJldHVybiBtX3N0YXJ0T3JQb3NpdGlv bjsgfQogICAgIHVuc2lnbmVkIGVuZCgpIGNvbnN0IHsgcmV0dXJuIHN0YXJ0KCkgKyBsZW5ndGgo KTsgfQpAQCAtNjEsMjQgKzYxLDI0IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgdXNpbmcgSW5s aW5lSXRlbTo6VGV4dEl0ZW1UeXBlOwogCi0gICAgSW5saW5lVGV4dEl0ZW0oY29uc3QgSW5saW5l VGV4dEJveCYsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBsZW5ndGgsIGJvb2wgaGFzVHJhaWxp bmdTb2Z0SHlwaGVuLCBib29sIGlzV29yZFNlcGFyYXRvciwgc3RkOjpvcHRpb25hbDxJbmxpbmVM YXlvdXRVbml0PiB3aWR0aCwgVGV4dEl0ZW1UeXBlKTsKLSAgICBleHBsaWNpdCBJbmxpbmVUZXh0 SXRlbShjb25zdCBJbmxpbmVUZXh0Qm94Jik7CisgICAgSW5saW5lVGV4dEl0ZW0oY29uc3QgSW5s aW5lVGV4dEJveCYsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBsZW5ndGgsIFVCaURpTGV2ZWws IGJvb2wgaGFzVHJhaWxpbmdTb2Z0SHlwaGVuLCBib29sIGlzV29yZFNlcGFyYXRvciwgc3RkOjpv cHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB3aWR0aCwgVGV4dEl0ZW1UeXBlKTsKKyAgICBleHBs aWNpdCBJbmxpbmVUZXh0SXRlbShjb25zdCBJbmxpbmVUZXh0Qm94JiwgVUJpRGlMZXZlbCk7CiB9 OwogCi1pbmxpbmUgSW5saW5lVGV4dEl0ZW0gSW5saW5lVGV4dEl0ZW06OmNyZWF0ZVdoaXRlc3Bh Y2VJdGVtKGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gsIHVuc2lnbmVkIHN0YXJ0 LCB1bnNpZ25lZCBsZW5ndGgsIGJvb2wgaXNXb3JkU2VwYXJhdG9yLCBzdGQ6Om9wdGlvbmFsPElu bGluZUxheW91dFVuaXQ+IHdpZHRoKQoraW5saW5lIElubGluZVRleHRJdGVtIElubGluZVRleHRJ dGVtOjpjcmVhdGVXaGl0ZXNwYWNlSXRlbShjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0 Qm94LCB1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgbGVuZ3RoLCBVQmlEaUxldmVsIGJpZGlMZXZl bCwgYm9vbCBpc1dvcmRTZXBhcmF0b3IsIHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4g d2lkdGgpCiB7Ci0gICAgcmV0dXJuIHsgaW5saW5lVGV4dEJveCwgc3RhcnQsIGxlbmd0aCwgZmFs c2UsIGlzV29yZFNlcGFyYXRvciwgd2lkdGgsIFRleHRJdGVtVHlwZTo6V2hpdGVzcGFjZSB9Owor ICAgIHJldHVybiB7IGlubGluZVRleHRCb3gsIHN0YXJ0LCBsZW5ndGgsIGJpZGlMZXZlbCwgZmFs c2UsIGlzV29yZFNlcGFyYXRvciwgd2lkdGgsIFRleHRJdGVtVHlwZTo6V2hpdGVzcGFjZSB9Owog fQogCi1pbmxpbmUgSW5saW5lVGV4dEl0ZW0gSW5saW5lVGV4dEl0ZW06OmNyZWF0ZU5vbldoaXRl c3BhY2VJdGVtKGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gsIHVuc2lnbmVkIHN0 YXJ0LCB1bnNpZ25lZCBsZW5ndGgsIGJvb2wgaGFzVHJhaWxpbmdTb2Z0SHlwaGVuLCBzdGQ6Om9w dGlvbmFsPElubGluZUxheW91dFVuaXQ+IHdpZHRoKQoraW5saW5lIElubGluZVRleHRJdGVtIElu bGluZVRleHRJdGVtOjpjcmVhdGVOb25XaGl0ZXNwYWNlSXRlbShjb25zdCBJbmxpbmVUZXh0Qm94 JiBpbmxpbmVUZXh0Qm94LCB1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgbGVuZ3RoLCBVQmlEaUxl dmVsIGJpZGlMZXZlbCwgYm9vbCBoYXNUcmFpbGluZ1NvZnRIeXBoZW4sIHN0ZDo6b3B0aW9uYWw8 SW5saW5lTGF5b3V0VW5pdD4gd2lkdGgpCiB7CiAgICAgLy8gRklYTUU6IFVzZSB0aGUgZm9sbG93 aW5nIGxpc3Qgb2Ygbm9uLXdoaXRlc3BhY2UgY2hhcmFjdGVycyB0byBzZXQgdGhlICJpc1dvcmRT ZXBhcmF0b3IiIGJpdDogbm9CcmVha1NwYWNlLCBldGhpb3BpY1dvcmRzcGFjZSwgYWVnZWFuV29y ZFNlcGFyYXRvckxpbmUgYWVnZWFuV29yZFNlcGFyYXRvckRvdCB1Z2FyaXRpY1dvcmREaXZpZGVy LgotICAgIHJldHVybiB7IGlubGluZVRleHRCb3gsIHN0YXJ0LCBsZW5ndGgsIGhhc1RyYWlsaW5n U29mdEh5cGhlbiwgZmFsc2UsIHdpZHRoLCBUZXh0SXRlbVR5cGU6Ok5vbldoaXRlc3BhY2UgfTsK KyAgICByZXR1cm4geyBpbmxpbmVUZXh0Qm94LCBzdGFydCwgbGVuZ3RoLCBiaWRpTGV2ZWwsIGhh c1RyYWlsaW5nU29mdEh5cGhlbiwgZmFsc2UsIHdpZHRoLCBUZXh0SXRlbVR5cGU6Ok5vbldoaXRl c3BhY2UgfTsKIH0KIAotaW5saW5lIElubGluZVRleHRJdGVtIElubGluZVRleHRJdGVtOjpjcmVh dGVFbXB0eUl0ZW0oY29uc3QgSW5saW5lVGV4dEJveCYgaW5saW5lVGV4dEJveCkKK2lubGluZSBJ bmxpbmVUZXh0SXRlbSBJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlRW1wdHlJdGVtKGNvbnN0IElubGlu ZVRleHRCb3gmIGlubGluZVRleHRCb3gsIFVCaURpTGV2ZWwgYmlkaUxldmVsKQogewotICAgIHJl dHVybiBJbmxpbmVUZXh0SXRlbSB7IGlubGluZVRleHRCb3ggfTsKKyAgICByZXR1cm4gSW5saW5l VGV4dEl0ZW0geyBpbmxpbmVUZXh0Qm94LCBiaWRpTGV2ZWwgfTsKIH0KIAogfQo=