230760 2021-09-24 10:55:03 -0700 [LFC][IFC] LineBuilder should have the option of passing in the correct style when a run is added to the line 2021-09-24 14:47:24 -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 wenson_hsieh zalan oldest_to_newest 1796953 0 zalan 2021-09-24 10:55:03 -0700 this is in preparation for supporting first-line 1796955 1 439166 zalan 2021-09-24 10:58:46 -0700 Created attachment 439166 Patch 1797040 2 ews-feeder 2021-09-24 14:46:48 -0700 Committed r283059 (242117@main): <https://commits.webkit.org/242117@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439166. 1797041 3 webkit-bug-importer 2021-09-24 14:47:24 -0700 <rdar://problem/83512342> 439166 2021-09-24 10:58:46 -0700 2021-09-24 14:46:50 -0700 Patch bug-230760-20210924105845.patch text/plain 15900 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTE4NzA1MjFkOWU5YjM5 NzVjNjI1OWM0NzY0MzY2Y2IwZjU4NzE2OS4uYzZiNzA1MDE4MTk3NDNiYzE2OTBkN2QwNzBiNDll NDc1Y2MzYjljZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTA5LTI0ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIExpbmVCdWls ZGVyIHNob3VsZCBoYXZlIHRoZSBvcHRpb24gb2YgcGFzc2luZyBpbiB0aGUgY29ycmVjdCBzdHls ZSB3aGVuIGEgcnVuIGlzIGFkZGVkIHRvIHRoZSBsaW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA3NjAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOb3cgdGhlIExpbmUgb25seSB1c2VzIHRoZSBwYXNz ZWQgaW4gc3R5bGUgaW5mb3JtYXRpb24uIEl0J3MgdXAgdG8gdGhlIExpbmVCdWlsZGVyIHRvIHBh c3MgaW4gdGhlIGxpbmUgaW5kZXggZGVwZW5kZW50IHN0eWxlIHdoZW4gYXR0YWNoaW5nIGEgcnVu LgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVuZCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVuZE5vbkJyZWFrYWJsZVNwYWNlKToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBwZW5kSW5saW5lQm94U3RhcnQpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjphcHBlbmRJbmxpbmVCb3hFbmQpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lOjphcHBlbmRUZXh0Q29udGVudCk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVuZE5vblJlcGxhY2VkSW5saW5lTGV2ZWxCb3gpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjphcHBlbmRSZXBsYWNlZElubGluZUxldmVsQm94 KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5l Lmg6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6cGxh Y2VJbmxpbmVDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6 OmhhbmRsZUlubGluZUNvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVp bGRlcjo6Y29tbWl0UGFydGlhbENvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lQnVpbGRlcjo6cmVidWlsZExpbmUpOgorCiAyMDIxLTA5LTI0ICBBbGFuIEJ1anRhcyAgPHph bGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIExpbmUgYnJlYWtpbmcgb25seSB1 c2VzIGEgZmV3IHN0eWxlIHByb3BlcnRpZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAKaW5k ZXggNDE0NjQ0ZmE2NzI2OGQ3MGUxYWMzNmIxNjE5ZWYyZmJhZjg1ZjczMC4uMzMxZjEzMmJkMTM1 MzRhMDU1MmE3OTc1MDRhNDBmZGYzZjJhN2MwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5j cHAKQEAgLTE5OCw0MiArMTk4LDQyIEBAIHZvaWQgTGluZTo6dmlzdWFsbHlDb2xsYXBzZUhhbmdp bmdPdmVyZmxvdyhJbmxpbmVMYXlvdXRVbml0IGV4dHJhSG9yaXpvbnRhbFNwYWNlCiAgICAgbV9j b250ZW50TG9naWNhbFdpZHRoIC09IHRyaW1tZWRDb250ZW50V2lkdGg7CiB9CiAKLXZvaWQgTGlu ZTo6YXBwZW5kKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIElubGluZUxheW91dFVuaXQg bG9naWNhbFdpZHRoKQordm9pZCBMaW5lOjphcHBlbmQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5l SXRlbSwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxX aWR0aCkKIHsKICAgICBpZiAoaW5saW5lSXRlbS5pc1RleHQoKSkKLSAgICAgICAgYXBwZW5kVGV4 dENvbnRlbnQoZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGlubGluZUl0ZW0pLCBsb2dpY2FsV2lk dGgpOworICAgICAgICBhcHBlbmRUZXh0Q29udGVudChkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4o aW5saW5lSXRlbSksIHN0eWxlLCBsb2dpY2FsV2lkdGgpOwogICAgIGVsc2UgaWYgKGlubGluZUl0 ZW0uaXNMaW5lQnJlYWsoKSkKICAgICAgICAgYXBwZW5kTGluZUJyZWFrKGlubGluZUl0ZW0pOwog ICAgIGVsc2UgaWYgKGlubGluZUl0ZW0uaXNXb3JkQnJlYWtPcHBvcnR1bml0eSgpKQogICAgICAg ICBhcHBlbmRXb3JkQnJlYWtPcHBvcnR1bml0eShpbmxpbmVJdGVtKTsKICAgICBlbHNlIGlmIChp bmxpbmVJdGVtLmlzSW5saW5lQm94U3RhcnQoKSkKLSAgICAgICAgYXBwZW5kSW5saW5lQm94U3Rh cnQoaW5saW5lSXRlbSwgbG9naWNhbFdpZHRoKTsKKyAgICAgICAgYXBwZW5kSW5saW5lQm94U3Rh cnQoaW5saW5lSXRlbSwgc3R5bGUsIGxvZ2ljYWxXaWR0aCk7CiAgICAgZWxzZSBpZiAoaW5saW5l SXRlbS5pc0lubGluZUJveEVuZCgpKQotICAgICAgICBhcHBlbmRJbmxpbmVCb3hFbmQoaW5saW5l SXRlbSwgbG9naWNhbFdpZHRoKTsKKyAgICAgICAgYXBwZW5kSW5saW5lQm94RW5kKGlubGluZUl0 ZW0sIHN0eWxlLCBsb2dpY2FsV2lkdGgpOwogICAgIGVsc2UgaWYgKGlubGluZUl0ZW0ubGF5b3V0 Qm94KCkuaXNSZXBsYWNlZEJveCgpKQotICAgICAgICBhcHBlbmRSZXBsYWNlZElubGluZUxldmVs Qm94KGlubGluZUl0ZW0sIGxvZ2ljYWxXaWR0aCk7CisgICAgICAgIGFwcGVuZFJlcGxhY2VkSW5s aW5lTGV2ZWxCb3goaW5saW5lSXRlbSwgc3R5bGUsIGxvZ2ljYWxXaWR0aCk7CiAgICAgZWxzZSBp ZiAoaW5saW5lSXRlbS5pc0JveCgpKQotICAgICAgICBhcHBlbmROb25SZXBsYWNlZElubGluZUxl dmVsQm94KGlubGluZUl0ZW0sIGxvZ2ljYWxXaWR0aCk7CisgICAgICAgIGFwcGVuZE5vblJlcGxh Y2VkSW5saW5lTGV2ZWxCb3goaW5saW5lSXRlbSwgc3R5bGUsIGxvZ2ljYWxXaWR0aCk7CiAgICAg ZWxzZQogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAotdm9pZCBMaW5lOjphcHBl bmROb25CcmVha2FibGVTcGFjZShjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpbmVM YXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCkKK3Zv aWQgTGluZTo6YXBwZW5kTm9uQnJlYWthYmxlU3BhY2UoY29uc3QgSW5saW5lSXRlbSYgaW5saW5l SXRlbSwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxM ZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCkKIHsKLSAgICBtX3J1bnMuYXBwZW5k KHsgaW5saW5lSXRlbSwgaW5saW5lSXRlbS5zdHlsZSgpLCBsb2dpY2FsTGVmdCwgbG9naWNhbFdp ZHRoIH0pOworICAgIG1fcnVucy5hcHBlbmQoeyBpbmxpbmVJdGVtLCBzdHlsZSwgbG9naWNhbExl ZnQsIGxvZ2ljYWxXaWR0aCB9KTsKICAgICAvLyBEbyBub3QgbGV0IG5lZ2F0aXZlIG1hcmdpbiBt YWtlIHRoZSBjb250ZW50IHNob3J0ZXIgdGhhbiBpdCBhbHJlYWR5IGlzLgogICAgIGF1dG8gcnVu TG9naWNhbFJpZ2h0ID0gbG9naWNhbExlZnQgKyBsb2dpY2FsV2lkdGg7CiAgICAgbV9jb250ZW50 TG9naWNhbFdpZHRoID0gc3RkOjptYXgobV9jb250ZW50TG9naWNhbFdpZHRoLCBydW5Mb2dpY2Fs UmlnaHQpOwogfQogCi12b2lkIExpbmU6OmFwcGVuZElubGluZUJveFN0YXJ0KGNvbnN0IElubGlu ZUl0ZW0mIGlubGluZUl0ZW0sIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKQordm9pZCBM aW5lOjphcHBlbmRJbmxpbmVCb3hTdGFydChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBj b25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKQog ewogICAgIC8vIFRoaXMgaXMgcmVhbGx5IGp1c3QgYSBwbGFjZWhvbGRlciB0byBtYXJrIHRoZSBz dGFydCBvZiB0aGUgaW5saW5lIGJveCA8c3Bhbj4uCiAgICAgKyttX25vblNwYW5uaW5nSW5saW5l TGV2ZWxCb3hDb3VudDsKLSAgICBhcHBlbmROb25CcmVha2FibGVTcGFjZShpbmxpbmVJdGVtLCBj b250ZW50TG9naWNhbFJpZ2h0KCksIGxvZ2ljYWxXaWR0aCk7CisgICAgYXBwZW5kTm9uQnJlYWth YmxlU3BhY2UoaW5saW5lSXRlbSwgc3R5bGUsIGNvbnRlbnRMb2dpY2FsUmlnaHQoKSwgbG9naWNh bFdpZHRoKTsKIH0KIAotdm9pZCBMaW5lOjphcHBlbmRJbmxpbmVCb3hFbmQoY29uc3QgSW5saW5l SXRlbSYgaW5saW5lSXRlbSwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpCit2b2lkIExp bmU6OmFwcGVuZElubGluZUJveEVuZChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBjb25z dCBSZW5kZXJTdHlsZSYgc3R5bGUsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKQogewog ICAgIC8vIFRoaXMgaXMgcmVhbGx5IGp1c3QgYSBwbGFjZWhvbGRlciB0byBtYXJrIHRoZSBlbmQg b2YgdGhlIGlubGluZSBib3ggPC9zcGFuPi4KICAgICBhdXRvIHJlbW92ZVRyYWlsaW5nTGV0dGVy U3BhY2luZyA9IFsmXSB7CkBAIC0yNDQsMTIgKzI0NCwxMSBAQCB2b2lkIExpbmU6OmFwcGVuZElu bGluZUJveEVuZChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpbmVMYXlvdXRVbml0 IGxvZwogICAgIC8vIFByZXZlbnQgdHJhaWxpbmcgbGV0dGVyLXNwYWNpbmcgZnJvbSBzcGlsbGlu ZyBvdXQgb2YgdGhlIGlubGluZSBib3guCiAgICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3Jn L2Nzcy10ZXh0LTMvI2xldHRlci1zcGFjaW5nLXByb3BlcnR5IFNlZSBleGFtcGxlIDIxLgogICAg IHJlbW92ZVRyYWlsaW5nTGV0dGVyU3BhY2luZygpOwotICAgIGFwcGVuZE5vbkJyZWFrYWJsZVNw YWNlKGlubGluZUl0ZW0sIGNvbnRlbnRMb2dpY2FsUmlnaHQoKSwgbG9naWNhbFdpZHRoKTsKKyAg ICBhcHBlbmROb25CcmVha2FibGVTcGFjZShpbmxpbmVJdGVtLCBzdHlsZSwgY29udGVudExvZ2lj YWxSaWdodCgpLCBsb2dpY2FsV2lkdGgpOwogfQogCi12b2lkIExpbmU6OmFwcGVuZFRleHRDb250 ZW50KGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0SXRlbSwgSW5saW5lTGF5b3V0VW5p dCBsb2dpY2FsV2lkdGgpCit2b2lkIExpbmU6OmFwcGVuZFRleHRDb250ZW50KGNvbnN0IElubGlu ZVRleHRJdGVtJiBpbmxpbmVUZXh0SXRlbSwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBJbmxp bmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCkKIHsKLSAgICBhdXRvJiBzdHlsZSA9IGlubGluZVRl eHRJdGVtLnN0eWxlKCk7CiAgICAgYXV0byB3aWxsQ29sbGFwc2VDb21wbGV0ZWx5ID0gWyZdIHsK ICAgICAgICAgaWYgKGlubGluZVRleHRJdGVtLmlzRW1wdHlDb250ZW50KCkpCiAgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKQEAgLTI5NSw3ICsyOTQsNyBAQCB2b2lkIExpbmU6OmFwcGVuZFRleHRD b250ZW50KGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0SXRlbSwgSW5saW5lTGF5b3V0 VQogICAgIGlmIChuZWVkc05ld1J1bikgewogICAgICAgICAvLyBOb3RlLCBuZWdhdGl2ZSB3b3Jk cyBzcGFjaW5nIG1heSBjYXVzZSBnbHlwaCBvdmVybGFwLgogICAgICAgICBhdXRvIHJ1bkxvZ2lj YWxMZWZ0ID0gY29udGVudExvZ2ljYWxSaWdodCgpICsgKGlubGluZVRleHRJdGVtLmlzV29yZFNl cGFyYXRvcigpID8gc3R5bGUuZm9udENhc2NhZGUoKS53b3JkU3BhY2luZygpIDogMC4wZik7Ci0g ICAgICAgIG1fcnVucy5hcHBlbmQoeyBpbmxpbmVUZXh0SXRlbSwgaW5saW5lVGV4dEl0ZW0uc3R5 bGUoKSwgcnVuTG9naWNhbExlZnQsIGxvZ2ljYWxXaWR0aCB9KTsKKyAgICAgICAgbV9ydW5zLmFw cGVuZCh7IGlubGluZVRleHRJdGVtLCBzdHlsZSwgcnVuTG9naWNhbExlZnQsIGxvZ2ljYWxXaWR0 aCB9KTsKICAgICAgICAgbV9jb250ZW50TG9naWNhbFdpZHRoID0gc3RkOjptYXgob2xkQ29udGVu dExvZ2ljYWxXaWR0aCwgcnVuTG9naWNhbExlZnQgKyBsb2dpY2FsV2lkdGgpOwogICAgIH0gZWxz ZSB7CiAgICAgICAgIG1fcnVucy5sYXN0KCkuZXhwYW5kKGlubGluZVRleHRJdGVtLCBsb2dpY2Fs V2lkdGgpOwpAQCAtMzE0LDcgKzMxMyw3IEBAIHZvaWQgTGluZTo6YXBwZW5kVGV4dENvbnRlbnQo Y29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtLCBJbmxpbmVMYXlvdXRVCiAgICAg bV90cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCA9IGlubGluZVRleHRJdGVtLmhhc1RyYWlsaW5nU29m dEh5cGhlbigpID8gc3RkOjptYWtlX29wdGlvbmFsKHN0eWxlLmZvbnRDYXNjYWRlKCkud2lkdGgo VGV4dFJ1biB7IFN0cmluZ1ZpZXcgeyBzdHlsZS5oeXBoZW5TdHJpbmcoKSB9IH0pKSA6IHN0ZDo6 bnVsbG9wdDsKIH0KIAotdm9pZCBMaW5lOjphcHBlbmROb25SZXBsYWNlZElubGluZUxldmVsQm94 KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIElubGluZUxheW91dFVuaXQgbWFyZ2luQm94 TG9naWNhbFdpZHRoKQordm9pZCBMaW5lOjphcHBlbmROb25SZXBsYWNlZElubGluZUxldmVsQm94 KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwg SW5saW5lTGF5b3V0VW5pdCBtYXJnaW5Cb3hMb2dpY2FsV2lkdGgpCiB7CiAgICAgbV90cmltbWFi bGVUcmFpbGluZ0NvbnRlbnQucmVzZXQoKTsKICAgICBtX3RyYWlsaW5nU29mdEh5cGhlbldpZHRo ID0geyB9OwpAQCAtMzIyLDIxICszMjEsMjEgQEAgdm9pZCBMaW5lOjphcHBlbmROb25SZXBsYWNl ZElubGluZUxldmVsQm94KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIElubGluZUwKICAg ICArK21fbm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50OwogICAgIGF1dG8gbWFyZ2luU3Rh cnQgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KGlubGluZUl0ZW0ubGF5b3V0 Qm94KCkpLm1hcmdpblN0YXJ0KCk7CiAgICAgaWYgKG1hcmdpblN0YXJ0ID49IDApIHsKLSAgICAg ICAgbV9ydW5zLmFwcGVuZCh7IGlubGluZUl0ZW0sIGlubGluZUl0ZW0uc3R5bGUoKSwgY29udGVu dExvZ2ljYWxSaWdodCgpLCBtYXJnaW5Cb3hMb2dpY2FsV2lkdGggfSk7CisgICAgICAgIG1fcnVu cy5hcHBlbmQoeyBpbmxpbmVJdGVtLCBzdHlsZSwgY29udGVudExvZ2ljYWxSaWdodCgpLCBtYXJn aW5Cb3hMb2dpY2FsV2lkdGggfSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgLy8gTmVn YXRpdmUgbWFyZ2luLXN0YXJ0IHB1bGxzIHRoZSBjb250ZW50IHRvIHRoZSBsb2dpY2FsIGxlZnQg ZGlyZWN0aW9uLgogICAgIC8vIE5lZ2F0aXZlIG1hcmdpbiBhbHNvIHNxdWVlemVzIHRoZSBtYXJn aW4gYm94LCB3ZSBuZWVkIHRvIHN0cmV0Y2ggaXQgdG8gbWFrZSBzdXJlIHRoZSBzdWJzZXF1ZW50 IGNvbnRlbnQgd29uJ3Qgb3ZlcmxhcC4KICAgICAvLyBlLmcuIDxpbWcgc3R5bGU9IndpZHRoOiAx MDBweDsgbWFyZ2luLWxlZnQ6IC0xMDBweDsiPiBwdWxscyB0aGUgcmVwbGFjZWQgYm94IHRvIC0x MDBweCB3aXRoIHRoZSBtYXJnaW4gYm94IHdpZHRoIG9mIDBweC4KICAgICAvLyBJbnN0ZWFkIHdl IG5lZWQgdG8gcG9zaXRpb24gaXQgYXQgLTEwMHB4IGFuZCBzaXplIGl0IHRvIDEwMHB4IHNvIHRo ZSBzdWJzZXF1ZW50IGNvbnRlbnQgc3RhcnRzIGF0IDBweC4gCi0gICAgbV9ydW5zLmFwcGVuZCh7 IGlubGluZUl0ZW0sIGlubGluZUl0ZW0uc3R5bGUoKSwgY29udGVudExvZ2ljYWxSaWdodCgpICsg bWFyZ2luU3RhcnQsIG1hcmdpbkJveExvZ2ljYWxXaWR0aCAtIG1hcmdpblN0YXJ0IH0pOworICAg IG1fcnVucy5hcHBlbmQoeyBpbmxpbmVJdGVtLCBzdHlsZSwgY29udGVudExvZ2ljYWxSaWdodCgp ICsgbWFyZ2luU3RhcnQsIG1hcmdpbkJveExvZ2ljYWxXaWR0aCAtIG1hcmdpblN0YXJ0IH0pOwog fQogCi12b2lkIExpbmU6OmFwcGVuZFJlcGxhY2VkSW5saW5lTGV2ZWxCb3goY29uc3QgSW5saW5l SXRlbSYgaW5saW5lSXRlbSwgSW5saW5lTGF5b3V0VW5pdCBtYXJnaW5Cb3hMb2dpY2FsV2lkdGgp Cit2b2lkIExpbmU6OmFwcGVuZFJlcGxhY2VkSW5saW5lTGV2ZWxCb3goY29uc3QgSW5saW5lSXRl bSYgaW5saW5lSXRlbSwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBJbmxpbmVMYXlvdXRVbml0 IG1hcmdpbkJveExvZ2ljYWxXaWR0aCkKIHsKICAgICBBU1NFUlQoaW5saW5lSXRlbS5sYXlvdXRC b3goKS5pc1JlcGxhY2VkQm94KCkpOwogICAgIC8vIEZJWE1FOiBTdXJlbHkgcmVwbGFjZWQgYm94 ZXMgYmVoYXZlIGRpZmZlcmVudGx5LgotICAgIGFwcGVuZE5vblJlcGxhY2VkSW5saW5lTGV2ZWxC b3goaW5saW5lSXRlbSwgbWFyZ2luQm94TG9naWNhbFdpZHRoKTsKKyAgICBhcHBlbmROb25SZXBs YWNlZElubGluZUxldmVsQm94KGlubGluZUl0ZW0sIHN0eWxlLCBtYXJnaW5Cb3hMb2dpY2FsV2lk dGgpOwogfQogCiB2b2lkIExpbmU6OmFwcGVuZExpbmVCcmVhayhjb25zdCBJbmxpbmVJdGVtJiBp bmxpbmVJdGVtKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oCmluZGV4IDBiYmM0NDk5NzkzMGU2ZjQz NmI1YzIxYWExNWZiMzFiYWJlOTU1NTEuLjYxYzJlNTJjZTc2MGQ4NmE3ZjQ0OTJkNGVhZTZlYzJi ZGJkYzhiMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmgKQEAgLTQ0LDcgKzQ0LDcgQEAgcHVi bGljOgogCiAgICAgdm9pZCBpbml0aWFsaXplKCk7CiAKLSAgICB2b2lkIGFwcGVuZChjb25zdCBJ bmxpbmVJdGVtJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOworICAgIHZvaWQgYXBw ZW5kKGNvbnN0IElubGluZUl0ZW0mLCBjb25zdCBSZW5kZXJTdHlsZSYsIElubGluZUxheW91dFVu aXQgbG9naWNhbFdpZHRoKTsKIAogICAgIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxX aWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudExvZ2ljYWxXaWR0aDsgfQogICAgIElubGlu ZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxSaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fcnVucy5p c0VtcHR5KCkgPyAwLjBmIDogbV9ydW5zLmxhc3QoKS5sb2dpY2FsUmlnaHQoKTsgfQpAQCAtMTQy LDEyICsxNDIsMTIgQEAgcHVibGljOgogICAgIGNvbnN0IFJ1bkxpc3QmIHJ1bnMoKSBjb25zdCB7 IHJldHVybiBtX3J1bnM7IH0KIAogcHJpdmF0ZToKLSAgICB2b2lkIGFwcGVuZE5vbkJyZWFrYWJs ZVNwYWNlKGNvbnN0IElubGluZUl0ZW0mLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJ bmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7Ci0gICAgdm9pZCBhcHBlbmRUZXh0Q29udGVu dChjb25zdCBJbmxpbmVUZXh0SXRlbSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKTsK LSAgICB2b2lkIGFwcGVuZE5vblJlcGxhY2VkSW5saW5lTGV2ZWxCb3goY29uc3QgSW5saW5lSXRl bSYsIElubGluZUxheW91dFVuaXQgbWFyZ2luQm94TG9naWNhbFdpZHRoKTsKLSAgICB2b2lkIGFw cGVuZFJlcGxhY2VkSW5saW5lTGV2ZWxCb3goY29uc3QgSW5saW5lSXRlbSYsIElubGluZUxheW91 dFVuaXQgbWFyZ2luQm94TG9naWNhbFdpZHRoKTsKLSAgICB2b2lkIGFwcGVuZElubGluZUJveFN0 YXJ0KGNvbnN0IElubGluZUl0ZW0mLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7Ci0g ICAgdm9pZCBhcHBlbmRJbmxpbmVCb3hFbmQoY29uc3QgSW5saW5lSXRlbSYsIElubGluZUxheW91 dFVuaXQgbG9naWNhbFdpZHRoKTsKKyAgICB2b2lkIGFwcGVuZE5vbkJyZWFrYWJsZVNwYWNlKGNv bnN0IElubGluZUl0ZW0mLCBjb25zdCBSZW5kZXJTdHlsZSYsIElubGluZUxheW91dFVuaXQgbG9n aWNhbExlZnQsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKTsKKyAgICB2b2lkIGFwcGVu ZFRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVtJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJ bmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7CisgICAgdm9pZCBhcHBlbmROb25SZXBsYWNl ZElubGluZUxldmVsQm94KGNvbnN0IElubGluZUl0ZW0mLCBjb25zdCBSZW5kZXJTdHlsZSYsIElu bGluZUxheW91dFVuaXQgbWFyZ2luQm94TG9naWNhbFdpZHRoKTsKKyAgICB2b2lkIGFwcGVuZFJl cGxhY2VkSW5saW5lTGV2ZWxCb3goY29uc3QgSW5saW5lSXRlbSYsIGNvbnN0IFJlbmRlclN0eWxl JiwgSW5saW5lTGF5b3V0VW5pdCBtYXJnaW5Cb3hMb2dpY2FsV2lkdGgpOworICAgIHZvaWQgYXBw ZW5kSW5saW5lQm94U3RhcnQoY29uc3QgSW5saW5lSXRlbSYsIGNvbnN0IFJlbmRlclN0eWxlJiwg SW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOworICAgIHZvaWQgYXBwZW5kSW5saW5lQm94 RW5kKGNvbnN0IElubGluZUl0ZW0mLCBjb25zdCBSZW5kZXJTdHlsZSYsIElubGluZUxheW91dFVu aXQgbG9naWNhbFdpZHRoKTsKICAgICB2b2lkIGFwcGVuZExpbmVCcmVhayhjb25zdCBJbmxpbmVJ dGVtJik7CiAgICAgdm9pZCBhcHBlbmRXb3JkQnJlYWtPcHBvcnR1bml0eShjb25zdCBJbmxpbmVJ dGVtJik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCBl YjhjYmVmNWY0MTA1Y2ZkMGY4ZWVhYWI3MzNmZGMwYzY3ZTRkOWNmLi4xOGQxZDhkNmNkMTI1Yzdm NTgzOWEyMzA2YWMyMDYwN2RiZjBlYmM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJ1aWxkZXIuY3BwCkBAIC0zMzAsMTQgKzMzMCwxNSBAQCBMaW5lQnVpbGRlcjo6Q29tbWl0dGVk Q29udGVudCBMaW5lQnVpbGRlcjo6cGxhY2VJbmxpbmVDb250ZW50KGNvbnN0IElubGluZUl0ZW1S YQogICAgICAgICAgICAgICAgIGlmIChhdXRvKiB3b3JkQnJlYWtPcHBvcnR1bml0eSA9IGlubGlu ZUNvbnRlbnQudHJhaWxpbmdXb3JkQnJlYWtPcHBvcnR1bml0eSgpKSB7CiAgICAgICAgICAgICAg ICAgICAgIC8vIDx3YnI+IG5lZWRzIHRvIGJlIG9uIHRoZSBsaW5lIGFzIGFuIGVtcHR5IHJ1biBz byB0aGF0IHdlIGNhbiBjb25zdHJ1Y3QgYW4gaW5saW5lIGJveCBhbmQgY29tcHV0ZSBiYXNpYyBn ZW9tZXRyeS4KICAgICAgICAgICAgICAgICAgICAgKytjb21taXR0ZWRJbmxpbmVJdGVtQ291bnQ7 Ci0gICAgICAgICAgICAgICAgICAgIG1fbGluZS5hcHBlbmQoKndvcmRCcmVha09wcG9ydHVuaXR5 LCB7IH0pOworICAgICAgICAgICAgICAgICAgICBtX2xpbmUuYXBwZW5kKCp3b3JkQnJlYWtPcHBv cnR1bml0eSwgd29yZEJyZWFrT3Bwb3J0dW5pdHktPnN0eWxlKCksIHsgfSk7CiAgICAgICAgICAg ICAgICAgfQogICAgICAgICAgICAgICAgIGlmIChpbmxpbmVDb250ZW50LnRyYWlsaW5nTGluZUJy ZWFrKCkpIHsKICAgICAgICAgICAgICAgICAgICAgLy8gRnVsbHkgY29tbWl0dGVkIChvciBlbXB0 eSkgY29udGVudCBmb2xsb3dlZCBieSBhIGxpbmUgYnJlYWsgbWVhbnMgImVuZCBvZiBsaW5lIi4K ICAgICAgICAgICAgICAgICAgICAgLy8gRklYTUU6IFRoaXMgd2lsbCBwdXQgdGhlIGxpbmUgYnJl YWsgYm94IGF0IHRoZSBlbmQgb2YgdGhlIGxpbmUgd2hpbGUgaW4gY2FzZSBvZiBzb21lIGlubGlu ZSBib3hlcywgdGhlIGxpbmUgYnJlYWsKICAgICAgICAgICAgICAgICAgICAgLy8gY291bGQgdmVy eSB3ZWxsIGJlIGF0IGFuIGVhcmxpZXIgcG9zaXRpb24uIFRoaXMgaGFzIG5vIHZpc3VhbCBpbXBs aWNhdGlvbnMgYXQgdGhpcyBwb2ludCB0aG91Z2ggKG9ubHkgZ2VvbWV0cnkgY29ycmVjdG5lc3Mg b24gdGhlIGxpbmUgYnJlYWsgYm94KS4KICAgICAgICAgICAgICAgICAgICAgLy8gZS5nLiA8c3Bh biBzdHlsZT0iYm9yZGVyLXJpZ2h0OiAxMHB4IHNvbGlkIGdyZWVuIj50ZXh0PGJyPjwvc3Bhbj4g d2hlcmUgdGhlIDxicj4ncyBob3Jpem9udGFsIHBvc2l0aW9uIGlzIGJlZm9yZSB0aGUgcmlnaHQg Ym9yZGVyIGFuZCBub3QgYWZ0ZXIuCi0gICAgICAgICAgICAgICAgICAgIG1fbGluZS5hcHBlbmQo KmlubGluZUNvbnRlbnQudHJhaWxpbmdMaW5lQnJlYWsoKSwgeyB9KTsKKyAgICAgICAgICAgICAg ICAgICAgYXV0byYgdHJhaWxpbmdMaW5lQnJlYWsgPSAqaW5saW5lQ29udGVudC50cmFpbGluZ0xp bmVCcmVhaygpOworICAgICAgICAgICAgICAgICAgICBtX2xpbmUuYXBwZW5kKHRyYWlsaW5nTGlu ZUJyZWFrLCB0cmFpbGluZ0xpbmVCcmVhay5zdHlsZSgpLCB7IH0pOwogICAgICAgICAgICAgICAg ICAgICArK2NvbW1pdHRlZElubGluZUl0ZW1Db3VudDsKICAgICAgICAgICAgICAgICAgICAgaXNF bmRPZkxpbmUgPSB0cnVlOwogICAgICAgICAgICAgICAgIH0KQEAgLTY5MCw3ICs2OTEsNyBAQCBM aW5lQnVpbGRlcjo6UmVzdWx0IExpbmVCdWlsZGVyOjpoYW5kbGVJbmxpbmVDb250ZW50KElubGlu ZUNvbnRlbnRCcmVha2VyJiBpbmxpbgogICAgICAgICAvLyBUaGlzIGNvbnRpbnVvdXMgY29udGVu dCBjYW4gYmUgZnVsbHkgcGxhY2VkIG9uIHRoZSBjdXJyZW50IGxpbmUuCiAgICAgICAgIG1fbGlu ZUxvZ2ljYWxSZWN0ID0gbGluZUxvZ2ljYWxSZWN0Rm9yQ2FuZGlkYXRlQ29udGVudDsKICAgICAg ICAgZm9yIChhdXRvJiBydW4gOiBjYW5kaWRhdGVSdW5zKQotICAgICAgICAgICAgbV9saW5lLmFw cGVuZChydW4uaW5saW5lSXRlbSwgcnVuLmxvZ2ljYWxXaWR0aCk7CisgICAgICAgICAgICBtX2xp bmUuYXBwZW5kKHJ1bi5pbmxpbmVJdGVtLCBydW4uaW5saW5lSXRlbS5zdHlsZSgpLCBydW4ubG9n aWNhbFdpZHRoKTsKICAgICAgICAgaWYgKGxpbmVDYW5kaWRhdGUuaW5saW5lQ29udGVudC5oYXNU cmFpbGluZ1NvZnRXcmFwT3Bwb3J0dW5pdHkoKSkgewogICAgICAgICAgICAgLy8gQ2hlY2sgaWYg d2UgYXJlIGFsbG93ZWQgdG8gd3JhcCBhdCB0aGlzIHBvc2l0aW9uLgogICAgICAgICAgICAgYXV0 byYgdHJhaWxpbmdSdW4gPSBjYW5kaWRhdGVSdW5zLmxhc3QoKTsKQEAgLTc3MywxNiArNzc0LDE2 IEBAIHZvaWQgTGluZUJ1aWxkZXI6OmNvbW1pdFBhcnRpYWxDb250ZW50KGNvbnN0IElubGluZUNv bnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29uCiAgICAgICAgICAgICAgICAgQVNTRVJUKHJ1bi5p bmxpbmVJdGVtLmlzVGV4dCgpKTsKICAgICAgICAgICAgICAgICBhdXRvJiB0cmFpbGluZ0lubGlu ZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KHJ1bnNbcGFydGlhbFRyYWlsaW5n Q29udGVudC50cmFpbGluZ1J1bkluZGV4XS5pbmxpbmVJdGVtKTsKICAgICAgICAgICAgICAgICBh dXRvIHBhcnRpYWxUcmFpbGluZ1RleHRJdGVtID0gdHJhaWxpbmdJbmxpbmVUZXh0SXRlbS5sZWZ0 KHBhcnRpYWxSdW4tPmxlbmd0aCk7Ci0gICAgICAgICAgICAgICAgbV9saW5lLmFwcGVuZChwYXJ0 aWFsVHJhaWxpbmdUZXh0SXRlbSwgcGFydGlhbFJ1bi0+bG9naWNhbFdpZHRoKTsKKyAgICAgICAg ICAgICAgICBtX2xpbmUuYXBwZW5kKHBhcnRpYWxUcmFpbGluZ1RleHRJdGVtLCB0cmFpbGluZ0lu bGluZVRleHRJdGVtLnN0eWxlKCksIHBhcnRpYWxSdW4tPmxvZ2ljYWxXaWR0aCk7CiAgICAgICAg ICAgICAgICAgaWYgKGF1dG8gaHlwaGVuV2lkdGggPSBwYXJ0aWFsUnVuLT5oeXBoZW5XaWR0aCkK ICAgICAgICAgICAgICAgICAgICAgbV9saW5lLmFkZFRyYWlsaW5nSHlwaGVuKCpoeXBoZW5XaWR0 aCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogICAgICAgICAgICAg Ly8gVGhlIHBhcnRpYWwgcnVuIGlzIHRoZSBsYXN0IGNvbnRlbnQgdG8gY29tbWl0LgotICAgICAg ICAgICAgbV9saW5lLmFwcGVuZChydW4uaW5saW5lSXRlbSwgcnVuLmxvZ2ljYWxXaWR0aCk7Cisg ICAgICAgICAgICBtX2xpbmUuYXBwZW5kKHJ1bi5pbmxpbmVJdGVtLCBydW4uaW5saW5lSXRlbS5z dHlsZSgpLCBydW4ubG9naWNhbFdpZHRoKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg fQotICAgICAgICBtX2xpbmUuYXBwZW5kKHJ1bi5pbmxpbmVJdGVtLCBydW4ubG9naWNhbFdpZHRo KTsKKyAgICAgICAgbV9saW5lLmFwcGVuZChydW4uaW5saW5lSXRlbSwgcnVuLmlubGluZUl0ZW0u c3R5bGUoKSwgcnVuLmxvZ2ljYWxXaWR0aCk7CiAgICAgfQogfQogCkBAIC03OTQsMTQgKzc5NSwx NCBAQCBzaXplX3QgTGluZUJ1aWxkZXI6OnJlYnVpbGRMaW5lKGNvbnN0IElubGluZUl0ZW1SYW5n ZSYgbGF5b3V0UmFuZ2UsIGNvbnN0IElubGluZQogICAgIG1fbGluZS5pbml0aWFsaXplKCk7CiAg ICAgYXV0byBjdXJyZW50SXRlbUluZGV4ID0gbGF5b3V0UmFuZ2Uuc3RhcnQ7CiAgICAgaWYgKG1f cGFydGlhbExlYWRpbmdUZXh0SXRlbSkgewotICAgICAgICBtX2xpbmUuYXBwZW5kKCptX3BhcnRp YWxMZWFkaW5nVGV4dEl0ZW0sIGlubGluZUl0ZW1XaWR0aCgqbV9wYXJ0aWFsTGVhZGluZ1RleHRJ dGVtLCB7IH0pKTsKKyAgICAgICAgbV9saW5lLmFwcGVuZCgqbV9wYXJ0aWFsTGVhZGluZ1RleHRJ dGVtLCBtX3BhcnRpYWxMZWFkaW5nVGV4dEl0ZW0tPnN0eWxlKCksIGlubGluZUl0ZW1XaWR0aCgq bV9wYXJ0aWFsTGVhZGluZ1RleHRJdGVtLCB7IH0pKTsKICAgICAgICAgaWYgKCZtX3BhcnRpYWxM ZWFkaW5nVGV4dEl0ZW0udmFsdWUoKSA9PSAmbGFzdElubGluZUl0ZW1Ub0FkZCkKICAgICAgICAg ICAgIHJldHVybiAxOwogICAgICAgICArK2N1cnJlbnRJdGVtSW5kZXg7CiAgICAgfQogICAgIGZv ciAoOyBjdXJyZW50SXRlbUluZGV4IDwgbGF5b3V0UmFuZ2UuZW5kOyArK2N1cnJlbnRJdGVtSW5k ZXgpIHsKICAgICAgICAgYXV0byYgaW5saW5lSXRlbSA9IG1faW5saW5lSXRlbXNbY3VycmVudEl0 ZW1JbmRleF07Ci0gICAgICAgIG1fbGluZS5hcHBlbmQoaW5saW5lSXRlbSwgaW5saW5lSXRlbVdp ZHRoKGlubGluZUl0ZW0sIG1fbGluZS5jb250ZW50TG9naWNhbFJpZ2h0KCkpKTsKKyAgICAgICAg bV9saW5lLmFwcGVuZChpbmxpbmVJdGVtLCBpbmxpbmVJdGVtLnN0eWxlKCksIGlubGluZUl0ZW1X aWR0aChpbmxpbmVJdGVtLCBtX2xpbmUuY29udGVudExvZ2ljYWxSaWdodCgpKSk7CiAgICAgICAg IGlmICgmaW5saW5lSXRlbSA9PSAmbGFzdElubGluZUl0ZW1Ub0FkZCkKICAgICAgICAgICAgIHJl dHVybiBjdXJyZW50SXRlbUluZGV4IC0gbGF5b3V0UmFuZ2Uuc3RhcnQgKyAxOwogICAgIH0K