238850 2022-04-05 16:26:29 -0700 [CSS-Contain] Grid layout should take "contain: inline-size" into account when computing the grid item's logical width 2022-04-06 08:04:14 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn jfernandez koivisto kondapallykalyan pdr rego simon.fraser svillar webkit-bug-importer zalan oldest_to_newest 1858642 0 zalan 2022-04-05 16:26:29 -0700 ssia 1858646 1 456765 zalan 2022-04-05 16:30:46 -0700 Created attachment 456765 Patch 1858827 2 ews-feeder 2022-04-06 08:03:14 -0700 Committed r292465 (249316@main): <https://commits.webkit.org/249316@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456765. 1858828 3 webkit-bug-importer 2022-04-06 08:04:14 -0700 <rdar://problem/91353843> 456765 2022-04-05 16:30:46 -0700 2022-04-06 08:03:17 -0700 Patch bug-238850-20220405163045.patch text/plain 11653 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMjY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYThiZjlhODQ4ZjBjMThh ZTc3NDQ5ODY0NGNkYzllMDIwNDIyMDE3MS4uNWM0NThjYzdiYzk0NDI3OWZlNGYwM2RiNWY5NzIz YWE3ZGZkNTIyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIyLTA0LTA1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTLUNvbnRhaW5dIEdyaWQg bGF5b3V0IHNob3VsZCB0YWtlICJjb250YWluOiBpbmxpbmUtc2l6ZSIgaW50byBhY2NvdW50IHdo ZW4gY29tcHV0aW5nIHRoZSBncmlkIGl0ZW0ncyBsb2dpY2FsIHdpZHRoCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg4NTAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJZ25vcmUgZ3JpZCBpdGVtJ3MgbG9n aWNhbCB3aWR0aCB3aGVuICJjb250YWluOiBpbmxpbmUtc2l6ZSIgaXMgcHJlc2VudCAoaS5lLiBp Z25vcmUgZGVzY2VuZGFudCBjb250ZW50IGluIGlubGluZSBkaXJlY3Rpb24gd2hlbiBzaXppbmcp LgorCisgICAgICAgICogcmVuZGVyaW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpHcmlkVHJhY2tTaXppbmdBbGdvcml0aG06OmNvbXB1dGVHcmlkQ29u dGFpbmVySW50cmluc2ljU2l6ZXMpOgorICAgICAgICAoV2ViQ29yZTo6R3JpZFRyYWNrU2l6aW5n QWxnb3JpdGhtU3RyYXRlZ3k6Om1pbkNvbnRlbnRGb3JDaGlsZCBjb25zdCk6CisgICAgICAgIChX ZWJDb3JlOjpHcmlkVHJhY2tTaXppbmdBbGdvcml0aG1TdHJhdGVneTo6bWF4Q29udGVudEZvckNo aWxkIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkdyaWRUcmFja1NpemluZ0FsZ29yaXRobVN0 cmF0ZWd5OjptaW5TaXplRm9yQ2hpbGQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6R3JpZFRy YWNrU2l6aW5nQWxnb3JpdGhtU3RyYXRlZ3k6Om1pbkxvZ2ljYWxTaXplRm9yQ2hpbGQgY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6R3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtOjphZHZhbmNlTmV4 dFN0YXRlKToKKyAgICAgICAgKiByZW5kZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmg6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyR3JpZDo6bGF5b3V0QmxvY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6 Y29tcHV0ZUVtcHR5VHJhY2tzRm9yQXV0b1JlcGVhdCBjb25zdCk6CisKIDIwMjItMDQtMDUgIEFs YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtDU1MtQ29udGFpbl0gRmxl eCBsYXlvdXQgc2hvdWxkIHRha2UgImNvbnRhaW46IGlubGluZS1zaXplIiBpbnRvIGFjY291bnQg d2hlbiBjb21wdXRpbmcgdGhlIGZsZXggaXRlbSdzIGxvZ2ljYWwgd2lkdGgKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5jcHAKaW5k ZXggMGZjYmE3ZWFkYTdkNzhiNGNhZWE0YzgxYjI0ZGVjMTE5MWE3Y2EyZC4uZTIxZjQwZGNmZGI3 OGQzOWIxNzgyMWEzNjBhYzQwOWU5ODZiODA4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5jcHAKQEAgLTc4Myw3ICs3ODMs NyBAQCB2b2lkIEdyaWRUcmFja1NpemluZ0FsZ29yaXRobTo6Y29tcHV0ZUdyaWRDb250YWluZXJJ bnRyaW5zaWNTaXplcygpCiAKICAgICBWZWN0b3I8R3JpZFRyYWNrPiYgYWxsVHJhY2tzID0gdHJh Y2tzKG1fZGlyZWN0aW9uKTsKICAgICBmb3IgKGF1dG8mIHRyYWNrIDogYWxsVHJhY2tzKSB7Ci0g ICAgICAgIEFTU0VSVChtX3N0cmF0ZWd5LT5pc0NvbXB1dGluZ1NpemVDb250YWlubWVudCgpIHx8 ICF0cmFjay5pbmZpbml0ZUdyb3d0aFBvdGVudGlhbCgpKTsKKyAgICAgICAgQVNTRVJUKG1fc3Ry YXRlZ3ktPmlzQ29tcHV0aW5nU2l6ZUNvbnRhaW5tZW50KCkgfHwgbV9zdHJhdGVneS0+aXNDb21w dXRpbmdJbmxpbmVTaXplQ29udGFpbm1lbnQoKSB8fCAhdHJhY2suaW5maW5pdGVHcm93dGhQb3Rl bnRpYWwoKSk7CiAgICAgICAgIG1fbWluQ29udGVudFNpemUgKz0gdHJhY2suYmFzZVNpemUoKTsK ICAgICAgICAgbV9tYXhDb250ZW50U2l6ZSArPSB0cmFjay5ncm93dGhMaW1pdElzSW5maW5pdGUo KSA/IHRyYWNrLmJhc2VTaXplKCkgOiB0cmFjay5ncm93dGhMaW1pdCgpOwogICAgICAgICAvLyBU aGUgZ3Jvd3RoIGxpbWl0IGNhcHMgbXVzdCBiZSBjbGVhcmVkIG5vdyBpbiBvcmRlciB0byBwcm9w ZXJseSBzb3J0CkBAIC04MTUsNiArODE1LDggQEAgTGF5b3V0VW5pdCBHcmlkVHJhY2tTaXppbmdB bGdvcml0aG1TdHJhdGVneTo6bWluQ29udGVudEZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQKIHsK ICAgICBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gY2hpbGRJbmxpbmVEaXJlY3Rpb24gPSBHcmlk TGF5b3V0RnVuY3Rpb25zOjpmbG93QXdhcmVEaXJlY3Rpb25Gb3JDaGlsZCgqcmVuZGVyR3JpZCgp LCBjaGlsZCwgRm9yQ29sdW1ucyk7CiAgICAgaWYgKGRpcmVjdGlvbigpID09IGNoaWxkSW5saW5l RGlyZWN0aW9uKSB7CisgICAgICAgIGlmIChpc0NvbXB1dGluZ0lubGluZVNpemVDb250YWlubWVu dCgpKQorICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAgICAgICAgLy8gRklYTUU6IEl0J3MgdW5j bGVhciBpZiB3ZSBzaG91bGQgcmV0dXJuIHRoZSBpbnRyaW5zaWMgd2lkdGggb3IgdGhlIHByZWZl cnJlZCB3aWR0aC4KICAgICAgICAgLy8gU2VlIGh0dHA6Ly9saXN0cy53My5vcmcvQXJjaGl2ZXMv UHVibGljL3d3dy1zdHlsZS8yMDEzSmFuLzAyNDUuaHRtbAogICAgICAgICBpZiAoY2hpbGQubmVl ZHNQcmVmZXJyZWRXaWR0aHNSZWNhbGN1bGF0aW9uKCkpCkBAIC04MzgsNiArODQwLDggQEAgTGF5 b3V0VW5pdCBHcmlkVHJhY2tTaXppbmdBbGdvcml0aG1TdHJhdGVneTo6bWF4Q29udGVudEZvckNo aWxkKFJlbmRlckJveCYgY2hpbGQKIHsKICAgICBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gY2hp bGRJbmxpbmVEaXJlY3Rpb24gPSBHcmlkTGF5b3V0RnVuY3Rpb25zOjpmbG93QXdhcmVEaXJlY3Rp b25Gb3JDaGlsZCgqcmVuZGVyR3JpZCgpLCBjaGlsZCwgRm9yQ29sdW1ucyk7CiAgICAgaWYgKGRp cmVjdGlvbigpID09IGNoaWxkSW5saW5lRGlyZWN0aW9uKSB7CisgICAgICAgIGlmIChpc0NvbXB1 dGluZ0lubGluZVNpemVDb250YWlubWVudCgpKQorICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAg ICAgICAgLy8gRklYTUU6IEl0J3MgdW5jbGVhciBpZiB3ZSBzaG91bGQgcmV0dXJuIHRoZSBpbnRy aW5zaWMgd2lkdGggb3IgdGhlIHByZWZlcnJlZCB3aWR0aC4KICAgICAgICAgLy8gU2VlIGh0dHA6 Ly9saXN0cy53My5vcmcvQXJjaGl2ZXMvUHVibGljL3d3dy1zdHlsZS8yMDEzSmFuLzAyNDUuaHRt bAogICAgICAgICBpZiAoY2hpbGQubmVlZHNQcmVmZXJyZWRXaWR0aHNSZWNhbGN1bGF0aW9uKCkp CkBAIC04NTQsNiArODU4LDggQEAgTGF5b3V0VW5pdCBHcmlkVHJhY2tTaXppbmdBbGdvcml0aG1T dHJhdGVneTo6bWluU2l6ZUZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQpIGMKIHsKICAgICBHcmlk VHJhY2tTaXppbmdEaXJlY3Rpb24gY2hpbGRJbmxpbmVEaXJlY3Rpb24gPSBHcmlkTGF5b3V0RnVu Y3Rpb25zOjpmbG93QXdhcmVEaXJlY3Rpb25Gb3JDaGlsZCgqcmVuZGVyR3JpZCgpLCBjaGlsZCwg Rm9yQ29sdW1ucyk7CiAgICAgYm9vbCBpc1Jvd0F4aXMgPSBkaXJlY3Rpb24oKSA9PSBjaGlsZElu bGluZURpcmVjdGlvbjsKKyAgICBpZiAoaXNSb3dBeGlzICYmIGlzQ29tcHV0aW5nSW5saW5lU2l6 ZUNvbnRhaW5tZW50KCkpCisgICAgICAgIHJldHVybiB7IH07CiAgICAgY29uc3QgTGVuZ3RoJiBj aGlsZFNpemUgPSBpc1Jvd0F4aXMgPyBjaGlsZC5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpIDogY2hp bGQuc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCk7CiAgICAgaWYgKCFjaGlsZFNpemUuaXNBdXRvKCkg JiYgIWNoaWxkU2l6ZS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSkKICAgICAgICAgcmV0dXJuIG1p bkNvbnRlbnRGb3JDaGlsZChjaGlsZCk7CkBAIC0xMDA2LDcgKzEwMTIsNyBAQCBMYXlvdXRVbml0 IEdyaWRUcmFja1NpemluZ0FsZ29yaXRobVN0cmF0ZWd5OjptaW5Mb2dpY2FsU2l6ZUZvckNoaWxk KFJlbmRlckJveCYgYwogICAgIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBjaGlsZElubGluZURp cmVjdGlvbiA9IEdyaWRMYXlvdXRGdW5jdGlvbnM6OmZsb3dBd2FyZURpcmVjdGlvbkZvckNoaWxk KCpyZW5kZXJHcmlkKCksIGNoaWxkLCBGb3JDb2x1bW5zKTsKICAgICBib29sIGlzUm93QXhpcyA9 IGRpcmVjdGlvbigpID09IGNoaWxkSW5saW5lRGlyZWN0aW9uOwogICAgIGlmIChpc1Jvd0F4aXMp Ci0gICAgICAgIHJldHVybiBjaGlsZC5jb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5n KE1pblNpemUsIGNoaWxkTWluU2l6ZSwgYXZhaWxhYmxlU2l6ZS52YWx1ZV9vcigwKSwgKnJlbmRl ckdyaWQoKSwgbnVsbHB0cikgKyBHcmlkTGF5b3V0RnVuY3Rpb25zOjptYXJnaW5Mb2dpY2FsU2l6 ZUZvckNoaWxkKCpyZW5kZXJHcmlkKCksIGNoaWxkSW5saW5lRGlyZWN0aW9uLCBjaGlsZCk7Cisg ICAgICAgIHJldHVybiBpc0NvbXB1dGluZ0lubGluZVNpemVDb250YWlubWVudCgpID8gMF9sdSA6 IGNoaWxkLmNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoTWluU2l6ZSwgY2hpbGRN aW5TaXplLCBhdmFpbGFibGVTaXplLnZhbHVlX29yKDApLCAqcmVuZGVyR3JpZCgpLCBudWxscHRy KSArIEdyaWRMYXlvdXRGdW5jdGlvbnM6Om1hcmdpbkxvZ2ljYWxTaXplRm9yQ2hpbGQoKnJlbmRl ckdyaWQoKSwgY2hpbGRJbmxpbmVEaXJlY3Rpb24sIGNoaWxkKTsKICAgICBib29sIG92ZXJyaWRl U2l6ZUhhc0NoYW5nZWQgPSB1cGRhdGVPdmVycmlkaW5nQ29udGFpbmluZ0Jsb2NrQ29udGVudFNp emVGb3JDaGlsZChjaGlsZCwgY2hpbGRJbmxpbmVEaXJlY3Rpb24sIGF2YWlsYWJsZVNpemUpOwog ICAgIGxheW91dEdyaWRJdGVtRm9yTWluU2l6ZUNvbXB1dGF0aW9uKGNoaWxkLCBvdmVycmlkZVNp emVIYXNDaGFuZ2VkKTsKICAgICBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gY2hpbGRCbG9ja0Rp cmVjdGlvbiA9IEdyaWRMYXlvdXRGdW5jdGlvbnM6OmZsb3dBd2FyZURpcmVjdGlvbkZvckNoaWxk KCpyZW5kZXJHcmlkKCksIGNoaWxkLCBGb3JSb3dzKTsKQEAgLTEwMjUsNiArMTAzMSw3IEBAIHBy aXZhdGU6CiAgICAgYm9vbCByZWNvbXB1dGVVc2VkRmxleEZyYWN0aW9uSWZOZWVkZWQoZG91Ymxl JiBmbGV4RnJhY3Rpb24sIExheW91dFVuaXQmIHRvdGFsR3Jvd3RoKSBjb25zdCBvdmVycmlkZTsK ICAgICBMYXlvdXRVbml0IGZyZWVTcGFjZUZvclN0cmV0Y2hBdXRvVHJhY2tzU3RlcCgpIGNvbnN0 IG92ZXJyaWRlOwogICAgIGJvb2wgaXNDb21wdXRpbmdTaXplQ29udGFpbm1lbnQoKSBjb25zdCBv dmVycmlkZSB7IHJldHVybiBzaG91bGRBcHBseVNpemVDb250YWlubWVudCgqcmVuZGVyR3JpZCgp KTsgfQorICAgIGJvb2wgaXNDb21wdXRpbmdJbmxpbmVTaXplQ29udGFpbm1lbnQoKSBjb25zdCBv dmVycmlkZSB7IHJldHVybiBzaG91bGRBcHBseUlubGluZVNpemVDb250YWlubWVudCgqcmVuZGVy R3JpZCgpKTsgfQogICAgIHZvaWQgYWNjdW11bGF0ZUZsZXhGcmFjdGlvbihkb3VibGUmIGZsZXhG cmFjdGlvbiwgR3JpZEl0ZXJhdG9yJiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIG91dGVybW9z dERpcmVjdGlvbiwgSGFzaFNldDxSZW5kZXJCb3gqPiYgaXRlbXNTZXQpIGNvbnN0OwogfTsKIApA QCAtMTEzNyw2ICsxMTQ0LDcgQEAgcHJpdmF0ZToKICAgICBMYXlvdXRVbml0IG1pbkNvbnRlbnRG b3JDaGlsZChSZW5kZXJCb3gmKSBjb25zdCBvdmVycmlkZTsKICAgICBMYXlvdXRVbml0IG1pbkxv Z2ljYWxTaXplRm9yQ2hpbGQoUmVuZGVyQm94JiwgY29uc3QgTGVuZ3RoJiBjaGlsZE1pblNpemUs IHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gYXZhaWxhYmxlU2l6ZSkgY29uc3Qgb3ZlcnJpZGU7 CiAgICAgYm9vbCBpc0NvbXB1dGluZ1NpemVDb250YWlubWVudCgpIGNvbnN0IG92ZXJyaWRlIHsg cmV0dXJuIGZhbHNlOyB9CisgICAgYm9vbCBpc0NvbXB1dGluZ0lubGluZVNpemVDb250YWlubWVu dCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIGZhbHNlOyB9CiB9OwogCiBMYXlvdXRVbml0IElu ZGVmaW5pdGVTaXplU3RyYXRlZ3k6OmZyZWVTcGFjZUZvclN0cmV0Y2hBdXRvVHJhY2tzU3RlcCgp IGNvbnN0CkBAIC0xNDEwLDcgKzE0MTgsNyBAQCB2b2lkIEdyaWRUcmFja1NpemluZ0FsZ29yaXRo bTo6YWR2YW5jZU5leHRTdGF0ZSgpCiB7CiAgICAgc3dpdGNoIChtX3NpemluZ1N0YXRlKSB7CiAg ICAgY2FzZSBDb2x1bW5TaXppbmdGaXJzdEl0ZXJhdGlvbjoKLSAgICAgICAgbV9zaXppbmdTdGF0 ZSA9IG1fc3RyYXRlZ3ktPmlzQ29tcHV0aW5nU2l6ZUNvbnRhaW5tZW50KCkgPyBDb2x1bW5TaXpp bmdFeHRyYUl0ZXJhdGlvbkZvclNpemVDb250YWlubWVudCA6IFJvd1NpemluZ0ZpcnN0SXRlcmF0 aW9uOworICAgICAgICBtX3NpemluZ1N0YXRlID0gbV9zdHJhdGVneS0+aXNDb21wdXRpbmdTaXpl Q29udGFpbm1lbnQoKSB8fCBtX3N0cmF0ZWd5LT5pc0NvbXB1dGluZ0lubGluZVNpemVDb250YWlu bWVudCgpID8gQ29sdW1uU2l6aW5nRXh0cmFJdGVyYXRpb25Gb3JTaXplQ29udGFpbm1lbnQgOiBS b3dTaXppbmdGaXJzdEl0ZXJhdGlvbjsKICAgICAgICAgcmV0dXJuOwogICAgIGNhc2UgQ29sdW1u U2l6aW5nRXh0cmFJdGVyYXRpb25Gb3JTaXplQ29udGFpbm1lbnQ6CiAgICAgICAgIG1fc2l6aW5n U3RhdGUgPSBSb3dTaXppbmdGaXJzdEl0ZXJhdGlvbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uaAppbmRleCAxOTA1ZGUxODVlYjdj OGE1MDUwYjE4OTg4NDM0MzIxNzU1ODA3ZjA0Li40ZGM1MThmN2Y5YzE3ZTY4YTQ3ZWM0NTlmMWZh N2RmYjRlNTNmOTg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvR3JpZFRy YWNrU2l6aW5nQWxnb3JpdGhtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0dyaWRU cmFja1NpemluZ0FsZ29yaXRobS5oCkBAIC0yODIsNiArMjgyLDcgQEAgcHVibGljOgogICAgIHZp cnR1YWwgYm9vbCByZWNvbXB1dGVVc2VkRmxleEZyYWN0aW9uSWZOZWVkZWQoZG91YmxlJiBmbGV4 RnJhY3Rpb24sIExheW91dFVuaXQmIHRvdGFsR3Jvd3RoKSBjb25zdCA9IDA7CiAgICAgdmlydHVh bCBMYXlvdXRVbml0IGZyZWVTcGFjZUZvclN0cmV0Y2hBdXRvVHJhY2tzU3RlcCgpIGNvbnN0ID0g MDsKICAgICB2aXJ0dWFsIGJvb2wgaXNDb21wdXRpbmdTaXplQ29udGFpbm1lbnQoKSBjb25zdCA9 IDA7CisgICAgdmlydHVhbCBib29sIGlzQ29tcHV0aW5nSW5saW5lU2l6ZUNvbnRhaW5tZW50KCkg Y29uc3QgPSAwOwogCiBwcm90ZWN0ZWQ6CiAgICAgR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtU3Ry YXRlZ3koR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtJiBhbGdvcml0aG0pCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKaW5kZXggZDk5MDdmMGY3YThmYjBkMDlkMGU1MWE0ZTkz NDA4YWYxMDJjNjkyMC4uYmU1ZTI4ODVkZmEyNjE1YWFmNzJmMTM5MzFkZTYyZjgyYTgyZGJmMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcApAQCAtMjgwLDE0ICsyODAs MTUgQEAgdm9pZCBSZW5kZXJHcmlkOjpsYXlvdXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4s IExheW91dFVuaXQpCiAgICAgICAgIC8vIGxvZ2ljYWwgd2lkdGggaXMgYWx3YXlzIGRlZmluaXRl IGFzIHRoZSBhYm92ZSBjYWxsIHRvIHVwZGF0ZUxvZ2ljYWxXaWR0aCgpIHByb3Blcmx5IHJlc29s dmVzIGludHJpbnNpYyAKICAgICAgICAgLy8gc2l6ZXMuIFdlIGNhbm5vdCBkbyB0aGUgc2FtZSBm b3IgaGVpZ2h0cyB0aG91Z2ggYmVjYXVzZSBtYW55IGNvZGUgcGF0aHMgaW5zaWRlIHVwZGF0ZUxv Z2ljYWxIZWlnaHQoKSByZXF1aXJlIAogICAgICAgICAvLyBhIHByZXZpb3VzIGNhbGwgdG8gc2V0 TG9naWNhbEhlaWdodCgpIHRvIHJlc29sdmUgaGVpZ2h0cyBwcm9wZXJseSAobGlrZSBmb3IgcG9z aXRpb25lZCBpdGVtcyBmb3IgZXhhbXBsZSkuCi0gICAgICAgIGlmIChzaG91bGRBcHBseVNpemVD b250YWlubWVudCgqdGhpcykpCisgICAgICAgIGF1dG8gc2hvdWxkSWdub3JlR3JpZEl0ZW1Db250 ZW50Rm9yTG9naWNhbFdpZHRoID0gc2hvdWxkQXBwbHlTaXplQ29udGFpbm1lbnQoKnRoaXMpIHx8 IHNob3VsZEFwcGx5SW5saW5lU2l6ZUNvbnRhaW5tZW50KCp0aGlzKTsKKyAgICAgICAgaWYgKHNo b3VsZElnbm9yZUdyaWRJdGVtQ29udGVudEZvckxvZ2ljYWxXaWR0aCkKICAgICAgICAgICAgIGNv bXB1dGVUcmFja1NpemVzRm9ySW5kZWZpbml0ZVNpemUobV90cmFja1NpemluZ0FsZ29yaXRobSwg Rm9yQ29sdW1ucyk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGNvbXB1dGVUcmFja1NpemVz Rm9yRGVmaW5pdGVTaXplKEZvckNvbHVtbnMsIGF2YWlsYWJsZVNwYWNlRm9yQ29sdW1ucyk7CiAK ICAgICAgICAgbV9taW5Db250ZW50U2l6ZSA9IG1fdHJhY2tTaXppbmdBbGdvcml0aG0ubWluQ29u dGVudFNpemUoKTsKICAgICAgICAgbV9tYXhDb250ZW50U2l6ZSA9IG1fdHJhY2tTaXppbmdBbGdv cml0aG0ubWF4Q29udGVudFNpemUoKTsKLSAgICAgICAgaWYgKHNob3VsZEFwcGx5U2l6ZUNvbnRh aW5tZW50KCp0aGlzKSkKKyAgICAgICAgaWYgKHNob3VsZElnbm9yZUdyaWRJdGVtQ29udGVudEZv ckxvZ2ljYWxXaWR0aCkKICAgICAgICAgICAgIGNvbXB1dGVUcmFja1NpemVzRm9yRGVmaW5pdGVT aXplKEZvckNvbHVtbnMsIGF2YWlsYWJsZVNwYWNlRm9yQ29sdW1ucyk7CiAKICAgICAgICAgLy8g MS41LSBDb21wdXRlIENvbnRlbnQgRGlzdHJpYnV0aW9uIG9mZnNldHMgZm9yIGNvbHVtbiB0cmFj a3MKQEAgLTYyNyw3ICs2MjgsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8T3JkZXJlZFRyYWNrSW5kZXhT ZXQ+IFJlbmRlckdyaWQ6OmNvbXB1dGVFbXB0eVRyYWNrc0ZvckF1dG9SZXBlYQogICAgIHVuc2ln bmVkIGZpcnN0QXV0b1JlcGVhdFRyYWNrID0gaW5zZXJ0aW9uUG9pbnQgKyBncmlkLmV4cGxpY2l0 R3JpZFN0YXJ0KGRpcmVjdGlvbik7CiAgICAgdW5zaWduZWQgbGFzdEF1dG9SZXBlYXRUcmFjayA9 IGZpcnN0QXV0b1JlcGVhdFRyYWNrICsgZ3JpZC5hdXRvUmVwZWF0VHJhY2tzKGRpcmVjdGlvbik7 CiAKLSAgICBpZiAoIWdyaWQuaGFzR3JpZEl0ZW1zKCkgfHwgc2hvdWxkQXBwbHlTaXplQ29udGFp bm1lbnQoKnRoaXMpKSB7CisgICAgaWYgKCFncmlkLmhhc0dyaWRJdGVtcygpIHx8IHNob3VsZEFw cGx5U2l6ZUNvbnRhaW5tZW50KCp0aGlzKSB8fCBzaG91bGRBcHBseUlubGluZVNpemVDb250YWlu bWVudCgqdGhpcykpIHsKICAgICAgICAgZW1wdHlUcmFja0luZGV4ZXMgPSBtYWtlVW5pcXVlPE9y ZGVyZWRUcmFja0luZGV4U2V0PigpOwogICAgICAgICBmb3IgKHVuc2lnbmVkIHRyYWNrSW5kZXgg PSBmaXJzdEF1dG9SZXBlYXRUcmFjazsgdHJhY2tJbmRleCA8IGxhc3RBdXRvUmVwZWF0VHJhY2s7 ICsrdHJhY2tJbmRleCkKICAgICAgICAgICAgIGVtcHR5VHJhY2tJbmRleGVzLT5hZGQodHJhY2tJ bmRleCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKaW5kZXggMjVlYzNiYzA0YTU0MWFlZWVmZDRjNGE2ODY2M2FlNzgxNjYzODZjYy4u OGY3NzlhYjY4MGU1MWNkZjAxM2JkYjY0ZDE3Y2VjNmExOWJiYWYxMyAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEyIEBACisyMDIyLTA0LTA1ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAg ICAgICBbQ1NTLUNvbnRhaW5dIEdyaWQgbGF5b3V0IHNob3VsZCB0YWtlICJjb250YWluOiBpbmxp bmUtc2l6ZSIgaW50byBhY2NvdW50IHdoZW4gY29tcHV0aW5nIHRoZSBncmlkIGl0ZW0ncyBsb2dp Y2FsIHdpZHRoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzg4NTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjItMDQtMDUgIEFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgogCiAgICAgICAgIFtDU1MtQ29udGFpbl0gRmxleCBsYXlvdXQgc2hvdWxkIHRh a2UgImNvbnRhaW46IGlubGluZS1zaXplIiBpbnRvIGFjY291bnQgd2hlbiBjb21wdXRpbmcgdGhl IGZsZXggaXRlbSdzIGxvZ2ljYWwgd2lkdGgKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RF eHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDBmZTkwMjg4 YzRkNjg0NmRmNDY3ZmEwNzg2ZDA3NjllZmFiYjFkMmEuLmNmZmZiNTAyYWRiNDQ4MGI0MjljYzU2 MWQ1OWViYWM5OTYwM2NlNDUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlv bnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDYzNiw3ICs0NjM2LDYg QEAgd2ViYW5pbWF0aW9ucy90cmFuc2xhdGUtcHJvcGVydHktYW5kLXRyYW5zbGF0ZS1hbmltYXRp b24td2l0aC1kZWxheS1vbi1mb3JjZWQtbGEKIAogIyBDU1MgY29udGFpbm1lbnQgdGVzdHMgdGhh dCBmYWlsCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9j b250YWluLWlubGluZS1zaXplLWJmYy1mbG9hdHMtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl IF0KLWltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRh aW4taW5saW5lLXNpemUtZ3JpZC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAjIHdlYmtpdC1y dWJ5LXRleHQKIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWlu L2NvbnRhaW4tbGF5b3V0LTAxNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluLXBhaW50LTAwOC5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg==