240957 2022-05-26 08:46:03 -0700 [LFC][FFC] Add support for flex-shrink 2022-05-26 15:40:14 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1872018 0 zalan 2022-05-26 08:46:03 -0700 ssia 1872019 1 459787 zalan 2022-05-26 08:50:25 -0700 Created attachment 459787 [fast-cq]Patch 1872108 2 ews-feeder 2022-05-26 14:29:59 -0700 Found 1 new test failure: webgl/2.0.0/conformance2/textures/image_bitmap_from_image_bitmap/tex-2d-rg32f-rg-float.html 1872184 3 ews-feeder 2022-05-26 15:39:06 -0700 Committed r294904 (251027@main): <https://commits.webkit.org/251027@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459787. 1872185 4 webkit-bug-importer 2022-05-26 15:40:14 -0700 <rdar://problem/93999678> 459787 2022-05-26 08:50:25 -0700 2022-05-26 15:39:07 -0700 [fast-cq]Patch bug-240957-20220526085024.patch text/plain 10052 zalan RnJvbSA2MzZjMzhhNGNjOGNmNWM0YjBiMGQxNmVkY2Y3ZWY0NjFkMWZkZThjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBU aHUsIDI2IE1heSAyMDIyIDA4OjQ3OjU5IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11bRkZD XSBBZGQgc3VwcG9ydCBmb3IgZmxleC1zaHJpbmsKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yNDA5NTcKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKVGhpcyBw YXRjaCBpbXBsZW1lbnRzIGEgc2ltcGxlICJsZXQncyBzaHJpbmsgdGhlIGZsZXggaXRlbXMgd2hl biBhdmFpbGFibGUgc3BhY2UgaXMgbGltaXRlZCIgbG9naWMuCgoqIFNvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwOgoo V2ViQ29yZTo6TGF5b3V0OjpGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVMb2dpY2FsV2lk dGhGb3JTaHJpbmtpbmdGbGV4SXRlbXMpOgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4Rm9ybWF0dGlu Z0NvbnRleHQ6OmNvbXB1dGVMb2dpY2FsV2lkdGhGb3JTdHJldGNoaW5nRmxleEl0ZW1zKToKKFdl YkNvcmU6OkxheW91dDo6RmxleEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlTG9naWNhbFdpZHRo Rm9yRmxleEl0ZW1zKToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0Lmg6Ci0tLQogLi4uL2ZsZXgvRmxleEZvcm1hdHRp bmdDb250ZXh0LmNwcCAgICAgICAgICAgIHwgMTAyICsrKysrKysrKysrKysrKy0tLQogLi4uL2Zs ZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmggICAgICAgICAgICAgIHwgICAyICsKIDIgZmlsZXMg Y2hhbmdlZCwgOTEgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0 aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCAzNGUxMTlkMjM0YTMuLjViYTkz MzEwMWY3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAK QEAgLTIwNCwxOCArMjA0LDcyIEBAIHZvaWQgRmxleEZvcm1hdHRpbmdDb250ZXh0OjpzZXRGbGV4 SXRlbXNHZW9tZXRyeShjb25zdCBMb2dpY2FsRmxleEl0ZW1zJiBsb2dpY2FsCiAgICAgfQogfQog Ci12b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZvckZsZXhJ dGVtcyhMb2dpY2FsRmxleEl0ZW1zJiBsb2dpY2FsRmxleEl0ZW1MaXN0LCBjb25zdCBDb25zdHJh aW50c0ZvckZsZXhDb250ZW50JiBmbGV4Q29uc3RyYWludHMpCit2b2lkIEZsZXhGb3JtYXR0aW5n Q29udGV4dDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZvclNocmlua2luZ0ZsZXhJdGVtcyhMb2dpY2Fs RmxleEl0ZW1zJiBsb2dpY2FsRmxleEl0ZW1MaXN0LCBMYXlvdXRVbml0IGF2YWlsYWJsZVNwYWNl KQogewogICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IHRoaXMtPmZvcm1hdHRpbmdTdGF0ZSgp OwogCi0gICAgYXV0byBmbGV4RGlyZWN0aW9uID0gcm9vdCgpLnN0eWxlKCkuZmxleERpcmVjdGlv bigpOwotICAgIGF1dG8gZmxleERpcmVjdGlvbklzSW5saW5lQXhpcyA9IGZsZXhEaXJlY3Rpb24g PT0gRmxleERpcmVjdGlvbjo6Um93IHx8IGZsZXhEaXJlY3Rpb24gPT0gRmxleERpcmVjdGlvbjo6 Um93UmV2ZXJzZTsKLSAgICBhdXRvIGF2YWlsYWJsZVNwYWNlID0gc3RkOjpvcHRpb25hbDxMYXlv dXRVbml0PiB7IGZsZXhEaXJlY3Rpb25Jc0lubGluZUF4aXMgPyBzdGQ6Om1ha2Vfb3B0aW9uYWwo ZmxleENvbnN0cmFpbnRzLmhvcml6b250YWwoKS5sb2dpY2FsV2lkdGgpIDogZmxleENvbnN0cmFp bnRzLmF2YWlsYWJsZVZlcnRpY2FsU3BhY2UoKSB9OworICAgIGF1dG8gdG90YWxTaHJpbmsgPSAw LmY7CisgICAgYXV0byB0b3RhbEZsZXhpYmxlU3BhY2UgPSBMYXlvdXRVbml0IHsgfTsKKyAgICBh dXRvIGZsZXhTaHJpbmtCYXNlID0gMC5mOworICAgIFZlY3RvcjxzaXplX3Q+IHNocmlua2luZ0l0 ZW1zOworCisgICAgYXV0byBjb21wdXRlVG90YWxTaHJpbmtBbmRPdmVyZmxvd2luZ1NwYWNlID0g WyZdIHsKKyAgICAgICAgLy8gQ29sbGVjdCBmbGV4IGl0ZW1zIHdpdGggbm9uLXplcm8gZmxleC1z aHJpbmsgdmFsdWUuIGZsZXgtc2hyaW5rOiAwIGZsZXggaXRlbXMKKyAgICAgICAgLy8gZG9uJ3Qg cGFydGljaXBhdGUgaW4gY29udGVudCBmbGV4aW5nLgorICAgICAgICBmb3IgKHNpemVfdCBpbmRl eCA9IDA7IGluZGV4IDwgbG9naWNhbEZsZXhJdGVtTGlzdC5zaXplKCk7ICsraW5kZXgpIHsKKyAg ICAgICAgICAgIGF1dG8mIGxvZ2ljYWxGbGV4SXRlbSA9IGxvZ2ljYWxGbGV4SXRlbUxpc3RbaW5k ZXhdOworICAgICAgICAgICAgaWYgKGF1dG8gZmxleFNocmluayA9IGxvZ2ljYWxGbGV4SXRlbS5s YXlvdXRCb3gtPnN0eWxlKCkuZmxleFNocmluaygpKSB7CisgICAgICAgICAgICAgICAgc2hyaW5r aW5nSXRlbXMuYXBwZW5kKGluZGV4KTsKKyAgICAgICAgICAgICAgICB0b3RhbFNocmluayArPSBm bGV4U2hyaW5rOworICAgICAgICAgICAgICAgIHRvdGFsRmxleGlibGVTcGFjZSArPSBsb2dpY2Fs RmxleEl0ZW0ucmVjdC53aWR0aCgpOworICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAg ICAgYXZhaWxhYmxlU3BhY2UgLT0gbG9naWNhbEZsZXhJdGVtLnJlY3Qud2lkdGgoKTsKKyAgICAg ICAgfQorICAgICAgICBpZiAodG90YWxTaHJpbmspCisgICAgICAgICAgICBmbGV4U2hyaW5rQmFz ZSA9ICh0b3RhbEZsZXhpYmxlU3BhY2UgLSBhdmFpbGFibGVTcGFjZSkgLyB0b3RhbFNocmluazsK KyAgICB9OworICAgIGNvbXB1dGVUb3RhbFNocmlua0FuZE92ZXJmbG93aW5nU3BhY2UoKTsKKwor ICAgIGF1dG8gYWRqdXN0U2hyaW5rQmFzZSA9IFsmXSB7CisgICAgICAgIC8vIE5vdyB0aGF0IHdl IGtub3cgaG93IG11Y2ggZWFjaCBmbGV4IGl0ZW0gbmVlZHMgdG8gYmUgc2hydW5rLCBsZXQncyBj aGVjaworICAgICAgICAvLyBpZiB0aGV5IGhpdCB0aGVpciBtaW5pbXVtIGNvbnRlbnQgd2lkdGgg KGkuZS4gd2hldGhlciB0aGV5IGNhbiBiZSBzaXplZCB0aGF0IHNtYWxsKS4KKyAgICAgICAgZm9y IChhdXRvIGZsZXhJdGVtSW5kZXggOiBzaHJpbmtpbmdJdGVtcykgeworICAgICAgICAgICAgYXV0 byYgZmxleEl0ZW0gPSBsb2dpY2FsRmxleEl0ZW1MaXN0W2ZsZXhJdGVtSW5kZXhdOworCisgICAg ICAgICAgICBhdXRvIGZsZXhTaHJpbmsgPSBmbGV4SXRlbS5sYXlvdXRCb3gtPnN0eWxlKCkuZmxl eFNocmluaygpOworICAgICAgICAgICAgYXV0byBmbGV4ZWRTaXplID0gZmxleEl0ZW0ucmVjdC53 aWR0aCgpIC0gKGZsZXhTaHJpbmsgKiBmbGV4U2hyaW5rQmFzZSk7CisgICAgICAgICAgICBhdXRv IG1pbmltdW1TaXplID0gZm9ybWF0dGluZ1N0YXRlLmludHJpbnNpY1dpZHRoQ29uc3RyYWludHNG b3JCb3goKmZsZXhJdGVtLmxheW91dEJveCktPm1pbmltdW07CisgICAgICAgICAgICBpZiAobWlu aW11bVNpemUgPj0gZmxleGVkU2l6ZSkgeworICAgICAgICAgICAgICAgIHRvdGFsU2hyaW5rIC09 IGZsZXhTaHJpbms7CisgICAgICAgICAgICAgICAgdG90YWxGbGV4aWJsZVNwYWNlIC09IGZsZXhJ dGVtLnJlY3Qud2lkdGgoKTsKKyAgICAgICAgICAgICAgICBhdmFpbGFibGVTcGFjZSAtPSBtaW5p bXVtU2l6ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICBmbGV4U2hyaW5rQmFz ZSA9IHRvdGFsU2hyaW5rID8gKHRvdGFsRmxleGlibGVTcGFjZSAtIGF2YWlsYWJsZVNwYWNlKSAv IHRvdGFsU2hyaW5rIDogMC5mOworICAgIH07CisgICAgYWRqdXN0U2hyaW5rQmFzZSgpOworCisg ICAgYXV0byBjb21wdXRlTG9naWNhbFdpZHRoID0gWyZdIHsKKyAgICAgICAgLy8gQWRqdXN0IHRo ZSB0b3RhbCBncm93IHdpZHRoIGJ5IHRoZSBvdmVyZmxvdyB2YWx1ZSAoc2hyaW5rKSBleGNlcHQg d2hlbiBtaW4gY29udGVudCB3aXRoIGRpc2FncmVlcy4KKyAgICAgICAgZm9yIChhdXRvIGZsZXhJ dGVtSW5kZXggOiBzaHJpbmtpbmdJdGVtcykgeworICAgICAgICAgICAgYXV0byYgZmxleEl0ZW0g PSBsb2dpY2FsRmxleEl0ZW1MaXN0W2ZsZXhJdGVtSW5kZXhdOworCisgICAgICAgICAgICBhdXRv IGZsZXhTaHJpbmsgPSBmbGV4SXRlbS5sYXlvdXRCb3gtPnN0eWxlKCkuZmxleFNocmluaygpOwor ICAgICAgICAgICAgYXV0byBmbGV4ZWRTaXplID0gTGF5b3V0VW5pdCB7IGZsZXhJdGVtLnJlY3Qu d2lkdGgoKSAtIChmbGV4U2hyaW5rICogZmxleFNocmlua0Jhc2UpIH07CisgICAgICAgICAgICBh dXRvIG1pbmltdW1TaXplID0gZm9ybWF0dGluZ1N0YXRlLmludHJpbnNpY1dpZHRoQ29uc3RyYWlu dHNGb3JCb3goKmZsZXhJdGVtLmxheW91dEJveCktPm1pbmltdW07CisgICAgICAgICAgICBmbGV4 SXRlbS5yZWN0LnNldFdpZHRoKHN0ZDo6bWF4KG1pbmltdW1TaXplLCBmbGV4ZWRTaXplKSk7Cisg ICAgICAgIH0KKyAgICB9OworICAgIGNvbXB1dGVMb2dpY2FsV2lkdGgoKTsKK30KKwordm9pZCBG bGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVMb2dpY2FsV2lkdGhGb3JTdHJldGNoaW5nRmxl eEl0ZW1zKExvZ2ljYWxGbGV4SXRlbXMmIGxvZ2ljYWxGbGV4SXRlbUxpc3QsIExheW91dFVuaXQg YXZhaWxhYmxlU3BhY2UpCit7CisgICAgYXV0byYgZm9ybWF0dGluZ1N0YXRlID0gdGhpcy0+Zm9y bWF0dGluZ1N0YXRlKCk7CiAKICAgICBhdXRvIHRvdGFsR3Jvd3RoID0gMC5mOwotICAgIGF1dG8g dG90YWxGbGV4aWJsZVNwYWNlID0gKmF2YWlsYWJsZVNwYWNlOwogICAgIGF1dG8gZmxleEdyb3dC YXNlID0gMC5mOwotICAgIFZlY3RvcjxzaXplX3Q+IGZsZXhpbmdJdGVtczsKKyAgICBWZWN0b3I8 c2l6ZV90PiBzdHJldGNoaW5nSXRlbXM7CiAKICAgICBhdXRvIGNvbXB1dGVUb3RhbEdyb3d0aEFu ZEZsZXhpYmxlU3BhY2UgPSBbJl0gewogICAgICAgICAvLyBDb2xsZWN0IGZsZXggaXRlbXMgd2l0 aCBub24temVybyBmbGV4LWdyb3cgdmFsdWUuIGZsZXgtZ3JvdzogMCAoaW5pdGlhbCkgZmxleCBp dGVtcwpAQCAtMjIzLDIyICsyNzcsMjQgQEAgdm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmNv bXB1dGVMb2dpY2FsV2lkdGhGb3JGbGV4SXRlbXMoTG9naWNhbEZsZXhJdGVtcyYgbG8KICAgICAg ICAgZm9yIChzaXplX3QgaW5kZXggPSAwOyBpbmRleCA8IGxvZ2ljYWxGbGV4SXRlbUxpc3Quc2l6 ZSgpOyArK2luZGV4KSB7CiAgICAgICAgICAgICBhdXRvJiBsb2dpY2FsRmxleEl0ZW0gPSBsb2dp Y2FsRmxleEl0ZW1MaXN0W2luZGV4XTsKICAgICAgICAgICAgIGlmIChhdXRvIGZsZXhHcm93ID0g bG9naWNhbEZsZXhJdGVtLmxheW91dEJveC0+c3R5bGUoKS5mbGV4R3JvdygpKSB7Ci0gICAgICAg ICAgICAgICAgZmxleGluZ0l0ZW1zLmFwcGVuZChpbmRleCk7CisgICAgICAgICAgICAgICAgc3Ry ZXRjaGluZ0l0ZW1zLmFwcGVuZChpbmRleCk7CiAgICAgICAgICAgICAgICAgdG90YWxHcm93dGgg Kz0gZmxleEdyb3c7CiAgICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAgICB0b3RhbEZs ZXhpYmxlU3BhY2UgLT0gbG9naWNhbEZsZXhJdGVtLnJlY3Qud2lkdGgoKTsKKyAgICAgICAgICAg ICAgICBhdmFpbGFibGVTcGFjZSAtPSBsb2dpY2FsRmxleEl0ZW0ucmVjdC53aWR0aCgpOwogICAg ICAgICB9CiAgICAgICAgIGlmICh0b3RhbEdyb3d0aCkKLSAgICAgICAgICAgIGZsZXhHcm93QmFz ZSA9IHRvdGFsRmxleGlibGVTcGFjZSAvIHRvdGFsR3Jvd3RoOworICAgICAgICAgICAgZmxleEdy b3dCYXNlID0gYXZhaWxhYmxlU3BhY2UgLyB0b3RhbEdyb3d0aDsKICAgICB9OwogICAgIGNvbXB1 dGVUb3RhbEdyb3d0aEFuZEZsZXhpYmxlU3BhY2UoKTsKKyAgICBpZiAoIXRvdGFsR3Jvd3RoKQor ICAgICAgICByZXR1cm47CiAKICAgICBhdXRvIHRvdGFsTG9naWNhbFdpZHRoID0gWyZdIHsKICAg ICAgICAgLy8gVGhpcyBpcyB3aGVyZSB3ZSBjb21wdXRlIGhvdyBtdWNoIHNwYWNlIHRoZSBmbGV4 aW5nIGJveGVzIHRha2UgdXAgaWYgd2UganVzdAogICAgICAgICAvLyBsZXQgdGhlbSBmbGV4IGJ5 IHRoZWlyIGZsZXgtZ3JvdyB2YWx1ZS4gTm90ZSB0aGF0IHdlIGNhbid0IHNpemUgdGhlbSBiZWxv dyB0aGVpciBtaW5pbXVtIGNvbnRlbnQgd2lkdGguCiAgICAgICAgIC8vIFN1Y2ggZmxleCBpdGVt cyBhcmUgcmVtb3ZlZCBmcm9tIHRoZSBmaW5hbCBvdmVyZmxvdyBkaXN0cmlidXRpb24uCiAgICAg ICAgIGF1dG8gYWNjdW11bGF0ZWRXaWR0aCA9IExheW91dFVuaXQgeyB9OwotICAgICAgICBmb3Ig KGF1dG8gZmxleEl0ZW1JbmRleCA6IGZsZXhpbmdJdGVtcykgeworICAgICAgICBmb3IgKGF1dG8g ZmxleEl0ZW1JbmRleCA6IHN0cmV0Y2hpbmdJdGVtcykgewogICAgICAgICAgICAgYXV0byYgZmxl eEl0ZW0gPSBsb2dpY2FsRmxleEl0ZW1MaXN0W2ZsZXhJdGVtSW5kZXhdOwogCiAgICAgICAgICAg ICBhdXRvIGZsZXhHcm93ID0gZmxleEl0ZW0ubGF5b3V0Qm94LT5zdHlsZSgpLmZsZXhHcm93KCk7 CkBAIC0yNTEsMTMgKzMwNywxMyBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0 ZUxvZ2ljYWxXaWR0aEZvckZsZXhJdGVtcyhMb2dpY2FsRmxleEl0ZW1zJiBsbwogICAgICAgICAg ICAgICAgIGFjY3VtdWxhdGVkV2lkdGggKz0gZmxleGVkU2l6ZTsKICAgICAgICAgfQogICAgICAg ICByZXR1cm4gYWNjdW11bGF0ZWRXaWR0aDsKLSAgICB9KCk7Ci0gICAgYXV0byBvdmVyZmxvd1dp ZHRoID0gdG90YWxMb2dpY2FsV2lkdGggLSB0b3RhbEZsZXhpYmxlU3BhY2U7CisgICAgfTsKKyAg ICBhdXRvIG92ZXJmbG93V2lkdGggPSB0b3RhbExvZ2ljYWxXaWR0aCgpIC0gYXZhaWxhYmxlU3Bh Y2U7CiAgICAgQVNTRVJUKG92ZXJmbG93V2lkdGggPj0gMCk7CiAKICAgICBhdXRvIGNvbXB1dGVM b2dpY2FsV2lkdGggPSBbJl0gewogICAgICAgICAvLyBBZGp1c3QgdGhlIHRvdGFsIGdyb3cgd2lk dGggYnkgdGhlIG92ZXJmbG93IHZhbHVlIChzaHJpbmspIGV4Y2VwdCB3aGVuIG1pbiBjb250ZW50 IHdpdGggZGlzYWdyZWVzLgotICAgICAgICBmb3IgKGF1dG8gZmxleEl0ZW1JbmRleCA6IGZsZXhp bmdJdGVtcykgeworICAgICAgICBmb3IgKGF1dG8gZmxleEl0ZW1JbmRleCA6IHN0cmV0Y2hpbmdJ dGVtcykgewogICAgICAgICAgICAgYXV0byYgZmxleEl0ZW0gPSBsb2dpY2FsRmxleEl0ZW1MaXN0 W2ZsZXhJdGVtSW5kZXhdOwogCiAgICAgICAgICAgICBhdXRvIGZsZXhHcm93ID0gZmxleEl0ZW0u bGF5b3V0Qm94LT5zdHlsZSgpLmZsZXhHcm93KCk7CkBAIC0yNzQsNiArMzMwLDI2IEBAIHZvaWQg RmxleEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlTG9naWNhbFdpZHRoRm9yRmxleEl0ZW1zKExv Z2ljYWxGbGV4SXRlbXMmIGxvCiAgICAgY29tcHV0ZUxvZ2ljYWxXaWR0aCgpOwogfQogCit2b2lk IEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZvckZsZXhJdGVtcyhM b2dpY2FsRmxleEl0ZW1zJiBsb2dpY2FsRmxleEl0ZW1MaXN0LCBjb25zdCBDb25zdHJhaW50c0Zv ckZsZXhDb250ZW50JiBmbGV4Q29uc3RyYWludHMpCit7CisgICAgYXV0byBmbGV4RGlyZWN0aW9u ID0gcm9vdCgpLnN0eWxlKCkuZmxleERpcmVjdGlvbigpOworICAgIGF1dG8gZmxleERpcmVjdGlv bklzSW5saW5lQXhpcyA9IGZsZXhEaXJlY3Rpb24gPT0gRmxleERpcmVjdGlvbjo6Um93IHx8IGZs ZXhEaXJlY3Rpb24gPT0gRmxleERpcmVjdGlvbjo6Um93UmV2ZXJzZTsKKyAgICBhdXRvIGF2YWls YWJsZVNwYWNlID0gc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiB7IGZsZXhEaXJlY3Rpb25Jc0lu bGluZUF4aXMgPyBzdGQ6Om1ha2Vfb3B0aW9uYWwoZmxleENvbnN0cmFpbnRzLmhvcml6b250YWwo KS5sb2dpY2FsV2lkdGgpIDogZmxleENvbnN0cmFpbnRzLmF2YWlsYWJsZVZlcnRpY2FsU3BhY2Uo KSB9OworICAgIGF1dG8gY29udGVudExvZ2ljYWxXaWR0aCA9IFsmXSB7CisgICAgICAgIGF1dG8g bG9naWNhbFdpZHRoID0gTGF5b3V0VW5pdCB7IH07CisgICAgICAgIGZvciAoYXV0byYgbG9naWNh bEZsZXhJdGVtIDogbG9naWNhbEZsZXhJdGVtTGlzdCkKKyAgICAgICAgICAgIGxvZ2ljYWxXaWR0 aCArPSBsb2dpY2FsRmxleEl0ZW0ucmVjdC53aWR0aCgpOworICAgICAgICByZXR1cm4gbG9naWNh bFdpZHRoOworICAgIH07CisKKyAgICBpZiAoIWF2YWlsYWJsZVNwYWNlKQorICAgICAgICBBU1NF UlRfTk9UX0lNUExFTUVOVEVEX1lFVCgpOworICAgIGVsc2UgaWYgKCphdmFpbGFibGVTcGFjZSA+ IGNvbnRlbnRMb2dpY2FsV2lkdGgoKSkKKyAgICAgICAgY29tcHV0ZUxvZ2ljYWxXaWR0aEZvclN0 cmV0Y2hpbmdGbGV4SXRlbXMobG9naWNhbEZsZXhJdGVtTGlzdCwgKmF2YWlsYWJsZVNwYWNlKTsK KyAgICBlbHNlCisgICAgICAgIGNvbXB1dGVMb2dpY2FsV2lkdGhGb3JTaHJpbmtpbmdGbGV4SXRl bXMobG9naWNhbEZsZXhJdGVtTGlzdCwgKmF2YWlsYWJsZVNwYWNlKTsKK30KKwogdm9pZCBGbGV4 Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnRGb3JJbnRlZ3JhdGlvbihjb25z dCBDb25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQmIGNvbnN0cmFpbnRzKQogewogICAgIGF1dG8g bG9naWNhbEZsZXhJdGVtTGlzdCA9IGNvbnZlcnRGbGV4SXRlbXNUb0xvZ2ljYWxTcGFjZSgpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4 L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IDZjOTU4OTQ0ZTY0 MS4uZTYwYzZkYTlmMjc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4 dC5oCkBAIC02Niw2ICs2Niw4IEBAIHByaXZhdGU6CiAgICAgTG9naWNhbEZsZXhJdGVtcyBjb252 ZXJ0RmxleEl0ZW1zVG9Mb2dpY2FsU3BhY2UoKTsKICAgICB2b2lkIHNldEZsZXhJdGVtc0dlb21l dHJ5KGNvbnN0IExvZ2ljYWxGbGV4SXRlbXMmLCBjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250 ZW50Jik7CiAgICAgdm9pZCBjb21wdXRlTG9naWNhbFdpZHRoRm9yRmxleEl0ZW1zKExvZ2ljYWxG bGV4SXRlbXMmLCBjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250ZW50Jik7CisgICAgdm9pZCBj b21wdXRlTG9naWNhbFdpZHRoRm9yU3RyZXRjaGluZ0ZsZXhJdGVtcyhMb2dpY2FsRmxleEl0ZW1z JiwgTGF5b3V0VW5pdCBhdmFpbGFibGVTcGFjZSk7CisgICAgdm9pZCBjb21wdXRlTG9naWNhbFdp ZHRoRm9yU2hyaW5raW5nRmxleEl0ZW1zKExvZ2ljYWxGbGV4SXRlbXMmLCBMYXlvdXRVbml0IGF2 YWlsYWJsZVNwYWNlKTsKIAogICAgIGNvbnN0IEZsZXhGb3JtYXR0aW5nU3RhdGUmIGZvcm1hdHRp bmdTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIGRvd25jYXN0PEZsZXhGb3JtYXR0aW5nU3RhdGU+KEZv cm1hdHRpbmdDb250ZXh0Ojpmb3JtYXR0aW5nU3RhdGUoKSk7IH0KICAgICBGbGV4Rm9ybWF0dGlu Z1N0YXRlJiBmb3JtYXR0aW5nU3RhdGUoKSB7IHJldHVybiBkb3duY2FzdDxGbGV4Rm9ybWF0dGlu Z1N0YXRlPihGb3JtYXR0aW5nQ29udGV4dDo6Zm9ybWF0dGluZ1N0YXRlKCkpOyB9Ci0tIAoyLjMy LjAgKEFwcGxlIEdpdC0xMzIpCgo=