234422 2021-12-16 21:18:57 -0800 [LFC][IFC] Let computeIsFirstIsLastBoxForInlineContent update the IsFirstForLayoutBox on the display boxes 2021-12-17 11:02:07 -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 1824975 0 zalan 2021-12-16 21:18:57 -0800 ssia 1824977 1 447422 zalan 2021-12-16 21:25:50 -0800 Created attachment 447422 Patch 1825084 2 447422 koivisto 2021-12-17 08:00:21 -0800 Comment on attachment 447422 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447422&action=review > Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:458 > +struct FirstLastInlineBoxes { > + HashMap<const Box*, size_t> first; > + HashMap<const Box*, size_t> last; > +}; Alternatively a single HashMap with a struct with optional first/last. Might save a hash lookup though maybe it doesn't matter. 1825088 3 zalan 2021-12-17 08:04:41 -0800 (In reply to Antti Koivisto from comment #2) > Comment on attachment 447422 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=447422&action=review > > > Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:458 > > +struct FirstLastInlineBoxes { > > + HashMap<const Box*, size_t> first; > > + HashMap<const Box*, size_t> last; > > +}; > > Alternatively a single HashMap with a struct with optional first/last. Might > save a hash lookup though maybe it doesn't matter. yeah I like that. 1825106 4 447457 zalan 2021-12-17 09:50:53 -0800 Created attachment 447457 Patch 1825139 5 ews-feeder 2021-12-17 11:00:05 -0800 Committed r287197 (245364@main): <https://commits.webkit.org/245364@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447457. 1825140 6 webkit-bug-importer 2021-12-17 11:02:07 -0800 <rdar://problem/86642161> 447422 2021-12-16 21:25:50 -0800 2021-12-17 09:50:51 -0800 Patch bug-234422-20211216212549.patch text/plain 8559 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDFkNjA4NWE2ODk3OGNl Mzc1MTY2MjRmOWQ2YzRkNzc3NmMwMmJlYy4uZDJjYmU2NjhjZWQ0MTU5N2ZjMGRkMjE4NDliNDM1 MTQ0NjA0YTJiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTEyLTE2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIExldCBjb21w dXRlSXNGaXJzdElzTGFzdEJveEZvcklubGluZUNvbnRlbnQgdXBkYXRlIHRoZSBJc0ZpcnN0Rm9y TGF5b3V0Qm94IG9uIHRoZSBkaXNwbGF5IGJveGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQ0MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBDdXJyZW50bHkgd2UgcHJlLWNvbXB1dGUgdGhlc2UgdmFs dWVzIGFuZCBjYWNoZSB0aGVtIG9uIHRoZSBkaXNwbGF5IGJveGVzIChmb3IgbGF0ZXIgdXNlIGlu IGFkanVzdFZpc3VhbEdlb21ldHJ5Rm9yRGlzcGxheUJveCkuCisKKyAgICAgICAgKiBsYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6 OmFkanVzdFZpc3VhbEdlb21ldHJ5Rm9yRGlzcGxheUJveCk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KToK KyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXIuaDoKKwogMjAyMS0xMi0xNiAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBBZGp1c3QgdGhlIGJveCBnZW9tZXRyeSBmb3Ig YXRvbWljL2dlbmVyaWMgaW5saW5lIGxldmVsIGJveGVzIGluIGJpZGkgY29udGVudApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKaW5k ZXggMTBjNzhkMTRmYWFkMDA1MzVjZWVlZTY1ZDRlOThlNTZkZTU5YTBiMi4uMDZmZGFlNTk1YzZl MjVmODdlZjYyNjQyYjM5MDMwY2FiZWIyNDlkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWls ZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCkBAIC00NTIsNyArNDUyLDExIEBA IHNpemVfdCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmVuc3VyZURpc3BsYXlCb3hGb3JD b250YWluZXIoY29uc3QgQ29udGFpbmVyCiAgICAgcmV0dXJuIGNyZWF0ZWREaXNwbGF5Qm94Tm9k ZUZvckNvbnRhaW5lckJveEFuZFB1c2hUb0FuY2VzdG9yU3RhY2soY29udGFpbmVyQm94LCBib3hl cy5zaXplKCkgLSAxLCBlbmNsb3NpbmdEaXNwbGF5Qm94Tm9kZUluZGV4Rm9yQ29udGFpbmVyLCBk aXNwbGF5Qm94VHJlZSwgYW5jZXN0b3JTdGFjayk7CiB9CiAKLXZvaWQgSW5saW5lRGlzcGxheUNv bnRlbnRCdWlsZGVyOjphZGp1c3RWaXN1YWxHZW9tZXRyeUZvckRpc3BsYXlCb3goc2l6ZV90IGRp c3BsYXlCb3hOb2RlSW5kZXgsIElubGluZUxheW91dFVuaXQmIGNvbnRlbnRSaWdodEluVmlzdWFs T3JkZXIsIElubGluZUxheW91dFVuaXQgbGluZUJveExvZ2ljYWxUb3AsIGNvbnN0IERpc3BsYXlC b3hUcmVlJiBkaXNwbGF5Qm94VHJlZSwgRGlzcGxheUJveGVzJiBib3hlcywgY29uc3QgTGluZUJv eCYgbGluZUJveCkKK3N0cnVjdCBGaXJzdExhc3RJbmxpbmVCb3hlcyB7CisgICAgSGFzaE1hcDxj b25zdCBCb3gqLCBzaXplX3Q+IGZpcnN0OworICAgIEhhc2hNYXA8Y29uc3QgQm94Kiwgc2l6ZV90 PiBsYXN0OworfTsKK3ZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphZGp1c3RWaXN1 YWxHZW9tZXRyeUZvckRpc3BsYXlCb3goc2l6ZV90IGRpc3BsYXlCb3hOb2RlSW5kZXgsIElubGlu ZUxheW91dFVuaXQmIGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIsIElubGluZUxheW91dFVuaXQg bGluZUJveExvZ2ljYWxUb3AsIGNvbnN0IERpc3BsYXlCb3hUcmVlJiBkaXNwbGF5Qm94VHJlZSwg RGlzcGxheUJveGVzJiBib3hlcywgY29uc3QgTGluZUJveCYgbGluZUJveCwgY29uc3QgRmlyc3RM YXN0SW5saW5lQm94ZXMmIGZpcnN0TGFzdElubGluZUJveGVzKQogewogICAgIC8vIE5vbi1pbmxp bmUgYm94IGRpc3BsYXkgYm94ZXMganVzdCBuZWVkIGEgaG9yaXpvbnRhbCBhZGp1c3RtZW50IHdo aWxlCiAgICAgLy8gaW5saW5lIGJveCB0eXBlIG9mIGRpc3BsYXkgYm94ZXMgbmVlZApAQCAtNDcy LDExICs0NzYsMTMgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFkanVzdFZp c3VhbEdlb21ldHJ5Rm9yRGlzcGxheUJveChzaXplX3QgZGlzcGwKICAgICB9CiAKICAgICBhdXRv IGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPSBsYXlvdXRCb3guc3R5bGUoKS5pc0xlZnRUb1JpZ2h0 RGlyZWN0aW9uKCk7CisgICAgYXV0byBpc0ZpcnN0SW5saW5lQm94ID0gZmlyc3RMYXN0SW5saW5l Qm94ZXMuZmlyc3QuY29udGFpbnMoJmxheW91dEJveCk7CisgICAgYXV0byBpc0xhc3RJbmxpbmVC b3ggPSBmaXJzdExhc3RJbmxpbmVCb3hlcy5sYXN0LmNvbnRhaW5zKCZsYXlvdXRCb3gpOwogICAg IGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRlKCkuYm94R2VvbWV0cnkobGF5b3V0 Qm94KTsKICAgICBhdXRvIGJlZm9yZUlubGluZUJveENvbnRlbnQgPSBbJl0gewogICAgICAgICBh dXRvIGxvZ2ljYWxSZWN0ID0gbGluZUJveC5sb2dpY2FsQm9yZGVyQm94Rm9ySW5saW5lQm94KGxh eW91dEJveCwgYm94R2VvbWV0cnkpOwogICAgICAgICBhdXRvIHZpc3VhbFJlY3QgPSBJbmxpbmVS ZWN0IHsgbGluZUJveExvZ2ljYWxUb3AgKyBsb2dpY2FsUmVjdC50b3AoKSwgY29udGVudFJpZ2h0 SW5WaXN1YWxPcmRlciwgeyB9LCBsb2dpY2FsUmVjdC5oZWlnaHQoKSB9OwotICAgICAgICBpZiAo IWRpc3BsYXlCb3guaXNGaXJzdEZvckxheW91dEJveCgpKQorICAgICAgICBpZiAoIWlzRmlyc3RJ bmxpbmVCb3gpCiAgICAgICAgICAgICByZXR1cm4gZGlzcGxheUJveC5zZXRSZWN0KHZpc3VhbFJl Y3QsIHZpc3VhbFJlY3QpOwogCiAgICAgICAgIGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIgKz0g bWFyZ2luTGVmdChib3hHZW9tZXRyeSwgaXNMZWZ0VG9SaWdodERpcmVjdGlvbik7CkBAIC00ODcs MTAgKzQ5MywxMCBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YWRqdXN0Vmlz dWFsR2VvbWV0cnlGb3JEaXNwbGF5Qm94KHNpemVfdCBkaXNwbAogICAgIGJlZm9yZUlubGluZUJv eENvbnRlbnQoKTsKIAogICAgIGZvciAoYXV0byBjaGlsZERpc3BsYXlCb3hOb2RlSW5kZXggOiBk aXNwbGF5Qm94VHJlZS5hdChkaXNwbGF5Qm94Tm9kZUluZGV4KS5jaGlsZHJlbikKLSAgICAgICAg YWRqdXN0VmlzdWFsR2VvbWV0cnlGb3JEaXNwbGF5Qm94KGNoaWxkRGlzcGxheUJveE5vZGVJbmRl eCwgY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciwgbGluZUJveExvZ2ljYWxUb3AsIGRpc3BsYXlC b3hUcmVlLCBib3hlcywgbGluZUJveCk7CisgICAgICAgIGFkanVzdFZpc3VhbEdlb21ldHJ5Rm9y RGlzcGxheUJveChjaGlsZERpc3BsYXlCb3hOb2RlSW5kZXgsIGNvbnRlbnRSaWdodEluVmlzdWFs T3JkZXIsIGxpbmVCb3hMb2dpY2FsVG9wLCBkaXNwbGF5Qm94VHJlZSwgYm94ZXMsIGxpbmVCb3gs IGZpcnN0TGFzdElubGluZUJveGVzKTsKIAogICAgIGF1dG8gYWZ0ZXJJbmxpbmVCb3hDb250ZW50 ID0gWyZdIHsKLSAgICAgICAgaWYgKCFkaXNwbGF5Qm94LmlzTGFzdEZvckxheW91dEJveCgpKQor ICAgICAgICBpZiAoIWlzTGFzdElubGluZUJveCkKICAgICAgICAgICAgIHJldHVybiBkaXNwbGF5 Qm94LnNldFJpZ2h0KGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIpOwogCiAgICAgICAgIGNvbnRl bnRSaWdodEluVmlzdWFsT3JkZXIgKz0gYm9yZGVyUmlnaHQoYm94R2VvbWV0cnksIGlzTGVmdFRv UmlnaHREaXJlY3Rpb24pICsgcGFkZGluZ1JpZ2h0KGJveEdlb21ldHJ5LCBpc0xlZnRUb1JpZ2h0 RGlyZWN0aW9uKTsKQEAgLTUwNiw3ICs1MTIsNyBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50 QnVpbGRlcjo6YWRqdXN0VmlzdWFsR2VvbWV0cnlGb3JEaXNwbGF5Qm94KHNpemVfdCBkaXNwbAog ICAgIH07CiAgICAgY29tcHV0ZUlua092ZXJmbG93KCk7CiAKLSAgICBzZXRJbmxpbmVCb3hHZW9t ZXRyeShsYXlvdXRCb3gsIGRpc3BsYXlCb3gucmVjdCgpLCBkaXNwbGF5Qm94LmlzRmlyc3RGb3JM YXlvdXRCb3goKSk7CisgICAgc2V0SW5saW5lQm94R2VvbWV0cnkobGF5b3V0Qm94LCBkaXNwbGF5 Qm94LnJlY3QoKSwgaXNGaXJzdElubGluZUJveCk7CiAgICAgaWYgKGxpbmVCb3guaW5saW5lTGV2 ZWxCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94KS5oYXNDb250ZW50KCkpCiAgICAgICAgIGRpc3Bs YXlCb3guc2V0SGFzQ29udGVudCgpOwogfQpAQCAtNTg4LDIxICs1OTQsMTggQEAgdm9pZCBJbmxp bmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVp bGRlcjo6TGluZUNvbnQKICAgICBjcmVhdGVEaXNwbGF5Qm94ZXNJblZpc3VhbE9yZGVyKCk7CiAK ICAgICBpZiAoZGlzcGxheUJveFRyZWUuaGFzSW5saW5lQm94KCkpIHsKKyAgICAgICAgYXV0byBm aXJzdExhc3RJbmxpbmVCb3hlcyA9IEZpcnN0TGFzdElubGluZUJveGVzIHsgfTsKICAgICAgICAg YXV0byBjb21wdXRlSXNGaXJzdElzTGFzdEJveCA9IFsmXSB7Ci0gICAgICAgICAgICBIYXNoTWFw PGNvbnN0IEJveCosIHNpemVfdD4gbGFzdERpc3BsYXlCb3hJbmRleGVzOwogICAgICAgICAgICAg QVNTRVJUKGJveGVzWzBdLmlzUm9vdElubGluZUJveCgpKTsKICAgICAgICAgICAgIGZvciAoc2l6 ZV90IGluZGV4ID0gMTsgaW5kZXggPCBib3hlcy5zaXplKCk7ICsraW5kZXgpIHsKICAgICAgICAg ICAgICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gYm94ZXNbaW5kZXhdOwogICAgICAgICAgICAgICAg IGlmICghZGlzcGxheUJveC5pc05vblJvb3RJbmxpbmVCb3goKSkKICAgICAgICAgICAgICAgICAg ICAgY29udGludWU7CiAgICAgICAgICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gZGlzcGxheUJv eC5sYXlvdXRCb3goKTsKLSAgICAgICAgICAgICAgICBhdXRvIGlzRmlyc3RCb3hPbkN1cnJlbnRM aW5lID0gbGFzdERpc3BsYXlCb3hJbmRleGVzLnNldCgmbGF5b3V0Qm94LCBpbmRleCkuaXNOZXdF bnRyeTsKLSAgICAgICAgICAgICAgICBpZiAobGluZUJveC5pbmxpbmVMZXZlbEJveEZvckxheW91 dEJveChsYXlvdXRCb3gpLmlzRmlyc3RCb3goKSAmJiBpc0ZpcnN0Qm94T25DdXJyZW50TGluZSkK LSAgICAgICAgICAgICAgICAgICAgZGlzcGxheUJveC5zZXRJc0ZpcnN0Rm9yTGF5b3V0Qm94KHRy dWUpOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgZm9yIChhdXRvIGluZGV4IDogbGFzdERp c3BsYXlCb3hJbmRleGVzLnZhbHVlcygpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGxpbmVCb3gu aW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3goYm94ZXNbaW5kZXhdLmxheW91dEJveCgpKS5pc0xh c3RCb3goKSkKLSAgICAgICAgICAgICAgICAgICAgYm94ZXNbaW5kZXhdLnNldElzTGFzdEZvckxh eW91dEJveCh0cnVlKTsKKyAgICAgICAgICAgICAgICBpZiAobGluZUJveC5pbmxpbmVMZXZlbEJv eEZvckxheW91dEJveChsYXlvdXRCb3gpLmlzRmlyc3RCb3goKSkKKyAgICAgICAgICAgICAgICAg ICAgZmlyc3RMYXN0SW5saW5lQm94ZXMuZmlyc3QuYWRkKCZsYXlvdXRCb3gsIGluZGV4KTsKKyAg ICAgICAgICAgICAgICBpZiAobGluZUJveC5pbmxpbmVMZXZlbEJveEZvckxheW91dEJveChsYXlv dXRCb3gpLmlzTGFzdEJveCgpKQorICAgICAgICAgICAgICAgICAgICBmaXJzdExhc3RJbmxpbmVC b3hlcy5sYXN0LnNldCgmbGF5b3V0Qm94LCBpbmRleCk7CiAgICAgICAgICAgICB9CiAgICAgICAg IH07CiAgICAgICAgIGNvbXB1dGVJc0ZpcnN0SXNMYXN0Qm94KCk7CkBAIC02MTEsNyArNjE0LDcg QEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChj b25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnQKICAgICAgICAgICAgIGF1dG8gY29udGVudFJpZ2h0 SW5WaXN1YWxPcmRlciA9IGxpbmVCb3hMb2dpY2FsVG9wTGVmdC54KCkgKyBjb250ZW50U3RhcnRJ blZpc3VhbE9yZGVyOwogCiAgICAgICAgICAgICBmb3IgKGF1dG8gY2hpbGREaXNwbGF5Qm94Tm9k ZUluZGV4IDogZGlzcGxheUJveFRyZWUucm9vdCgpLmNoaWxkcmVuKQotICAgICAgICAgICAgICAg IGFkanVzdFZpc3VhbEdlb21ldHJ5Rm9yRGlzcGxheUJveChjaGlsZERpc3BsYXlCb3hOb2RlSW5k ZXgsIGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIsIGxpbmVCb3hMb2dpY2FsVG9wTGVmdC55KCks IGRpc3BsYXlCb3hUcmVlLCBib3hlcywgbGluZUJveCk7CisgICAgICAgICAgICAgICAgYWRqdXN0 VmlzdWFsR2VvbWV0cnlGb3JEaXNwbGF5Qm94KGNoaWxkRGlzcGxheUJveE5vZGVJbmRleCwgY29u dGVudFJpZ2h0SW5WaXN1YWxPcmRlciwgbGluZUJveExvZ2ljYWxUb3BMZWZ0LnkoKSwgZGlzcGxh eUJveFRyZWUsIGJveGVzLCBsaW5lQm94LCBmaXJzdExhc3RJbmxpbmVCb3hlcyk7CiAgICAgICAg IH07CiAgICAgICAgIGFkanVzdFZpc3VhbEdlb21ldHJ5V2l0aElubGluZUJveGVzKCk7CiAgICAg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIu aAppbmRleCA1YzQyNDEzYjBiNzdlMGQ2ODhhNTRkYTNkMjc5YjI4NTYzZDMzYzcwLi45MThmODQ2 MDc1ODk4NjI1MjQxZGEyNWUwMDkzMDY1ZjEzMTk1ZGRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVu dEJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaApAQCAtMzYsNiArMzYsNyBAQCBu YW1lc3BhY2UgTGF5b3V0IHsKIHN0cnVjdCBBbmNlc3RvclN0YWNrOwogY2xhc3MgQ29udGFpbmVy Qm94Owogc3RydWN0IERpc3BsYXlCb3hUcmVlOworc3RydWN0IEZpcnN0TGFzdElubGluZUJveGVz OwogY2xhc3MgSW5saW5lRm9ybWF0dGluZ1N0YXRlOwogY2xhc3MgTGluZUJveDsKIApAQCAtNjIs NyArNjMsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgYXBwZW5kSW5saW5lRGlzcGxheUJveEF0Qmlk aUJvdW5kYXJ5KGNvbnN0IEJveCYsIERpc3BsYXlCb3hlcyYpOwogCiAgICAgdm9pZCBzZXRJbmxp bmVCb3hHZW9tZXRyeShjb25zdCBCb3gmLCBjb25zdCBJbmxpbmVSZWN0JiwgYm9vbCBpc0ZpcnN0 SW5saW5lQm94RnJhZ21lbnQpOwotICAgIHZvaWQgYWRqdXN0VmlzdWFsR2VvbWV0cnlGb3JEaXNw bGF5Qm94KHNpemVfdCBkaXNwbGF5Qm94Tm9kZUluZGV4LCBJbmxpbmVMYXlvdXRVbml0JiBhY2N1 bXVsYXRlZE9mZnNldCwgSW5saW5lTGF5b3V0VW5pdCBsaW5lQm94TG9naWNhbFRvcCwgY29uc3Qg RGlzcGxheUJveFRyZWUmLCBEaXNwbGF5Qm94ZXMmLCBjb25zdCBMaW5lQm94Jik7CisgICAgdm9p ZCBhZGp1c3RWaXN1YWxHZW9tZXRyeUZvckRpc3BsYXlCb3goc2l6ZV90IGRpc3BsYXlCb3hOb2Rl SW5kZXgsIElubGluZUxheW91dFVuaXQmIGFjY3VtdWxhdGVkT2Zmc2V0LCBJbmxpbmVMYXlvdXRV bml0IGxpbmVCb3hMb2dpY2FsVG9wLCBjb25zdCBEaXNwbGF5Qm94VHJlZSYsIERpc3BsYXlCb3hl cyYsIGNvbnN0IExpbmVCb3gmLCBjb25zdCBGaXJzdExhc3RJbmxpbmVCb3hlcyYpOwogICAgIHNp emVfdCBlbnN1cmVEaXNwbGF5Qm94Rm9yQ29udGFpbmVyKGNvbnN0IENvbnRhaW5lckJveCYsIERp c3BsYXlCb3hUcmVlJiwgQW5jZXN0b3JTdGFjayYsIERpc3BsYXlCb3hlcyYpOwogCiAgICAgY29u c3QgQ29udGFpbmVyQm94JiByb290KCkgY29uc3QgeyByZXR1cm4gbV9mb3JtYXR0aW5nQ29udGV4 dFJvb3Q7IH0K 447457 2021-12-17 09:50:53 -0800 2021-12-17 11:00:07 -0800 Patch bug-234422-20211217095052.patch text/plain 9510 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjI4MjJjZDRkYWVhMzA3 NGVkOWQ0NzI0ODdhOWY0MjgzYjUzZTg3Ni4uMDE3NDAzMzJhYjdmMzBlODczNmM5Y2RiZTNiZWM5 ZTg3MmRhYzE4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTEyLTE3ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIExldCBjb21w dXRlSXNGaXJzdElzTGFzdEJveEZvcklubGluZUNvbnRlbnQgdXBkYXRlIHRoZSBJc0ZpcnN0Rm9y TGF5b3V0Qm94IG9uIHRoZSBkaXNwbGF5IGJveGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQ0MjIKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0 aSBLb2l2aXN0by4KKworICAgICAgICBDdXJyZW50bHkgd2UgcHJlLWNvbXB1dGUgdGhlc2UgdmFs dWVzIGFuZCBjYWNoZSB0aGVtIG9uIHRoZSBkaXNwbGF5IGJveGVzIChmb3IgbGF0ZXIgdXNlIGlu IGFkanVzdFZpc3VhbEdlb21ldHJ5Rm9yRGlzcGxheUJveCkuCisKKyAgICAgICAgKiBsYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6 OmFkanVzdFZpc3VhbEdlb21ldHJ5Rm9yRGlzcGxheUJveCk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KToK KyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXIuaDoKKwogMjAyMS0xMi0xNyAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBMaW5lIHNwYW5uaW5nIGlubGluZSBpdGVtcyBz aG91bGQgdXNlIElubGluZUl0ZW06Om9wYXF1ZUJpZGlMZXZlbApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNv bnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKaW5kZXggNzgzZTVlZjlm MzUzNzZkYzkxMjEzM2VkMTAyZjI1NmFkMzdhYmNkMi4uYmQyNzg5ZTU2MTA2MDQzNWY5ZGFlYjZl MDY4ZGU0MTBlNjFkZmVkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVE aXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCkBAIC00NTIsNyArNDUyLDEyIEBAIHNpemVfdCBJbmxp bmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmVuc3VyZURpc3BsYXlCb3hGb3JDb250YWluZXIoY29u c3QgQ29udGFpbmVyCiAgICAgcmV0dXJuIGNyZWF0ZWREaXNwbGF5Qm94Tm9kZUZvckNvbnRhaW5l ckJveEFuZFB1c2hUb0FuY2VzdG9yU3RhY2soY29udGFpbmVyQm94LCBib3hlcy5zaXplKCkgLSAx LCBlbmNsb3NpbmdEaXNwbGF5Qm94Tm9kZUluZGV4Rm9yQ29udGFpbmVyLCBkaXNwbGF5Qm94VHJl ZSwgYW5jZXN0b3JTdGFjayk7CiB9CiAKLXZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVy OjphZGp1c3RWaXN1YWxHZW9tZXRyeUZvckRpc3BsYXlCb3goc2l6ZV90IGRpc3BsYXlCb3hOb2Rl SW5kZXgsIElubGluZUxheW91dFVuaXQmIGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIsIElubGlu ZUxheW91dFVuaXQgbGluZUJveExvZ2ljYWxUb3AsIGNvbnN0IERpc3BsYXlCb3hUcmVlJiBkaXNw bGF5Qm94VHJlZSwgRGlzcGxheUJveGVzJiBib3hlcywgY29uc3QgTGluZUJveCYgbGluZUJveCkK K3N0cnVjdCBJc0ZpcnN0TGFzdEluZGV4IHsKKyAgICBzdGQ6Om9wdGlvbmFsPHNpemVfdD4gZmly c3Q7CisgICAgc3RkOjpvcHRpb25hbDxzaXplX3Q+IGxhc3Q7Cit9OwordXNpbmcgSXNGaXJzdExh c3RJbmRleGVzTWFwID0gSGFzaE1hcDxjb25zdCBCb3gqLCBJc0ZpcnN0TGFzdEluZGV4PjsKK3Zv aWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphZGp1c3RWaXN1YWxHZW9tZXRyeUZvckRp c3BsYXlCb3goc2l6ZV90IGRpc3BsYXlCb3hOb2RlSW5kZXgsIElubGluZUxheW91dFVuaXQmIGNv bnRlbnRSaWdodEluVmlzdWFsT3JkZXIsIElubGluZUxheW91dFVuaXQgbGluZUJveExvZ2ljYWxU b3AsIGNvbnN0IERpc3BsYXlCb3hUcmVlJiBkaXNwbGF5Qm94VHJlZSwgRGlzcGxheUJveGVzJiBi b3hlcywgY29uc3QgTGluZUJveCYgbGluZUJveCwgY29uc3QgSXNGaXJzdExhc3RJbmRleGVzTWFw JiBpc0ZpcnN0TGFzdEluZGV4ZXNNYXApCiB7CiAgICAgLy8gTm9uLWlubGluZSBib3ggZGlzcGxh eSBib3hlcyBqdXN0IG5lZWQgYSBob3Jpem9udGFsIGFkanVzdG1lbnQgd2hpbGUKICAgICAvLyBp bmxpbmUgYm94IHR5cGUgb2YgZGlzcGxheSBib3hlcyBuZWVkCkBAIC00NjksMTIgKzQ3NCwxNSBA QCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YWRqdXN0VmlzdWFsR2VvbWV0cnlG b3JEaXNwbGF5Qm94KHNpemVfdCBkaXNwbAogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAg YXV0byBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uID0gbGF5b3V0Qm94LnN0eWxlKCkuaXNMZWZ0VG9S aWdodERpcmVjdGlvbigpOwogICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRl KCkuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKKyAgICBhdXRvIGlzTGVmdFRvUmlnaHREaXJlY3Rp b24gPSBsYXlvdXRCb3guc3R5bGUoKS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCk7CisgICAgYXV0 byBpc0ZpcnN0TGFzdEluZGV4ZXMgPSBpc0ZpcnN0TGFzdEluZGV4ZXNNYXAuZ2V0KCZsYXlvdXRC b3gpOworICAgIGF1dG8gaXNGaXJzdEJveCA9IGlzRmlyc3RMYXN0SW5kZXhlcy5maXJzdCAmJiAq aXNGaXJzdExhc3RJbmRleGVzLmZpcnN0ID09IGRpc3BsYXlCb3hOb2RlSW5kZXg7CisgICAgYXV0 byBpc0xhc3RCb3ggPSBpc0ZpcnN0TGFzdEluZGV4ZXMubGFzdCAmJiAqaXNGaXJzdExhc3RJbmRl eGVzLmxhc3QgPT0gZGlzcGxheUJveE5vZGVJbmRleDsKICAgICBhdXRvIGJlZm9yZUlubGluZUJv eENvbnRlbnQgPSBbJl0gewogICAgICAgICBhdXRvIGxvZ2ljYWxSZWN0ID0gbGluZUJveC5sb2dp Y2FsQm9yZGVyQm94Rm9ySW5saW5lQm94KGxheW91dEJveCwgYm94R2VvbWV0cnkpOwogICAgICAg ICBhdXRvIHZpc3VhbFJlY3QgPSBJbmxpbmVSZWN0IHsgbGluZUJveExvZ2ljYWxUb3AgKyBsb2dp Y2FsUmVjdC50b3AoKSwgY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciwgeyB9LCBsb2dpY2FsUmVj dC5oZWlnaHQoKSB9OwotICAgICAgICBpZiAoIWRpc3BsYXlCb3guaXNGaXJzdEZvckxheW91dEJv eCgpKQorICAgICAgICBpZiAoIWlzRmlyc3RCb3gpCiAgICAgICAgICAgICByZXR1cm4gZGlzcGxh eUJveC5zZXRSZWN0KHZpc3VhbFJlY3QsIHZpc3VhbFJlY3QpOwogCiAgICAgICAgIGNvbnRlbnRS aWdodEluVmlzdWFsT3JkZXIgKz0gbWFyZ2luTGVmdChib3hHZW9tZXRyeSwgaXNMZWZ0VG9SaWdo dERpcmVjdGlvbik7CkBAIC00ODUsMTAgKzQ5MywxMCBAQCB2b2lkIElubGluZURpc3BsYXlDb250 ZW50QnVpbGRlcjo6YWRqdXN0VmlzdWFsR2VvbWV0cnlGb3JEaXNwbGF5Qm94KHNpemVfdCBkaXNw bAogICAgIGJlZm9yZUlubGluZUJveENvbnRlbnQoKTsKIAogICAgIGZvciAoYXV0byBjaGlsZERp c3BsYXlCb3hOb2RlSW5kZXggOiBkaXNwbGF5Qm94VHJlZS5hdChkaXNwbGF5Qm94Tm9kZUluZGV4 KS5jaGlsZHJlbikKLSAgICAgICAgYWRqdXN0VmlzdWFsR2VvbWV0cnlGb3JEaXNwbGF5Qm94KGNo aWxkRGlzcGxheUJveE5vZGVJbmRleCwgY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciwgbGluZUJv eExvZ2ljYWxUb3AsIGRpc3BsYXlCb3hUcmVlLCBib3hlcywgbGluZUJveCk7CisgICAgICAgIGFk anVzdFZpc3VhbEdlb21ldHJ5Rm9yRGlzcGxheUJveChjaGlsZERpc3BsYXlCb3hOb2RlSW5kZXgs IGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIsIGxpbmVCb3hMb2dpY2FsVG9wLCBkaXNwbGF5Qm94 VHJlZSwgYm94ZXMsIGxpbmVCb3gsIGlzRmlyc3RMYXN0SW5kZXhlc01hcCk7CiAKICAgICBhdXRv IGFmdGVySW5saW5lQm94Q29udGVudCA9IFsmXSB7Ci0gICAgICAgIGlmICghZGlzcGxheUJveC5p c0xhc3RGb3JMYXlvdXRCb3goKSkKKyAgICAgICAgaWYgKCFpc0xhc3RCb3gpCiAgICAgICAgICAg ICByZXR1cm4gZGlzcGxheUJveC5zZXRSaWdodChjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyKTsK IAogICAgICAgICBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyICs9IGJvcmRlclJpZ2h0KGJveEdl b21ldHJ5LCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKSArIHBhZGRpbmdSaWdodChib3hHZW9tZXRy eSwgaXNMZWZ0VG9SaWdodERpcmVjdGlvbik7CkBAIC01MDQsNyArNTEyLDcgQEAgdm9pZCBJbmxp bmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFkanVzdFZpc3VhbEdlb21ldHJ5Rm9yRGlzcGxheUJv eChzaXplX3QgZGlzcGwKICAgICB9OwogICAgIGNvbXB1dGVJbmtPdmVyZmxvdygpOwogCi0gICAg c2V0SW5saW5lQm94R2VvbWV0cnkobGF5b3V0Qm94LCBkaXNwbGF5Qm94LnJlY3QoKSwgZGlzcGxh eUJveC5pc0ZpcnN0Rm9yTGF5b3V0Qm94KCkpOworICAgIHNldElubGluZUJveEdlb21ldHJ5KGxh eW91dEJveCwgZGlzcGxheUJveC5yZWN0KCksIGlzRmlyc3RCb3gpOwogICAgIGlmIChsaW5lQm94 LmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCkuaGFzQ29udGVudCgpKQogICAg ICAgICBkaXNwbGF5Qm94LnNldEhhc0NvbnRlbnQoKTsKIH0KQEAgLTU4NiwyMSArNTk0LDI4IEBA IHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQoY29u c3QgTGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgY3JlYXRlRGlzcGxheUJveGVzSW5WaXN1YWxP cmRlcigpOwogCiAgICAgaWYgKGRpc3BsYXlCb3hUcmVlLmhhc0lubGluZUJveCgpKSB7CisgICAg ICAgIElzRmlyc3RMYXN0SW5kZXhlc01hcCBpc0ZpcnN0TGFzdEluZGV4ZXNNYXA7CiAgICAgICAg IGF1dG8gY29tcHV0ZUlzRmlyc3RJc0xhc3RCb3ggPSBbJl0gewotICAgICAgICAgICAgSGFzaE1h cDxjb25zdCBCb3gqLCBzaXplX3Q+IGxhc3REaXNwbGF5Qm94SW5kZXhlczsKICAgICAgICAgICAg IEFTU0VSVChib3hlc1swXS5pc1Jvb3RJbmxpbmVCb3goKSk7CiAgICAgICAgICAgICBmb3IgKHNp emVfdCBpbmRleCA9IDE7IGluZGV4IDwgYm94ZXMuc2l6ZSgpOyArK2luZGV4KSB7Ci0gICAgICAg ICAgICAgICAgYXV0byYgZGlzcGxheUJveCA9IGJveGVzW2luZGV4XTsKLSAgICAgICAgICAgICAg ICBpZiAoIWRpc3BsYXlCb3guaXNOb25Sb290SW5saW5lQm94KCkpCisgICAgICAgICAgICAgICAg aWYgKCFib3hlc1tpbmRleF0uaXNOb25Sb290SW5saW5lQm94KCkpCiAgICAgICAgICAgICAgICAg ICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGRpc3BsYXlC b3gubGF5b3V0Qm94KCk7Ci0gICAgICAgICAgICAgICAgYXV0byBpc0ZpcnN0Qm94T25DdXJyZW50 TGluZSA9IGxhc3REaXNwbGF5Qm94SW5kZXhlcy5zZXQoJmxheW91dEJveCwgaW5kZXgpLmlzTmV3 RW50cnk7Ci0gICAgICAgICAgICAgICAgaWYgKGxpbmVCb3guaW5saW5lTGV2ZWxCb3hGb3JMYXlv dXRCb3gobGF5b3V0Qm94KS5pc0ZpcnN0Qm94KCkgJiYgaXNGaXJzdEJveE9uQ3VycmVudExpbmUp Ci0gICAgICAgICAgICAgICAgICAgIGRpc3BsYXlCb3guc2V0SXNGaXJzdEZvckxheW91dEJveCh0 cnVlKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGZvciAoYXV0byBpbmRleCA6IGxhc3RE aXNwbGF5Qm94SW5kZXhlcy52YWx1ZXMoKSkgewotICAgICAgICAgICAgICAgIGlmIChsaW5lQm94 LmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGJveGVzW2luZGV4XS5sYXlvdXRCb3goKSkuaXNM YXN0Qm94KCkpCi0gICAgICAgICAgICAgICAgICAgIGJveGVzW2luZGV4XS5zZXRJc0xhc3RGb3JM YXlvdXRCb3godHJ1ZSk7CisgICAgICAgICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gYm94ZXNb aW5kZXhdLmxheW91dEJveCgpOworICAgICAgICAgICAgICAgIGF1dG8gaXNGaXJzdEJveCA9IGxp bmVCb3guaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94KS5pc0ZpcnN0Qm94KCk7 CisgICAgICAgICAgICAgICAgYXV0byBpc0xhc3RCb3ggPSBsaW5lQm94LmlubGluZUxldmVsQm94 Rm9yTGF5b3V0Qm94KGxheW91dEJveCkuaXNMYXN0Qm94KCk7CisgICAgICAgICAgICAgICAgaWYg KCFpc0ZpcnN0Qm94ICYmICFpc0xhc3RCb3gpCisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVl OworICAgICAgICAgICAgICAgIGlmIChpc0ZpcnN0Qm94KSB7CisgICAgICAgICAgICAgICAgICAg IGF1dG8gaXNGaXJzdExhc3RJbmRleGVzID0gaXNGaXJzdExhc3RJbmRleGVzTWFwLmdldCgmbGF5 b3V0Qm94KTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFpc0ZpcnN0TGFzdEluZGV4ZXMuZmly c3QgfHwgaXNMYXN0Qm94KQorICAgICAgICAgICAgICAgICAgICAgICAgaXNGaXJzdExhc3RJbmRl eGVzTWFwLnNldCgmbGF5b3V0Qm94LCBJc0ZpcnN0TGFzdEluZGV4IHsgaXNGaXJzdExhc3RJbmRl eGVzLmZpcnN0LnZhbHVlX29yKGluZGV4KSwgaXNMYXN0Qm94ID8gaW5kZXggOiBpc0ZpcnN0TGFz dEluZGV4ZXMubGFzdCB9KTsKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgICAgIGlmIChpc0xhc3RCb3gpIHsKKyAgICAgICAgICAg ICAgICAgICAgQVNTRVJUKCFpc0ZpcnN0Qm94KTsKKyAgICAgICAgICAgICAgICAgICAgaXNGaXJz dExhc3RJbmRleGVzTWFwLnNldCgmbGF5b3V0Qm94LCBJc0ZpcnN0TGFzdEluZGV4IHsgeyB9LCBp bmRleCB9KTsKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgfQogICAgICAgICB9OwogICAgICAgICBjb21wdXRlSXNGaXJzdElzTGFz dEJveCgpOwpAQCAtNjA5LDcgKzYyNCw3IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWls ZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAg ICAgICAgICBhdXRvIGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIgPSBsaW5lQm94TG9naWNhbFRv cExlZnQueCgpICsgY29udGVudFN0YXJ0SW5WaXN1YWxPcmRlcjsKIAogICAgICAgICAgICAgZm9y IChhdXRvIGNoaWxkRGlzcGxheUJveE5vZGVJbmRleCA6IGRpc3BsYXlCb3hUcmVlLnJvb3QoKS5j aGlsZHJlbikKLSAgICAgICAgICAgICAgICBhZGp1c3RWaXN1YWxHZW9tZXRyeUZvckRpc3BsYXlC b3goY2hpbGREaXNwbGF5Qm94Tm9kZUluZGV4LCBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyLCBs aW5lQm94TG9naWNhbFRvcExlZnQueSgpLCBkaXNwbGF5Qm94VHJlZSwgYm94ZXMsIGxpbmVCb3gp OworICAgICAgICAgICAgICAgIGFkanVzdFZpc3VhbEdlb21ldHJ5Rm9yRGlzcGxheUJveChjaGls ZERpc3BsYXlCb3hOb2RlSW5kZXgsIGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIsIGxpbmVCb3hM b2dpY2FsVG9wTGVmdC55KCksIGRpc3BsYXlCb3hUcmVlLCBib3hlcywgbGluZUJveCwgaXNGaXJz dExhc3RJbmRleGVzTWFwKTsKICAgICAgICAgfTsKICAgICAgICAgYWRqdXN0VmlzdWFsR2VvbWV0 cnlXaXRoSW5saW5lQm94ZXMoKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxk ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZURpc3BsYXlDb250ZW50QnVpbGRlci5oCmluZGV4IDVjNDI0MTNiMGI3N2UwZDY4OGE1NGRh M2QyNzliMjg1NjNkMzNjNzAuLmExZmZiYjU4Y2ZlNWQ4MDhjMWE0MTg3ZWI0YjdmODNhNjc0MGZh YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVp bGRlci5oCkBAIC0zNiw2ICszNiw3IEBAIG5hbWVzcGFjZSBMYXlvdXQgewogc3RydWN0IEFuY2Vz dG9yU3RhY2s7CiBjbGFzcyBDb250YWluZXJCb3g7CiBzdHJ1Y3QgRGlzcGxheUJveFRyZWU7Citz dHJ1Y3QgSXNGaXJzdExhc3RJbmRleDsKIGNsYXNzIElubGluZUZvcm1hdHRpbmdTdGF0ZTsKIGNs YXNzIExpbmVCb3g7CiAKQEAgLTYyLDcgKzYzLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGFwcGVu ZElubGluZURpc3BsYXlCb3hBdEJpZGlCb3VuZGFyeShjb25zdCBCb3gmLCBEaXNwbGF5Qm94ZXMm KTsKIAogICAgIHZvaWQgc2V0SW5saW5lQm94R2VvbWV0cnkoY29uc3QgQm94JiwgY29uc3QgSW5s aW5lUmVjdCYsIGJvb2wgaXNGaXJzdElubGluZUJveEZyYWdtZW50KTsKLSAgICB2b2lkIGFkanVz dFZpc3VhbEdlb21ldHJ5Rm9yRGlzcGxheUJveChzaXplX3QgZGlzcGxheUJveE5vZGVJbmRleCwg SW5saW5lTGF5b3V0VW5pdCYgYWNjdW11bGF0ZWRPZmZzZXQsIElubGluZUxheW91dFVuaXQgbGlu ZUJveExvZ2ljYWxUb3AsIGNvbnN0IERpc3BsYXlCb3hUcmVlJiwgRGlzcGxheUJveGVzJiwgY29u c3QgTGluZUJveCYpOworICAgIHZvaWQgYWRqdXN0VmlzdWFsR2VvbWV0cnlGb3JEaXNwbGF5Qm94 KHNpemVfdCBkaXNwbGF5Qm94Tm9kZUluZGV4LCBJbmxpbmVMYXlvdXRVbml0JiBhY2N1bXVsYXRl ZE9mZnNldCwgSW5saW5lTGF5b3V0VW5pdCBsaW5lQm94TG9naWNhbFRvcCwgY29uc3QgRGlzcGxh eUJveFRyZWUmLCBEaXNwbGF5Qm94ZXMmLCBjb25zdCBMaW5lQm94JiwgY29uc3QgSGFzaE1hcDxj b25zdCBCb3gqLCBJc0ZpcnN0TGFzdEluZGV4PiYpOwogICAgIHNpemVfdCBlbnN1cmVEaXNwbGF5 Qm94Rm9yQ29udGFpbmVyKGNvbnN0IENvbnRhaW5lckJveCYsIERpc3BsYXlCb3hUcmVlJiwgQW5j ZXN0b3JTdGFjayYsIERpc3BsYXlCb3hlcyYpOwogCiAgICAgY29uc3QgQ29udGFpbmVyQm94JiBy b290KCkgY29uc3QgeyByZXR1cm4gbV9mb3JtYXR0aW5nQ29udGV4dFJvb3Q7IH0K