230924 2021-09-28 16:46:33 -0700 [LFC][IFC] Pass in the first-line style to the InlineContentBreaker::ContinuousContent runs if applicable 2021-09-29 13:17:13 -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 1798105 0 zalan 2021-09-28 16:46:33 -0700 ssia 1798108 1 439545 zalan 2021-09-28 16:49:10 -0700 Created attachment 439545 Patch 1798520 2 ews-feeder 2021-09-29 13:16:19 -0700 Committed r283255 (242284@main): <https://commits.webkit.org/242284@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439545. 1798522 3 webkit-bug-importer 2021-09-29 13:17:13 -0700 <rdar://problem/83685078> 439545 2021-09-28 16:49:10 -0700 2021-09-29 13:16:20 -0700 Patch bug-230924-20210928164909.patch text/plain 10298 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzgzMGY4YzEwM2JkOTUx NGU2NWMyMjQ4MGY1ZWMyNjAxZDBkMThjMi4uZTBkM2QwZWE1YjczYTY5ZGE2MmNiNjU1NjhhNjRi MTQ0ZGM2YzEzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA5LTI4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFBhc3MgaW4g dGhlIGZpcnN0LWxpbmUgc3R5bGUgdG8gdGhlIElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51 b3VzQ29udGVudCBydW5zIGlmIGFwcGxpY2FibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDkyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE5vdyB0aGUgaW5saW5lIGNvbnRlbnQgYnJlYWtlciBoYXMg dGhlIGNvcnJlY3Qgc2V0IG9mIHN0eWxlIHZhbHVlcyB3aGVuIGZpcnN0LWxpbmUgc3R5bGUgaXMg c2V0LgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l SXRlbS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtOjpmaXJzdExpbmVT dHlsZSBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lTGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQ2Fu ZGlkYXRlOjpJbmxpbmVDb250ZW50OjphcHBlbmRJbmxpbmVJdGVtKToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmxheW91dElubGluZUNvbnRlbnQpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aCk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjppbml0aWFsaXplKToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmNhbmRpZGF0ZUNvbnRlbnRGb3JMaW5l KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5l QnVpbGRlci5oOgorCiAyMDIxLTA5LTI4ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K IAogICAgICAgICBbTEZDXVtJRkNdIExheW91dDo6Qm94IHNob3VsZCBiZSBhYmxlIHRvIHJldHVy biB0aGUgZmlyc3QtbGluZSBzdHlsZSB3aGVuIGFwcGxpY2FibGUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW0uaCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0 ZW0uaAppbmRleCBjMmFlMjRhNjEyNjg0NTg4NzRjNzIwOTk0MzgyYmFiODI5MWRkYzRkLi42OTM1 NWEzMzFjYTdjZjc1YTk2YjVlMzBkNmI4OTM5MzdjZDU3NDk0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtLmgKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l SXRlbS5oCkBAIC00MSw2ICs0MSw3IEBAIHB1YmxpYzoKICAgICBUeXBlIHR5cGUoKSBjb25zdCB7 IHJldHVybiBtX3R5cGU7IH0KICAgICBjb25zdCBCb3gmIGxheW91dEJveCgpIGNvbnN0IHsgcmV0 dXJuICptX2xheW91dEJveDsgfQogICAgIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSgpIGNvbnN0 IHsgcmV0dXJuIGxheW91dEJveCgpLnN0eWxlKCk7IH0KKyAgICBjb25zdCBSZW5kZXJTdHlsZSYg Zmlyc3RMaW5lU3R5bGUoKSBjb25zdCB7IHJldHVybiBsYXlvdXRCb3goKS5maXJzdExpbmVTdHls ZSgpOyB9CiAKICAgICBib29sIGlzVGV4dCgpIGNvbnN0IHsgcmV0dXJuIHR5cGUoKSA9PSBUeXBl OjpUZXh0OyB9CiAgICAgYm9vbCBpc0JveCgpIGNvbnN0IHsgcmV0dXJuIHR5cGUoKSA9PSBUeXBl OjpCb3g7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCBh ZjEyOWZiZDc2NzU1Y2UzODljZjkwOWEzNGExZTYwMGIzZjY1YWY4Li4zODJjNzY0MjgyYzIxYTdi ZmEzY2NkYjM5MmY2NzY3ODU3NjdhZTFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJ1aWxkZXIuY3BwCkBAIC0xNDAsNyArMTQwLDcgQEAgc3RydWN0IExpbmVDYW5kaWRhdGUgewog ICAgICAgICBjb25zdCBJbmxpbmVJdGVtKiB0cmFpbGluZ0xpbmVCcmVhaygpIGNvbnN0IHsgcmV0 dXJuIG1fdHJhaWxpbmdMaW5lQnJlYWs7IH0KICAgICAgICAgY29uc3QgSW5saW5lSXRlbSogdHJh aWxpbmdXb3JkQnJlYWtPcHBvcnR1bml0eSgpIGNvbnN0IHsgcmV0dXJuIG1fdHJhaWxpbmdXb3Jk QnJlYWtPcHBvcnR1bml0eTsgfQogCi0gICAgICAgIHZvaWQgYXBwZW5kSW5saW5lSXRlbShjb25z dCBJbmxpbmVJdGVtJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOworICAgICAgICB2 b2lkIGFwcGVuZElubGluZUl0ZW0oY29uc3QgSW5saW5lSXRlbSYsIGNvbnN0IFJlbmRlclN0eWxl JiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwogICAgICAgICB2b2lkIGFwcGVuZFRy YWlsaW5nTGluZUJyZWFrKGNvbnN0IElubGluZUl0ZW0mIGxpbmVCcmVha0l0ZW0pIHsgbV90cmFp bGluZ0xpbmVCcmVhayA9ICZsaW5lQnJlYWtJdGVtOyB9CiAgICAgICAgIHZvaWQgYXBwZW5kdHJh aWxpbmdXb3JkQnJlYWtPcHBvcnR1bml0eShjb25zdCBJbmxpbmVJdGVtJiB3b3JkQnJlYWtJdGVt KSB7IG1fdHJhaWxpbmdXb3JkQnJlYWtPcHBvcnR1bml0eSA9ICZ3b3JkQnJlYWtJdGVtOyB9CiAg ICAgICAgIHZvaWQgcmVzZXQoKTsKQEAgLTE3NSw3ICsxNzUsNyBAQCBMaW5lQ2FuZGlkYXRlOjpJ bmxpbmVDb250ZW50OjpJbmxpbmVDb250ZW50KGJvb2wgaWdub3JlVHJhaWxpbmdMZXR0ZXJTcGFj aW5nKQogewogfQogCi1pbmxpbmUgdm9pZCBMaW5lQ2FuZGlkYXRlOjpJbmxpbmVDb250ZW50Ojph cHBlbmRJbmxpbmVJdGVtKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIElubGluZUxheW91 dFVuaXQgbG9naWNhbFdpZHRoKQoraW5saW5lIHZvaWQgTGluZUNhbmRpZGF0ZTo6SW5saW5lQ29u dGVudDo6YXBwZW5kSW5saW5lSXRlbShjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBjb25z dCBSZW5kZXJTdHlsZSYgc3R5bGUsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKQogewog ICAgIEFTU0VSVChpbmxpbmVJdGVtLmlzVGV4dCgpIHx8IGlubGluZUl0ZW0uaXNCb3goKSB8fCBp bmxpbmVJdGVtLmlzSW5saW5lQm94U3RhcnQoKSB8fCBpbmxpbmVJdGVtLmlzSW5saW5lQm94RW5k KCkpOwogICAgIGF1dG8gY29sbGFwc2libGVXaWR0aCA9IFsmXSgpIC0+IHN0ZDo6b3B0aW9uYWw8 SW5saW5lTGF5b3V0VW5pdD4gewpAQCAtMTk1LDggKzE5NSw3IEBAIGlubGluZSB2b2lkIExpbmVD YW5kaWRhdGU6OklubGluZUNvbnRlbnQ6OmFwcGVuZElubGluZUl0ZW0oY29uc3QgSW5saW5lSXRl bSYgaW5sCiAgICAgICAgIEFTU0VSVChsb2dpY2FsV2lkdGggPiBsZXR0ZXJTcGFjaW5nKTsKICAg ICAgICAgcmV0dXJuIGxldHRlclNwYWNpbmc7CiAgICAgfTsKLSAgICAvLyBGSVhNRTogV2hpbGUg dGhlIGxpbmUgYnJlYWtpbmcgcmVsYXRlZCBwcm9wZXJ0aWVzIGZvciBhdG9taWMgbGV2ZWwgYm94 ZXMgZG8gbm90IGRlcGVuZCBvbiB0aGUgbGluZSBpbmRleCAoZmlyc3QgbGluZSBzdHlsZSkgaXQn ZCBiZSBncmVhdCB0byBmaWd1cmUgb3V0IHRoZSBjb3JyZWN0IHN0eWxlIHRvIHBhc3MgaW4uCi0g ICAgbV9jb250aW51b3VzQ29udGVudC5hcHBlbmQoaW5saW5lSXRlbSwgIWlubGluZUl0ZW0uaXNC b3goKSA/IGlubGluZUl0ZW0uc3R5bGUoKSA6IGlubGluZUl0ZW0ubGF5b3V0Qm94KCkucGFyZW50 KCkuc3R5bGUoKSwgbG9naWNhbFdpZHRoLCBjb2xsYXBzaWJsZVdpZHRoKCkpOworICAgIG1fY29u dGludW91c0NvbnRlbnQuYXBwZW5kKGlubGluZUl0ZW0sIHN0eWxlLCBsb2dpY2FsV2lkdGgsIGNv bGxhcHNpYmxlV2lkdGgoKSk7CiAgICAgbV9oYXNJbmxpbmVMZXZlbEJveCA9IG1faGFzSW5saW5l TGV2ZWxCb3ggfHwgaW5saW5lSXRlbS5pc0JveCgpIHx8IGlubGluZUl0ZW0uaXNJbmxpbmVCb3hT dGFydCgpOwogfQogCkBAIC0yNjcsNyArMjY2LDcgQEAgTGluZUJ1aWxkZXI6OkxpbmVCdWlsZGVy KGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCwK IAogTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50IExpbmVCdWlsZGVyOjpsYXlvdXRJbmxpbmVDb250 ZW50KGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbmVlZHNMYXlvdXRSYW5nZSwgc2l6ZV90IHBhcnRp YWxMZWFkaW5nQ29udGVudExlbmd0aCwgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBv dmVyZmxvd0xvZ2ljYWxXaWR0aCwgY29uc3QgSW5saW5lUmVjdCYgaW5pdGlhbExpbmVMb2dpY2Fs UmVjdCwgYm9vbCBpc0ZpcnN0TGluZSkKIHsKLSAgICBpbml0aWFsaXplKGluaXRpYWxDb25zdHJh aW50c0ZvckxpbmUoaW5pdGlhbExpbmVMb2dpY2FsUmVjdCwgaXNGaXJzdExpbmUpKTsKKyAgICBp bml0aWFsaXplKGluaXRpYWxDb25zdHJhaW50c0ZvckxpbmUoaW5pdGlhbExpbmVMb2dpY2FsUmVj dCwgaXNGaXJzdExpbmUpLCBpc0ZpcnN0TGluZSk7CiAKICAgICBhdXRvIGNvbW1pdHRlZENvbnRl bnQgPSBwbGFjZUlubGluZUNvbnRlbnQobmVlZHNMYXlvdXRSYW5nZSwgcGFydGlhbExlYWRpbmdD b250ZW50TGVuZ3RoLCBvdmVyZmxvd0xvZ2ljYWxXaWR0aCk7CiAgICAgYXV0byBjb21taXR0ZWRS YW5nZSA9IGNsb3NlKG5lZWRzTGF5b3V0UmFuZ2UsIGNvbW1pdHRlZENvbnRlbnQpOwpAQCAtMjg0 LDE0ICsyODMsMTUgQEAgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50IExpbmVCdWlsZGVyOjpsYXlv dXRJbmxpbmVDb250ZW50KGNvbnN0IElubGluZUl0ZW1SYW5nZSYKIAogTGluZUJ1aWxkZXI6Oklu dHJpbnNpY0NvbnRlbnQgTGluZUJ1aWxkZXI6OmNvbXB1dGVkSW50cmluc2ljV2lkdGgoY29uc3Qg SW5saW5lSXRlbVJhbmdlJiBuZWVkc0xheW91dFJhbmdlLCBJbmxpbmVMYXlvdXRVbml0IGF2YWls YWJsZVdpZHRoKQogewotICAgIGluaXRpYWxpemUoeyB7IHsgfSwgeyBhdmFpbGFibGVXaWR0aCwg bWF4SW5saW5lTGF5b3V0VW5pdCgpIH0gfSwgZmFsc2UgfSk7CisgICAgaW5pdGlhbGl6ZSh7IHsg eyB9LCB7IGF2YWlsYWJsZVdpZHRoLCBtYXhJbmxpbmVMYXlvdXRVbml0KCkgfSB9LCBmYWxzZSB9 LCBmYWxzZSk7CiAgICAgYXV0byBjb21taXR0ZWRDb250ZW50ID0gcGxhY2VJbmxpbmVDb250ZW50 KG5lZWRzTGF5b3V0UmFuZ2UsIHsgfSwgeyB9KTsKICAgICBhdXRvIGNvbW1pdHRlZFJhbmdlID0g Y2xvc2UobmVlZHNMYXlvdXRSYW5nZSwgY29tbWl0dGVkQ29udGVudCk7CiAgICAgcmV0dXJuIHsg Y29tbWl0dGVkUmFuZ2UsIG1fbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCksIG1fZmxvYXRzIH07 CiB9CiAKLXZvaWQgTGluZUJ1aWxkZXI6OmluaXRpYWxpemUoY29uc3QgVXNlZENvbnN0cmFpbnRz JiBsaW5lQ29uc3RyYWludHMpCit2b2lkIExpbmVCdWlsZGVyOjppbml0aWFsaXplKGNvbnN0IFVz ZWRDb25zdHJhaW50cyYgbGluZUNvbnN0cmFpbnRzLCBib29sIGlzRmlyc3RMaW5lKQogeworICAg IG1faXNGaXJzdExpbmUgPSBpc0ZpcnN0TGluZTsKICAgICBtX2Zsb2F0cy5jbGVhcigpOwogICAg IG1fcGFydGlhbExlYWRpbmdUZXh0SXRlbSA9IHsgfTsKICAgICBtX3dyYXBPcHBvcnR1bml0eUxp c3QuY2xlYXIoKTsKQEAgLTQ4MCwyNyArNDgwLDM4IEBAIHZvaWQgTGluZUJ1aWxkZXI6OmNhbmRp ZGF0ZUNvbnRlbnRGb3JMaW5lKExpbmVDYW5kaWRhdGUmIGxpbmVDYW5kaWRhdGUsIHNpemVfdCBj CiAgICAgQVNTRVJUKHNvZnRXcmFwT3Bwb3J0dW5pdHlJbmRleCA8PSBsYXlvdXRSYW5nZS5lbmQp OwogCiAgICAgaWYgKHBhcnRpYWxMZWFkaW5nQ29udGVudExlbmd0aCkgeworICAgICAgICBBU1NF UlQoIW1faXNGaXJzdExpbmUpOwogICAgICAgICAvLyBIYW5kbGUgbGVhZGluZyBwYXJ0aWFsIGNv bnRlbnQgZmlyc3QgKG92ZXJmbG93aW5nIHRleHQgZnJvbSB0aGUgcHJldmlvdXMgbGluZSkuCiAg ICAgICAgIC8vIENvbnN0cnVjdCBhIHBhcnRpYWwgbGVhZGluZyBpbmxpbmUgaXRlbS4KICAgICAg ICAgbV9wYXJ0aWFsTGVhZGluZ1RleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KG1f aW5saW5lSXRlbXNbY3VycmVudElubGluZUl0ZW1JbmRleF0pLnJpZ2h0KHBhcnRpYWxMZWFkaW5n Q29udGVudExlbmd0aCk7CiAgICAgICAgIGF1dG8gaXRlbVdpZHRoID0gbGVhZGluZ0xvZ2ljYWxX aWR0aCA/ICpzdGQ6OmV4Y2hhbmdlKGxlYWRpbmdMb2dpY2FsV2lkdGgsIHN0ZDo6bnVsbG9wdCkg OiBpbmxpbmVJdGVtV2lkdGgoKm1fcGFydGlhbExlYWRpbmdUZXh0SXRlbSwgY3VycmVudExvZ2lj YWxSaWdodCk7Ci0gICAgICAgIGxpbmVDYW5kaWRhdGUuaW5saW5lQ29udGVudC5hcHBlbmRJbmxp bmVJdGVtKCptX3BhcnRpYWxMZWFkaW5nVGV4dEl0ZW0sIGl0ZW1XaWR0aCk7CisgICAgICAgIGxp bmVDYW5kaWRhdGUuaW5saW5lQ29udGVudC5hcHBlbmRJbmxpbmVJdGVtKCptX3BhcnRpYWxMZWFk aW5nVGV4dEl0ZW0sIG1fcGFydGlhbExlYWRpbmdUZXh0SXRlbS0+c3R5bGUoKSwgaXRlbVdpZHRo KTsKICAgICAgICAgY3VycmVudExvZ2ljYWxSaWdodCArPSBpdGVtV2lkdGg7CiAgICAgICAgICsr Y3VycmVudElubGluZUl0ZW1JbmRleDsKICAgICB9CiAKICAgICBmb3IgKGF1dG8gaW5kZXggPSBj dXJyZW50SW5saW5lSXRlbUluZGV4OyBpbmRleCA8IHNvZnRXcmFwT3Bwb3J0dW5pdHlJbmRleDsg KytpbmRleCkgewogICAgICAgICBhdXRvJiBpbmxpbmVJdGVtID0gbV9pbmxpbmVJdGVtc1tpbmRl eF07CisgICAgICAgIGF1dG8mIHN0eWxlID0gWyZdICgpIC0+IGNvbnN0IFJlbmRlclN0eWxlJiB7 CisgICAgICAgICAgICByZXR1cm4gbV9pc0ZpcnN0TGluZSA/IGlubGluZUl0ZW0uZmlyc3RMaW5l U3R5bGUoKSA6IGlubGluZUl0ZW0uc3R5bGUoKTsKKyAgICAgICAgfSgpOwogICAgICAgICBpZiAo aW5saW5lSXRlbS5pc0Zsb2F0KCkpIHsKICAgICAgICAgICAgIGxpbmVDYW5kaWRhdGUuZmxvYXRJ dGVtID0gJmlubGluZUl0ZW07CiAgICAgICAgICAgICAvLyBUaGlzIGlzIGEgc29mdCB3cmFwIG9w cG9ydHVuaXR5LCBtdXN0IGJlIHRoZSBvbmx5IGl0ZW0gaW4gdGhlIGxpc3QuCiAgICAgICAgICAg ICBBU1NFUlQoY3VycmVudElubGluZUl0ZW1JbmRleCArIDEgPT0gc29mdFdyYXBPcHBvcnR1bml0 eUluZGV4KTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9Ci0gICAgICAgIGlmIChp bmxpbmVJdGVtLmlzVGV4dCgpIHx8IGlubGluZUl0ZW0uaXNJbmxpbmVCb3hTdGFydCgpIHx8IGlu bGluZUl0ZW0uaXNJbmxpbmVCb3hFbmQoKSB8fCBpbmxpbmVJdGVtLmlzQm94KCkpIHsKKyAgICAg ICAgaWYgKGlubGluZUl0ZW0uaXNUZXh0KCkgfHwgaW5saW5lSXRlbS5pc0lubGluZUJveFN0YXJ0 KCkgfHwgaW5saW5lSXRlbS5pc0lubGluZUJveEVuZCgpKSB7CiAgICAgICAgICAgICBBU1NFUlQo IWxlYWRpbmdMb2dpY2FsV2lkdGggfHwgaW5saW5lSXRlbS5pc1RleHQoKSk7CiAgICAgICAgICAg ICBhdXRvIGxvZ2ljYWxXaWR0aCA9IGxlYWRpbmdMb2dpY2FsV2lkdGggPyAqc3RkOjpleGNoYW5n ZShsZWFkaW5nTG9naWNhbFdpZHRoLCBzdGQ6Om51bGxvcHQpIDogaW5saW5lSXRlbVdpZHRoKGlu bGluZUl0ZW0sIGN1cnJlbnRMb2dpY2FsUmlnaHQpOwotICAgICAgICAgICAgbGluZUNhbmRpZGF0 ZS5pbmxpbmVDb250ZW50LmFwcGVuZElubGluZUl0ZW0oaW5saW5lSXRlbSwgbG9naWNhbFdpZHRo KTsKKyAgICAgICAgICAgIGxpbmVDYW5kaWRhdGUuaW5saW5lQ29udGVudC5hcHBlbmRJbmxpbmVJ dGVtKGlubGluZUl0ZW0sIHN0eWxlLCBsb2dpY2FsV2lkdGgpOworICAgICAgICAgICAgY3VycmVu dExvZ2ljYWxSaWdodCArPSBsb2dpY2FsV2lkdGg7CisgICAgICAgICAgICBjb250aW51ZTsKKyAg ICAgICAgfQorICAgICAgICBpZiAoaW5saW5lSXRlbS5pc0JveCgpKSB7CisgICAgICAgICAgICBh dXRvIGxvZ2ljYWxXaWR0aCA9IGlubGluZUl0ZW1XaWR0aChpbmxpbmVJdGVtLCBjdXJyZW50TG9n aWNhbFJpZ2h0KTsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBXaGlsZSB0aGUgbGluZSBicmVha2lu ZyByZWxhdGVkIHByb3BlcnRpZXMgZm9yIGF0b21pYyBsZXZlbCBib3hlcyBkbyBub3QgZGVwZW5k IG9uIHRoZSBsaW5lIGluZGV4IChmaXJzdCBsaW5lIHN0eWxlKSBpdCdkIGJlIGdyZWF0IHRvIGZp Z3VyZSBvdXQgdGhlIGNvcnJlY3Qgc3R5bGUgdG8gcGFzcyBpbi4KKyAgICAgICAgICAgIGxpbmVD YW5kaWRhdGUuaW5saW5lQ29udGVudC5hcHBlbmRJbmxpbmVJdGVtKGlubGluZUl0ZW0sIGlubGlu ZUl0ZW0ubGF5b3V0Qm94KCkucGFyZW50KCkuc3R5bGUoKSwgbG9naWNhbFdpZHRoKTsKICAgICAg ICAgICAgIGN1cnJlbnRMb2dpY2FsUmlnaHQgKz0gbG9naWNhbFdpZHRoOwogICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmggYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5o CmluZGV4IGIxZTc5NGQ3ZTNiYTA4MWJkNzhiNTk0OTFhOTI1MTc0ZGQ1NGJkMzEuLjYyZDc1ZWE4 M2QwNDhjOTIyYzVmMWUxN2EzMjU0MTBiOWFlYWJiYWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmgK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lTGluZUJ1aWxkZXIuaApAQCAtOTcsNyArOTcsNyBAQCBwcml2YXRlOgogICAgIHNpemVfdCBy ZWJ1aWxkTGluZShjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIG5lZWRzTGF5b3V0UmFuZ2UsIGNvbnN0 IElubGluZUl0ZW0mIGxhc3RJbmxpbmVJdGVtVG9BZGQpOwogICAgIHNpemVfdCByZWJ1aWxkTGlu ZUZvclRyYWlsaW5nU29mdEh5cGhlbihjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIGxheW91dFJhbmdl KTsKICAgICB2b2lkIGNvbW1pdFBhcnRpYWxDb250ZW50KGNvbnN0IElubGluZUNvbnRlbnRCcmVh a2VyOjpDb250aW51b3VzQ29udGVudDo6UnVuTGlzdCYsIGNvbnN0IElubGluZUNvbnRlbnRCcmVh a2VyOjpSZXN1bHQ6OlBhcnRpYWxUcmFpbGluZ0NvbnRlbnQmKTsKLSAgICB2b2lkIGluaXRpYWxp emUoY29uc3QgVXNlZENvbnN0cmFpbnRzJik7CisgICAgdm9pZCBpbml0aWFsaXplKGNvbnN0IFVz ZWRDb25zdHJhaW50cyYsIGJvb2wgaXNGaXJzdExpbmUpOwogICAgIHN0cnVjdCBDb21taXR0ZWRD b250ZW50IHsKICAgICAgICAgc2l6ZV90IGlubGluZUl0ZW1Db3VudCB7IDAgfTsKICAgICAgICAg c2l6ZV90IHBhcnRpYWxUcmFpbGluZ0NvbnRlbnRMZW5ndGggeyAwIH07CkBAIC0xMTYsNiArMTE2 LDggQEAgcHJpdmF0ZToKICAgICBjb25zdCBDb250YWluZXJCb3gmIHJvb3QoKSBjb25zdDsKICAg ICBjb25zdCBMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUoKSBjb25zdDsKIAorcHJpdmF0ZToKKyAg ICBib29sIG1faXNGaXJzdExpbmUgeyBmYWxzZSB9OwogICAgIGNvbnN0IElubGluZUZvcm1hdHRp bmdDb250ZXh0JiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0OwogICAgIElubGluZUZvcm1hdHRp bmdTdGF0ZSogbV9pbmxpbmVGb3JtYXR0aW5nU3RhdGUgeyBudWxscHRyIH07CiAgICAgRmxvYXRp bmdTdGF0ZSogbV9mbG9hdGluZ1N0YXRlIHsgbnVsbHB0ciB9Owo=