234662 2021-12-24 07:01:59 -0800 [LFC][IFC] InlineContentBreaker should know about the hanging content width 2021-12-25 07:38:17 -0800 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 1826711 0 zalan 2021-12-24 07:01:59 -0800 ssia 1826720 1 447941 zalan 2021-12-24 08:39:47 -0800 Created attachment 447941 Patch 1826812 2 ews-feeder 2021-12-25 07:37:26 -0800 Committed r287437 (245572@main): <https://commits.webkit.org/245572@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447941. 1826813 3 webkit-bug-importer 2021-12-25 07:38:17 -0800 <rdar://problem/86905110> 447941 2021-12-24 08:39:47 -0800 2021-12-25 07:37:27 -0800 Patch bug-234662-20211224083947.patch text/plain 10477 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3Mzk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjQ2ZjU4ODllYjE1ZDdh MmIxN2ZkMjkxNDcwNTZkYTgzZjYzNzA3My4uNmI1MzUxNTllMGZmZWQ1OWM5OWU5YzZkMDA1Y2Ux ZmQ4MDZjNDk5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTEyLTI0ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIElubGluZUNv bnRlbnRCcmVha2VyIHNob3VsZCBrbm93IGFib3V0IHRoZSBoYW5naW5nIGNvbnRlbnQgd2lkdGgK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDY2Mgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhc3MgaW4g dGhlIHRyYWlsaW5nIGhhbmdpbmcgY29udGVudCB3aWR0aCB0byBJbmxpbmVDb250ZW50QnJlYWtl ciBhcyB0aGlzIHNwZWNpZmljIHR5cGUKKyAgICAgICAgb2YgY29udGVudCAoZS5nLiBwcmUtd3Jh cCB3aGl0ZXNwYWNlKSBzaG91bGQgYmUgaWdub3JlZCB3aGVuIGNoZWNraW5nIGZvciBjb250ZW50 IGZpdC4KKworICAgICAgICAoTm90ZSB0aGF0IHdlIGFscmVhZHkgaWdub3JlIGl0IHRocm91Z2gg dGhlIHNob3VsZEtlZXBFbmRPZkxpbmVXaGl0ZXNwYWNlKCkgY2FsbCBpbgorICAgICAgICBJbmxp bmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nQ29udGVudCwgYnV0IHRoaXMgcGF0 Y2ggaXMgaW4gcHJlcGFyYXRpb24gZm9yIG1ha2luZyBoYW5naW5nIGNvbnRlbnQgbG9naWMKKyAg ICAgICAgbW9yZSBpbmxpbmUgd2l0aCB0aGUgc3BlYy4gLWFuZCBhbHNvIHJlbW92aW5nIHNob3Vs ZEtlZXBFbmRPZkxpbmVXaGl0ZXNwYWNlIG5lZWRzIHNvbWUgbW9yZSBjaGFuZ2VzLikKKworICAg ICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVh a2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6 OnByb2Nlc3NPdmVyZmxvd2luZ0NvbnRlbnQgY29uc3QpOgorICAgICAgICAqIGxheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmg6CisgICAgICAgICog bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpoYW5naW5nVHJhaWxpbmdDb250ZW50V2lkdGggY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpoYW5naW5nV2hpdGVzcGFjZVdpZHRo IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxp bmVCdWlsZGVyOjpsYXlvdXRJbmxpbmVDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZUJ1aWxkZXI6OmhhbmRsZUlubGluZUNvbnRlbnQpOgorCiAyMDIxLTEyLTIzICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIERvIG5vdCB0 cnkgdG8gYmlkaSByZW9yZGVyIGVtcHR5IGNvbnRlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2Vy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUNvbnRlbnRCcmVha2VyLmNwcAppbmRleCA4ZTk1NWJmNzMwMjcwY2Q2NWVlYjkzYmNlOTAz YjQ2YzA1YjJiNjYzLi5iNTg4ZjBjODAyZjMzMjJmYjViOWI4MGI1NjA2ZTY4ZmM3NzA3NTZhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCkBAIC0xNjYs MjggKzE2NiwzOCBAQCBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0IElubGluZUNvbnRlbnRC cmVha2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdDb250ZW50KGNvbgogICAgIEFTU0VSVCghY29udGlu dW91c0NvbnRlbnQucnVucygpLmlzRW1wdHkoKSk7CiAKICAgICBBU1NFUlQoY29udGludW91c0Nv bnRlbnQubG9naWNhbFdpZHRoKCkgPiBsaW5lU3RhdHVzLmF2YWlsYWJsZVdpZHRoKTsKLSAgICBp ZiAoY29udGludW91c0NvbnRlbnQuaGFzQ29sbGFwc2libGVDb250ZW50KCkpIHsKLSAgICAgICAg aWYgKGxpbmVTdGF0dXMuaGFzRnVsbHlDb2xsYXBzaWJsZVRyYWlsaW5nQ29udGVudCAmJiBjb250 aW51b3VzQ29udGVudC5pc0Z1bGx5Q29sbGFwc2libGUoKSkgewotICAgICAgICAgICAgLy8gSWYg dGhpcyBuZXcgY29udGVudCBpcyBmdWxseSBjb2xsYXBzaWJsZSwgaXQgc2hvdWxkIHN1cmVseSBm aXQuCi0gICAgICAgICAgICByZXR1cm4geyBSZXN1bHQ6OkFjdGlvbjo6S2VlcCwgSXNFbmRPZkxp bmU6Ok5vIH07CisgICAgYXV0byBjaGVja0ZvclRyYWlsaW5nQ29udGVudEZpdCA9IFsmXSgpIC0+ IHN0ZDo6b3B0aW9uYWw8SW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdD4geworICAgICAgICBp ZiAoY29udGludW91c0NvbnRlbnQuaGFzQ29sbGFwc2libGVDb250ZW50KCkpIHsKKyAgICAgICAg ICAgIC8vIENoZWNrIGlmIHRoZSBjb250ZW50IGZpdHMgaWYgd2UgY29sbGFwc2VkIGl0LgorICAg ICAgICAgICAgaWYgKGNvbnRpbnVvdXNDb250ZW50LmlzRnVsbHlDb2xsYXBzaWJsZSgpKSB7Cisg ICAgICAgICAgICAgICAgaWYgKGxpbmVTdGF0dXMuaGFzRnVsbHlDb2xsYXBzaWJsZVRyYWlsaW5n Q29udGVudCB8fCBsaW5lU3RhdHVzLmF2YWlsYWJsZVdpZHRoID49IDApIHsKKyAgICAgICAgICAg ICAgICAgICAgLy8gSWYgdGhpcyBuZXcgY29udGVudCBpcyBmdWxseSBjb2xsYXBzaWJsZSwgaXQg c2hvdWxkIHN1cmVseSBmaXQuCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBJbmxpbmVDb250 ZW50QnJlYWtlcjo6UmVzdWx0IHsgUmVzdWx0OjpBY3Rpb246OktlZXAsIElzRW5kT2ZMaW5lOjpO byB9OworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGF1dG8g c3BhY2VSZXF1aXJlZCA9IGNvbnRpbnVvdXNDb250ZW50LmxvZ2ljYWxXaWR0aCgpIC0gY29udGlu dW91c0NvbnRlbnQudHJhaWxpbmdDb2xsYXBzaWJsZVdpZHRoKCk7CisgICAgICAgICAgICBpZiAo bGluZVN0YXR1cy5oYXNGdWxseUNvbGxhcHNpYmxlVHJhaWxpbmdDb250ZW50KQorICAgICAgICAg ICAgICAgIHNwYWNlUmVxdWlyZWQgLT0gY29udGludW91c0NvbnRlbnQubGVhZGluZ0NvbGxhcHNp YmxlV2lkdGgoKTsKKyAgICAgICAgICAgIGlmIChzcGFjZVJlcXVpcmVkIDw9IGxpbmVTdGF0dXMu YXZhaWxhYmxlV2lkdGgpCisgICAgICAgICAgICAgICAgcmV0dXJuIElubGluZUNvbnRlbnRCcmVh a2VyOjpSZXN1bHQgeyBSZXN1bHQ6OkFjdGlvbjo6S2VlcCwgSXNFbmRPZkxpbmU6Ok5vIH07CiAg ICAgICAgIH0KLSAgICAgICAgLy8gQ2hlY2sgaWYgdGhlIGNvbnRlbnQgZml0cyBpZiB3ZSBjb2xs YXBzZWQgaXQuCi0gICAgICAgIGF1dG8gc3BhY2VSZXF1aXJlZCA9IGNvbnRpbnVvdXNDb250ZW50 LmxvZ2ljYWxXaWR0aCgpIC0gY29udGludW91c0NvbnRlbnQudHJhaWxpbmdDb2xsYXBzaWJsZVdp ZHRoKCk7Ci0gICAgICAgIGlmIChsaW5lU3RhdHVzLmhhc0Z1bGx5Q29sbGFwc2libGVUcmFpbGlu Z0NvbnRlbnQpCi0gICAgICAgICAgICBzcGFjZVJlcXVpcmVkIC09IGNvbnRpbnVvdXNDb250ZW50 LmxlYWRpbmdDb2xsYXBzaWJsZVdpZHRoKCk7Ci0gICAgICAgIGlmIChzcGFjZVJlcXVpcmVkIDw9 IGxpbmVTdGF0dXMuYXZhaWxhYmxlV2lkdGgpCi0gICAgICAgICAgICByZXR1cm4geyBSZXN1bHQ6 OkFjdGlvbjo6S2VlcCwgSXNFbmRPZkxpbmU6Ok5vIH07Ci0gICAgfSBlbHNlIGlmIChsaW5lU3Rh dHVzLmNvbGxhcHNpYmxlV2lkdGggJiYgaXNOb25Db250ZW50UnVuc09ubHkoY29udGludW91c0Nv bnRlbnQpKSB7Ci0gICAgICAgIC8vIExldCdzIHNlZSBpZiB0aGUgbm9uLWNvbnRlbnQgcnVucyBm aXQgd2hlbiB0aGUgbGluZSBoYXMgdHJhaWxpbmcgY29sbGFwc2libGUgY29udGVudC4KLSAgICAg ICAgLy8gInRleHQgY29udGVudCA8c3BhbiBzdHlsZT0icGFkZGluZzogMXB4Ij48L3NwYW4+IiA8 LSB0aGUgPHNwYW4+PC9zcGFuPiBydW5zIGNvdWxkIGZpdCBhZnRlciBjb2xsYXBzaW5nIHRoZSB0 cmFpbGluZyB3aGl0ZXNwYWNlLgotICAgICAgICBpZiAoY29udGludW91c0NvbnRlbnQubG9naWNh bFdpZHRoKCkgPD0gbGluZVN0YXR1cy5hdmFpbGFibGVXaWR0aCArIGxpbmVTdGF0dXMuY29sbGFw c2libGVXaWR0aCkKLSAgICAgICAgICAgIHJldHVybiB7IFJlc3VsdDo6QWN0aW9uOjpLZWVwIH07 Ci0gICAgfQotICAgIGlmIChpc1Zpc3VhbGx5RW1wdHlXaGl0ZXNwYWNlQ29udGVudChjb250aW51 b3VzQ29udGVudCkgJiYgc2hvdWxkS2VlcEVuZE9mTGluZVdoaXRlc3BhY2UoY29udGludW91c0Nv bnRlbnQpKSB7Ci0gICAgICAgIC8vIFRoaXMgb3ZlcmZsb3dpbmcgY29udGVudCBhcHBhcmVudGx5 IGZhbGxzIGludG8gdGhlIHJlbW92ZS9oYW5nIGVuZC1vZi1saW5lLXNwYWNlcyBjYXRlZ29yeS4K LSAgICAgICAgLy8gc2VlIGh0dHBzOi8vd3d3LnczLm9yZy9UUi9jc3MtdGV4dC0zLyN3aGl0ZS1z cGFjZS1wcm9wZXJ0eSBtYXRyaXgKLSAgICAgICAgcmV0dXJuIHsgUmVzdWx0OjpBY3Rpb246Oktl ZXAgfTsKLSAgICB9CisKKyAgICAgICAgYXV0byBjYW5JZ25vcmVOb25Db250ZW50VHJhaWxpbmdS dW5zID0gbGluZVN0YXR1cy5jb2xsYXBzaWJsZU9ySGFuZ2luZ1dpZHRoICYmIGlzTm9uQ29udGVu dFJ1bnNPbmx5KGNvbnRpbnVvdXNDb250ZW50KTsKKyAgICAgICAgaWYgKGNhbklnbm9yZU5vbkNv bnRlbnRUcmFpbGluZ1J1bnMpIHsKKyAgICAgICAgICAgIC8vIExldCdzIHNlZSBpZiB0aGUgbm9u LWNvbnRlbnQgcnVucyBmaXQgd2hlbiB0aGUgbGluZSBoYXMgdHJhaWxpbmcgY29sbGFwc2libGUv aGFuZ2luZyBjb250ZW50LgorICAgICAgICAgICAgLy8gInRleHQgY29udGVudCA8c3BhbiBzdHls ZT0icGFkZGluZzogMXB4Ij48L3NwYW4+IiA8LSB0aGUgPHNwYW4+PC9zcGFuPiBydW5zIGNvdWxk IGZpdCBhZnRlciBjb2xsYXBzaW5nIHRoZSB0cmFpbGluZyB3aGl0ZXNwYWNlLgorICAgICAgICAg ICAgaWYgKGNvbnRpbnVvdXNDb250ZW50LmxvZ2ljYWxXaWR0aCgpIDw9IGxpbmVTdGF0dXMuYXZh aWxhYmxlV2lkdGggKyBsaW5lU3RhdHVzLmNvbGxhcHNpYmxlT3JIYW5naW5nV2lkdGgpCisgICAg ICAgICAgICAgICAgcmV0dXJuIElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQgeyBSZXN1bHQ6 OkFjdGlvbjo6S2VlcCB9OworICAgICAgICB9CisgICAgICAgIGlmIChpc1Zpc3VhbGx5RW1wdHlX aGl0ZXNwYWNlQ29udGVudChjb250aW51b3VzQ29udGVudCkgJiYgc2hvdWxkS2VlcEVuZE9mTGlu ZVdoaXRlc3BhY2UoY29udGludW91c0NvbnRlbnQpKSB7CisgICAgICAgICAgICAvLyBUaGlzIG92 ZXJmbG93aW5nIGNvbnRlbnQgYXBwYXJlbnRseSBmYWxscyBpbnRvIHRoZSByZW1vdmUvaGFuZyBl bmQtb2YtbGluZS1zcGFjZXMgY2F0ZWdvcnkuCisgICAgICAgICAgICAvLyBzZWUgaHR0cHM6Ly93 d3cudzMub3JnL1RSL2Nzcy10ZXh0LTMvI3doaXRlLXNwYWNlLXByb3BlcnR5IG1hdHJpeAorICAg ICAgICAgICAgcmV0dXJuIElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQgeyBSZXN1bHQ6OkFj dGlvbjo6S2VlcCB9OworICAgICAgICB9CisgICAgICAgIHJldHVybiB7IH07CisgICAgfTsKKyAg ICBpZiAoYXV0byByZXN1bHQgPSBjaGVja0ZvclRyYWlsaW5nQ29udGVudEZpdCgpKQorICAgICAg ICByZXR1cm4gKnJlc3VsdDsKIAogICAgIHNpemVfdCBvdmVyZmxvd2luZ1J1bkluZGV4ID0gMDsK ICAgICBpZiAoaGFzVGV4dFJ1bihjb250aW51b3VzQ29udGVudCkpIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRl bnRCcmVha2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5oCmluZGV4IGIzMjNiMGI3NmEzOTJhODNjZjY1MTFm Y2EzZTEyNjNkYTZiYzcxMTIuLjM2ZjFiMThlNGNmYTFkMjIxMDcwOTNlNjhmM2Q5Y2NjOTM5NmFi OWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuaApAQCAtMTEw LDcgKzExMCw4IEBAIHB1YmxpYzoKICAgICBzdHJ1Y3QgTGluZVN0YXR1cyB7CiAgICAgICAgIElu bGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxSaWdodCB7IDAgfTsKICAgICAgICAgSW5saW5l TGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCB7IDAgfTsKLSAgICAgICAgSW5saW5lTGF5b3V0VW5p dCBjb2xsYXBzaWJsZVdpZHRoIHsgMCB9OworICAgICAgICAvLyBCb3RoIG9mIHRoZXNlIHR5cGVz IG9mIHRyYWlsaW5nIGNvbnRlbnQgbWF5IGJlIGlnbm9yZWQgd2hlbiBjaGVja2luZyBmb3IgY29u dGVudCBmaXQuCisgICAgICAgIElubGluZUxheW91dFVuaXQgY29sbGFwc2libGVPckhhbmdpbmdX aWR0aCB7IDAgfTsKICAgICAgICAgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB0cmFp bGluZ1NvZnRIeXBoZW5XaWR0aDsKICAgICAgICAgYm9vbCBoYXNGdWxseUNvbGxhcHNpYmxlVHJh aWxpbmdDb250ZW50IHsgZmFsc2UgfTsKICAgICAgICAgYm9vbCBoYXNDb250ZW50IHsgZmFsc2Ug fTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUxpbmUuaAppbmRleCBkNDA3Yjk0NTc4M2MxMDQxOTU4NzkyNmRk YjgzZTc1ZTRjZDFjMTgzLi5iNWE1ZGQ5N2FlY2ViNzQyMDFjYzFlMDJkNmM5NDJjNDNmMzkyYmFl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVMaW5lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oCkBAIC01OCw3ICs1OCw3IEBAIHB1YmxpYzoKICAg ICBJbmxpbmVMYXlvdXRVbml0IHRyaW1tYWJsZVRyYWlsaW5nV2lkdGgoKSBjb25zdCB7IHJldHVy biBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC53aWR0aCgpOyB9CiAgICAgYm9vbCBpc1RyYWls aW5nUnVuRnVsbHlUcmltbWFibGUoKSBjb25zdCB7IHJldHVybiBtX3RyaW1tYWJsZVRyYWlsaW5n Q29udGVudC5pc1RyYWlsaW5nUnVuRnVsbHlUcmltbWFibGUoKTsgfQogCi0gICAgSW5saW5lTGF5 b3V0VW5pdCBoYW5naW5nV2hpdGVzcGFjZVdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9oYW5naW5n VHJhaWxpbmdDb250ZW50LndpZHRoKCk7IH0KKyAgICBJbmxpbmVMYXlvdXRVbml0IGhhbmdpbmdU cmFpbGluZ0NvbnRlbnRXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1faGFuZ2luZ1RyYWlsaW5nQ29u dGVudC53aWR0aCgpOyB9CiAKICAgICBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IHRy YWlsaW5nU29mdEh5cGhlbldpZHRoKCkgY29uc3QgeyByZXR1cm4gbV90cmFpbGluZ1NvZnRIeXBo ZW5XaWR0aDsgfQogICAgIHZvaWQgYWRkVHJhaWxpbmdIeXBoZW4oSW5saW5lTGF5b3V0VW5pdCBo eXBoZW5Mb2dpY2FsV2lkdGgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIu Y3BwCmluZGV4IDA5ZWQ0ZWZhZGJlN2E4MjJhNmQ5YmViMTMyZTNjZjZmMmNjNjVmOWMuLjYyYWNk NjA4MDMzOTE2OTZkNzRhMmYzYTE2MTk3ODlhNjZiYmY4YzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAgLTM0MSw3ICszNDEsNyBAQCBMaW5lQnVpbGRlcjo6 TGluZUNvbnRlbnQgTGluZUJ1aWxkZXI6OmxheW91dElubGluZUNvbnRlbnQoY29uc3QgSW5saW5l SXRlbVJhbmdlJgogICAgICAgICAsIG1fbGluZUxvZ2ljYWxSZWN0LnRvcExlZnQoKQogICAgICAg ICAsIG1fbGluZUxvZ2ljYWxSZWN0LndpZHRoKCkKICAgICAgICAgLCBtX2xpbmUuY29udGVudExv Z2ljYWxXaWR0aCgpCi0gICAgICAgICwgbV9saW5lLmhhbmdpbmdXaGl0ZXNwYWNlV2lkdGgoKQor ICAgICAgICAsIG1fbGluZS5oYW5naW5nVHJhaWxpbmdDb250ZW50V2lkdGgoKQogICAgICAgICAs IGlzTGFzdExpbmUKICAgICAgICAgLCBtX2xpbmUubm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENv dW50KCkKICAgICAgICAgLCBjb21wdXRlZFZpc3VhbE9yZGVyKCkKQEAgLTg2MCw3ICs4NjAsMjEg QEAgTGluZUJ1aWxkZXI6OlJlc3VsdCBMaW5lQnVpbGRlcjo6aGFuZGxlSW5saW5lQ29udGVudChJ bmxpbmVDb250ZW50QnJlYWtlciYgaW5saW4KICAgICAvLyBXaGlsZSB0aGUgZmxvYXRzIGFyZSBu b3QgY29uc2lkZXJlZCB0byBiZSBvbiB0aGUgbGluZSwgdGhleSBtYWtlIHRoZSBsaW5lIGNvbnRl bnRmdWwgZm9yIGxpbmUgYnJlYWtpbmcuCiAgICAgYXV0byBhdmFpbGFibGVXaWR0aEZvck5ld0Nv bnRlbnQgPSBhdmFpbGFibGVXaWR0aChpbmxpbmVDb250ZW50LCBtX2xpbmUsIGxpbmVMb2dpY2Fs UmVjdEZvckNhbmRpZGF0ZUNvbnRlbnQud2lkdGgoKSk7CiAgICAgYXV0byBsaW5lSGFzQ29udGVu dCA9IG1fbGluZS5oYXNDb250ZW50KCkgfHwgbV9jb250ZW50SXNDb25zdHJhaW5lZEJ5RmxvYXQ7 Ci0gICAgYXV0byBsaW5lU3RhdHVzID0gSW5saW5lQ29udGVudEJyZWFrZXI6OkxpbmVTdGF0dXMg eyBtX2xpbmUuY29udGVudExvZ2ljYWxSaWdodCgpLCBhdmFpbGFibGVXaWR0aEZvck5ld0NvbnRl bnQsIG1fbGluZS50cmltbWFibGVUcmFpbGluZ1dpZHRoKCksIG1fbGluZS50cmFpbGluZ1NvZnRI eXBoZW5XaWR0aCgpLCBtX2xpbmUuaXNUcmFpbGluZ1J1bkZ1bGx5VHJpbW1hYmxlKCksIGxpbmVI YXNDb250ZW50LCAhbV93cmFwT3Bwb3J0dW5pdHlMaXN0LmlzRW1wdHkoKSB9OworICAgIGF1dG8g dHJhaWxpbmdDb250ZW50V2lkdGhUb0lnbm9yZSA9IFsmXSB7CisgICAgICAgIGlmIChhdXRvIHRy aW1tYWJsZVdpZHRoID0gbV9saW5lLnRyaW1tYWJsZVRyYWlsaW5nV2lkdGgoKSkgeworICAgICAg ICAgICAgQVNTRVJUKCFtX2xpbmUuaGFuZ2luZ1RyYWlsaW5nQ29udGVudFdpZHRoKCkpOworICAg ICAgICAgICAgcmV0dXJuIHRyaW1tYWJsZVdpZHRoOworICAgICAgICB9CisgICAgICAgIHJldHVy biBtX2xpbmUuaGFuZ2luZ1RyYWlsaW5nQ29udGVudFdpZHRoKCk7CisgICAgfTsKKyAgICBhdXRv IGxpbmVTdGF0dXMgPSBJbmxpbmVDb250ZW50QnJlYWtlcjo6TGluZVN0YXR1cyB7IG1fbGluZS5j b250ZW50TG9naWNhbFJpZ2h0KCkKKyAgICAgICAgLCBhdmFpbGFibGVXaWR0aEZvck5ld0NvbnRl bnQKKyAgICAgICAgLCB0cmFpbGluZ0NvbnRlbnRXaWR0aFRvSWdub3JlKCkKKyAgICAgICAgLCBt X2xpbmUudHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGgoKQorICAgICAgICAsIG1fbGluZS5pc1RyYWls aW5nUnVuRnVsbHlUcmltbWFibGUoKQorICAgICAgICAsIGxpbmVIYXNDb250ZW50CisgICAgICAg ICwgIW1fd3JhcE9wcG9ydHVuaXR5TGlzdC5pc0VtcHR5KCkKKyAgICB9OwogICAgIGF1dG8gcmVz dWx0ID0gaW5saW5lQ29udGVudEJyZWFrZXIucHJvY2Vzc0lubGluZUNvbnRlbnQoY29udGludW91 c0lubGluZUNvbnRlbnQsIGxpbmVTdGF0dXMpOwogICAgIGF1dG8mIGNhbmRpZGF0ZVJ1bnMgPSBj b250aW51b3VzSW5saW5lQ29udGVudC5ydW5zKCk7CiAgICAgaWYgKHJlc3VsdC5hY3Rpb24gPT0g SW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdDo6QWN0aW9uOjpLZWVwKSB7Cg==