241300 2022-06-03 21:37:01 -0700 [LFC][FFC] Add basic 'flex-wrap: wrap' support 2022-06-04 07:28: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 1874102 0 zalan 2022-06-03 21:37:01 -0700 ssia 1874103 1 460024 zalan 2022-06-03 21:52:06 -0700 Created attachment 460024 [fast-cq]Patch 1874135 2 ews-feeder 2022-06-04 07:27:01 -0700 Committed r295266 (251312@main): <https://commits.webkit.org/251312@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 460024. 1874136 3 webkit-bug-importer 2022-06-04 07:28:14 -0700 <rdar://problem/94388036> 460024 2022-06-03 21:52:06 -0700 2022-06-04 07:27:02 -0700 [fast-cq]Patch bug-241300-20220603215205.patch text/plain 14567 zalan RnJvbSAxMjlkZWRlODUxNWI1OTFiNjQ5ZjNjZjkxNDM5NGMwMmVjYjk1MGQ1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBG cmksIDMgSnVuIDIwMjIgMjE6Mzc6NTEgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbTEZDXVtGRkNd IEFkZCBiYXNpYyAnZmxleC13cmFwOiB3cmFwJyBzdXBwb3J0CiBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQxMzAwCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K CjEuIGNvbXB1dGUgd3JhcCBwb3NpdGlvbnMgYnkgc2ltcGx5IGNoZWNraW5nIGZvciBvdmVyZmxv dyBhcyB3YWxraW5nIHRoZSBmbGV4IGl0ZW0gbGlzdC4KMi4gbGV0IGVhY2ggZnVuY3Rpb24gb3Bl cmF0ZSBvbiB0aGUgcmFuZ2UgaW5zdGVhZCBvZiB0aGUgZW50aXJlIGxpc3QuCgoqIFNvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4TGF5b3V0LmNwcDoKKFdl YkNvcmU6OkxheW91dDo6RmxleExheW91dDo6Y29tcHV0ZVdyYXBwaW5nUG9zaXRpb25zIGNvbnN0 KToKKFdlYkNvcmU6OkxheW91dDo6RmxleExheW91dDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZvclNo cmlua2luZ0ZsZXhJdGVtcyk6CihXZWJDb3JlOjpMYXlvdXQ6OkZsZXhMYXlvdXQ6OmNvbXB1dGVM b2dpY2FsV2lkdGhGb3JTdHJldGNoaW5nRmxleEl0ZW1zKToKKFdlYkNvcmU6OkxheW91dDo6Rmxl eExheW91dDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZvckZsZXhJdGVtcyk6CihXZWJDb3JlOjpMYXlv dXQ6OkZsZXhMYXlvdXQ6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0Rm9yRmxleEl0ZW1zKToKKFdlYkNv cmU6OkxheW91dDo6RmxleExheW91dDo6YWxpZ25GbGV4SXRlbXMpOgooV2ViQ29yZTo6TGF5b3V0 OjpGbGV4TGF5b3V0OjpqdXN0aWZ5RmxleEl0ZW1zKToKKFdlYkNvcmU6OkxheW91dDo6RmxleExh eW91dDo6bGF5b3V0KToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2ZsZXgvRmxleExheW91dC5oOgotLS0KIC4uLi9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4 TGF5b3V0LmNwcCAgICB8IDEwMyArKysrKysrKysrKystLS0tLS0KIC4uLi9mb3JtYXR0aW5nQ29u dGV4dHMvZmxleC9GbGV4TGF5b3V0LmggICAgICB8ICAgNCArLQogMiBmaWxlcyBjaGFuZ2VkLCA3 MiBpbnNlcnRpb25zKCspLCAzNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleExheW91dC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleExheW91dC5jcHAK aW5kZXggZjhiYzBkYjM2NTBmLi44MTgyMzAyZGYxMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4TGF5b3V0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleExheW91dC5j cHAKQEAgLTc3LDE4ICs3Nyw0MSBAQCBMYXlvdXRVbml0IEZsZXhMYXlvdXQ6OmNvbXB1dGVBdmFp bGFibGVMb2dpY2FsSG9yaXpvbnRhbFNwYWNlKGNvbnN0IExvZ2ljYWxGbGV4SQogICAgIHJldHVy biBhdmFpbGFibGVTcGFjZTsKIH0KIAotRmxleExheW91dDo6V3JhcHBpbmdQb3NpdGlvbnMgRmxl eExheW91dDo6Y29tcHV0ZVdyYXBwaW5nUG9zaXRpb25zKGNvbnN0IExvZ2ljYWxGbGV4SXRlbXMm IGZsZXhJdGVtcywgTGF5b3V0VW5pdCkgY29uc3QKK0ZsZXhMYXlvdXQ6OldyYXBwaW5nUG9zaXRp b25zIEZsZXhMYXlvdXQ6OmNvbXB1dGVXcmFwcGluZ1Bvc2l0aW9ucyhjb25zdCBMb2dpY2FsRmxl eEl0ZW1zJiBmbGV4SXRlbXMsIExheW91dFVuaXQgYXZhaWxhYmxlU3BhY2UpIGNvbnN0CiB7Ci0g ICAgaWYgKGZsZXhCb3hTdHlsZSgpLmZsZXhXcmFwKCkgPT0gRmxleFdyYXA6Ok5vV3JhcCkgewot ICAgICAgICBhdXRvIHdyYXBwaW5nUG9zaXRpb25zID0gV3JhcHBpbmdQb3NpdGlvbnMoKTsKKyAg ICBhdXRvIHdyYXBwaW5nUG9zaXRpb25zID0gV3JhcHBpbmdQb3NpdGlvbnMoKTsKKworICAgIHN3 aXRjaCAoZmxleEJveFN0eWxlKCkuZmxleFdyYXAoKSkgeworICAgIGNhc2UgRmxleFdyYXA6Ok5v V3JhcDoKICAgICAgICAgd3JhcHBpbmdQb3NpdGlvbnMuYXBwZW5kKGZsZXhJdGVtcy5zaXplKCkp OwotICAgICAgICByZXR1cm4gd3JhcHBpbmdQb3NpdGlvbnM7CisgICAgICAgIGJyZWFrOworICAg IGNhc2UgRmxleFdyYXA6OldyYXA6IHsKKyAgICAgICAgYXV0byBhY2N1bXVsYXRlZFdpZHRoID0g TGF5b3V0VW5pdCB7IH07CisgICAgICAgIHNpemVfdCBsYXN0V3JhcEluZGV4ID0gMDsKKyAgICAg ICAgZm9yIChzaXplX3QgaW5kZXggPSAwOyBpbmRleCA8IGZsZXhJdGVtcy5zaXplKCk7ICsraW5k ZXgpIHsKKyAgICAgICAgICAgIGF1dG8gZmxleEl0ZW1XaWR0aCA9IGZsZXhJdGVtc1tpbmRleF0u d2lkdGgoKTsKKyAgICAgICAgICAgIGlmIChhY2N1bXVsYXRlZFdpZHRoICsgZmxleEl0ZW1XaWR0 aCA8PSBhdmFpbGFibGVTcGFjZSkgeworICAgICAgICAgICAgICAgIGFjY3VtdWxhdGVkV2lkdGgg Kz0gZmxleEl0ZW1XaWR0aDsKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAg IH0KKyAgICAgICAgICAgIGF1dG8gc2hvdWxkTGV0RmxleEl0ZW1PdmVyZmxvdyA9IGluZGV4ID09 IGxhc3RXcmFwSW5kZXg7CisgICAgICAgICAgICBpZiAoIXNob3VsZExldEZsZXhJdGVtT3ZlcmZs b3cpCisgICAgICAgICAgICAgICAgLS1pbmRleDsKKyAgICAgICAgICAgIGxhc3RXcmFwSW5kZXgg PSBpbmRleCArIDE7CisgICAgICAgICAgICB3cmFwcGluZ1Bvc2l0aW9ucy5hcHBlbmQobGFzdFdy YXBJbmRleCk7CisgICAgICAgICAgICBhY2N1bXVsYXRlZFdpZHRoID0geyB9OworICAgICAgICB9 CisgICAgICAgIHdyYXBwaW5nUG9zaXRpb25zLmFwcGVuZChmbGV4SXRlbXMuc2l6ZSgpKTsKKyAg ICAgICAgYnJlYWs7CisgICAgfQorICAgIGRlZmF1bHQ6CisgICAgICAgIEFTU0VSVF9OT1RfSU1Q TEVNRU5URURfWUVUKCk7CisgICAgICAgIGJyZWFrOwogICAgIH0KLSAgICBBU1NFUlRfTk9UX0lN UExFTUVOVEVEX1lFVCgpOwotICAgIHJldHVybiB7IH07CisgICAgcmV0dXJuIHdyYXBwaW5nUG9z aXRpb25zOwogfQogCi12b2lkIEZsZXhMYXlvdXQ6OmNvbXB1dGVMb2dpY2FsV2lkdGhGb3JTaHJp bmtpbmdGbGV4SXRlbXMoTG9naWNhbEZsZXhJdGVtcyYgZmxleEl0ZW1zLCBjb25zdCBMaW5lUmFu Z2UmLCBMYXlvdXRVbml0IGF2YWlsYWJsZVNwYWNlKQordm9pZCBGbGV4TGF5b3V0Ojpjb21wdXRl TG9naWNhbFdpZHRoRm9yU2hyaW5raW5nRmxleEl0ZW1zKExvZ2ljYWxGbGV4SXRlbXMmIGZsZXhJ dGVtcywgY29uc3QgTGluZVJhbmdlJiBsaW5lUmFuZ2UsIExheW91dFVuaXQgYXZhaWxhYmxlU3Bh Y2UpCiB7CiAgICAgYXV0byB0b3RhbFNocmluayA9IDAuZjsKICAgICBhdXRvIHRvdGFsRmxleGli bGVTcGFjZSA9IExheW91dFVuaXQgeyB9OwpAQCAtMTA2LDcgKzEyOSw4IEBAIHZvaWQgRmxleExh eW91dDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZvclNocmlua2luZ0ZsZXhJdGVtcyhMb2dpY2FsRmxl eEl0ZW1zJiBmbGV4CiAgICAgYXV0byBjb21wdXRlVG90YWxTaHJpbmtBbmRPdmVyZmxvd2luZ1Nw YWNlID0gWyZdIHsKICAgICAgICAgLy8gQ29sbGVjdCBmbGV4IGl0ZW1zIHdpdGggbm9uLXplcm8g ZmxleC1zaHJpbmsgdmFsdWUuIGZsZXgtc2hyaW5rOiAwIGZsZXggaXRlbXMKICAgICAgICAgLy8g ZG9uJ3QgcGFydGljaXBhdGUgaW4gY29udGVudCBmbGV4aW5nLgotICAgICAgICBmb3IgKGF1dG8m IGZsZXhJdGVtIDogZmxleEl0ZW1zKSB7CisgICAgICAgIGZvciAoc2l6ZV90IGluZGV4ID0gbGlu ZVJhbmdlLmJlZ2luKCk7IGluZGV4IDwgbGluZVJhbmdlLmVuZCgpOyArK2luZGV4KSB7CisgICAg ICAgICAgICBhdXRvJiBmbGV4SXRlbSA9IGZsZXhJdGVtc1tpbmRleF07CiAgICAgICAgICAgICBh dXRvJiBzdHlsZSA9IGZsZXhJdGVtLnN0eWxlKCk7CiAgICAgICAgICAgICBhdXRvIGJhc2VTaXpl ID0gc3R5bGUuZmxleEJhc2lzKCkuaXNGaXhlZCgpID8gTGF5b3V0VW5pdCB7IHN0eWxlLmZsZXhC YXNpcygpLnZhbHVlKCkgfSA6IGZsZXhJdGVtLndpZHRoKCk7CiAgICAgICAgICAgICBpZiAoYXV0 byBzaHJpbmtWYWx1ZSA9IHN0eWxlLmZsZXhTaHJpbmsoKSkgewpAQCAtMTU0LDcgKzE3OCw3IEBA IHZvaWQgRmxleExheW91dDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZvclNocmlua2luZ0ZsZXhJdGVt cyhMb2dpY2FsRmxleEl0ZW1zJiBmbGV4CiAgICAgY29tcHV0ZUxvZ2ljYWxXaWR0aCgpOwogfQog Ci12b2lkIEZsZXhMYXlvdXQ6OmNvbXB1dGVMb2dpY2FsV2lkdGhGb3JTdHJldGNoaW5nRmxleEl0 ZW1zKExvZ2ljYWxGbGV4SXRlbXMmIGZsZXhJdGVtcywgY29uc3QgTGluZVJhbmdlJiwgTGF5b3V0 VW5pdCBhdmFpbGFibGVTcGFjZSkKK3ZvaWQgRmxleExheW91dDo6Y29tcHV0ZUxvZ2ljYWxXaWR0 aEZvclN0cmV0Y2hpbmdGbGV4SXRlbXMoTG9naWNhbEZsZXhJdGVtcyYgZmxleEl0ZW1zLCBjb25z dCBMaW5lUmFuZ2UmIGxpbmVSYW5nZSwgTGF5b3V0VW5pdCBhdmFpbGFibGVTcGFjZSkKIHsKICAg ICBhdXRvIHRvdGFsRmxleGlibGVTcGFjZSA9IExheW91dFVuaXQgeyB9OwogICAgIGF1dG8gdG90 YWxHcm93dGggPSAwLmY7CkBAIC0xNzEsNyArMTk1LDggQEAgdm9pZCBGbGV4TGF5b3V0Ojpjb21w dXRlTG9naWNhbFdpZHRoRm9yU3RyZXRjaGluZ0ZsZXhJdGVtcyhMb2dpY2FsRmxleEl0ZW1zJiBm bGUKICAgICBhdXRvIGNvbXB1dGVUb3RhbEdyb3d0aEFuZEZsZXhpYmxlU3BhY2UgPSBbJl0gewog ICAgICAgICAvLyBDb2xsZWN0IGZsZXggaXRlbXMgd2l0aCBub24temVybyBmbGV4LWdyb3cgdmFs dWUuIGZsZXgtZ3JvdzogMCAoaW5pdGlhbCkgZmxleCBpdGVtcwogICAgICAgICAvLyBkb24ndCBw YXJ0aWNpcGF0ZSBpbiBhdmFpbGFibGUgc3BhY2UgZGlzdHJpYnV0aW9uLgotICAgICAgICBmb3Ig KGF1dG8mIGZsZXhJdGVtIDogZmxleEl0ZW1zKSB7CisgICAgICAgIGZvciAoc2l6ZV90IGluZGV4 ID0gbGluZVJhbmdlLmJlZ2luKCk7IGluZGV4IDwgbGluZVJhbmdlLmVuZCgpOyArK2luZGV4KSB7 CisgICAgICAgICAgICBhdXRvJiBmbGV4SXRlbSA9IGZsZXhJdGVtc1tpbmRleF07CiAgICAgICAg ICAgICBhdXRvJiBzdHlsZSA9IGZsZXhJdGVtLnN0eWxlKCk7CiAgICAgICAgICAgICBhdXRvIGJh c2VTaXplID0gc3R5bGUuZmxleEJhc2lzKCkuaXNGaXhlZCgpID8gTGF5b3V0VW5pdCB7IHN0eWxl LmZsZXhCYXNpcygpLnZhbHVlKCkgfSA6IGZsZXhJdGVtLndpZHRoKCk7CiAgICAgICAgICAgICBp ZiAoYXV0byBncm93VmFsdWUgPSBzdHlsZS5mbGV4R3JvdygpKSB7CkBAIC0yMjcsOCArMjUyLDgg QEAgdm9pZCBGbGV4TGF5b3V0Ojpjb21wdXRlTG9naWNhbFdpZHRoRm9yRmxleEl0ZW1zKExvZ2lj YWxGbGV4SXRlbXMmIGZsZXhJdGVtcywgY28KIHsKICAgICBhdXRvIGNvbnRlbnRMb2dpY2FsV2lk dGggPSBbJl0gewogICAgICAgICBhdXRvIGxvZ2ljYWxXaWR0aCA9IExheW91dFVuaXQgeyB9Owot ICAgICAgICBmb3IgKGF1dG8mIGZsZXhJdGVtIDogZmxleEl0ZW1zKQotICAgICAgICAgICAgbG9n aWNhbFdpZHRoICs9IGZsZXhJdGVtLndpZHRoKCk7CisgICAgICAgIGZvciAoc2l6ZV90IGluZGV4 ID0gbGluZVJhbmdlLmJlZ2luKCk7IGluZGV4IDwgbGluZVJhbmdlLmVuZCgpOyArK2luZGV4KQor ICAgICAgICAgICAgbG9naWNhbFdpZHRoICs9IGZsZXhJdGVtc1tpbmRleF0ud2lkdGgoKTsKICAg ICAgICAgcmV0dXJuIGxvZ2ljYWxXaWR0aDsKICAgICB9KCk7CiAKQEAgLTIzOCwxNyArMjYzLDIy IEBAIHZvaWQgRmxleExheW91dDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZvckZsZXhJdGVtcyhMb2dp Y2FsRmxleEl0ZW1zJiBmbGV4SXRlbXMsIGNvCiAgICAgICAgIGNvbXB1dGVMb2dpY2FsV2lkdGhG b3JTaHJpbmtpbmdGbGV4SXRlbXMoZmxleEl0ZW1zLCBsaW5lUmFuZ2UsIGF2YWlsYWJsZVNwYWNl KTsKIH0KIAotdm9pZCBGbGV4TGF5b3V0Ojpjb21wdXRlTG9naWNhbEhlaWdodEZvckZsZXhJdGVt cyhMb2dpY2FsRmxleEl0ZW1zJiBmbGV4SXRlbXMsIGNvbnN0IExpbmVSYW5nZSYsIExheW91dFVu aXQgYXZhaWxhYmxlU3BhY2UpCitMYXlvdXRVbml0IEZsZXhMYXlvdXQ6OmNvbXB1dGVMb2dpY2Fs SGVpZ2h0Rm9yRmxleEl0ZW1zKExvZ2ljYWxGbGV4SXRlbXMmIGZsZXhJdGVtcywgY29uc3QgTGlu ZVJhbmdlJiBsaW5lUmFuZ2UsIExheW91dFVuaXQgYXZhaWxhYmxlU3BhY2UpCiB7CiAgICAgYXV0 byBhbGlnbkl0ZW1zID0gZmxleEJveFN0eWxlKCkuYWxpZ25JdGVtcygpOworICAgIGF1dG8gbGlu ZUhlaWdodCA9IExheW91dFVuaXQgeyB9OwogCi0gICAgZm9yIChhdXRvJiBmbGV4SXRlbSA6IGZs ZXhJdGVtcykgewotICAgICAgICBpZiAoIWZsZXhJdGVtLmlzSGVpZ2h0QXV0bygpKQorICAgIGZv ciAoc2l6ZV90IGluZGV4ID0gbGluZVJhbmdlLmJlZ2luKCk7IGluZGV4IDwgbGluZVJhbmdlLmVu ZCgpOyArK2luZGV4KSB7CisgICAgICAgIGF1dG8mIGZsZXhJdGVtID0gZmxleEl0ZW1zW2luZGV4 XTsKKyAgICAgICAgaWYgKCFmbGV4SXRlbS5pc0hlaWdodEF1dG8oKSkgeworICAgICAgICAgICAg bGluZUhlaWdodCA9IHN0ZDo6bWF4KGxpbmVIZWlnaHQsIGZsZXhJdGVtLmhlaWdodCgpKTsKICAg ICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CiAgICAgICAgIHN3aXRjaCAoYWxpZ25JdGVt cy5wb3NpdGlvbigpKSB7CiAgICAgICAgIGNhc2UgSXRlbVBvc2l0aW9uOjpOb3JtYWw6CiAgICAg ICAgIGNhc2UgSXRlbVBvc2l0aW9uOjpTdHJldGNoOgogICAgICAgICAgICAgZmxleEl0ZW0uc2V0 SGVpZ2h0KGF2YWlsYWJsZVNwYWNlKTsKKyAgICAgICAgICAgIGxpbmVIZWlnaHQgPSBhdmFpbGFi bGVTcGFjZTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEl0ZW1Qb3NpdGlvbjo6 Q2VudGVyOgogICAgICAgICBjYXNlIEl0ZW1Qb3NpdGlvbjo6U3RhcnQ6CkBAIC0yNjEsMzEgKzI5 MSwzNSBAQCB2b2lkIEZsZXhMYXlvdXQ6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0Rm9yRmxleEl0ZW1z KExvZ2ljYWxGbGV4SXRlbXMmIGZsZXhJdGVtcywgYwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIH0KICAgICB9CisgICAgcmV0dXJuIGxpbmVIZWlnaHQ7CiB9CiAKLXZvaWQgRmxleExheW91 dDo6YWxpZ25GbGV4SXRlbXMoTG9naWNhbEZsZXhJdGVtcyYgZmxleEl0ZW1zLCBjb25zdCBMaW5l UmFuZ2UmLCBMYXlvdXRVbml0IGF2YWlsYWJsZVNwYWNlKQordm9pZCBGbGV4TGF5b3V0OjphbGln bkZsZXhJdGVtcyhMb2dpY2FsRmxleEl0ZW1zJiBmbGV4SXRlbXMsIGNvbnN0IExpbmVSYW5nZSYg bGluZVJhbmdlLCBWZXJ0aWNhbENvbnN0cmFpbnRzIGNvbnN0cmFpbnRzKQogewogICAgIC8vIEZJ WE1FOiBDaGVjayBpZiBoZWlnaHQgY29tcHV0YXRpb24gYW5kIHZlcnRpY2FsIGFsaWdubWVudCBz aG91bGQgbWVyZ2UuCisgICAgYXV0byBhdmFpbGFibGVTcGFjZSA9IGNvbnN0cmFpbnRzLmxvZ2lj YWxIZWlnaHQ7CisgICAgYXV0byBsaW5lVG9wID0gY29uc3RyYWludHMubG9naWNhbFRvcDsKICAg ICBhdXRvIGZsZXhCb3hBbGlnbkl0ZW1zID0gZmxleEJveFN0eWxlKCkuYWxpZ25JdGVtcygpOwog Ci0gICAgZm9yIChhdXRvJiBmbGV4SXRlbSA6IGZsZXhJdGVtcykgeworICAgIGZvciAoc2l6ZV90 IGluZGV4ID0gbGluZVJhbmdlLmJlZ2luKCk7IGluZGV4IDwgbGluZVJhbmdlLmVuZCgpOyArK2lu ZGV4KSB7CisgICAgICAgIGF1dG8mIGZsZXhJdGVtID0gZmxleEl0ZW1zW2luZGV4XTsKICAgICAg ICAgYXV0byYgZmxleEl0ZW1BbGlnblNlbGYgPSBmbGV4SXRlbS5zdHlsZSgpLmFsaWduU2VsZigp OwogICAgICAgICBhdXRvIGFsaWduVmFsdWUgPSBmbGV4SXRlbUFsaWduU2VsZi5wb3NpdGlvbigp ICE9IEl0ZW1Qb3NpdGlvbjo6QXV0byA/IGZsZXhJdGVtQWxpZ25TZWxmIDogZmxleEJveEFsaWdu SXRlbXM7CiAgICAgICAgIHN3aXRjaCAoYWxpZ25WYWx1ZS5wb3NpdGlvbigpKSB7CiAgICAgICAg IGNhc2UgSXRlbVBvc2l0aW9uOjpOb3JtYWw6CiAgICAgICAgIGNhc2UgSXRlbVBvc2l0aW9uOjpT dHJldGNoOgotICAgICAgICAgICAgZmxleEl0ZW0uc2V0VG9wKHsgfSk7CisgICAgICAgICAgICBm bGV4SXRlbS5zZXRUb3AobGluZVRvcCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2Fz ZSBJdGVtUG9zaXRpb246OkNlbnRlcjoKLSAgICAgICAgICAgIGZsZXhJdGVtLnNldFRvcCh7IGF2 YWlsYWJsZVNwYWNlIC8gMiAtICBmbGV4SXRlbS5oZWlnaHQoKSAvIDIgfSk7CisgICAgICAgICAg ICBmbGV4SXRlbS5zZXRUb3AoeyBsaW5lVG9wICsgKGF2YWlsYWJsZVNwYWNlIC8gMiAtICBmbGV4 SXRlbS5oZWlnaHQoKSAvIDIpIH0pOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2Ug SXRlbVBvc2l0aW9uOjpTdGFydDoKICAgICAgICAgY2FzZSBJdGVtUG9zaXRpb246OkZsZXhTdGFy dDoKLSAgICAgICAgICAgIGZsZXhJdGVtLnNldFRvcCh7IH0pOworICAgICAgICAgICAgZmxleEl0 ZW0uc2V0VG9wKGxpbmVUb3ApOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgSXRl bVBvc2l0aW9uOjpFbmQ6CiAgICAgICAgIGNhc2UgSXRlbVBvc2l0aW9uOjpGbGV4RW5kOgotICAg ICAgICAgICAgZmxleEl0ZW0uc2V0VG9wKHsgYXZhaWxhYmxlU3BhY2UgLSBmbGV4SXRlbS5oZWln aHQoKSB9KTsKKyAgICAgICAgICAgIGZsZXhJdGVtLnNldFRvcCh7IGxpbmVUb3AgKyBhdmFpbGFi bGVTcGFjZSAtIGZsZXhJdGVtLmhlaWdodCgpIH0pOwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICBBU1NFUlRfTk9UX0lNUExFTUVOVEVEX1lFVCgpOwpA QCAtMjk0LDE0ICszMjgsMTQgQEAgdm9pZCBGbGV4TGF5b3V0OjphbGlnbkZsZXhJdGVtcyhMb2dp Y2FsRmxleEl0ZW1zJiBmbGV4SXRlbXMsIGNvbnN0IExpbmVSYW5nZSYsIEwKICAgICB9CiB9CiAK LXZvaWQgRmxleExheW91dDo6anVzdGlmeUZsZXhJdGVtcyhMb2dpY2FsRmxleEl0ZW1zJiBmbGV4 SXRlbXMsIGNvbnN0IExpbmVSYW5nZSYsIExheW91dFVuaXQgYXZhaWxhYmxlU3BhY2UpCit2b2lk IEZsZXhMYXlvdXQ6Omp1c3RpZnlGbGV4SXRlbXMoTG9naWNhbEZsZXhJdGVtcyYgZmxleEl0ZW1z LCBjb25zdCBMaW5lUmFuZ2UmIGxpbmVSYW5nZSwgTGF5b3V0VW5pdCBhdmFpbGFibGVTcGFjZSkK IHsKICAgICBhdXRvIGp1c3RpZnlDb250ZW50ID0gZmxleEJveFN0eWxlKCkuanVzdGlmeUNvbnRl bnQoKTsKICAgICAvLyBGSVhNRTogTWFrZSB0aGlzIG9wdGlvbmFsLgogICAgIGF1dG8gY29udGVu dExvZ2ljYWxXaWR0aCA9IFsmXSB7CiAgICAgICAgIGF1dG8gbG9naWNhbFdpZHRoID0gTGF5b3V0 VW5pdCB7IH07Ci0gICAgICAgIGZvciAoYXV0byYgZmxleEl0ZW0gOiBmbGV4SXRlbXMpCi0gICAg ICAgICAgICBsb2dpY2FsV2lkdGggKz0gZmxleEl0ZW0ud2lkdGgoKTsKKyAgICAgICAgZm9yIChz aXplX3QgaW5kZXggPSBsaW5lUmFuZ2UuYmVnaW4oKTsgaW5kZXggPCBsaW5lUmFuZ2UuZW5kKCk7 ICsraW5kZXgpCisgICAgICAgICAgICBsb2dpY2FsV2lkdGggKz0gZmxleEl0ZW1zW2luZGV4XS53 aWR0aCgpOwogICAgICAgICByZXR1cm4gbG9naWNhbFdpZHRoOwogICAgIH0oKTsKIApAQCAtMzEz LDkgKzM0Nyw5IEBAIHZvaWQgRmxleExheW91dDo6anVzdGlmeUZsZXhJdGVtcyhMb2dpY2FsRmxl eEl0ZW1zJiBmbGV4SXRlbXMsIGNvbnN0IExpbmVSYW5nZSYsCiAgICAgICAgIGNhc2UgQ29udGVu dERpc3RyaWJ1dGlvbjo6U3BhY2VCZXR3ZWVuOgogICAgICAgICAgICAgcmV0dXJuIExheW91dFVu aXQgeyB9OwogICAgICAgICBjYXNlIENvbnRlbnREaXN0cmlidXRpb246OlNwYWNlQXJvdW5kOgot ICAgICAgICAgICAgcmV0dXJuIChhdmFpbGFibGVTcGFjZSAtIGNvbnRlbnRMb2dpY2FsV2lkdGgp IC8gZmxleEl0ZW1zLnNpemUoKSAvIDI7IAorICAgICAgICAgICAgcmV0dXJuIChhdmFpbGFibGVT cGFjZSAtIGNvbnRlbnRMb2dpY2FsV2lkdGgpIC8gbGluZVJhbmdlLmRpc3RhbmNlKCkgLyAyOwog ICAgICAgICBjYXNlIENvbnRlbnREaXN0cmlidXRpb246OlNwYWNlRXZlbmx5OgotICAgICAgICAg ICAgcmV0dXJuIChhdmFpbGFibGVTcGFjZSAtIGNvbnRlbnRMb2dpY2FsV2lkdGgpIC8gKGZsZXhJ dGVtcy5zaXplKCkgKyAxKTsKKyAgICAgICAgICAgIHJldHVybiAoYXZhaWxhYmxlU3BhY2UgLSBj b250ZW50TG9naWNhbFdpZHRoKSAvIChsaW5lUmFuZ2UuZGlzdGFuY2UoKSArIDEpOwogICAgICAg ICBkZWZhdWx0OgogICAgICAgICAgICAgQVNTRVJUX05PVF9JTVBMRU1FTlRFRF9ZRVQoKTsKICAg ICAgICAgICAgIGJyZWFrOwpAQCAtMzQ2LDEzICszODAsMTMgQEAgdm9pZCBGbGV4TGF5b3V0Ojpq dXN0aWZ5RmxleEl0ZW1zKExvZ2ljYWxGbGV4SXRlbXMmIGZsZXhJdGVtcywgY29uc3QgTGluZVJh bmdlJiwKICAgICAgICAgY2FzZSBDb250ZW50RGlzdHJpYnV0aW9uOjpEZWZhdWx0OgogICAgICAg ICAgICAgcmV0dXJuIExheW91dFVuaXQgeyB9OwogICAgICAgICBjYXNlIENvbnRlbnREaXN0cmli dXRpb246OlNwYWNlQmV0d2VlbjoKLSAgICAgICAgICAgIGlmIChmbGV4SXRlbXMuc2l6ZSgpID09 IDEpCisgICAgICAgICAgICBpZiAobGluZVJhbmdlLmRpc3RhbmNlKCkgPT0gMSkKICAgICAgICAg ICAgICAgICByZXR1cm4gTGF5b3V0VW5pdCB7IH07Ci0gICAgICAgICAgICByZXR1cm4gKGF2YWls YWJsZVNwYWNlIC0gY29udGVudExvZ2ljYWxXaWR0aCkgLyAoZmxleEl0ZW1zLnNpemUoKSAtIDEp OyAKKyAgICAgICAgICAgIHJldHVybiAoYXZhaWxhYmxlU3BhY2UgLSBjb250ZW50TG9naWNhbFdp ZHRoKSAvIChsaW5lUmFuZ2UuZGlzdGFuY2UoKSAtIDEpOwogICAgICAgICBjYXNlIENvbnRlbnRE aXN0cmlidXRpb246OlNwYWNlQXJvdW5kOgotICAgICAgICAgICAgcmV0dXJuIChhdmFpbGFibGVT cGFjZSAtIGNvbnRlbnRMb2dpY2FsV2lkdGgpIC8gZmxleEl0ZW1zLnNpemUoKTsgCisgICAgICAg ICAgICByZXR1cm4gKGF2YWlsYWJsZVNwYWNlIC0gY29udGVudExvZ2ljYWxXaWR0aCkgLyBsaW5l UmFuZ2UuZGlzdGFuY2UoKTsKICAgICAgICAgY2FzZSBDb250ZW50RGlzdHJpYnV0aW9uOjpTcGFj ZUV2ZW5seToKLSAgICAgICAgICAgIHJldHVybiAoYXZhaWxhYmxlU3BhY2UgLSBjb250ZW50TG9n aWNhbFdpZHRoKSAvIChmbGV4SXRlbXMuc2l6ZSgpICsgMSk7CisgICAgICAgICAgICByZXR1cm4g KGF2YWlsYWJsZVNwYWNlIC0gY29udGVudExvZ2ljYWxXaWR0aCkgLyAobGluZVJhbmdlLmRpc3Rh bmNlKCkgKyAxKTsKICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgIEFTU0VSVF9OT1RfSU1Q TEVNRU5URURfWUVUKCk7CiAgICAgICAgICAgICBicmVhazsKQEAgLTM2Myw3ICszOTcsOCBAQCB2 b2lkIEZsZXhMYXlvdXQ6Omp1c3RpZnlGbGV4SXRlbXMoTG9naWNhbEZsZXhJdGVtcyYgZmxleEl0 ZW1zLCBjb25zdCBMaW5lUmFuZ2UmLAogCiAgICAgYXV0byBsb2dpY2FsTGVmdCA9IGluaXRpYWxP ZmZzZXQoKTsKICAgICBhdXRvIGdhcCA9IGdhcEJldHdlZW5JdGVtcygpOwotICAgIGZvciAoYXV0 byYgZmxleEl0ZW0gOiBmbGV4SXRlbXMpIHsKKyAgICBmb3IgKHNpemVfdCBpbmRleCA9IGxpbmVS YW5nZS5iZWdpbigpOyBpbmRleCA8IGxpbmVSYW5nZS5lbmQoKTsgKytpbmRleCkgeworICAgICAg ICBhdXRvJiBmbGV4SXRlbSA9IGZsZXhJdGVtc1tpbmRleF07CiAgICAgICAgIGZsZXhJdGVtLnNl dExlZnQobG9naWNhbExlZnQpOwogICAgICAgICBsb2dpY2FsTGVmdCA9IGZsZXhJdGVtLnJpZ2h0 KCkgKyBnYXA7CiAgICAgfQpAQCAtMzc1LDEzICs0MTAsMTUgQEAgdm9pZCBGbGV4TGF5b3V0Ojps YXlvdXQoY29uc3QgQ29uc3RyYWludHNGb3JGbGV4Q29udGVudCYgY29uc3RyYWludHMsIExvZ2lj YWxGbGUKICAgICBhdXRvIHdyYXBwaW5nSW5kZXhMaXN0ID0gY29tcHV0ZVdyYXBwaW5nUG9zaXRp b25zKGZsZXhJdGVtcywgYXZhaWxhYmxlTG9naWNhbEhvcml6b250YWxTcGFjZSk7CiAKICAgICBh dXRvIGxpbmVSYW5nZSA9IFJhbmdlPHNpemVfdD4geyB9OworICAgIGF1dG8gbGluZVRvcCA9IGNv bnN0cmFpbnRzLmxvZ2ljYWxUb3AoKTsKICAgICBmb3IgKGF1dG8gbmV4dFdyYXBwaW5nUG9zaXRp b24gOiB3cmFwcGluZ0luZGV4TGlzdCkgewogICAgICAgICBsaW5lUmFuZ2UgPSB7IGxpbmVSYW5n ZS5lbmQoKSwgbmV4dFdyYXBwaW5nUG9zaXRpb24gfTsKICAgICAgICAgY29tcHV0ZUxvZ2ljYWxX aWR0aEZvckZsZXhJdGVtcyhmbGV4SXRlbXMsIGxpbmVSYW5nZSwgYXZhaWxhYmxlTG9naWNhbEhv cml6b250YWxTcGFjZSk7CiAgICAgICAgIGF1dG8gYXZhaWxhYmxlTG9naWNhbFZlcnRpY2FsU3Bh Y2UgPSBjb21wdXRlQXZhaWxhYmxlTG9naWNhbFZlcnRpY2FsU3BhY2UoZmxleEl0ZW1zLCBsaW5l UmFuZ2UsIGNvbnN0cmFpbnRzKTsKLSAgICAgICAgY29tcHV0ZUxvZ2ljYWxIZWlnaHRGb3JGbGV4 SXRlbXMoZmxleEl0ZW1zLCBsaW5lUmFuZ2UsIGF2YWlsYWJsZUxvZ2ljYWxWZXJ0aWNhbFNwYWNl KTsKLSAgICAgICAgYWxpZ25GbGV4SXRlbXMoZmxleEl0ZW1zLCBsaW5lUmFuZ2UsIGF2YWlsYWJs ZUxvZ2ljYWxWZXJ0aWNhbFNwYWNlKTsKKyAgICAgICAgYXV0byBsaW5lSGVpZ2h0ID0gY29tcHV0 ZUxvZ2ljYWxIZWlnaHRGb3JGbGV4SXRlbXMoZmxleEl0ZW1zLCBsaW5lUmFuZ2UsIGF2YWlsYWJs ZUxvZ2ljYWxWZXJ0aWNhbFNwYWNlKTsKKyAgICAgICAgYWxpZ25GbGV4SXRlbXMoZmxleEl0ZW1z LCBsaW5lUmFuZ2UsIHsgbGluZVRvcCwgYXZhaWxhYmxlTG9naWNhbFZlcnRpY2FsU3BhY2UgfSk7 CiAgICAgICAgIGp1c3RpZnlGbGV4SXRlbXMoZmxleEl0ZW1zLCBsaW5lUmFuZ2UsIGF2YWlsYWJs ZUxvZ2ljYWxIb3Jpem9udGFsU3BhY2UpOworICAgICAgICBsaW5lVG9wICs9IGxpbmVIZWlnaHQ7 CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2ZsZXgvRmxleExheW91dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhMYXlvdXQuaAppbmRleCBhNWZjYTY0ODQzMDcuLjJkMjEz ZmY5ZTlkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9mbGV4L0ZsZXhMYXlvdXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2ZsZXgvRmxleExheW91dC5oCkBAIC04NSw4ICs4NSw4IEBAIHByaXZhdGU6 CiAgICAgdm9pZCBjb21wdXRlTG9naWNhbFdpZHRoRm9yRmxleEl0ZW1zKExvZ2ljYWxGbGV4SXRl bXMmLCBjb25zdCBMaW5lUmFuZ2UmLCBMYXlvdXRVbml0IGF2YWlsYWJsZVNwYWNlKTsKICAgICB2 b2lkIGNvbXB1dGVMb2dpY2FsV2lkdGhGb3JTdHJldGNoaW5nRmxleEl0ZW1zKExvZ2ljYWxGbGV4 SXRlbXMmLCBjb25zdCBMaW5lUmFuZ2UmLCBMYXlvdXRVbml0IGF2YWlsYWJsZVNwYWNlKTsKICAg ICB2b2lkIGNvbXB1dGVMb2dpY2FsV2lkdGhGb3JTaHJpbmtpbmdGbGV4SXRlbXMoTG9naWNhbEZs ZXhJdGVtcyYsIGNvbnN0IExpbmVSYW5nZSYsIExheW91dFVuaXQgYXZhaWxhYmxlU3BhY2UpOwot ICAgIHZvaWQgY29tcHV0ZUxvZ2ljYWxIZWlnaHRGb3JGbGV4SXRlbXMoTG9naWNhbEZsZXhJdGVt cyYsIGNvbnN0IExpbmVSYW5nZSYsIExheW91dFVuaXQgYXZhaWxhYmxlU3BhY2UpOwotICAgIHZv aWQgYWxpZ25GbGV4SXRlbXMoTG9naWNhbEZsZXhJdGVtcyYsIGNvbnN0IExpbmVSYW5nZSYsIExh eW91dFVuaXQgYXZhaWxhYmxlU3BhY2UpOworICAgIExheW91dFVuaXQgY29tcHV0ZUxvZ2ljYWxI ZWlnaHRGb3JGbGV4SXRlbXMoTG9naWNhbEZsZXhJdGVtcyYsIGNvbnN0IExpbmVSYW5nZSYsIExh eW91dFVuaXQgYXZhaWxhYmxlU3BhY2UpOworICAgIHZvaWQgYWxpZ25GbGV4SXRlbXMoTG9naWNh bEZsZXhJdGVtcyYsIGNvbnN0IExpbmVSYW5nZSYsIFZlcnRpY2FsQ29uc3RyYWludHMpOwogICAg IHZvaWQganVzdGlmeUZsZXhJdGVtcyhMb2dpY2FsRmxleEl0ZW1zJiwgY29uc3QgTGluZVJhbmdl JiwgTGF5b3V0VW5pdCBhdmFpbGFibGVTcGFjZSk7CiAgICAgTGF5b3V0VW5pdCBjb21wdXRlQXZh aWxhYmxlTG9naWNhbFZlcnRpY2FsU3BhY2UoY29uc3QgTG9naWNhbEZsZXhJdGVtcyYsIGNvbnN0 IExpbmVSYW5nZSYsIGNvbnN0IENvbnN0cmFpbnRzRm9yRmxleENvbnRlbnQmKSBjb25zdDsKICAg ICBMYXlvdXRVbml0IGNvbXB1dGVBdmFpbGFibGVMb2dpY2FsSG9yaXpvbnRhbFNwYWNlKGNvbnN0 IExvZ2ljYWxGbGV4SXRlbXMmLCBjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250ZW50JikgY29u c3Q7Ci0tIAoyLjMyLjAgKEFwcGxlIEdpdC0xMzIpCgo=