258777 2023-07-01 21:09:55 -0700 [FFC] Add support for box-sizing for cross axis 2023-07-02 13:57:16 -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 1964659 0 zalan 2023-07-01 21:09:55 -0700 ssia 1964660 1 466899 zalan 2023-07-01 21:21:37 -0700 Created attachment 466899 Patch 1964662 2 466900 zalan 2023-07-01 21:23:45 -0700 Created attachment 466900 [fast-cq]Patch 1964691 3 ews-feeder 2023-07-02 13:56:17 -0700 Committed 265696@main (8161b33ac1f8): <https://commits.webkit.org/265696@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 466900. 1964692 4 webkit-bug-importer 2023-07-02 13:57:16 -0700 <rdar://problem/111653605> 466899 2023-07-01 21:21:37 -0700 2023-07-01 21:25:37 -0700 Patch bug-258777-20230701212136.patch text/plain 4576 zalan RnJvbSAyYzRkYmUzODliOGVjMTM3NzNkYmJkN2E4ZmE1YmY0NjM4ZWIzYzI5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMSBKdWwgMjAyMyAyMToxOTo0NyAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtGRkNdIEFk ZCBzdXBwb3J0IGZvciBib3gtc2l6aW5nIGZvciBjcm9zcyBheGlzCiBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU4Nzc3CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KClRha2UgYm94LXNpemluZyBpbnRvIGFjY291bnQgd2hlbiBjb21wdXRpbmcgdGhlIG91dGVy IGNyb3NzIGF4aXMgc2l6ZSBmb3IgZmxleCBpdGVtcy4KCiogU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhMYXlvdXQuY3BwOgooV2ViQ29yZTo6TGF5b3V0 OjpvdXRlckNyb3NzU2l6ZSk6CihXZWJDb3JlOjpMYXlvdXQ6OkZsZXhMYXlvdXQ6OmNyb3NzU2l6 ZUZvckZsZXhMaW5lcyBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXQ6OkZsZXhMYXlvdXQ6OmNvbXB1 dGVDcm9zc1NpemVGb3JGbGV4SXRlbXMgY29uc3QpOgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4TGF5 b3V0OjpoYW5kbGVDcm9zc0F4aXNBbGlnbm1lbnRGb3JGbGV4SXRlbXMgY29uc3QpOgotLS0KIC4u Li9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4TGF5b3V0LmNwcCAgICAgICB8IDE2ICsrKysr KysrKysrKystLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvZmxleC9GbGV4TGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvZmxleC9GbGV4TGF5b3V0LmNwcAppbmRleCBlNDk4NGY5YjIwM2MuLmQwNzM3MmU0 M2ZiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9mbGV4L0ZsZXhMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvZmxleC9GbGV4TGF5b3V0LmNwcApAQCAtMjQwLDYgKzI0MCwxNSBAQCBzdGF0 aWMgTGF5b3V0VW5pdCBvdXRlck1haW5TaXplKGNvbnN0IExvZ2ljYWxGbGV4SXRlbSYgZmxleEl0 ZW0sIExheW91dFVuaXQgbWFpbgogICAgIHJldHVybiBvdXRlck1haW5TaXplOwogfQogCitzdGF0 aWMgTGF5b3V0VW5pdCBvdXRlckNyb3NzU2l6ZShjb25zdCBMb2dpY2FsRmxleEl0ZW0mIGZsZXhJ dGVtLCBMYXlvdXRVbml0IGNyb3NzU2l6ZSwgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiB1c2Vk TWFyZ2luID0geyB9KQoreworICAgIGF1dG8gb3V0ZXJDcm9zc1NpemUgPSB1c2VkTWFyZ2luLnZh bHVlX29yKGZsZXhJdGVtLmNyb3NzQXhpcygpLm1hcmdpbigpKTsKKyAgICBpZiAoZmxleEl0ZW0u aXNDb250ZW50Qm94QmFzZWQoKSkKKyAgICAgICAgb3V0ZXJDcm9zc1NpemUgKz0gZmxleEl0ZW0u Y3Jvc3NBeGlzKCkuYm9yZGVyQW5kUGFkZGluZzsKKyAgICBvdXRlckNyb3NzU2l6ZSArPSBjcm9z c1NpemU7CisgICAgcmV0dXJuIG91dGVyQ3Jvc3NTaXplOworfQorCiBGbGV4TGF5b3V0OjpMaW5l UmFuZ2VzIEZsZXhMYXlvdXQ6OmNvbXB1dGVGbGV4TGluZXMoY29uc3QgTG9naWNhbEZsZXhJdGVt cyYgZmxleEl0ZW1zLCBMYXlvdXRVbml0IGZsZXhDb250YWluZXJNYWluU2l6ZSwgY29uc3QgRmxl eEJhc2VBbmRIeXBvdGhldGljYWxNYWluU2l6ZUxpc3QmIGZsZXhCYXNlQW5kSHlwb3RoZXRpY2Fs TWFpblNpemVMaXN0KSBjb25zdAogewogICAgIC8vIENvbGxlY3QgZmxleCBpdGVtcyBpbnRvIGZs ZXggbGluZXM6CkBAIC00NDgsNyArNDU3LDggQEAgRmxleExheW91dDo6TGluZXNDcm9zc1NpemVM aXN0IEZsZXhMYXlvdXQ6OmNyb3NzU2l6ZUZvckZsZXhMaW5lcyhjb25zdCBMaW5lUmFuZ2UKICAg ICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIC8vIEFt b25nIGFsbCB0aGUgaXRlbXMgbm90IGNvbGxlY3RlZCBieSB0aGUgcHJldmlvdXMgc3RlcCwgZmlu ZCB0aGUgbGFyZ2VzdCBvdXRlciBoeXBvdGhldGljYWwgY3Jvc3Mgc2l6ZS4KLSAgICAgICAgICAg IG1heGltdW1IeXBvdGhldGljYWxPdXRlckNyb3NzU2l6ZSA9IHN0ZDo6bWF4KG1heGltdW1IeXBv dGhldGljYWxPdXRlckNyb3NzU2l6ZSwgZmxleEl0ZW1zSHlwb3RoZXRpY2FsQ3Jvc3NTaXplTGlz dFtmbGV4SXRlbUluZGV4XSk7CisgICAgICAgICAgICBhdXRvIGZsZXhJdGVtT3V0ZXJDcm9zc1Np emUgPSBvdXRlckNyb3NzU2l6ZShmbGV4SXRlbSwgZmxleEl0ZW1zSHlwb3RoZXRpY2FsQ3Jvc3NT aXplTGlzdFtmbGV4SXRlbUluZGV4XSk7CisgICAgICAgICAgICBtYXhpbXVtSHlwb3RoZXRpY2Fs T3V0ZXJDcm9zc1NpemUgPSBzdGQ6Om1heChtYXhpbXVtSHlwb3RoZXRpY2FsT3V0ZXJDcm9zc1Np emUsIGZsZXhJdGVtT3V0ZXJDcm9zc1NpemUpOwogICAgICAgICB9CiAgICAgICAgIC8vIFRoZSB1 c2VkIGNyb3NzLXNpemUgb2YgdGhlIGZsZXggbGluZSBpcyB0aGUgbGFyZ2VzdCBvZiB0aGUgbnVt YmVycyBmb3VuZCBpbiB0aGUgcHJldmlvdXMgdHdvIHN0ZXBzIGFuZCB6ZXJvLgogICAgICAgICAv LyBJZiB0aGUgZmxleCBjb250YWluZXIgaXMgc2luZ2xlLWxpbmUsIHRoZW4gY2xhbXAgdGhlIGxp bmUncyBjcm9zcy1zaXplIHRvIGJlIHdpdGhpbiB0aGUgY29udGFpbmVyJ3MgY29tcHV0ZWQgbWlu IGFuZCBtYXggY3Jvc3Mgc2l6ZXMuCkBAIC01MDMsNyArNTEzLDcgQEAgRmxleExheW91dDo6U2l6 ZUxpc3QgRmxleExheW91dDo6Y29tcHV0ZUNyb3NzU2l6ZUZvckZsZXhJdGVtcyhjb25zdCBMb2dp Y2FsRmxleEkKICAgICAgICAgICAgIGNyb3NzU2l6ZUxpc3RbZmxleEl0ZW1JbmRleF0gPSBmbGV4 SXRlbXNIeXBvdGhldGljYWxDcm9zc1NpemVMaXN0W2ZsZXhJdGVtSW5kZXhdOwogICAgICAgICAg ICAgaWYgKGZsZXhJdGVtLnN0eWxlKCkuYWxpZ25TZWxmKCkucG9zaXRpb24oKSA9PSBJdGVtUG9z aXRpb246OlN0cmV0Y2gpIHsKICAgICAgICAgICAgICAgICBpZiAoZmxleEl0ZW0uY3Jvc3NBeGlz KCkuaGFzU2l6ZUF1dG8gJiYgZmxleEl0ZW0uY3Jvc3NBeGlzKCkuaGFzTm9uQXV0b01hcmdpbnMo KSkgewotICAgICAgICAgICAgICAgICAgICBhdXRvIHVzZWRPdXRlckNyb3NzU2l6ZSA9IGZsZXhM aW5lc0Nyb3NzU2l6ZUxpc3RbbGluZUluZGV4XTsKKyAgICAgICAgICAgICAgICAgICAgYXV0byB1 c2VkT3V0ZXJDcm9zc1NpemUgPSBvdXRlckNyb3NzU2l6ZShmbGV4SXRlbSwgZmxleExpbmVzQ3Jv c3NTaXplTGlzdFtmbGV4SXRlbUluZGV4XSk7CiAgICAgICAgICAgICAgICAgICAgIGF1dG8gbWlu aW11bUNyb3NzU2l6ZSA9IGZsZXhJdGVtLm1haW5BeGlzKCkubWluaW11bVNpemUudmFsdWVfb3Io dXNlZE91dGVyQ3Jvc3NTaXplKTsKICAgICAgICAgICAgICAgICAgICAgYXV0byBtYXhpbXVtQ3Jv c3NTaXplID0gZmxleEl0ZW0ubWFpbkF4aXMoKS5tYXhpbXVtU2l6ZS52YWx1ZV9vcih1c2VkT3V0 ZXJDcm9zc1NpemUpOwogICAgICAgICAgICAgICAgICAgICBjcm9zc1NpemVMaXN0W2ZsZXhJdGVt SW5kZXhdID0gc3RkOjptYXgobWF4aW11bUNyb3NzU2l6ZSwgc3RkOjptaW4obWluaW11bUNyb3Nz U2l6ZSwgdXNlZE91dGVyQ3Jvc3NTaXplKSk7CkBAIC02ODAsNyArNjkwLDcgQEAgRmxleExheW91 dDo6UG9zaXRpb25BbmRNYXJnaW5zTGlzdCBGbGV4TGF5b3V0OjpoYW5kbGVDcm9zc0F4aXNBbGln bm1lbnRGb3JGbGV4SXQKIAogICAgICAgICAgICAgICAgIC8vIFJlc29sdmUgY3Jvc3MtYXhpcyBh dXRvIG1hcmdpbnMuIElmIGEgZmxleCBpdGVtIGhhcyBhdXRvIGNyb3NzLWF4aXMgbWFyZ2luczoK ICAgICAgICAgICAgICAgICBpZiAoIW1hcmdpblN0YXJ0IHx8ICFtYXJnaW5FbmQpIHsKLSAgICAg ICAgICAgICAgICAgICAgYXV0byBmbGV4SXRlbU91dGVyQ3Jvc3NTaXplID0gbWFyZ2luU3RhcnQu dmFsdWVfb3IoMF9sdSkgKyBmbGV4SXRlbXNDcm9zc1NpemVMaXN0W2ZsZXhJdGVtSW5kZXhdICsg bWFyZ2luRW5kLnZhbHVlX29yKDBfbHUpOworICAgICAgICAgICAgICAgICAgICBhdXRvIGZsZXhJ dGVtT3V0ZXJDcm9zc1NpemUgPSBvdXRlckNyb3NzU2l6ZShmbGV4SXRlbSwgZmxleEl0ZW1zQ3Jv c3NTaXplTGlzdFtmbGV4SXRlbUluZGV4XSk7CiAgICAgICAgICAgICAgICAgICAgIGF1dG8gZXh0 cmFDcm9zc1NwYWNlID0gZmxleExpbmVzQ3Jvc3NTaXplTGlzdFtsaW5lSW5kZXhdIC0gZmxleEl0 ZW1PdXRlckNyb3NzU2l6ZTsKICAgICAgICAgICAgICAgICAgICAgLy8gSWYgaXRzIG91dGVyIGNy b3NzIHNpemUgKHRyZWF0aW5nIHRob3NlIGF1dG8gbWFyZ2lucyBhcyB6ZXJvKSBpcyBsZXNzIHRo YW4gdGhlIGNyb3NzIHNpemUgb2YgaXRzIGZsZXggbGluZSwgZGlzdHJpYnV0ZQogICAgICAgICAg ICAgICAgICAgICAvLyB0aGUgZGlmZmVyZW5jZSBpbiB0aG9zZSBzaXplcyBlcXVhbGx5IHRvIHRo ZSBhdXRvIG1hcmdpbnMuCg== 466900 2023-07-01 21:23:45 -0700 2023-07-02 13:56:17 -0700 [fast-cq]Patch bug-258777-20230701212344.patch text/plain 6351 zalan RnJvbSA1NjNhNmRiZjcxNWYzZGM0ZWQzM2VmNTFiY2RjYjc2MTM1Mjg1NTEwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMSBKdWwgMjAyMyAyMToxOTo0NyAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtGRkNdIEFk ZCBzdXBwb3J0IGZvciBib3gtc2l6aW5nIGZvciBjcm9zcyBheGlzCiBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU4Nzc3CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KClRha2UgYm94LXNpemluZyBpbnRvIGFjY291bnQgd2hlbiBjb21wdXRpbmcgdGhlIG91dGVy IGNyb3NzIGF4aXMgc2l6ZSBmb3IgZmxleCBpdGVtcy4KCiogU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhMYXlvdXQuY3BwOgooV2ViQ29yZTo6TGF5b3V0 OjpvdXRlckNyb3NzU2l6ZSk6CihXZWJDb3JlOjpMYXlvdXQ6OkZsZXhMYXlvdXQ6OmNyb3NzU2l6 ZUZvckZsZXhMaW5lcyBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXQ6OkZsZXhMYXlvdXQ6OmNvbXB1 dGVDcm9zc1NpemVGb3JGbGV4SXRlbXMgY29uc3QpOgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4TGF5 b3V0OjpoYW5kbGVDcm9zc0F4aXNBbGlnbm1lbnRGb3JGbGV4SXRlbXMgY29uc3QpOgotLS0KIC4u Li9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAgICAgICAgICAgICAgICB8ICAxICsKIC4u Li9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4TGF5b3V0LmNwcCAgICAgICB8IDE2ICsrKysr KysrKysrKystLS0KIC4uLi9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9Mb2dpY2FsRmxleEl0ZW0u aCAgICB8ICA3ICsrKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygrKSwgMyBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3Bw CmluZGV4IGM4MTAxNjY0YTI4OS4uZWVmNmZhNzRkNzMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgv RmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMTI0LDYgKzEyNCw3IEBAIEZsZXhMYXlvdXQ6 OkxvZ2ljYWxGbGV4SXRlbXMgRmxleEZvcm1hdHRpbmdDb250ZXh0Ojpjb252ZXJ0RmxleEl0ZW1z VG9Mb2dpY2FsU3BhCiAgICAgICAgICAgICAgICAgY3Jvc3NBeGlzLmhhc1NpemVBdXRvID0gaGVp Z2h0LmlzQXV0bygpOwogICAgICAgICAgICAgICAgIGlmIChoZWlnaHQuaXNGaXhlZCgpKQogICAg ICAgICAgICAgICAgICAgICBjcm9zc0F4aXMuZGVmaW5pdGVTaXplID0gaGVpZ2h0LnZhbHVlKCk7 CisgICAgICAgICAgICAgICAgY3Jvc3NBeGlzLmJvcmRlckFuZFBhZGRpbmcgPSBmbGV4SXRlbUdl b21ldHJ5LnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZygpOwogICAgICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICAgICAgfQogICAgICAgICAgICAgY2FzZSBGbGV4RGlyZWN0aW9uOjpDb2x1bW46 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2Zs ZXgvRmxleExheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2ZsZXgvRmxleExheW91dC5jcHAKaW5kZXggZTQ5ODRmOWIyMDNjLi5kMDczNzJlNDNmYmIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxl eC9GbGV4TGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2ZsZXgvRmxleExheW91dC5jcHAKQEAgLTI0MCw2ICsyNDAsMTUgQEAgc3RhdGljIExh eW91dFVuaXQgb3V0ZXJNYWluU2l6ZShjb25zdCBMb2dpY2FsRmxleEl0ZW0mIGZsZXhJdGVtLCBM YXlvdXRVbml0IG1haW4KICAgICByZXR1cm4gb3V0ZXJNYWluU2l6ZTsKIH0KIAorc3RhdGljIExh eW91dFVuaXQgb3V0ZXJDcm9zc1NpemUoY29uc3QgTG9naWNhbEZsZXhJdGVtJiBmbGV4SXRlbSwg TGF5b3V0VW5pdCBjcm9zc1NpemUsIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gdXNlZE1hcmdp biA9IHsgfSkKK3sKKyAgICBhdXRvIG91dGVyQ3Jvc3NTaXplID0gdXNlZE1hcmdpbi52YWx1ZV9v cihmbGV4SXRlbS5jcm9zc0F4aXMoKS5tYXJnaW4oKSk7CisgICAgaWYgKGZsZXhJdGVtLmlzQ29u dGVudEJveEJhc2VkKCkpCisgICAgICAgIG91dGVyQ3Jvc3NTaXplICs9IGZsZXhJdGVtLmNyb3Nz QXhpcygpLmJvcmRlckFuZFBhZGRpbmc7CisgICAgb3V0ZXJDcm9zc1NpemUgKz0gY3Jvc3NTaXpl OworICAgIHJldHVybiBvdXRlckNyb3NzU2l6ZTsKK30KKwogRmxleExheW91dDo6TGluZVJhbmdl cyBGbGV4TGF5b3V0Ojpjb21wdXRlRmxleExpbmVzKGNvbnN0IExvZ2ljYWxGbGV4SXRlbXMmIGZs ZXhJdGVtcywgTGF5b3V0VW5pdCBmbGV4Q29udGFpbmVyTWFpblNpemUsIGNvbnN0IEZsZXhCYXNl QW5kSHlwb3RoZXRpY2FsTWFpblNpemVMaXN0JiBmbGV4QmFzZUFuZEh5cG90aGV0aWNhbE1haW5T aXplTGlzdCkgY29uc3QKIHsKICAgICAvLyBDb2xsZWN0IGZsZXggaXRlbXMgaW50byBmbGV4IGxp bmVzOgpAQCAtNDQ4LDcgKzQ1Nyw4IEBAIEZsZXhMYXlvdXQ6OkxpbmVzQ3Jvc3NTaXplTGlzdCBG bGV4TGF5b3V0Ojpjcm9zc1NpemVGb3JGbGV4TGluZXMoY29uc3QgTGluZVJhbmdlCiAgICAgICAg ICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAvLyBBbW9uZyBh bGwgdGhlIGl0ZW1zIG5vdCBjb2xsZWN0ZWQgYnkgdGhlIHByZXZpb3VzIHN0ZXAsIGZpbmQgdGhl IGxhcmdlc3Qgb3V0ZXIgaHlwb3RoZXRpY2FsIGNyb3NzIHNpemUuCi0gICAgICAgICAgICBtYXhp bXVtSHlwb3RoZXRpY2FsT3V0ZXJDcm9zc1NpemUgPSBzdGQ6Om1heChtYXhpbXVtSHlwb3RoZXRp Y2FsT3V0ZXJDcm9zc1NpemUsIGZsZXhJdGVtc0h5cG90aGV0aWNhbENyb3NzU2l6ZUxpc3RbZmxl eEl0ZW1JbmRleF0pOworICAgICAgICAgICAgYXV0byBmbGV4SXRlbU91dGVyQ3Jvc3NTaXplID0g b3V0ZXJDcm9zc1NpemUoZmxleEl0ZW0sIGZsZXhJdGVtc0h5cG90aGV0aWNhbENyb3NzU2l6ZUxp c3RbZmxleEl0ZW1JbmRleF0pOworICAgICAgICAgICAgbWF4aW11bUh5cG90aGV0aWNhbE91dGVy Q3Jvc3NTaXplID0gc3RkOjptYXgobWF4aW11bUh5cG90aGV0aWNhbE91dGVyQ3Jvc3NTaXplLCBm bGV4SXRlbU91dGVyQ3Jvc3NTaXplKTsKICAgICAgICAgfQogICAgICAgICAvLyBUaGUgdXNlZCBj cm9zcy1zaXplIG9mIHRoZSBmbGV4IGxpbmUgaXMgdGhlIGxhcmdlc3Qgb2YgdGhlIG51bWJlcnMg Zm91bmQgaW4gdGhlIHByZXZpb3VzIHR3byBzdGVwcyBhbmQgemVyby4KICAgICAgICAgLy8gSWYg dGhlIGZsZXggY29udGFpbmVyIGlzIHNpbmdsZS1saW5lLCB0aGVuIGNsYW1wIHRoZSBsaW5lJ3Mg Y3Jvc3Mtc2l6ZSB0byBiZSB3aXRoaW4gdGhlIGNvbnRhaW5lcidzIGNvbXB1dGVkIG1pbiBhbmQg bWF4IGNyb3NzIHNpemVzLgpAQCAtNTAzLDcgKzUxMyw3IEBAIEZsZXhMYXlvdXQ6OlNpemVMaXN0 IEZsZXhMYXlvdXQ6OmNvbXB1dGVDcm9zc1NpemVGb3JGbGV4SXRlbXMoY29uc3QgTG9naWNhbEZs ZXhJCiAgICAgICAgICAgICBjcm9zc1NpemVMaXN0W2ZsZXhJdGVtSW5kZXhdID0gZmxleEl0ZW1z SHlwb3RoZXRpY2FsQ3Jvc3NTaXplTGlzdFtmbGV4SXRlbUluZGV4XTsKICAgICAgICAgICAgIGlm IChmbGV4SXRlbS5zdHlsZSgpLmFsaWduU2VsZigpLnBvc2l0aW9uKCkgPT0gSXRlbVBvc2l0aW9u OjpTdHJldGNoKSB7CiAgICAgICAgICAgICAgICAgaWYgKGZsZXhJdGVtLmNyb3NzQXhpcygpLmhh c1NpemVBdXRvICYmIGZsZXhJdGVtLmNyb3NzQXhpcygpLmhhc05vbkF1dG9NYXJnaW5zKCkpIHsK LSAgICAgICAgICAgICAgICAgICAgYXV0byB1c2VkT3V0ZXJDcm9zc1NpemUgPSBmbGV4TGluZXND cm9zc1NpemVMaXN0W2xpbmVJbmRleF07CisgICAgICAgICAgICAgICAgICAgIGF1dG8gdXNlZE91 dGVyQ3Jvc3NTaXplID0gb3V0ZXJDcm9zc1NpemUoZmxleEl0ZW0sIGZsZXhMaW5lc0Nyb3NzU2l6 ZUxpc3RbZmxleEl0ZW1JbmRleF0pOwogICAgICAgICAgICAgICAgICAgICBhdXRvIG1pbmltdW1D cm9zc1NpemUgPSBmbGV4SXRlbS5tYWluQXhpcygpLm1pbmltdW1TaXplLnZhbHVlX29yKHVzZWRP dXRlckNyb3NzU2l6ZSk7CiAgICAgICAgICAgICAgICAgICAgIGF1dG8gbWF4aW11bUNyb3NzU2l6 ZSA9IGZsZXhJdGVtLm1haW5BeGlzKCkubWF4aW11bVNpemUudmFsdWVfb3IodXNlZE91dGVyQ3Jv c3NTaXplKTsKICAgICAgICAgICAgICAgICAgICAgY3Jvc3NTaXplTGlzdFtmbGV4SXRlbUluZGV4 XSA9IHN0ZDo6bWF4KG1heGltdW1Dcm9zc1NpemUsIHN0ZDo6bWluKG1pbmltdW1Dcm9zc1NpemUs IHVzZWRPdXRlckNyb3NzU2l6ZSkpOwpAQCAtNjgwLDcgKzY5MCw3IEBAIEZsZXhMYXlvdXQ6OlBv c2l0aW9uQW5kTWFyZ2luc0xpc3QgRmxleExheW91dDo6aGFuZGxlQ3Jvc3NBeGlzQWxpZ25tZW50 Rm9yRmxleEl0CiAKICAgICAgICAgICAgICAgICAvLyBSZXNvbHZlIGNyb3NzLWF4aXMgYXV0byBt YXJnaW5zLiBJZiBhIGZsZXggaXRlbSBoYXMgYXV0byBjcm9zcy1heGlzIG1hcmdpbnM6CiAgICAg ICAgICAgICAgICAgaWYgKCFtYXJnaW5TdGFydCB8fCAhbWFyZ2luRW5kKSB7Ci0gICAgICAgICAg ICAgICAgICAgIGF1dG8gZmxleEl0ZW1PdXRlckNyb3NzU2l6ZSA9IG1hcmdpblN0YXJ0LnZhbHVl X29yKDBfbHUpICsgZmxleEl0ZW1zQ3Jvc3NTaXplTGlzdFtmbGV4SXRlbUluZGV4XSArIG1hcmdp bkVuZC52YWx1ZV9vcigwX2x1KTsKKyAgICAgICAgICAgICAgICAgICAgYXV0byBmbGV4SXRlbU91 dGVyQ3Jvc3NTaXplID0gb3V0ZXJDcm9zc1NpemUoZmxleEl0ZW0sIGZsZXhJdGVtc0Nyb3NzU2l6 ZUxpc3RbZmxleEl0ZW1JbmRleF0pOwogICAgICAgICAgICAgICAgICAgICBhdXRvIGV4dHJhQ3Jv c3NTcGFjZSA9IGZsZXhMaW5lc0Nyb3NzU2l6ZUxpc3RbbGluZUluZGV4XSAtIGZsZXhJdGVtT3V0 ZXJDcm9zc1NpemU7CiAgICAgICAgICAgICAgICAgICAgIC8vIElmIGl0cyBvdXRlciBjcm9zcyBz aXplICh0cmVhdGluZyB0aG9zZSBhdXRvIG1hcmdpbnMgYXMgemVybykgaXMgbGVzcyB0aGFuIHRo ZSBjcm9zcyBzaXplIG9mIGl0cyBmbGV4IGxpbmUsIGRpc3RyaWJ1dGUKICAgICAgICAgICAgICAg ICAgICAgLy8gdGhlIGRpZmZlcmVuY2UgaW4gdGhvc2Ugc2l6ZXMgZXF1YWxseSB0byB0aGUgYXV0 byBtYXJnaW5zLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9mbGV4L0xvZ2ljYWxGbGV4SXRlbS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9mbGV4L0xvZ2ljYWxGbGV4SXRlbS5oCmluZGV4IGU5ZTcxZmQ2MWM5 My4uMjlkYmVjMDBhZWVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2ZsZXgvTG9naWNhbEZsZXhJdGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0xvZ2ljYWxGbGV4SXRlbS5oCkBAIC00NSwx MyArNDUsMjAgQEAgcHVibGljOgogICAgIH07CiAKICAgICBzdHJ1Y3QgQ3Jvc3NBeGlzR2VvbWV0 cnkgeworICAgICAgICBMYXlvdXRVbml0IG1hcmdpbigpIGNvbnN0IHsgcmV0dXJuIG1hcmdpblN0 YXJ0LnZhbHVlX29yKDBfbHUpICsgbWFyZ2luRW5kLnZhbHVlX29yKDBfbHUpOyB9CisKICAgICAg ICAgYm9vbCBoYXNOb25BdXRvTWFyZ2lucygpIGNvbnN0IHsgcmV0dXJuIG1hcmdpblN0YXJ0ICYm IG1hcmdpbkVuZDsgfQogCiAgICAgICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gZGVmaW5p dGVTaXplOworCiAgICAgICAgIExheW91dFVuaXQgYXNjZW50OwogICAgICAgICBMYXlvdXRVbml0 IGRlc2NlbnQ7CisKICAgICAgICAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBtYXJnaW5TdGFy dDsKICAgICAgICAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBtYXJnaW5FbmQ7CisKKyAgICAg ICAgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nOworCiAgICAgICAgIGJvb2wgaGFzU2l6ZUF1 dG8geyBmYWxzZSB9OwogICAgIH07CiAK