202288 2019-09-26 14:16:37 -0700 [LFC][IFC] Line::Run should have a reference to the associated InlineItem 2019-09-26 20:44:02 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1574625 0 zalan 2019-09-26 14:16:37 -0700 It makes it clearer where the type and the layout box come from. 1574626 1 webkit-bug-importer 2019-09-26 14:16:57 -0700 <rdar://problem/55758112> 1574627 2 379680 zalan 2019-09-26 14:18:43 -0700 Created attachment 379680 Patch 1574714 3 379707 zalan 2019-09-26 20:26:00 -0700 Created attachment 379707 Patch 1574718 4 379707 commit-queue 2019-09-26 20:44:01 -0700 Comment on attachment 379707 Patch Clearing flags on attachment: 379707 Committed r250412: <https://trac.webkit.org/changeset/250412> 1574719 5 commit-queue 2019-09-26 20:44:02 -0700 All reviewed patches have been landed. Closing bug. 379680 2019-09-26 14:18:43 -0700 2019-09-26 20:25:58 -0700 Patch bug-202288-20190926141843.patch text/plain 6899 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWY2N2YxY2Q5N2E4YWRh NjRmYWZmMzNmNWM4ZWNlYjdmNzc0YzFjMi4uOWY2MmVhMzg1NzhjYTQzYzM1MDRhN2ZlNDA4Nzcx NDAyNTYwN2QzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTA5LTI2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBMaW5lOjpS dW4gc2hvdWxkIGhhdmUgYSByZWZlcmVuY2UgdG8gdGhlIGFzc29jaWF0ZWQgSW5saW5lSXRlbQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAyMjg4Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NTc1ODExMj4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJdCBtYWtlcyBpdCBjbGVhcmVyIHdoZXJlIHRoZSB0 eXBlIGFuZCB0aGUgbGF5b3V0IGJveCBjb21lIGZyb20uCisKKyAgICAgICAgKiBsYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmxpbmVE ZXNjZW50TmVlZHNDb2xsYXBzaW5nIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6 UnVuOjpSdW4pOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUu aDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6UnVuOjpsYXlvdXRCb3ggY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpSdW46OnRleHRDb250ZXh0IGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6UnVuOjppc1RleHQgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpSdW46OmlzQm94IGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6UnVuOjppc0xpbmVCcmVhayBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OlJ1bjo6aXNDb250YWluZXJTdGFydCBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OlJ1bjo6aXNDb250YWluZXJFbmQgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpSdW46OnR5cGUgY29uc3QpOiBE ZWxldGVkLgorCiAyMDE5LTA5LTI2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0xGQ11bSUZDXSBSZW1vdmUgcmVkdW5kYW50IExpbmU6OkNvbnRlbnQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAppbmRleCA3NzliYTI3OWEy MDUxOTI1NTFiMjFjYzQyN2FkY2U1NTc3NGYyYTZmLi42NWEzNzVkN2E4ZTI4OGM5ZmMwNjhkM2M3 YmMxMDE2ZjVjNzMyZGM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRR dWlya3MuY3BwCkBAIC00NiwyNSArNDYsMjMgQEAgYm9vbCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDo6UXVpcmtzOjpsaW5lRGVzY2VudE5lZWRzQ29sbGFwc2luZyhjb25zdCBMaW5lOjpSdW4KIAog ICAgIGZvciAoYXV0byYgcnVuIDogcnVuTGlzdCkgewogICAgICAgICBhdXRvJiBsYXlvdXRCb3gg PSBydW4tPmxheW91dEJveCgpOwotICAgICAgICBpZiAobGF5b3V0Qm94LnN0eWxlKCkudmVydGlj YWxBbGlnbigpICE9IFZlcnRpY2FsQWxpZ246OkJhc2VsaW5lKQorICAgICAgICBpZiAocnVuLT5p c0NvbnRhaW5lckVuZCgpIHx8IGxheW91dEJveC5zdHlsZSgpLnZlcnRpY2FsQWxpZ24oKSAhPSBW ZXJ0aWNhbEFsaWduOjpCYXNlbGluZSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAg IHN3aXRjaCAocnVuLT50eXBlKCkpIHsKLSAgICAgICAgY2FzZSBJbmxpbmVJdGVtOjpUeXBlOjpU ZXh0OgorICAgICAgICBpZiAocnVuLT5pc0xpbmVCcmVhaygpKQorICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICBpZiAocnVuLT5pc1RleHQoKSkgewogICAgICAgICAgICAgaWYgKCFy dW4tPnRleHRDb250ZXh0KCkgfHwgIXJ1bi0+dGV4dENvbnRleHQoKS0+aXNDb2xsYXBzZWQpCiAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg IGNhc2UgSW5saW5lSXRlbTo6VHlwZTo6SGFyZExpbmVCcmVhazoKLSAgICAgICAgICAgIHJldHVy biBmYWxzZTsKLSAgICAgICAgY2FzZSBJbmxpbmVJdGVtOjpUeXBlOjpDb250YWluZXJTdGFydDog eworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgaWYgKHJ1bi0+aXND b250YWluZXJTdGFydCgpKSB7CiAgICAgICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1h dHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3gobGF5b3V0Qm94KTsKICAgICAgICAgICAgIGlm IChib3hHZW9tZXRyeS5ob3Jpem9udGFsQm9yZGVyKCkgfHwgKGJveEdlb21ldHJ5Lmhvcml6b250 YWxQYWRkaW5nKCkgJiYgYm94R2VvbWV0cnkuaG9yaXpvbnRhbFBhZGRpbmcoKS52YWx1ZSgpKSkK ICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICBicmVhazsKKyAgICAg ICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9Ci0gICAgICAgIGNhc2UgSW5saW5lSXRlbTo6VHlw ZTo6Q29udGFpbmVyRW5kOgotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgSW5saW5l SXRlbTo6VHlwZTo6Qm94OiB7CisgICAgICAgIGlmIChydW4tPmlzQm94KCkpIHsKICAgICAgICAg ICAgIGlmIChsYXlvdXRCb3guaXNJbmxpbmVCbG9ja0JveCgpICYmIGxheW91dEJveC5lc3RhYmxp c2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkpIHsKICAgICAgICAgICAgICAgICBhdXRvJiBm b3JtYXR0aW5nU3RhdGUgPSBkb3duY2FzdDxJbmxpbmVGb3JtYXR0aW5nU3RhdGU+KGxheW91dFN0 YXRlLmVzdGFibGlzaGVkRm9ybWF0dGluZ1N0YXRlKGRvd25jYXN0PENvbnRhaW5lcj4obGF5b3V0 Qm94KSkpOwogICAgICAgICAgICAgICAgIEFTU0VSVCghZm9ybWF0dGluZ1N0YXRlLmxpbmVCb3hl cygpLmlzRW1wdHkoKSk7CkBAIC03MiwxMiArNzAsOSBAQCBib29sIElubGluZUZvcm1hdHRpbmdD b250ZXh0OjpRdWlya3M6OmxpbmVEZXNjZW50TmVlZHNDb2xsYXBzaW5nKGNvbnN0IExpbmU6OlJ1 bgogICAgICAgICAgICAgICAgIGlmIChpbmxpbmVCbG9ja0Jhc2VsaW5lLmRlc2NlbnQoKSkKICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgfQotICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgIH0KLSAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjb250aW51 ZTsKICAgICAgICAgfQorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9CiAgICAg cmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCmluZGV4IGEwMTBlOTExYmFjNWNhMGY5ODliN2U0Yzdj YTJjYzEzYzA1Y2ZhMDYuLjBiYTFiYTUxOTgzNGRlZGYyNzUxNzcxNzYxMDhmZDYzZmNhNjBkOTgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmUuY3BwCkBAIC0zOCwxNSArMzgsMTMgQEAgbmFtZXNwYWNlIExheW91dCB7CiBXVEZf TUFLRV9JU09fQUxMT0NBVEVEX0lNUEwoTGluZSk7CiAKIExpbmU6OlJ1bjo6UnVuKGNvbnN0IElu bGluZUl0ZW0mIGlubGluZUl0ZW0sIGNvbnN0IERpc3BsYXk6OlJlY3QmIGxvZ2ljYWxSZWN0KQot ICAgIDogbV9sYXlvdXRCb3goaW5saW5lSXRlbS5sYXlvdXRCb3goKSkKLSAgICAsIG1fdHlwZShp bmxpbmVJdGVtLnR5cGUoKSkKKyAgICA6IG1faW5saW5lSXRlbShpbmxpbmVJdGVtKQogICAgICwg bV9sb2dpY2FsUmVjdChsb2dpY2FsUmVjdCkKIHsKIH0KIAogTGluZTo6UnVuOjpSdW4oY29uc3Qg SW5saW5lSXRlbSYgaW5saW5lSXRlbSwgY29uc3QgVGV4dENvbnRleHQmIHRleHRDb250ZXh0LCBj b25zdCBEaXNwbGF5OjpSZWN0JiBsb2dpY2FsUmVjdCkKLSAgICA6IG1fbGF5b3V0Qm94KGlubGlu ZUl0ZW0ubGF5b3V0Qm94KCkpCi0gICAgLCBtX3R5cGUoaW5saW5lSXRlbS50eXBlKCkpCisgICAg OiBtX2lubGluZUl0ZW0oaW5saW5lSXRlbSkKICAgICAsIG1fbG9naWNhbFJlY3QobG9naWNhbFJl Y3QpCiAgICAgLCBtX3RleHRDb250ZXh0KHRleHRDb250ZXh0KQogewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCmluZGV4IDUzNzBi OGNmYmZmZjlmYTE2MmE3NmEyMzhhMWI3M2RlNGUyOWFkNjYuLjVhZjA5YjA4ZDRjZDgxYjUyN2U1 OTk0MTAzMTk0ZWEzYjRjMDQxMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKQEAgLTc2LDE2ICs3NiwxNSBAQCBwdWJsaWM6 CiAgICAgICAgIFJ1bihjb25zdCBJbmxpbmVJdGVtJiwgY29uc3QgRGlzcGxheTo6UmVjdCYpOwog ICAgICAgICBSdW4oY29uc3QgSW5saW5lSXRlbSYsIGNvbnN0IFRleHRDb250ZXh0JiwgY29uc3Qg RGlzcGxheTo6UmVjdCYpOwogCi0gICAgICAgIGNvbnN0IEJveCYgbGF5b3V0Qm94KCkgY29uc3Qg eyByZXR1cm4gbV9sYXlvdXRCb3g7IH0KKyAgICAgICAgY29uc3QgQm94JiBsYXlvdXRCb3goKSBj b25zdCB7IHJldHVybiBtX2lubGluZUl0ZW0ubGF5b3V0Qm94KCk7IH0KICAgICAgICAgY29uc3Qg RGlzcGxheTo6UmVjdCYgbG9naWNhbFJlY3QoKSBjb25zdCB7IHJldHVybiBtX2xvZ2ljYWxSZWN0 OyB9CiAgICAgICAgIGNvbnN0IE9wdGlvbmFsPFRleHRDb250ZXh0PiB0ZXh0Q29udGV4dCgpIGNv bnN0IHsgcmV0dXJuIG1fdGV4dENvbnRleHQ7IH0KLSAgICAgICAgSW5saW5lSXRlbTo6VHlwZSB0 eXBlKCkgY29uc3QgeyByZXR1cm4gbV90eXBlOyB9CiAKLSAgICAgICAgYm9vbCBpc1RleHQoKSBj b25zdCB7IHJldHVybiBtX3R5cGUgPT0gSW5saW5lSXRlbTo6VHlwZTo6VGV4dDsgfQotICAgICAg ICBib29sIGlzQm94KCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IElubGluZUl0ZW06OlR5cGU6 OkJveDsgfQotICAgICAgICBib29sIGlzTGluZUJyZWFrKCkgY29uc3QgeyByZXR1cm4gbV90eXBl ID09IElubGluZUl0ZW06OlR5cGU6OkhhcmRMaW5lQnJlYWs7IH0KLSAgICAgICAgYm9vbCBpc0Nv bnRhaW5lclN0YXJ0KCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IElubGluZUl0ZW06OlR5cGU6 OkNvbnRhaW5lclN0YXJ0OyB9Ci0gICAgICAgIGJvb2wgaXNDb250YWluZXJFbmQoKSBjb25zdCB7 IHJldHVybiBtX3R5cGUgPT0gSW5saW5lSXRlbTo6VHlwZTo6Q29udGFpbmVyRW5kOyB9CisgICAg ICAgIGJvb2wgaXNUZXh0KCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVJdGVtLmlzVGV4dCgpOyB9 CisgICAgICAgIGJvb2wgaXNCb3goKSBjb25zdCB7IHJldHVybiBtX2lubGluZUl0ZW0uaXNCb3go KTsgfQorICAgICAgICBib29sIGlzTGluZUJyZWFrKCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVJ dGVtLmlzTGluZUJyZWFrKCk7IH0KKyAgICAgICAgYm9vbCBpc0NvbnRhaW5lclN0YXJ0KCkgY29u c3QgeyByZXR1cm4gbV9pbmxpbmVJdGVtLmlzQ29udGFpbmVyU3RhcnQoKTsgfQorICAgICAgICBi b29sIGlzQ29udGFpbmVyRW5kKCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVJdGVtLmlzQ29udGFp bmVyRW5kKCk7IH0KIAogICAgIHByaXZhdGU6CiAgICAgICAgIGZyaWVuZCBjbGFzcyBMaW5lOwpA QCAtOTQsOCArOTMsNyBAQCBwdWJsaWM6CiAgICAgICAgIHZvaWQgbW92ZUhvcml6b250YWxseShM YXlvdXRVbml0IG9mZnNldCkgeyBtX2xvZ2ljYWxSZWN0Lm1vdmVIb3Jpem9udGFsbHkob2Zmc2V0 KTsgfQogICAgICAgICB2b2lkIHNldFRleHRJc0NvbGxhcHNlZCgpIHsgbV90ZXh0Q29udGV4dC0+ aXNDb2xsYXBzZWQgPSB0cnVlOyB9CiAKLSAgICAgICAgY29uc3QgQm94JiBtX2xheW91dEJveDsK LSAgICAgICAgY29uc3QgSW5saW5lSXRlbTo6VHlwZSBtX3R5cGU7CisgICAgICAgIGNvbnN0IElu bGluZUl0ZW0mIG1faW5saW5lSXRlbTsKICAgICAgICAgRGlzcGxheTo6UmVjdCBtX2xvZ2ljYWxS ZWN0OwogICAgICAgICBPcHRpb25hbDxUZXh0Q29udGV4dD4gbV90ZXh0Q29udGV4dDsKICAgICB9 Owo= 379707 2019-09-26 20:26:00 -0700 2019-09-26 20:44:01 -0700 Patch bug-202288-20190926202559.patch text/plain 6899 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwNDExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzRlYjgyZjFlZDVkZmM2 NWI5NGMxMTY1NTNkYWExMzg4ZDdhZTNhNy4uNjQ5NmUxYzExYzhmZDMwMzkxZmVhZGZmYWY5ZDUx ZTJmMzYwOWQ3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTA5LTI2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBMaW5lOjpS dW4gc2hvdWxkIGhhdmUgYSByZWZlcmVuY2UgdG8gdGhlIGFzc29jaWF0ZWQgSW5saW5lSXRlbQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAyMjg4Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NTc1ODExMj4KKworICAgICAgICBSZXZpZXdlZCBieSBB bnR0aSBLb2l2aXN0by4KKworICAgICAgICBJdCBtYWtlcyBpdCBjbGVhcmVyIHdoZXJlIHRoZSB0 eXBlIGFuZCB0aGUgbGF5b3V0IGJveCBjb21lIGZyb20uCisKKyAgICAgICAgKiBsYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmxpbmVE ZXNjZW50TmVlZHNDb2xsYXBzaW5nIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6 UnVuOjpSdW4pOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUu aDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6UnVuOjpsYXlvdXRCb3ggY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpSdW46OnRleHRDb250ZXh0IGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6UnVuOjppc1RleHQgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpSdW46OmlzQm94IGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6UnVuOjppc0xpbmVCcmVhayBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OlJ1bjo6aXNDb250YWluZXJTdGFydCBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OlJ1bjo6aXNDb250YWluZXJFbmQgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpSdW46OnR5cGUgY29uc3QpOiBE ZWxldGVkLgorCiAyMDE5LTA5LTI2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0xGQ11bSUZDXSBSZW1vdmUgcmVkdW5kYW50IExpbmU6OkNvbnRlbnQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAppbmRleCA3NzliYTI3OWEy MDUxOTI1NTFiMjFjYzQyN2FkY2U1NTc3NGYyYTZmLi42NWEzNzVkN2E4ZTI4OGM5ZmMwNjhkM2M3 YmMxMDE2ZjVjNzMyZGM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRR dWlya3MuY3BwCkBAIC00NiwyNSArNDYsMjMgQEAgYm9vbCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDo6UXVpcmtzOjpsaW5lRGVzY2VudE5lZWRzQ29sbGFwc2luZyhjb25zdCBMaW5lOjpSdW4KIAog ICAgIGZvciAoYXV0byYgcnVuIDogcnVuTGlzdCkgewogICAgICAgICBhdXRvJiBsYXlvdXRCb3gg PSBydW4tPmxheW91dEJveCgpOwotICAgICAgICBpZiAobGF5b3V0Qm94LnN0eWxlKCkudmVydGlj YWxBbGlnbigpICE9IFZlcnRpY2FsQWxpZ246OkJhc2VsaW5lKQorICAgICAgICBpZiAocnVuLT5p c0NvbnRhaW5lckVuZCgpIHx8IGxheW91dEJveC5zdHlsZSgpLnZlcnRpY2FsQWxpZ24oKSAhPSBW ZXJ0aWNhbEFsaWduOjpCYXNlbGluZSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAg IHN3aXRjaCAocnVuLT50eXBlKCkpIHsKLSAgICAgICAgY2FzZSBJbmxpbmVJdGVtOjpUeXBlOjpU ZXh0OgorICAgICAgICBpZiAocnVuLT5pc0xpbmVCcmVhaygpKQorICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICBpZiAocnVuLT5pc1RleHQoKSkgewogICAgICAgICAgICAgaWYgKCFy dW4tPnRleHRDb250ZXh0KCkgfHwgIXJ1bi0+dGV4dENvbnRleHQoKS0+aXNDb2xsYXBzZWQpCiAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg IGNhc2UgSW5saW5lSXRlbTo6VHlwZTo6SGFyZExpbmVCcmVhazoKLSAgICAgICAgICAgIHJldHVy biBmYWxzZTsKLSAgICAgICAgY2FzZSBJbmxpbmVJdGVtOjpUeXBlOjpDb250YWluZXJTdGFydDog eworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgaWYgKHJ1bi0+aXND b250YWluZXJTdGFydCgpKSB7CiAgICAgICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1h dHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3gobGF5b3V0Qm94KTsKICAgICAgICAgICAgIGlm IChib3hHZW9tZXRyeS5ob3Jpem9udGFsQm9yZGVyKCkgfHwgKGJveEdlb21ldHJ5Lmhvcml6b250 YWxQYWRkaW5nKCkgJiYgYm94R2VvbWV0cnkuaG9yaXpvbnRhbFBhZGRpbmcoKS52YWx1ZSgpKSkK ICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICBicmVhazsKKyAgICAg ICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9Ci0gICAgICAgIGNhc2UgSW5saW5lSXRlbTo6VHlw ZTo6Q29udGFpbmVyRW5kOgotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgSW5saW5l SXRlbTo6VHlwZTo6Qm94OiB7CisgICAgICAgIGlmIChydW4tPmlzQm94KCkpIHsKICAgICAgICAg ICAgIGlmIChsYXlvdXRCb3guaXNJbmxpbmVCbG9ja0JveCgpICYmIGxheW91dEJveC5lc3RhYmxp c2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkpIHsKICAgICAgICAgICAgICAgICBhdXRvJiBm b3JtYXR0aW5nU3RhdGUgPSBkb3duY2FzdDxJbmxpbmVGb3JtYXR0aW5nU3RhdGU+KGxheW91dFN0 YXRlLmVzdGFibGlzaGVkRm9ybWF0dGluZ1N0YXRlKGRvd25jYXN0PENvbnRhaW5lcj4obGF5b3V0 Qm94KSkpOwogICAgICAgICAgICAgICAgIEFTU0VSVCghZm9ybWF0dGluZ1N0YXRlLmxpbmVCb3hl cygpLmlzRW1wdHkoKSk7CkBAIC03MiwxMiArNzAsOSBAQCBib29sIElubGluZUZvcm1hdHRpbmdD b250ZXh0OjpRdWlya3M6OmxpbmVEZXNjZW50TmVlZHNDb2xsYXBzaW5nKGNvbnN0IExpbmU6OlJ1 bgogICAgICAgICAgICAgICAgIGlmIChpbmxpbmVCbG9ja0Jhc2VsaW5lLmRlc2NlbnQoKSkKICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgfQotICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgIH0KLSAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjb250aW51 ZTsKICAgICAgICAgfQorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9CiAgICAg cmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCmluZGV4IGEwMTBlOTExYmFjNWNhMGY5ODliN2U0Yzdj YTJjYzEzYzA1Y2ZhMDYuLjBiYTFiYTUxOTgzNGRlZGYyNzUxNzcxNzYxMDhmZDYzZmNhNjBkOTgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmUuY3BwCkBAIC0zOCwxNSArMzgsMTMgQEAgbmFtZXNwYWNlIExheW91dCB7CiBXVEZf TUFLRV9JU09fQUxMT0NBVEVEX0lNUEwoTGluZSk7CiAKIExpbmU6OlJ1bjo6UnVuKGNvbnN0IElu bGluZUl0ZW0mIGlubGluZUl0ZW0sIGNvbnN0IERpc3BsYXk6OlJlY3QmIGxvZ2ljYWxSZWN0KQot ICAgIDogbV9sYXlvdXRCb3goaW5saW5lSXRlbS5sYXlvdXRCb3goKSkKLSAgICAsIG1fdHlwZShp bmxpbmVJdGVtLnR5cGUoKSkKKyAgICA6IG1faW5saW5lSXRlbShpbmxpbmVJdGVtKQogICAgICwg bV9sb2dpY2FsUmVjdChsb2dpY2FsUmVjdCkKIHsKIH0KIAogTGluZTo6UnVuOjpSdW4oY29uc3Qg SW5saW5lSXRlbSYgaW5saW5lSXRlbSwgY29uc3QgVGV4dENvbnRleHQmIHRleHRDb250ZXh0LCBj b25zdCBEaXNwbGF5OjpSZWN0JiBsb2dpY2FsUmVjdCkKLSAgICA6IG1fbGF5b3V0Qm94KGlubGlu ZUl0ZW0ubGF5b3V0Qm94KCkpCi0gICAgLCBtX3R5cGUoaW5saW5lSXRlbS50eXBlKCkpCisgICAg OiBtX2lubGluZUl0ZW0oaW5saW5lSXRlbSkKICAgICAsIG1fbG9naWNhbFJlY3QobG9naWNhbFJl Y3QpCiAgICAgLCBtX3RleHRDb250ZXh0KHRleHRDb250ZXh0KQogewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCmluZGV4IDUzNzBi OGNmYmZmZjlmYTE2MmE3NmEyMzhhMWI3M2RlNGUyOWFkNjYuLjVhZjA5YjA4ZDRjZDgxYjUyN2U1 OTk0MTAzMTk0ZWEzYjRjMDQxMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKQEAgLTc2LDE2ICs3NiwxNSBAQCBwdWJsaWM6 CiAgICAgICAgIFJ1bihjb25zdCBJbmxpbmVJdGVtJiwgY29uc3QgRGlzcGxheTo6UmVjdCYpOwog ICAgICAgICBSdW4oY29uc3QgSW5saW5lSXRlbSYsIGNvbnN0IFRleHRDb250ZXh0JiwgY29uc3Qg RGlzcGxheTo6UmVjdCYpOwogCi0gICAgICAgIGNvbnN0IEJveCYgbGF5b3V0Qm94KCkgY29uc3Qg eyByZXR1cm4gbV9sYXlvdXRCb3g7IH0KKyAgICAgICAgY29uc3QgQm94JiBsYXlvdXRCb3goKSBj b25zdCB7IHJldHVybiBtX2lubGluZUl0ZW0ubGF5b3V0Qm94KCk7IH0KICAgICAgICAgY29uc3Qg RGlzcGxheTo6UmVjdCYgbG9naWNhbFJlY3QoKSBjb25zdCB7IHJldHVybiBtX2xvZ2ljYWxSZWN0 OyB9CiAgICAgICAgIGNvbnN0IE9wdGlvbmFsPFRleHRDb250ZXh0PiB0ZXh0Q29udGV4dCgpIGNv bnN0IHsgcmV0dXJuIG1fdGV4dENvbnRleHQ7IH0KLSAgICAgICAgSW5saW5lSXRlbTo6VHlwZSB0 eXBlKCkgY29uc3QgeyByZXR1cm4gbV90eXBlOyB9CiAKLSAgICAgICAgYm9vbCBpc1RleHQoKSBj b25zdCB7IHJldHVybiBtX3R5cGUgPT0gSW5saW5lSXRlbTo6VHlwZTo6VGV4dDsgfQotICAgICAg ICBib29sIGlzQm94KCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IElubGluZUl0ZW06OlR5cGU6 OkJveDsgfQotICAgICAgICBib29sIGlzTGluZUJyZWFrKCkgY29uc3QgeyByZXR1cm4gbV90eXBl ID09IElubGluZUl0ZW06OlR5cGU6OkhhcmRMaW5lQnJlYWs7IH0KLSAgICAgICAgYm9vbCBpc0Nv bnRhaW5lclN0YXJ0KCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IElubGluZUl0ZW06OlR5cGU6 OkNvbnRhaW5lclN0YXJ0OyB9Ci0gICAgICAgIGJvb2wgaXNDb250YWluZXJFbmQoKSBjb25zdCB7 IHJldHVybiBtX3R5cGUgPT0gSW5saW5lSXRlbTo6VHlwZTo6Q29udGFpbmVyRW5kOyB9CisgICAg ICAgIGJvb2wgaXNUZXh0KCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVJdGVtLmlzVGV4dCgpOyB9 CisgICAgICAgIGJvb2wgaXNCb3goKSBjb25zdCB7IHJldHVybiBtX2lubGluZUl0ZW0uaXNCb3go KTsgfQorICAgICAgICBib29sIGlzTGluZUJyZWFrKCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVJ dGVtLmlzTGluZUJyZWFrKCk7IH0KKyAgICAgICAgYm9vbCBpc0NvbnRhaW5lclN0YXJ0KCkgY29u c3QgeyByZXR1cm4gbV9pbmxpbmVJdGVtLmlzQ29udGFpbmVyU3RhcnQoKTsgfQorICAgICAgICBi b29sIGlzQ29udGFpbmVyRW5kKCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVJdGVtLmlzQ29udGFp bmVyRW5kKCk7IH0KIAogICAgIHByaXZhdGU6CiAgICAgICAgIGZyaWVuZCBjbGFzcyBMaW5lOwpA QCAtOTQsOCArOTMsNyBAQCBwdWJsaWM6CiAgICAgICAgIHZvaWQgbW92ZUhvcml6b250YWxseShM YXlvdXRVbml0IG9mZnNldCkgeyBtX2xvZ2ljYWxSZWN0Lm1vdmVIb3Jpem9udGFsbHkob2Zmc2V0 KTsgfQogICAgICAgICB2b2lkIHNldFRleHRJc0NvbGxhcHNlZCgpIHsgbV90ZXh0Q29udGV4dC0+ aXNDb2xsYXBzZWQgPSB0cnVlOyB9CiAKLSAgICAgICAgY29uc3QgQm94JiBtX2xheW91dEJveDsK LSAgICAgICAgY29uc3QgSW5saW5lSXRlbTo6VHlwZSBtX3R5cGU7CisgICAgICAgIGNvbnN0IElu bGluZUl0ZW0mIG1faW5saW5lSXRlbTsKICAgICAgICAgRGlzcGxheTo6UmVjdCBtX2xvZ2ljYWxS ZWN0OwogICAgICAgICBPcHRpb25hbDxUZXh0Q29udGV4dD4gbV90ZXh0Q29udGV4dDsKICAgICB9 Owo=