222821 2021-03-05 13:39:51 -0800 [LFC][IFC] Provide a better estimate on the number of inline level boxes per line for LineBox. 2021-03-06 18:39:14 -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 1736515 0 zalan 2021-03-05 13:39:51 -0800 try to count them. 1736520 1 422409 zalan 2021-03-05 13:44:53 -0800 Created attachment 422409 Patch 1736780 2 422409 koivisto 2021-03-06 05:51:40 -0800 Comment on attachment 422409 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=422409&action=review > Source/WebCore/layout/inlineformatting/InlineLineBuilder.h:62 > + size_t inlineLevelBoxCount { 0 }; // Note that inline boxes spanning multiple lines may not be included in here. esitemated/approximateInlineLevelBoxCount or similar? 1736825 3 422501 zalan 2021-03-06 11:33:57 -0800 Created attachment 422501 Patch 1736851 4 422510 zalan 2021-03-06 15:34:00 -0800 Created attachment 422510 Patch 1736882 5 ews-feeder 2021-03-06 18:38:04 -0800 Committed r274048: <https://commits.webkit.org/r274048> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422510. 1736883 6 webkit-bug-importer 2021-03-06 18:39:14 -0800 <rdar://problem/75138898> 422409 2021-03-05 13:44:53 -0800 2021-03-06 11:33:55 -0800 Patch bug-222821-20210305134452.patch text/plain 10459 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjczOTc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjExZmZmNjBhMDExMTRh ZmJjYWMxYzVhZThkMzBkZDJjMDY1YTAzYy4uMGQyYTMxMmMyNjExNjkzZGM0NzRkNGY3N2UxNjBk N2M5MTJkMGIzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTAzLTA1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBQcm92aWRl IGEgYmV0dGVyIGVzdGltYXRlIG9uIHRoZSBudW1iZXIgb2YgaW5saW5lIGxldmVsIGJveGVzIHBl ciBsaW5lIGZvciBMaW5lQm94LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIyODIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTGV0J3MgY291bnRpbmcgdGhlIG51bWJlciBvZiBpbmxpbmUgbGV2ZWwgYm94 IG9uIHRoZSBsaW5lLiBJdCBpcyBhIG11Y2ggYmV0dGVyIGVzdGltYXRlIHRoYW4gdGhlIG51bWJl ciBvZiBydW5zIGV2ZW4KKyAgICAgICAgaWYgaXQgbWlzc2VzIHNvbWUgaW5saW5lIGJveGVzIHdo ZW4gdGhleSBzcGFuIG92ZXIgbXVsdGlwbGUgbGluZXMgKHRoZSBmYWlsIHJhdGUgaXMgfjElIG9u IG55dGltZXMuY29tKS4gCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZUJveEJ1aWxkZXI6OmJ1aWxkKToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6aW5p dGlhbGl6ZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVuZElubGluZUJv eFN0YXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBwZW5kTm9uUmVwbGFj ZWRJbmxpbmVMZXZlbEJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVu ZExpbmVCcmVhayk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjppbmxpbmVMZXZlbEJveENvdW50 IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6TGluZUJveCk6CisgICAg ICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oOgorICAgICAgICAq IGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmxheW91dElubGluZUNvbnRlbnQpOgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmg6CisKIDIw MjEtMDMtMDUgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZD XVtJRkNdIFJlcGxhY2VkIGFuZCBub24tcmVwbGFjZWQgaW5saW5lIGxldmVsIGJveCBzaG91bGQg bm90IGJlIGNhbGxlZCBpbmxpbmUgYm94ZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRp bmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IGYwYzlhNTM0OWJkYjM5NTBmZWFhYmU0NWUyZGM5 YmI5YTI4MDE1ZDEuLjIyYzQ2YzJlZmMwNzg4MTRlM2VhNWNjMWIwMDY2MTE5ZGJhMzkxOWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC0x NzksNyArMTc5LDcgQEAgTGluZUJveCBMaW5lQm94QnVpbGRlcjo6YnVpbGQoY29uc3QgTGluZUJ1 aWxkZXI6OkxpbmVDb250ZW50JiBsaW5lQ29udGVudCkKICAgICBhdXRvIGxpbmVMb2dpY2FsV2lk dGggPSBsaW5lQ29udGVudC5saW5lTG9naWNhbFdpZHRoOwogICAgIGF1dG8gY29udGVudExvZ2lj YWxXaWR0aCA9IGxpbmVDb250ZW50LmNvbnRlbnRMb2dpY2FsV2lkdGg7CiAgICAgYXV0byBob3Jp em9udGFsQWxpZ25tZW50T2Zmc2V0ID0gTGF5b3V0Ojpob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0 KHJ1bnMsIHJvb3RCb3goKS5zdHlsZSgpLnRleHRBbGlnbigpLCBsaW5lTG9naWNhbFdpZHRoLCBj b250ZW50TG9naWNhbFdpZHRoLCBsaW5lQ29udGVudC5pc0xhc3RMaW5lV2l0aElubGluZUNvbnRl bnQpOwotICAgIGF1dG8gbGluZUJveCA9IExpbmVCb3ggeyByb290Qm94KCksIGxpbmVDb250ZW50 LmxvZ2ljYWxUb3BMZWZ0LCBsaW5lTG9naWNhbFdpZHRoLCBob3Jpem9udGFsQWxpZ25tZW50T2Zm c2V0LnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCB7IH0pLCBjb250ZW50TG9naWNhbFdpZHRoLCBy dW5zLnNpemUoKSB9OworICAgIGF1dG8gbGluZUJveCA9IExpbmVCb3ggeyByb290Qm94KCksIGxp bmVDb250ZW50LmxvZ2ljYWxUb3BMZWZ0LCBsaW5lTG9naWNhbFdpZHRoLCBob3Jpem9udGFsQWxp Z25tZW50T2Zmc2V0LnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCB7IH0pLCBjb250ZW50TG9naWNh bFdpZHRoLCBsaW5lQ29udGVudC5pbmxpbmVMZXZlbEJveENvdW50IH07CiAgICAgY29uc3RydWN0 QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzKGxpbmVCb3gsIHJ1bnMpOwogICAgIHJldHVybiBsaW5l Qm94OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lLmNwcAppbmRleCAwMWJiODJmMWQ5NDM3OGNhMzNhZTlhZmUzNjkwY2MzY2Mx ZWExZjI3Li5kMjc1MTM1NmU2N2VmZmNhNGUzYzlmN2NiNDdhOTM0ZDU4NjMwODU1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l LmNwcApAQCAtNTIsNiArNTIsNyBAQCBMaW5lOjp+TGluZSgpCiAKIHZvaWQgTGluZTo6aW5pdGlh bGl6ZSgpCiB7CisgICAgbV9pbmxpbmVMZXZlbEJveENvdW50ID0gMDsKICAgICBtX2NvbnRlbnRM b2dpY2FsV2lkdGggPSB7IH07CiAgICAgbV9ydW5zLmNsZWFyKCk7CiAgICAgbV90cmFpbGluZ1Nv ZnRIeXBoZW5XaWR0aCA9IHsgfTsKQEAgLTIwMiw2ICsyMDMsNyBAQCB2b2lkIExpbmU6OmFwcGVu ZElubGluZUJveFN0YXJ0KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIElubGluZUxheW91 dFVuaXQgbAogICAgIC8vIFRoaXMgaXMgcmVhbGx5IGp1c3QgYSBwbGFjZWhvbGRlciB0byBtYXJr IHRoZSBzdGFydCBvZiB0aGUgaW5saW5lIGJveCA8c3Bhbj4uCiAgICAgYXV0byYgYm94R2VvbWV0 cnkgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KGlubGluZUl0ZW0ubGF5b3V0 Qm94KCkpOwogICAgIGF1dG8gYWRqdXN0ZWRSdW5TdGFydCA9IGNvbnRlbnRMb2dpY2FsUmlnaHQo KSArIHN0ZDo6bWluKGJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCksIDBfbHUpOworICAgICsrbV9p bmxpbmVMZXZlbEJveENvdW50OwogICAgIGFwcGVuZE5vbkJyZWFrYWJsZVNwYWNlKGlubGluZUl0 ZW0sIGFkanVzdGVkUnVuU3RhcnQsIGxvZ2ljYWxXaWR0aCk7CiB9CiAKQEAgLTI5MSw2ICsyOTMs NyBAQCB2b2lkIExpbmU6OmFwcGVuZE5vblJlcGxhY2VkSW5saW5lTGV2ZWxCb3goY29uc3QgSW5s aW5lSXRlbSYgaW5saW5lSXRlbSwgSW5saW5lTAogICAgIG1fdHJpbW1hYmxlVHJhaWxpbmdDb250 ZW50LnJlc2V0KCk7CiAgICAgbV90cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCA9IHsgfTsKICAgICBt X2NvbnRlbnRMb2dpY2FsV2lkdGggKz0gbWFyZ2luQm94TG9naWNhbFdpZHRoOworICAgICsrbV9p bmxpbmVMZXZlbEJveENvdW50OwogICAgIGF1dG8gbWFyZ2luU3RhcnQgPSBmb3JtYXR0aW5nQ29u dGV4dCgpLmdlb21ldHJ5Rm9yQm94KGlubGluZUl0ZW0ubGF5b3V0Qm94KCkpLm1hcmdpblN0YXJ0 KCk7CiAgICAgaWYgKG1hcmdpblN0YXJ0ID49IDApIHsKICAgICAgICAgbV9ydW5zLmFwcGVuZCh7 IGlubGluZUl0ZW0sIGNvbnRlbnRMb2dpY2FsUmlnaHQoKSwgbWFyZ2luQm94TG9naWNhbFdpZHRo IH0pOwpAQCAtMzEzLDggKzMxNiwxMCBAQCB2b2lkIExpbmU6OmFwcGVuZFJlcGxhY2VkSW5saW5l TGV2ZWxCb3goY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgSW5saW5lTGF5bwogdm9pZCBM aW5lOjphcHBlbmRMaW5lQnJlYWsoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSkKIHsKICAg ICBtX3RyYWlsaW5nU29mdEh5cGhlbldpZHRoID0geyB9OwotICAgIGlmIChpbmxpbmVJdGVtLmlz SGFyZExpbmVCcmVhaygpKQorICAgIGlmIChpbmxpbmVJdGVtLmlzSGFyZExpbmVCcmVhaygpKSB7 CisgICAgICAgICsrbV9pbmxpbmVMZXZlbEJveENvdW50OwogICAgICAgICByZXR1cm4gbV9ydW5z LmFwcGVuZCh7IGlubGluZUl0ZW0sIGNvbnRlbnRMb2dpY2FsUmlnaHQoKSwgMF9sdSB9KTsKKyAg ICB9CiAgICAgLy8gU29mdCBsaW5lIGJyZWFrcyAocHJlc2VydmVkIG5ldyBsaW5lIGNoYXJhY3Rl cnMpIHJlcXVpcmUgaW5saW5lIHRleHQgYm94ZXMgZm9yIGNvbXBhdGliaWxpdHkgcmVhc29ucy4K ICAgICBBU1NFUlQoaW5saW5lSXRlbS5pc1NvZnRMaW5lQnJlYWsoKSk7CiAgICAgbV9ydW5zLmFw cGVuZCh7IGRvd25jYXN0PElubGluZVNvZnRMaW5lQnJlYWtJdGVtPihpbmxpbmVJdGVtKSwgY29u dGVudExvZ2ljYWxSaWdodCgpIH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCmluZGV4IDMyNDQ5NzRiZGRmZjBiNDhmY2M2MTE4 NTJlODQ0MTgyYTlkMTNkZGQuLmJjMDRkMTRhOTQ5OThjZWE1M2UxODg2OWFkZGE5ZDdjYjA2ZmMx NzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lLmgKQEAgLTQ4LDYgKzQ4LDcgQEAgcHVibGljOgogCiAgICAgSW5saW5lTGF5b3V0 VW5pdCBjb250ZW50TG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50TG9naWNh bFdpZHRoOyB9CiAgICAgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFJpZ2h0KCkgY29u c3QgeyByZXR1cm4gbV9ydW5zLmlzRW1wdHkoKSA/IDAuMGYgOiBtX3J1bnMubGFzdCgpLmxvZ2lj YWxSaWdodCgpOyB9CisgICAgc2l6ZV90IGlubGluZUxldmVsQm94Q291bnQoKSBjb25zdCB7IHJl dHVybiBtX2lubGluZUxldmVsQm94Q291bnQ7IH0KIAogICAgIElubGluZUxheW91dFVuaXQgdHJp bW1hYmxlVHJhaWxpbmdXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fdHJpbW1hYmxlVHJhaWxpbmdD b250ZW50LndpZHRoKCk7IH0KICAgICBib29sIGlzVHJhaWxpbmdSdW5GdWxseVRyaW1tYWJsZSgp IGNvbnN0IHsgcmV0dXJuIG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50LmlzVHJhaWxpbmdSdW5G dWxseVRyaW1tYWJsZSgpOyB9CkBAIC0xNzAsNiArMTcxLDcgQEAgcHJpdmF0ZToKICAgICBSdW5M aXN0IG1fcnVuczsKICAgICBUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQgbV90cmltbWFibGVUcmFp bGluZ0NvbnRlbnQ7CiAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2NvbnRlbnRMb2dpY2FsV2lkdGgg eyAwIH07CisgICAgc2l6ZV90IG1faW5saW5lTGV2ZWxCb3hDb3VudCB7IDAgfTsKICAgICBPcHRp b25hbDxJbmxpbmVMYXlvdXRVbml0PiBtX3RyYWlsaW5nU29mdEh5cGhlbldpZHRoIHsgMCB9Owog fTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lQm94LmNwcAppbmRleCBiN2VlYzQ1NTI5NmExYzcwMzZmMDFhZWMzZThhOGU1 MjM0YmQ2ZjMxLi5iNTg1OTNjMWFlMjM0NmQ5NjAzYWM1YzRhNTBmNzhkZTg0ZjQwMzY0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lQm94LmNwcApAQCAtODMsMTMgKzgzLDEzIEBAIGJvb2wgTGluZUJveDo6SW5saW5lTGV2 ZWxCb3g6Omhhc0xpbmVCb3hSZWxhdGl2ZUFsaWdubWVudCgpIGNvbnN0CiAgICAgcmV0dXJuIHZl cnRpY2FsQWxpZ25tZW50ID09IFZlcnRpY2FsQWxpZ246OlRvcCB8fCB2ZXJ0aWNhbEFsaWdubWVu dCA9PSBWZXJ0aWNhbEFsaWduOjpCb3R0b207CiB9CiAKLUxpbmVCb3g6OkxpbmVCb3goY29uc3Qg Qm94JiByb290TGF5b3V0Qm94LCBjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbG9naWNhbFRvcGxl ZnQsIElubGluZUxheW91dFVuaXQgbGluZUxvZ2ljYWxXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBj b250ZW50TG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCwg c2l6ZV90IG51bWJlck9mUnVucykKK0xpbmVCb3g6OkxpbmVCb3goY29uc3QgQm94JiByb290TGF5 b3V0Qm94LCBjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbG9naWNhbFRvcGxlZnQsIElubGluZUxh eW91dFVuaXQgbGluZUxvZ2ljYWxXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNh bExlZnQsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCwgc2l6ZV90IG51bWJl ck9mSW5saW5lTGV2ZWxCb3hlcykKICAgICA6IG1fbG9naWNhbFJlY3QobG9naWNhbFRvcGxlZnQs IElubGluZUxheW91dFNpemUgeyBsaW5lTG9naWNhbFdpZHRoLCB7IH0gfSkKICAgICAsIG1fY29u dGVudExvZ2ljYWxXaWR0aChjb250ZW50TG9naWNhbFdpZHRoKQogICAgICwgbV9yb290SW5saW5l Qm94KHJvb3RMYXlvdXRCb3gsIGNvbnRlbnRMb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0U2l6ZSB7 IGNvbnRlbnRMb2dpY2FsV2lkdGgsIHsgfSB9LCBJbmxpbmVMZXZlbEJveDo6VHlwZTo6Um9vdElu bGluZUJveCkKIHsKLSAgICBtX25vblJvb3RJbmxpbmVMZXZlbEJveExpc3QucmVzZXJ2ZUluaXRp YWxDYXBhY2l0eShudW1iZXJPZlJ1bnMpOwotICAgIG1fbm9uUm9vdElubGluZUxldmVsQm94TWFw LnJlc2VydmVJbml0aWFsQ2FwYWNpdHkobnVtYmVyT2ZSdW5zKTsKKyAgICBtX25vblJvb3RJbmxp bmVMZXZlbEJveExpc3QucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShudW1iZXJPZklubGluZUxldmVs Qm94ZXMpOworICAgIG1fbm9uUm9vdElubGluZUxldmVsQm94TWFwLnJlc2VydmVJbml0aWFsQ2Fw YWNpdHkobnVtYmVyT2ZJbmxpbmVMZXZlbEJveGVzKTsKIH0KIAogdm9pZCBMaW5lQm94OjphZGRJ bmxpbmVMZXZlbEJveChJbmxpbmVMZXZlbEJveCYmIGlubGluZUxldmVsQm94KQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5o IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5o CmluZGV4IDM2MWE1YzkzYjJmM2I2MzkwZDE4MmIzNWRjZTI1MDlhNzBiZTVhZjcuLjQ5YmY2NmVi NzIxYjM1MjI2OTYxODAwMjc0MmU1ZTBlNjNiOTIwYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKQEAgLTEzMyw3 ICsxMzMsNyBAQCBwdWJsaWM6CiAgICAgICAgIFR5cGUgbV90eXBlIHsgVHlwZTo6SW5saW5lQm94 IH07CiAgICAgfTsKIAotICAgIExpbmVCb3goY29uc3QgQm94JiByb290TGF5b3V0Qm94LCBjb25z dCBJbmxpbmVMYXlvdXRQb2ludCYgbG9naWNhbFRvcExlZnQsIElubGluZUxheW91dFVuaXQgY29u dGVudExvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxpbmVMb2dpY2FsV2lkdGgsIElubGlu ZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCwgc2l6ZV90IG51bWJlck9mUnVucyk7Cisg ICAgTGluZUJveChjb25zdCBCb3gmIHJvb3RMYXlvdXRCb3gsIGNvbnN0IElubGluZUxheW91dFBv aW50JiBsb2dpY2FsVG9wTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQs IElubGluZUxheW91dFVuaXQgbGluZUxvZ2ljYWxXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBjb250 ZW50TG9naWNhbFdpZHRoLCBzaXplX3QgbnVtYmVyT2ZJbmxpbmVMZXZlbEJveGVzKTsKIAogICAg IGNvbnN0IElubGluZVJlY3QmIGxvZ2ljYWxSZWN0KCkgY29uc3QgeyByZXR1cm4gbV9sb2dpY2Fs UmVjdDsgfQogICAgIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1 cm4gbG9naWNhbFNpemUoKS53aWR0aCgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXgg ODgxM2I3N2QyNDA5YjNkNGQyZjdlYzE3NWNjMTFiYTJlZTkwNjRkYi4uYTg0OTVkM2UzN2UyM2I1 N2NiNjc1OGVmNjkyMmFmNTc3OGFmZmFlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcApAQCAt MjY5LDYgKzI2OSw3IEBAIExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCBMaW5lQnVpbGRlcjo6bGF5 b3V0SW5saW5lQ29udGVudChjb25zdCBJbmxpbmVJdGVtUmFuZ2UmCiAgICAgICAgICwgbV9saW5l TG9naWNhbFJlY3Qud2lkdGgoKQogICAgICAgICAsIG1fbGluZS5jb250ZW50TG9naWNhbFdpZHRo KCkKICAgICAgICAgLCBpc0xhc3RMaW5lCisgICAgICAgICwgbV9saW5lLmlubGluZUxldmVsQm94 Q291bnQoKQogICAgICAgICAsIG1fbGluZS5ydW5zKCl9OwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIu aAppbmRleCA1MGJiM2QxMTQxYzYxZGQwYzQ5OGQ3NDkyYzBkMTNmMzk4YjkyZWI0Li5jYmZkNzQ3 M2QzZDE3N2FhYjcxZGJmZGYwNjkzZmVkNTQ0YTk2OTY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgK QEAgLTU5LDYgKzU5LDcgQEAgcHVibGljOgogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxpbmVM b2dpY2FsV2lkdGg7CiAgICAgICAgIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0 aDsKICAgICAgICAgYm9vbCBpc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQgeyB0cnVlIH07Cisg ICAgICAgIHNpemVfdCBpbmxpbmVMZXZlbEJveENvdW50IHsgMCB9OyAvLyBOb3RlIHRoYXQgaW5s aW5lIGJveGVzIHNwYW5uaW5nIG11bHRpcGxlIGxpbmVzIG1heSBub3QgYmUgaW5jbHVkZWQgaW4g aGVyZS4KICAgICAgICAgY29uc3QgTGluZTo6UnVuTGlzdCYgcnVuczsKICAgICB9OwogICAgIExp bmVDb250ZW50IGxheW91dElubGluZUNvbnRlbnQoY29uc3QgSW5saW5lSXRlbVJhbmdlJiwgc2l6 ZV90IHBhcnRpYWxMZWFkaW5nQ29udGVudExlbmd0aCwgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5p dD4gbGVhZGluZ0xvZ2ljYWxXaWR0aCwgY29uc3QgSW5saW5lUmVjdCYgaW5pdGlhbExpbmVMb2dp Y2FsUmVjdCwgYm9vbCBpc0ZpcnN0TGluZSk7Cg== 422501 2021-03-06 11:33:57 -0800 2021-03-06 15:33:57 -0800 Patch bug-222821-20210306113357.patch text/plain 10500 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjUyYjg5YjMyNGQxZTE0 N2E5ZjAyZGI3MTEyMDE2MDMxZDBhZjk5Zi4uM2VmNTc2YmQzN2NmZmU1N2FiZWQwZWM0YjNmMmMz ZWRjYjg2ODYyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTAzLTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBQcm92aWRl IGEgYmV0dGVyIGVzdGltYXRlIG9uIHRoZSBudW1iZXIgb2YgaW5saW5lIGxldmVsIGJveGVzIHBl ciBsaW5lIGZvciBMaW5lQm94LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIyODIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8u CisKKyAgICAgICAgTGV0J3MgY291bnRpbmcgdGhlIG51bWJlciBvZiBpbmxpbmUgbGV2ZWwgYm94 IG9uIHRoZSBsaW5lLiBJdCBpcyBhIG11Y2ggYmV0dGVyIGVzdGltYXRlIHRoYW4gdGhlIG51bWJl ciBvZiBydW5zIGV2ZW4KKyAgICAgICAgaWYgaXQgbWlzc2VzIHNvbWUgaW5saW5lIGJveGVzIHdo ZW4gdGhleSBzcGFuIG92ZXIgbXVsdGlwbGUgbGluZXMgKHRoZSBmYWlsIHJhdGUgaXMgfjElIG9u IG55dGltZXMuY29tKS4gCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZUJveEJ1aWxkZXI6OmJ1aWxkKToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6aW5p dGlhbGl6ZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVuZElubGluZUJv eFN0YXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBwZW5kTm9uUmVwbGFj ZWRJbmxpbmVMZXZlbEJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVu ZExpbmVCcmVhayk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjppbmxpbmVMZXZlbEJveENvdW50 IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6TGluZUJveCk6CisgICAg ICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oOgorICAgICAgICAq IGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmxheW91dElubGluZUNvbnRlbnQpOgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmg6CisKIDIw MjEtMDMtMDYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbUmVu ZGVyVHJlZUJ1aWxkZXJdIEludmFsaWRhdGUgYmVmb3JlQ2hpbGQgd2hlbiBwYXJlbnQgY2hhbmdl cyB0byBSdWJ5QmFzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21l dHJ5LmNwcAppbmRleCBmMGM5YTUzNDliZGIzOTUwZmVhYWJlNDVlMmRjOWJiOWEyODAxNWQxLi5l ZDViODY0NTUzYjkwOWU1YzNiODhmMTZjOGZhNjA3MTMyMjMwMjQxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMTc5LDcgKzE3OSw3IEBA IExpbmVCb3ggTGluZUJveEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29u dGVudCYgbGluZUNvbnRlbnQpCiAgICAgYXV0byBsaW5lTG9naWNhbFdpZHRoID0gbGluZUNvbnRl bnQubGluZUxvZ2ljYWxXaWR0aDsKICAgICBhdXRvIGNvbnRlbnRMb2dpY2FsV2lkdGggPSBsaW5l Q29udGVudC5jb250ZW50TG9naWNhbFdpZHRoOwogICAgIGF1dG8gaG9yaXpvbnRhbEFsaWdubWVu dE9mZnNldCA9IExheW91dDo6aG9yaXpvbnRhbEFsaWdubWVudE9mZnNldChydW5zLCByb290Qm94 KCkuc3R5bGUoKS50ZXh0QWxpZ24oKSwgbGluZUxvZ2ljYWxXaWR0aCwgY29udGVudExvZ2ljYWxX aWR0aCwgbGluZUNvbnRlbnQuaXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50KTsKLSAgICBhdXRv IGxpbmVCb3ggPSBMaW5lQm94IHsgcm9vdEJveCgpLCBsaW5lQ29udGVudC5sb2dpY2FsVG9wTGVm dCwgbGluZUxvZ2ljYWxXaWR0aCwgaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldC52YWx1ZU9yKElu bGluZUxheW91dFVuaXQgeyB9KSwgY29udGVudExvZ2ljYWxXaWR0aCwgcnVucy5zaXplKCkgfTsK KyAgICBhdXRvIGxpbmVCb3ggPSBMaW5lQm94IHsgcm9vdEJveCgpLCBsaW5lQ29udGVudC5sb2dp Y2FsVG9wTGVmdCwgbGluZUxvZ2ljYWxXaWR0aCwgaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldC52 YWx1ZU9yKElubGluZUxheW91dFVuaXQgeyB9KSwgY29udGVudExvZ2ljYWxXaWR0aCwgbGluZUNv bnRlbnQubm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50IH07CiAgICAgY29uc3RydWN0QW5k QWxpZ25JbmxpbmVMZXZlbEJveGVzKGxpbmVCb3gsIHJ1bnMpOwogICAgIHJldHVybiBsaW5lQm94 OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lLmNwcAppbmRleCAwMWJiODJmMWQ5NDM3OGNhMzNhZTlhZmUzNjkwY2MzY2MxZWEx ZjI3Li4yYmEzNzQ3YjYxODdjY2YzMzRjMWI2ZTZiMjU3ZGEwZGMwOTNmZTYxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNw cApAQCAtNTIsNiArNTIsNyBAQCBMaW5lOjp+TGluZSgpCiAKIHZvaWQgTGluZTo6aW5pdGlhbGl6 ZSgpCiB7CisgICAgbV9ub25TcGFubmluZ0lubGluZUxldmVsQm94Q291bnQgPSAwOwogICAgIG1f Y29udGVudExvZ2ljYWxXaWR0aCA9IHsgfTsKICAgICBtX3J1bnMuY2xlYXIoKTsKICAgICBtX3Ry YWlsaW5nU29mdEh5cGhlbldpZHRoID0geyB9OwpAQCAtMjAyLDYgKzIwMyw3IEBAIHZvaWQgTGlu ZTo6YXBwZW5kSW5saW5lQm94U3RhcnQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgSW5s aW5lTGF5b3V0VW5pdCBsCiAgICAgLy8gVGhpcyBpcyByZWFsbHkganVzdCBhIHBsYWNlaG9sZGVy IHRvIG1hcmsgdGhlIHN0YXJ0IG9mIHRoZSBpbmxpbmUgYm94IDxzcGFuPi4KICAgICBhdXRvJiBi b3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3goaW5saW5lSXRl bS5sYXlvdXRCb3goKSk7CiAgICAgYXV0byBhZGp1c3RlZFJ1blN0YXJ0ID0gY29udGVudExvZ2lj YWxSaWdodCgpICsgc3RkOjptaW4oYm94R2VvbWV0cnkubWFyZ2luU3RhcnQoKSwgMF9sdSk7Cisg ICAgKyttX25vblNwYW5uaW5nSW5saW5lTGV2ZWxCb3hDb3VudDsKICAgICBhcHBlbmROb25CcmVh a2FibGVTcGFjZShpbmxpbmVJdGVtLCBhZGp1c3RlZFJ1blN0YXJ0LCBsb2dpY2FsV2lkdGgpOwog fQogCkBAIC0yOTEsNiArMjkzLDcgQEAgdm9pZCBMaW5lOjphcHBlbmROb25SZXBsYWNlZElubGlu ZUxldmVsQm94KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIElubGluZUwKICAgICBtX3Ry aW1tYWJsZVRyYWlsaW5nQ29udGVudC5yZXNldCgpOwogICAgIG1fdHJhaWxpbmdTb2Z0SHlwaGVu V2lkdGggPSB7IH07CiAgICAgbV9jb250ZW50TG9naWNhbFdpZHRoICs9IG1hcmdpbkJveExvZ2lj YWxXaWR0aDsKKyAgICArK21fbm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50OwogICAgIGF1 dG8gbWFyZ2luU3RhcnQgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KGlubGlu ZUl0ZW0ubGF5b3V0Qm94KCkpLm1hcmdpblN0YXJ0KCk7CiAgICAgaWYgKG1hcmdpblN0YXJ0ID49 IDApIHsKICAgICAgICAgbV9ydW5zLmFwcGVuZCh7IGlubGluZUl0ZW0sIGNvbnRlbnRMb2dpY2Fs UmlnaHQoKSwgbWFyZ2luQm94TG9naWNhbFdpZHRoIH0pOwpAQCAtMzEzLDggKzMxNiwxMCBAQCB2 b2lkIExpbmU6OmFwcGVuZFJlcGxhY2VkSW5saW5lTGV2ZWxCb3goY29uc3QgSW5saW5lSXRlbSYg aW5saW5lSXRlbSwgSW5saW5lTGF5bwogdm9pZCBMaW5lOjphcHBlbmRMaW5lQnJlYWsoY29uc3Qg SW5saW5lSXRlbSYgaW5saW5lSXRlbSkKIHsKICAgICBtX3RyYWlsaW5nU29mdEh5cGhlbldpZHRo ID0geyB9OwotICAgIGlmIChpbmxpbmVJdGVtLmlzSGFyZExpbmVCcmVhaygpKQorICAgIGlmIChp bmxpbmVJdGVtLmlzSGFyZExpbmVCcmVhaygpKSB7CisgICAgICAgICsrbV9ub25TcGFubmluZ0lu bGluZUxldmVsQm94Q291bnQ7CiAgICAgICAgIHJldHVybiBtX3J1bnMuYXBwZW5kKHsgaW5saW5l SXRlbSwgY29udGVudExvZ2ljYWxSaWdodCgpLCAwX2x1IH0pOworICAgIH0KICAgICAvLyBTb2Z0 IGxpbmUgYnJlYWtzIChwcmVzZXJ2ZWQgbmV3IGxpbmUgY2hhcmFjdGVycykgcmVxdWlyZSBpbmxp bmUgdGV4dCBib3hlcyBmb3IgY29tcGF0aWJpbGl0eSByZWFzb25zLgogICAgIEFTU0VSVChpbmxp bmVJdGVtLmlzU29mdExpbmVCcmVhaygpKTsKICAgICBtX3J1bnMuYXBwZW5kKHsgZG93bmNhc3Q8 SW5saW5lU29mdExpbmVCcmVha0l0ZW0+KGlubGluZUl0ZW0pLCBjb250ZW50TG9naWNhbFJpZ2h0 KCkgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lLmgKaW5kZXggMzI0NDk3NGJkZGZmMGI0OGZjYzYxMTg1MmU4NDQxODJhOWQxM2Rk ZC4uZmUzMzUxOTUyMWFhOWU0Zjk2YTc5MzRhZWQ4YzAzMmNjOWU3OTNmNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaApAQCAt NDgsNiArNDgsNyBAQCBwdWJsaWM6CiAKICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dp Y2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRMb2dpY2FsV2lkdGg7IH0KICAgICBJ bmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsUmlnaHQoKSBjb25zdCB7IHJldHVybiBtX3J1 bnMuaXNFbXB0eSgpID8gMC4wZiA6IG1fcnVucy5sYXN0KCkubG9naWNhbFJpZ2h0KCk7IH0KKyAg ICBzaXplX3Qgbm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50KCkgY29uc3QgeyByZXR1cm4g bV9ub25TcGFubmluZ0lubGluZUxldmVsQm94Q291bnQ7IH0KIAogICAgIElubGluZUxheW91dFVu aXQgdHJpbW1hYmxlVHJhaWxpbmdXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fdHJpbW1hYmxlVHJh aWxpbmdDb250ZW50LndpZHRoKCk7IH0KICAgICBib29sIGlzVHJhaWxpbmdSdW5GdWxseVRyaW1t YWJsZSgpIGNvbnN0IHsgcmV0dXJuIG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50LmlzVHJhaWxp bmdSdW5GdWxseVRyaW1tYWJsZSgpOyB9CkBAIC0xNzAsNiArMTcxLDcgQEAgcHJpdmF0ZToKICAg ICBSdW5MaXN0IG1fcnVuczsKICAgICBUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQgbV90cmltbWFi bGVUcmFpbGluZ0NvbnRlbnQ7CiAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2NvbnRlbnRMb2dpY2Fs V2lkdGggeyAwIH07CisgICAgc2l6ZV90IG1fbm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50 IHsgMCB9OwogICAgIE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IG1fdHJhaWxpbmdTb2Z0SHlw aGVuV2lkdGggeyAwIH07CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCmluZGV4IGI3ZWVjNDU1Mjk2YTFj NzAzNmYwMWFlYzNlOGE4ZTUyMzRiZDZmMzEuLmVkMjEzYWUwMWNhYTM5NWE3OTg0MjExOGI5OTk3 MjMxZThkMjBlMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCkBAIC04MywxMyArODMsMTMgQEAgYm9vbCBM aW5lQm94OjpJbmxpbmVMZXZlbEJveDo6aGFzTGluZUJveFJlbGF0aXZlQWxpZ25tZW50KCkgY29u c3QKICAgICByZXR1cm4gdmVydGljYWxBbGlnbm1lbnQgPT0gVmVydGljYWxBbGlnbjo6VG9wIHx8 IHZlcnRpY2FsQWxpZ25tZW50ID09IFZlcnRpY2FsQWxpZ246OkJvdHRvbTsKIH0KIAotTGluZUJv eDo6TGluZUJveChjb25zdCBCb3gmIHJvb3RMYXlvdXRCb3gsIGNvbnN0IElubGluZUxheW91dFBv aW50JiBsb2dpY2FsVG9wbGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsaW5lTG9naWNhbFdpZHRoLCBJ bmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBjb250 ZW50TG9naWNhbFdpZHRoLCBzaXplX3QgbnVtYmVyT2ZSdW5zKQorTGluZUJveDo6TGluZUJveChj b25zdCBCb3gmIHJvb3RMYXlvdXRCb3gsIGNvbnN0IElubGluZUxheW91dFBvaW50JiBsb2dpY2Fs VG9wbGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsaW5lTG9naWNhbFdpZHRoLCBJbmxpbmVMYXlvdXRV bml0IGNvbnRlbnRMb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdp ZHRoLCBzaXplX3Qgbm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50KQogICAgIDogbV9sb2dp Y2FsUmVjdChsb2dpY2FsVG9wbGVmdCwgSW5saW5lTGF5b3V0U2l6ZSB7IGxpbmVMb2dpY2FsV2lk dGgsIHsgfSB9KQogICAgICwgbV9jb250ZW50TG9naWNhbFdpZHRoKGNvbnRlbnRMb2dpY2FsV2lk dGgpCiAgICAgLCBtX3Jvb3RJbmxpbmVCb3gocm9vdExheW91dEJveCwgY29udGVudExvZ2ljYWxM ZWZ0LCBJbmxpbmVMYXlvdXRTaXplIHsgY29udGVudExvZ2ljYWxXaWR0aCwgeyB9IH0sIElubGlu ZUxldmVsQm94OjpUeXBlOjpSb290SW5saW5lQm94KQogewotICAgIG1fbm9uUm9vdElubGluZUxl dmVsQm94TGlzdC5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KG51bWJlck9mUnVucyk7Ci0gICAgbV9u b25Sb290SW5saW5lTGV2ZWxCb3hNYXAucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShudW1iZXJPZlJ1 bnMpOworICAgIG1fbm9uUm9vdElubGluZUxldmVsQm94TGlzdC5yZXNlcnZlSW5pdGlhbENhcGFj aXR5KG5vblNwYW5uaW5nSW5saW5lTGV2ZWxCb3hDb3VudCk7CisgICAgbV9ub25Sb290SW5saW5l TGV2ZWxCb3hNYXAucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShub25TcGFubmluZ0lubGluZUxldmVs Qm94Q291bnQpOwogfQogCiB2b2lkIExpbmVCb3g6OmFkZElubGluZUxldmVsQm94KElubGluZUxl dmVsQm94JiYgaW5saW5lTGV2ZWxCb3gpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKaW5kZXggMzYxYTVjOTNiMmYzYjYz OTBkMTgyYjM1ZGNlMjUwOWE3MGJlNWFmNy4uNjkyZTk2NjM4MzhlZDMyYThkZGIxOWI1ZmVhZDI0 Njk3OTlmMWMxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lTGluZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmVCb3guaApAQCAtMTMzLDcgKzEzMyw3IEBAIHB1YmxpYzoKICAg ICAgICAgVHlwZSBtX3R5cGUgeyBUeXBlOjpJbmxpbmVCb3ggfTsKICAgICB9OwogCi0gICAgTGlu ZUJveChjb25zdCBCb3gmIHJvb3RMYXlvdXRCb3gsIGNvbnN0IElubGluZUxheW91dFBvaW50JiBs b2dpY2FsVG9wTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQsIElubGlu ZUxheW91dFVuaXQgbGluZUxvZ2ljYWxXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9n aWNhbFdpZHRoLCBzaXplX3QgbnVtYmVyT2ZSdW5zKTsKKyAgICBMaW5lQm94KGNvbnN0IEJveCYg cm9vdExheW91dEJveCwgY29uc3QgSW5saW5lTGF5b3V0UG9pbnQmIGxvZ2ljYWxUb3BMZWZ0LCBJ bmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsaW5l TG9naWNhbFdpZHRoLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGgsIHNpemVf dCBub25TcGFubmluZ0lubGluZUxldmVsQm94Q291bnQpOwogCiAgICAgY29uc3QgSW5saW5lUmVj dCYgbG9naWNhbFJlY3QoKSBjb25zdCB7IHJldHVybiBtX2xvZ2ljYWxSZWN0OyB9CiAgICAgSW5s aW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsU2l6ZSgp LndpZHRoKCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCA4ODEzYjc3ZDI0MDliM2Q0 ZDJmN2VjMTc1Y2MxMWJhMmVlOTA2NGRiLi5lYmIwZmFlYTU1NTc3NDVhYzQxNTJjZjQ1MDIwZmVm Y2ZhM2RjYjBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0yNjksNiArMjY5LDcgQEAg TGluZUJ1aWxkZXI6OkxpbmVDb250ZW50IExpbmVCdWlsZGVyOjpsYXlvdXRJbmxpbmVDb250ZW50 KGNvbnN0IElubGluZUl0ZW1SYW5nZSYKICAgICAgICAgLCBtX2xpbmVMb2dpY2FsUmVjdC53aWR0 aCgpCiAgICAgICAgICwgbV9saW5lLmNvbnRlbnRMb2dpY2FsV2lkdGgoKQogICAgICAgICAsIGlz TGFzdExpbmUKKyAgICAgICAgLCBtX2xpbmUubm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50 KCkKICAgICAgICAgLCBtX2xpbmUucnVucygpfTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKaW5k ZXggNTBiYjNkMTE0MWM2MWRkMGM0OThkNzQ5MmMwZDEzZjM5OGI5MmViNC4uMGUyMTcxNTA1ZWZm YjQyZmRmMGIzMjE2NDNiMzQzZDhjNTVmY2FlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCkBAIC01 OSw2ICs1OSw3IEBAIHB1YmxpYzoKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsaW5lTG9naWNh bFdpZHRoOwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGg7CiAg ICAgICAgIGJvb2wgaXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50IHsgdHJ1ZSB9OworICAgICAg ICBzaXplX3Qgbm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50IHsgMCB9OwogICAgICAgICBj b25zdCBMaW5lOjpSdW5MaXN0JiBydW5zOwogICAgIH07CiAgICAgTGluZUNvbnRlbnQgbGF5b3V0 SW5saW5lQ29udGVudChjb25zdCBJbmxpbmVJdGVtUmFuZ2UmLCBzaXplX3QgcGFydGlhbExlYWRp bmdDb250ZW50TGVuZ3RoLCBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBsZWFkaW5nTG9naWNh bFdpZHRoLCBjb25zdCBJbmxpbmVSZWN0JiBpbml0aWFsTGluZUxvZ2ljYWxSZWN0LCBib29sIGlz Rmlyc3RMaW5lKTsK 422510 2021-03-06 15:34:00 -0800 2021-03-06 18:38:05 -0800 Patch bug-222821-20210306153359.patch text/plain 10500 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjUyYjg5YjMyNGQxZTE0 N2E5ZjAyZGI3MTEyMDE2MDMxZDBhZjk5Zi4uM2VmNTc2YmQzN2NmZmU1N2FiZWQwZWM0YjNmMmMz ZWRjYjg2ODYyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTAzLTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBQcm92aWRl IGEgYmV0dGVyIGVzdGltYXRlIG9uIHRoZSBudW1iZXIgb2YgaW5saW5lIGxldmVsIGJveGVzIHBl ciBsaW5lIGZvciBMaW5lQm94LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIyODIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8u CisKKyAgICAgICAgTGV0J3MgY291bnRpbmcgdGhlIG51bWJlciBvZiBpbmxpbmUgbGV2ZWwgYm94 IG9uIHRoZSBsaW5lLiBJdCBpcyBhIG11Y2ggYmV0dGVyIGVzdGltYXRlIHRoYW4gdGhlIG51bWJl ciBvZiBydW5zIGV2ZW4KKyAgICAgICAgaWYgaXQgbWlzc2VzIHNvbWUgaW5saW5lIGJveGVzIHdo ZW4gdGhleSBzcGFuIG92ZXIgbXVsdGlwbGUgbGluZXMgKHRoZSBmYWlsIHJhdGUgaXMgfjElIG9u IG55dGltZXMuY29tKS4gCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZUJveEJ1aWxkZXI6OmJ1aWxkKToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6aW5p dGlhbGl6ZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVuZElubGluZUJv eFN0YXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBwZW5kTm9uUmVwbGFj ZWRJbmxpbmVMZXZlbEJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVu ZExpbmVCcmVhayk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjppbmxpbmVMZXZlbEJveENvdW50 IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6TGluZUJveCk6CisgICAg ICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oOgorICAgICAgICAq IGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmxheW91dElubGluZUNvbnRlbnQpOgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmg6CisKIDIw MjEtMDMtMDYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbUmVu ZGVyVHJlZUJ1aWxkZXJdIEludmFsaWRhdGUgYmVmb3JlQ2hpbGQgd2hlbiBwYXJlbnQgY2hhbmdl cyB0byBSdWJ5QmFzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21l dHJ5LmNwcAppbmRleCBmMGM5YTUzNDliZGIzOTUwZmVhYWJlNDVlMmRjOWJiOWEyODAxNWQxLi5l ZDViODY0NTUzYjkwOWU1YzNiODhmMTZjOGZhNjA3MTMyMjMwMjQxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMTc5LDcgKzE3OSw3IEBA IExpbmVCb3ggTGluZUJveEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29u dGVudCYgbGluZUNvbnRlbnQpCiAgICAgYXV0byBsaW5lTG9naWNhbFdpZHRoID0gbGluZUNvbnRl bnQubGluZUxvZ2ljYWxXaWR0aDsKICAgICBhdXRvIGNvbnRlbnRMb2dpY2FsV2lkdGggPSBsaW5l Q29udGVudC5jb250ZW50TG9naWNhbFdpZHRoOwogICAgIGF1dG8gaG9yaXpvbnRhbEFsaWdubWVu dE9mZnNldCA9IExheW91dDo6aG9yaXpvbnRhbEFsaWdubWVudE9mZnNldChydW5zLCByb290Qm94 KCkuc3R5bGUoKS50ZXh0QWxpZ24oKSwgbGluZUxvZ2ljYWxXaWR0aCwgY29udGVudExvZ2ljYWxX aWR0aCwgbGluZUNvbnRlbnQuaXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50KTsKLSAgICBhdXRv IGxpbmVCb3ggPSBMaW5lQm94IHsgcm9vdEJveCgpLCBsaW5lQ29udGVudC5sb2dpY2FsVG9wTGVm dCwgbGluZUxvZ2ljYWxXaWR0aCwgaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldC52YWx1ZU9yKElu bGluZUxheW91dFVuaXQgeyB9KSwgY29udGVudExvZ2ljYWxXaWR0aCwgcnVucy5zaXplKCkgfTsK KyAgICBhdXRvIGxpbmVCb3ggPSBMaW5lQm94IHsgcm9vdEJveCgpLCBsaW5lQ29udGVudC5sb2dp Y2FsVG9wTGVmdCwgbGluZUxvZ2ljYWxXaWR0aCwgaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldC52 YWx1ZU9yKElubGluZUxheW91dFVuaXQgeyB9KSwgY29udGVudExvZ2ljYWxXaWR0aCwgbGluZUNv bnRlbnQubm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50IH07CiAgICAgY29uc3RydWN0QW5k QWxpZ25JbmxpbmVMZXZlbEJveGVzKGxpbmVCb3gsIHJ1bnMpOwogICAgIHJldHVybiBsaW5lQm94 OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lLmNwcAppbmRleCAwMWJiODJmMWQ5NDM3OGNhMzNhZTlhZmUzNjkwY2MzY2MxZWEx ZjI3Li4yYmEzNzQ3YjYxODdjY2YzMzRjMWI2ZTZiMjU3ZGEwZGMwOTNmZTYxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNw cApAQCAtNTIsNiArNTIsNyBAQCBMaW5lOjp+TGluZSgpCiAKIHZvaWQgTGluZTo6aW5pdGlhbGl6 ZSgpCiB7CisgICAgbV9ub25TcGFubmluZ0lubGluZUxldmVsQm94Q291bnQgPSAwOwogICAgIG1f Y29udGVudExvZ2ljYWxXaWR0aCA9IHsgfTsKICAgICBtX3J1bnMuY2xlYXIoKTsKICAgICBtX3Ry YWlsaW5nU29mdEh5cGhlbldpZHRoID0geyB9OwpAQCAtMjAyLDYgKzIwMyw3IEBAIHZvaWQgTGlu ZTo6YXBwZW5kSW5saW5lQm94U3RhcnQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgSW5s aW5lTGF5b3V0VW5pdCBsCiAgICAgLy8gVGhpcyBpcyByZWFsbHkganVzdCBhIHBsYWNlaG9sZGVy IHRvIG1hcmsgdGhlIHN0YXJ0IG9mIHRoZSBpbmxpbmUgYm94IDxzcGFuPi4KICAgICBhdXRvJiBi b3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3goaW5saW5lSXRl bS5sYXlvdXRCb3goKSk7CiAgICAgYXV0byBhZGp1c3RlZFJ1blN0YXJ0ID0gY29udGVudExvZ2lj YWxSaWdodCgpICsgc3RkOjptaW4oYm94R2VvbWV0cnkubWFyZ2luU3RhcnQoKSwgMF9sdSk7Cisg ICAgKyttX25vblNwYW5uaW5nSW5saW5lTGV2ZWxCb3hDb3VudDsKICAgICBhcHBlbmROb25CcmVh a2FibGVTcGFjZShpbmxpbmVJdGVtLCBhZGp1c3RlZFJ1blN0YXJ0LCBsb2dpY2FsV2lkdGgpOwog fQogCkBAIC0yOTEsNiArMjkzLDcgQEAgdm9pZCBMaW5lOjphcHBlbmROb25SZXBsYWNlZElubGlu ZUxldmVsQm94KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIElubGluZUwKICAgICBtX3Ry aW1tYWJsZVRyYWlsaW5nQ29udGVudC5yZXNldCgpOwogICAgIG1fdHJhaWxpbmdTb2Z0SHlwaGVu V2lkdGggPSB7IH07CiAgICAgbV9jb250ZW50TG9naWNhbFdpZHRoICs9IG1hcmdpbkJveExvZ2lj YWxXaWR0aDsKKyAgICArK21fbm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50OwogICAgIGF1 dG8gbWFyZ2luU3RhcnQgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KGlubGlu ZUl0ZW0ubGF5b3V0Qm94KCkpLm1hcmdpblN0YXJ0KCk7CiAgICAgaWYgKG1hcmdpblN0YXJ0ID49 IDApIHsKICAgICAgICAgbV9ydW5zLmFwcGVuZCh7IGlubGluZUl0ZW0sIGNvbnRlbnRMb2dpY2Fs UmlnaHQoKSwgbWFyZ2luQm94TG9naWNhbFdpZHRoIH0pOwpAQCAtMzEzLDggKzMxNiwxMCBAQCB2 b2lkIExpbmU6OmFwcGVuZFJlcGxhY2VkSW5saW5lTGV2ZWxCb3goY29uc3QgSW5saW5lSXRlbSYg aW5saW5lSXRlbSwgSW5saW5lTGF5bwogdm9pZCBMaW5lOjphcHBlbmRMaW5lQnJlYWsoY29uc3Qg SW5saW5lSXRlbSYgaW5saW5lSXRlbSkKIHsKICAgICBtX3RyYWlsaW5nU29mdEh5cGhlbldpZHRo ID0geyB9OwotICAgIGlmIChpbmxpbmVJdGVtLmlzSGFyZExpbmVCcmVhaygpKQorICAgIGlmIChp bmxpbmVJdGVtLmlzSGFyZExpbmVCcmVhaygpKSB7CisgICAgICAgICsrbV9ub25TcGFubmluZ0lu bGluZUxldmVsQm94Q291bnQ7CiAgICAgICAgIHJldHVybiBtX3J1bnMuYXBwZW5kKHsgaW5saW5l SXRlbSwgY29udGVudExvZ2ljYWxSaWdodCgpLCAwX2x1IH0pOworICAgIH0KICAgICAvLyBTb2Z0 IGxpbmUgYnJlYWtzIChwcmVzZXJ2ZWQgbmV3IGxpbmUgY2hhcmFjdGVycykgcmVxdWlyZSBpbmxp bmUgdGV4dCBib3hlcyBmb3IgY29tcGF0aWJpbGl0eSByZWFzb25zLgogICAgIEFTU0VSVChpbmxp bmVJdGVtLmlzU29mdExpbmVCcmVhaygpKTsKICAgICBtX3J1bnMuYXBwZW5kKHsgZG93bmNhc3Q8 SW5saW5lU29mdExpbmVCcmVha0l0ZW0+KGlubGluZUl0ZW0pLCBjb250ZW50TG9naWNhbFJpZ2h0 KCkgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lLmgKaW5kZXggMzI0NDk3NGJkZGZmMGI0OGZjYzYxMTg1MmU4NDQxODJhOWQxM2Rk ZC4uZmUzMzUxOTUyMWFhOWU0Zjk2YTc5MzRhZWQ4YzAzMmNjOWU3OTNmNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaApAQCAt NDgsNiArNDgsNyBAQCBwdWJsaWM6CiAKICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dp Y2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRMb2dpY2FsV2lkdGg7IH0KICAgICBJ bmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsUmlnaHQoKSBjb25zdCB7IHJldHVybiBtX3J1 bnMuaXNFbXB0eSgpID8gMC4wZiA6IG1fcnVucy5sYXN0KCkubG9naWNhbFJpZ2h0KCk7IH0KKyAg ICBzaXplX3Qgbm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50KCkgY29uc3QgeyByZXR1cm4g bV9ub25TcGFubmluZ0lubGluZUxldmVsQm94Q291bnQ7IH0KIAogICAgIElubGluZUxheW91dFVu aXQgdHJpbW1hYmxlVHJhaWxpbmdXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fdHJpbW1hYmxlVHJh aWxpbmdDb250ZW50LndpZHRoKCk7IH0KICAgICBib29sIGlzVHJhaWxpbmdSdW5GdWxseVRyaW1t YWJsZSgpIGNvbnN0IHsgcmV0dXJuIG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50LmlzVHJhaWxp bmdSdW5GdWxseVRyaW1tYWJsZSgpOyB9CkBAIC0xNzAsNiArMTcxLDcgQEAgcHJpdmF0ZToKICAg ICBSdW5MaXN0IG1fcnVuczsKICAgICBUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQgbV90cmltbWFi bGVUcmFpbGluZ0NvbnRlbnQ7CiAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2NvbnRlbnRMb2dpY2Fs V2lkdGggeyAwIH07CisgICAgc2l6ZV90IG1fbm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50 IHsgMCB9OwogICAgIE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IG1fdHJhaWxpbmdTb2Z0SHlw aGVuV2lkdGggeyAwIH07CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCmluZGV4IGI3ZWVjNDU1Mjk2YTFj NzAzNmYwMWFlYzNlOGE4ZTUyMzRiZDZmMzEuLmVkMjEzYWUwMWNhYTM5NWE3OTg0MjExOGI5OTk3 MjMxZThkMjBlMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCkBAIC04MywxMyArODMsMTMgQEAgYm9vbCBM aW5lQm94OjpJbmxpbmVMZXZlbEJveDo6aGFzTGluZUJveFJlbGF0aXZlQWxpZ25tZW50KCkgY29u c3QKICAgICByZXR1cm4gdmVydGljYWxBbGlnbm1lbnQgPT0gVmVydGljYWxBbGlnbjo6VG9wIHx8 IHZlcnRpY2FsQWxpZ25tZW50ID09IFZlcnRpY2FsQWxpZ246OkJvdHRvbTsKIH0KIAotTGluZUJv eDo6TGluZUJveChjb25zdCBCb3gmIHJvb3RMYXlvdXRCb3gsIGNvbnN0IElubGluZUxheW91dFBv aW50JiBsb2dpY2FsVG9wbGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsaW5lTG9naWNhbFdpZHRoLCBJ bmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBjb250 ZW50TG9naWNhbFdpZHRoLCBzaXplX3QgbnVtYmVyT2ZSdW5zKQorTGluZUJveDo6TGluZUJveChj b25zdCBCb3gmIHJvb3RMYXlvdXRCb3gsIGNvbnN0IElubGluZUxheW91dFBvaW50JiBsb2dpY2Fs VG9wbGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsaW5lTG9naWNhbFdpZHRoLCBJbmxpbmVMYXlvdXRV bml0IGNvbnRlbnRMb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdp ZHRoLCBzaXplX3Qgbm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50KQogICAgIDogbV9sb2dp Y2FsUmVjdChsb2dpY2FsVG9wbGVmdCwgSW5saW5lTGF5b3V0U2l6ZSB7IGxpbmVMb2dpY2FsV2lk dGgsIHsgfSB9KQogICAgICwgbV9jb250ZW50TG9naWNhbFdpZHRoKGNvbnRlbnRMb2dpY2FsV2lk dGgpCiAgICAgLCBtX3Jvb3RJbmxpbmVCb3gocm9vdExheW91dEJveCwgY29udGVudExvZ2ljYWxM ZWZ0LCBJbmxpbmVMYXlvdXRTaXplIHsgY29udGVudExvZ2ljYWxXaWR0aCwgeyB9IH0sIElubGlu ZUxldmVsQm94OjpUeXBlOjpSb290SW5saW5lQm94KQogewotICAgIG1fbm9uUm9vdElubGluZUxl dmVsQm94TGlzdC5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KG51bWJlck9mUnVucyk7Ci0gICAgbV9u b25Sb290SW5saW5lTGV2ZWxCb3hNYXAucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShudW1iZXJPZlJ1 bnMpOworICAgIG1fbm9uUm9vdElubGluZUxldmVsQm94TGlzdC5yZXNlcnZlSW5pdGlhbENhcGFj aXR5KG5vblNwYW5uaW5nSW5saW5lTGV2ZWxCb3hDb3VudCk7CisgICAgbV9ub25Sb290SW5saW5l TGV2ZWxCb3hNYXAucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShub25TcGFubmluZ0lubGluZUxldmVs Qm94Q291bnQpOwogfQogCiB2b2lkIExpbmVCb3g6OmFkZElubGluZUxldmVsQm94KElubGluZUxl dmVsQm94JiYgaW5saW5lTGV2ZWxCb3gpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKaW5kZXggMzYxYTVjOTNiMmYzYjYz OTBkMTgyYjM1ZGNlMjUwOWE3MGJlNWFmNy4uNjkyZTk2NjM4MzhlZDMyYThkZGIxOWI1ZmVhZDI0 Njk3OTlmMWMxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lTGluZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmVCb3guaApAQCAtMTMzLDcgKzEzMyw3IEBAIHB1YmxpYzoKICAg ICAgICAgVHlwZSBtX3R5cGUgeyBUeXBlOjpJbmxpbmVCb3ggfTsKICAgICB9OwogCi0gICAgTGlu ZUJveChjb25zdCBCb3gmIHJvb3RMYXlvdXRCb3gsIGNvbnN0IElubGluZUxheW91dFBvaW50JiBs b2dpY2FsVG9wTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQsIElubGlu ZUxheW91dFVuaXQgbGluZUxvZ2ljYWxXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9n aWNhbFdpZHRoLCBzaXplX3QgbnVtYmVyT2ZSdW5zKTsKKyAgICBMaW5lQm94KGNvbnN0IEJveCYg cm9vdExheW91dEJveCwgY29uc3QgSW5saW5lTGF5b3V0UG9pbnQmIGxvZ2ljYWxUb3BMZWZ0LCBJ bmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsaW5l TG9naWNhbFdpZHRoLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGgsIHNpemVf dCBub25TcGFubmluZ0lubGluZUxldmVsQm94Q291bnQpOwogCiAgICAgY29uc3QgSW5saW5lUmVj dCYgbG9naWNhbFJlY3QoKSBjb25zdCB7IHJldHVybiBtX2xvZ2ljYWxSZWN0OyB9CiAgICAgSW5s aW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsU2l6ZSgp LndpZHRoKCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCA4ODEzYjc3ZDI0MDliM2Q0 ZDJmN2VjMTc1Y2MxMWJhMmVlOTA2NGRiLi5lYmIwZmFlYTU1NTc3NDVhYzQxNTJjZjQ1MDIwZmVm Y2ZhM2RjYjBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0yNjksNiArMjY5LDcgQEAg TGluZUJ1aWxkZXI6OkxpbmVDb250ZW50IExpbmVCdWlsZGVyOjpsYXlvdXRJbmxpbmVDb250ZW50 KGNvbnN0IElubGluZUl0ZW1SYW5nZSYKICAgICAgICAgLCBtX2xpbmVMb2dpY2FsUmVjdC53aWR0 aCgpCiAgICAgICAgICwgbV9saW5lLmNvbnRlbnRMb2dpY2FsV2lkdGgoKQogICAgICAgICAsIGlz TGFzdExpbmUKKyAgICAgICAgLCBtX2xpbmUubm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50 KCkKICAgICAgICAgLCBtX2xpbmUucnVucygpfTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKaW5k ZXggNTBiYjNkMTE0MWM2MWRkMGM0OThkNzQ5MmMwZDEzZjM5OGI5MmViNC4uMGUyMTcxNTA1ZWZm YjQyZmRmMGIzMjE2NDNiMzQzZDhjNTVmY2FlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCkBAIC01 OSw2ICs1OSw3IEBAIHB1YmxpYzoKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsaW5lTG9naWNh bFdpZHRoOwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGg7CiAg ICAgICAgIGJvb2wgaXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50IHsgdHJ1ZSB9OworICAgICAg ICBzaXplX3Qgbm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50IHsgMCB9OwogICAgICAgICBj b25zdCBMaW5lOjpSdW5MaXN0JiBydW5zOwogICAgIH07CiAgICAgTGluZUNvbnRlbnQgbGF5b3V0 SW5saW5lQ29udGVudChjb25zdCBJbmxpbmVJdGVtUmFuZ2UmLCBzaXplX3QgcGFydGlhbExlYWRp bmdDb250ZW50TGVuZ3RoLCBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBsZWFkaW5nTG9naWNh bFdpZHRoLCBjb25zdCBJbmxpbmVSZWN0JiBpbml0aWFsTGluZUxvZ2ljYWxSZWN0LCBib29sIGlz Rmlyc3RMaW5lKTsK