253013 2023-02-27 11:35:19 -0800 [contain-intrinsic-size] failures related to replaced elements 2023-03-03 19:51:05 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 236707 1 cathiechen cathiechen bfulgham cathiechen ntim obrufau rbuis webkit-bug-importer oldest_to_newest 1937107 0 cathiechen 2023-02-27 11:35:19 -0800 There are several issues need to fix. * There are some special returns for inline size containment. We should avoid it and let intrinsicSize() to handle both size and inline size containment instead. * For video, when calculateIntrinsicSize(), it should consider contain:inline-size. * intrinsicSize() should consider the inline size containment scenario. 1937110 1 465202 cathiechen 2023-02-27 11:37:30 -0800 Created attachment 465202 WIP-patch 1937844 2 cathiechen 2023-03-01 11:07:07 -0800 Pull request: https://github.com/WebKit/WebKit/pull/10881 1937879 3 webkit-bug-importer 2023-03-01 12:23:25 -0800 <rdar://problem/106100196> 1938768 4 ews-feeder 2023-03-03 19:51:02 -0800 Committed 261205@main (43b73e296e50): <https://commits.webkit.org/261205@main> Reviewed commits have been landed. Closing PR #10881 and removing active labels. 465202 2023-02-27 11:37:30 -0800 2023-02-27 11:37:30 -0800 WIP-patch cis-028-001.diff text/plain 14066 cathiechen ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9U ZXN0RXhwZWN0YXRpb25zCmluZGV4IGZhZmRmYWU4MjI1OS4uYjgwYTg0OGE4NWEwIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RF eHBlY3RhdGlvbnMKQEAgLTQ4NTYsNyArNDg1Niw2IEBAIHdlYmFuaW1hdGlvbnMvdHJhbnNsYXRl LXByb3BlcnR5LWFuZC10cmFuc2xhdGUtYW5pbWF0aW9uLXdpdGgtZGVsYXktb24tZm9yY2VkLWxh CiAKICMgQ1NTIGNvbnRhaW5tZW50IHRlc3RzIHRoYXQgZmFpbAogaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbi1pbmxpbmUtc2l6ZS1iZmMtZmxv YXRzLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi1pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluLWlubGluZS1zaXplLWludHJpbnNpYy5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAjIGZvcmNlZCBsYXlvdXQKIGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRlbnQtdmlzaWJpbGl0eS9jb250 ZW50LXZpc2liaWxpdHktMDM1Lmh0bWwgWyBTa2lwIF0KICMgYy12OiBhdXRvCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2NvbnRhaW4taW50cmluc2ljLXNpemUvY29udGFpbi1pbnRyaW5zaWMtc2l6ZS0wMjgtZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNpemluZy9jb250YWluLWludHJpbnNpYy1zaXplL2NvbnRhaW4taW50cmluc2ljLXNp emUtMDI4LWV4cGVjdGVkLnR4dAppbmRleCBmOTE1MmY2YWQyMDkuLjExNWMwMjE5ZWZiZiAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9jb250YWluLWludHJpbnNpYy1zaXplL2NvbnRhaW4taW50cmluc2ljLXNpemUt MDI4LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2NvbnRhaW4taW50cmluc2ljLXNpemUvY29udGFpbi1p bnRyaW5zaWMtc2l6ZS0wMjgtZXhwZWN0ZWQudHh0CkBAIC05LDg0ICs5LDQ0IEBAIFBBU1MgLnRl c3QgNwogUEFTUyAudGVzdCA4CiBQQVNTIC50ZXN0IDkKIFBBU1MgLnRlc3QgMTAKLUZBSUwgLnRl c3QgMTEgYXNzZXJ0X2VxdWFsczoKLTxpbWcgY2xhc3M9InRlc3QgY2lzLXdpZHRoIiBzcmM9Ii9j c3Mvc3VwcG9ydC82MHg2MC1ncmVlbi5wbmciIGRhdGEtZXhwZWN0ZWQtY2xpZW50LXdpZHRoPSIx MDAiIGRhdGEtZXhwZWN0ZWQtY2xpZW50LWhlaWdodD0iNjAiPgotY2xpZW50V2lkdGggZXhwZWN0 ZWQgMTAwIGJ1dCBnb3QgMAotRkFJTCAudGVzdCAxMiBhc3NlcnRfZXF1YWxzOgotPGltZyBjbGFz cz0idGVzdCBjaXMtYm90aCIgc3JjPSIvY3NzL3N1cHBvcnQvNjB4NjAtZ3JlZW4ucG5nIiBkYXRh LWV4cGVjdGVkLWNsaWVudC13aWR0aD0iMTAwIiBkYXRhLWV4cGVjdGVkLWNsaWVudC1oZWlnaHQ9 IjYwIj4KLWNsaWVudFdpZHRoIGV4cGVjdGVkIDEwMCBidXQgZ290IDAKK1BBU1MgLnRlc3QgMTEK K1BBU1MgLnRlc3QgMTIKIFBBU1MgLnRlc3QgMTMKLUZBSUwgLnRlc3QgMTQgYXNzZXJ0X2VxdWFs czoKLTxpbWcgY2xhc3M9InRlc3QgY2lzLWhlaWdodCB2ZXJ0aWNhbCIgc3JjPSIvY3NzL3N1cHBv cnQvNjB4NjAtZ3JlZW4ucG5nIiBkYXRhLWV4cGVjdGVkLWNsaWVudC13aWR0aD0iNjAiIGRhdGEt ZXhwZWN0ZWQtY2xpZW50LWhlaWdodD0iNTAiPgotY2xpZW50SGVpZ2h0IGV4cGVjdGVkIDUwIGJ1 dCBnb3QgMAorUEFTUyAudGVzdCAxNAogUEFTUyAudGVzdCAxNQotRkFJTCAudGVzdCAxNiBhc3Nl cnRfZXF1YWxzOgotPGltZyBjbGFzcz0idGVzdCBjaXMtYm90aCB2ZXJ0aWNhbCIgc3JjPSIvY3Nz L3N1cHBvcnQvNjB4NjAtZ3JlZW4ucG5nIiBkYXRhLWV4cGVjdGVkLWNsaWVudC13aWR0aD0iNjAi IGRhdGEtZXhwZWN0ZWQtY2xpZW50LWhlaWdodD0iNTAiPgotY2xpZW50SGVpZ2h0IGV4cGVjdGVk IDUwIGJ1dCBnb3QgMAorUEFTUyAudGVzdCAxNgogUEFTUyAudGVzdCAxNwogUEFTUyAudGVzdCAx OAotRkFJTCAudGVzdCAxOSBhc3NlcnRfZXF1YWxzOgotPHN2ZyBjbGFzcz0idGVzdCBjaXMtd2lk dGgiIGRhdGEtZXhwZWN0ZWQtY2xpZW50LXdpZHRoPSIxMDAiIGRhdGEtZXhwZWN0ZWQtY2xpZW50 LWhlaWdodD0iMTUwIj48L3N2Zz4KLWNsaWVudFdpZHRoIGV4cGVjdGVkIDEwMCBidXQgZ290IDAK LUZBSUwgLnRlc3QgMjAgYXNzZXJ0X2VxdWFsczoKLTxzdmcgY2xhc3M9InRlc3QgY2lzLWJvdGgi IGRhdGEtZXhwZWN0ZWQtY2xpZW50LXdpZHRoPSIxMDAiIGRhdGEtZXhwZWN0ZWQtY2xpZW50LWhl aWdodD0iMTUwIj48L3N2Zz4KLWNsaWVudFdpZHRoIGV4cGVjdGVkIDEwMCBidXQgZ290IDAKK1BB U1MgLnRlc3QgMTkKK1BBU1MgLnRlc3QgMjAKIFBBU1MgLnRlc3QgMjEKLUZBSUwgLnRlc3QgMjIg YXNzZXJ0X2VxdWFsczoKLTxzdmcgY2xhc3M9InRlc3QgY2lzLWhlaWdodCB2ZXJ0aWNhbCIgZGF0 YS1leHBlY3RlZC1jbGllbnQtd2lkdGg9IjMwMCIgZGF0YS1leHBlY3RlZC1jbGllbnQtaGVpZ2h0 PSI1MCI+PC9zdmc+Ci1jbGllbnRIZWlnaHQgZXhwZWN0ZWQgNTAgYnV0IGdvdCAwCitQQVNTIC50 ZXN0IDIyCiBQQVNTIC50ZXN0IDIzCi1GQUlMIC50ZXN0IDI0IGFzc2VydF9lcXVhbHM6Ci08c3Zn IGNsYXNzPSJ0ZXN0IGNpcy1ib3RoIHZlcnRpY2FsIiBkYXRhLWV4cGVjdGVkLWNsaWVudC13aWR0 aD0iMzAwIiBkYXRhLWV4cGVjdGVkLWNsaWVudC1oZWlnaHQ9IjUwIj48L3N2Zz4KLWNsaWVudEhl aWdodCBleHBlY3RlZCA1MCBidXQgZ290IDAKK1BBU1MgLnRlc3QgMjQKIFBBU1MgLnRlc3QgMjUK IFBBU1MgLnRlc3QgMjYKLUZBSUwgLnRlc3QgMjcgYXNzZXJ0X2VxdWFsczoKLTxjYW52YXMgY2xh c3M9InRlc3QgY2lzLXdpZHRoIiB3aWR0aD0iNDAiIGhlaWdodD0iMjAiIGRhdGEtZXhwZWN0ZWQt Y2xpZW50LXdpZHRoPSIxMDAiIGRhdGEtZXhwZWN0ZWQtY2xpZW50LWhlaWdodD0iMjAiPjwvY2Fu dmFzPgotY2xpZW50V2lkdGggZXhwZWN0ZWQgMTAwIGJ1dCBnb3QgMAotRkFJTCAudGVzdCAyOCBh c3NlcnRfZXF1YWxzOgotPGNhbnZhcyBjbGFzcz0idGVzdCBjaXMtYm90aCIgd2lkdGg9IjQwIiBo ZWlnaHQ9IjIwIiBkYXRhLWV4cGVjdGVkLWNsaWVudC13aWR0aD0iMTAwIiBkYXRhLWV4cGVjdGVk LWNsaWVudC1oZWlnaHQ9IjIwIj48L2NhbnZhcz4KLWNsaWVudFdpZHRoIGV4cGVjdGVkIDEwMCBi dXQgZ290IDAKK1BBU1MgLnRlc3QgMjcKK1BBU1MgLnRlc3QgMjgKIFBBU1MgLnRlc3QgMjkKLUZB SUwgLnRlc3QgMzAgYXNzZXJ0X2VxdWFsczoKLTxjYW52YXMgY2xhc3M9InRlc3QgY2lzLWhlaWdo dCB2ZXJ0aWNhbCIgd2lkdGg9IjQwIiBoZWlnaHQ9IjIwIiBkYXRhLWV4cGVjdGVkLWNsaWVudC13 aWR0aD0iNDAiIGRhdGEtZXhwZWN0ZWQtY2xpZW50LWhlaWdodD0iNTAiPjwvY2FudmFzPgotY2xp ZW50SGVpZ2h0IGV4cGVjdGVkIDUwIGJ1dCBnb3QgMAorUEFTUyAudGVzdCAzMAogUEFTUyAudGVz dCAzMQotRkFJTCAudGVzdCAzMiBhc3NlcnRfZXF1YWxzOgotPGNhbnZhcyBjbGFzcz0idGVzdCBj aXMtYm90aCB2ZXJ0aWNhbCIgd2lkdGg9IjQwIiBoZWlnaHQ9IjIwIiBkYXRhLWV4cGVjdGVkLWNs aWVudC13aWR0aD0iNDAiIGRhdGEtZXhwZWN0ZWQtY2xpZW50LWhlaWdodD0iNTAiPjwvY2FudmFz PgotY2xpZW50SGVpZ2h0IGV4cGVjdGVkIDUwIGJ1dCBnb3QgMAorUEFTUyAudGVzdCAzMgogUEFT UyAudGVzdCAzMwogUEFTUyAudGVzdCAzNAotRkFJTCAudGVzdCAzNSBhc3NlcnRfZXF1YWxzOgot PGlmcmFtZSBjbGFzcz0idGVzdCBjaXMtd2lkdGgiIGRhdGEtZXhwZWN0ZWQtY2xpZW50LXdpZHRo PSIxMDAiIGRhdGEtZXhwZWN0ZWQtY2xpZW50LWhlaWdodD0iMTUwIj48L2lmcmFtZT4KLWNsaWVu dFdpZHRoIGV4cGVjdGVkIDEwMCBidXQgZ290IDAKLUZBSUwgLnRlc3QgMzYgYXNzZXJ0X2VxdWFs czoKLTxpZnJhbWUgY2xhc3M9InRlc3QgY2lzLWJvdGgiIGRhdGEtZXhwZWN0ZWQtY2xpZW50LXdp ZHRoPSIxMDAiIGRhdGEtZXhwZWN0ZWQtY2xpZW50LWhlaWdodD0iMTUwIj48L2lmcmFtZT4KLWNs aWVudFdpZHRoIGV4cGVjdGVkIDEwMCBidXQgZ290IDAKK1BBU1MgLnRlc3QgMzUKK1BBU1MgLnRl c3QgMzYKIFBBU1MgLnRlc3QgMzcKLUZBSUwgLnRlc3QgMzggYXNzZXJ0X2VxdWFsczoKLTxpZnJh bWUgY2xhc3M9InRlc3QgY2lzLWhlaWdodCB2ZXJ0aWNhbCIgZGF0YS1leHBlY3RlZC1jbGllbnQt d2lkdGg9IjMwMCIgZGF0YS1leHBlY3RlZC1jbGllbnQtaGVpZ2h0PSI1MCI+PC9pZnJhbWU+Ci1j bGllbnRIZWlnaHQgZXhwZWN0ZWQgNTAgYnV0IGdvdCAwCitQQVNTIC50ZXN0IDM4CiBQQVNTIC50 ZXN0IDM5Ci1GQUlMIC50ZXN0IDQwIGFzc2VydF9lcXVhbHM6Ci08aWZyYW1lIGNsYXNzPSJ0ZXN0 IGNpcy1ib3RoIHZlcnRpY2FsIiBkYXRhLWV4cGVjdGVkLWNsaWVudC13aWR0aD0iMzAwIiBkYXRh LWV4cGVjdGVkLWNsaWVudC1oZWlnaHQ9IjUwIj48L2lmcmFtZT4KLWNsaWVudEhlaWdodCBleHBl Y3RlZCA1MCBidXQgZ290IDAKK1BBU1MgLnRlc3QgNDAKIFBBU1MgLnRlc3QgNDEKIFBBU1MgLnRl c3QgNDIKLUZBSUwgLnRlc3QgNDMgYXNzZXJ0X2VxdWFsczoKLTx2aWRlbyBjbGFzcz0idGVzdCBj aXMtd2lkdGgiIGRhdGEtZXhwZWN0ZWQtY2xpZW50LXdpZHRoPSIxMDAiIGRhdGEtZXhwZWN0ZWQt Y2xpZW50LWhlaWdodD0iMTUwIj48L3ZpZGVvPgotY2xpZW50V2lkdGggZXhwZWN0ZWQgMTAwIGJ1 dCBnb3QgMAotRkFJTCAudGVzdCA0NCBhc3NlcnRfZXF1YWxzOgotPHZpZGVvIGNsYXNzPSJ0ZXN0 IGNpcy1ib3RoIiBkYXRhLWV4cGVjdGVkLWNsaWVudC13aWR0aD0iMTAwIiBkYXRhLWV4cGVjdGVk LWNsaWVudC1oZWlnaHQ9IjE1MCI+PC92aWRlbz4KLWNsaWVudFdpZHRoIGV4cGVjdGVkIDEwMCBi dXQgZ290IDAKK1BBU1MgLnRlc3QgNDMKK1BBU1MgLnRlc3QgNDQKIFBBU1MgLnRlc3QgNDUKLUZB SUwgLnRlc3QgNDYgYXNzZXJ0X2VxdWFsczoKLTx2aWRlbyBjbGFzcz0idGVzdCBjaXMtaGVpZ2h0 IHZlcnRpY2FsIiBkYXRhLWV4cGVjdGVkLWNsaWVudC13aWR0aD0iMzAwIiBkYXRhLWV4cGVjdGVk LWNsaWVudC1oZWlnaHQ9IjUwIj48L3ZpZGVvPgotY2xpZW50SGVpZ2h0IGV4cGVjdGVkIDUwIGJ1 dCBnb3QgMAorUEFTUyAudGVzdCA0NgogUEFTUyAudGVzdCA0NwotRkFJTCAudGVzdCA0OCBhc3Nl cnRfZXF1YWxzOgotPHZpZGVvIGNsYXNzPSJ0ZXN0IGNpcy1ib3RoIHZlcnRpY2FsIiBkYXRhLWV4 cGVjdGVkLWNsaWVudC13aWR0aD0iMzAwIiBkYXRhLWV4cGVjdGVkLWNsaWVudC1oZWlnaHQ9IjUw Ij48L3ZpZGVvPgotY2xpZW50SGVpZ2h0IGV4cGVjdGVkIDUwIGJ1dCBnb3QgMAorUEFTUyAudGVz dCA0OAogCiAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv eC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCA3YWFm ZWFmY2Q4NTguLjY4Yzk2YTQ2MDczMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv eC5jcHAKQEAgLTU2MDcsOCArNTYwNyw2IEBAIExheW91dFVuaXQgc3ludGhlc2l6ZWRCYXNlbGlu ZShjb25zdCBSZW5kZXJCb3gmIGJveCwgY29uc3QgUmVuZGVyU3R5bGUmIHBhcmVudFN0CiAKIExh eW91dFVuaXQgUmVuZGVyQm94OjppbnRyaW5zaWNMb2dpY2FsV2lkdGgoKSBjb25zdAogewotICAg IGlmIChzaG91bGRBcHBseUlubGluZVNpemVDb250YWlubWVudCgpKQotICAgICAgICByZXR1cm4g TGF5b3V0VW5pdCgpOwogICAgIHJldHVybiBzdHlsZSgpLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2Rl KCkgPyBpbnRyaW5zaWNTaXplKCkud2lkdGgoKSA6IGludHJpbnNpY1NpemUoKS5oZWlnaHQoKTsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2Vk LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKaW5kZXgg YmI4NjU2OTZiNDA0Li4zZjIxZGJlMTFmYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclJlcGxhY2VkLmNwcApAQCAtMzk4LDcgKzM5OCw3IEBAIHN0YXRpYyBib29sIGlzVmlk ZW9XaXRoRGVmYXVsdE9iamVjdFNpemUoY29uc3QgUmVuZGVyUmVwbGFjZWQqIG1heWJlVmlkZW8p CiB2b2lkIFJlbmRlclJlcGxhY2VkOjpjb21wdXRlQXNwZWN0UmF0aW9JbmZvcm1hdGlvbkZvclJl bmRlckJveChSZW5kZXJCb3gqIGNvbnRlbnRSZW5kZXJlciwgRmxvYXRTaXplJiBjb25zdHJhaW5l ZFNpemUsIEZsb2F0U2l6ZSYgaW50cmluc2ljUmF0aW8pIGNvbnN0CiB7CiAgICAgRmxvYXRTaXpl IGludHJpbnNpY1NpemU7Ci0gICAgaWYgKHNob3VsZEFwcGx5U2l6ZUNvbnRhaW5tZW50KCkpCisg ICAgaWYgKHNob3VsZEFwcGx5U2l6ZU9ySW5saW5lU2l6ZUNvbnRhaW5tZW50KCkpCiAgICAgICAg IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlSW50cmluc2ljUmF0aW9JbmZvcm1hdGlvbihpbnRyaW5z aWNTaXplLCBpbnRyaW5zaWNSYXRpbyk7CiAgICAgZWxzZSBpZiAoY29udGVudFJlbmRlcmVyKSB7 CiAgICAgICAgIGNvbnRlbnRSZW5kZXJlci0+Y29tcHV0ZUludHJpbnNpY1JhdGlvSW5mb3JtYXRp b24oaW50cmluc2ljU2l6ZSwgaW50cmluc2ljUmF0aW8pOwpAQCAtNTE1LDcgKzUxNSw3IEBAIFJv dW5kZWRSZWN0IFJlbmRlclJlcGxhY2VkOjpyb3VuZGVkQ29udGVudEJveFJlY3QoKSBjb25zdAog dm9pZCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZUludHJpbnNpY1JhdGlvSW5mb3JtYXRpb24oRmxv YXRTaXplJiBpbnRyaW5zaWNTaXplLCBGbG9hdFNpemUmIGludHJpbnNpY1JhdGlvKSBjb25zdAog ewogICAgIC8vIElmIHRoZXJlJ3MgYW4gZW1iZWRkZWRDb250ZW50Qm94KCkgb2YgYSByZW1vdGUs IHJlZmVyZW5jZWQgZG9jdW1lbnQgYXZhaWxhYmxlLCB0aGlzIGNvZGUtcGF0aCBzaG91bGQgbmV2 ZXIgYmUgdXNlZC4KLSAgICBBU1NFUlQoIWVtYmVkZGVkQ29udGVudEJveCgpIHx8IHNob3VsZEFw cGx5U2l6ZUNvbnRhaW5tZW50KCkpOworICAgIEFTU0VSVCghZW1iZWRkZWRDb250ZW50Qm94KCkg fHwgc2hvdWxkQXBwbHlTaXplT3JJbmxpbmVTaXplQ29udGFpbm1lbnQoKSk7CiAgICAgaW50cmlu c2ljU2l6ZSA9IEZsb2F0U2l6ZShpbnRyaW5zaWNMb2dpY2FsV2lkdGgoKSwgaW50cmluc2ljTG9n aWNhbEhlaWdodCgpKTsKIAogICAgIGlmIChzdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpIHsKQEAg LTU3NSw4ICs1NzUsNiBAQCBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlUmVwbGFj ZWRMb2dpY2FsV2lkdGgoU2hvdWxkQ29tcHV0ZVByZWZlcnJlZCBzaAogewogICAgIGlmIChzdHls ZSgpLmxvZ2ljYWxXaWR0aCgpLmlzU3BlY2lmaWVkKCkpCiAgICAgICAgIHJldHVybiBjb21wdXRl UmVwbGFjZWRMb2dpY2FsV2lkdGhSZXNwZWN0aW5nTWluTWF4V2lkdGgoY29tcHV0ZVJlcGxhY2Vk TG9naWNhbFdpZHRoVXNpbmcoTWFpbk9yUHJlZmVycmVkU2l6ZSwgc3R5bGUoKS5sb2dpY2FsV2lk dGgoKSksIHNob3VsZENvbXB1dGVQcmVmZXJyZWQpOwotICAgIGlmIChzaG91bGRBcHBseUlubGlu ZVNpemVDb250YWlubWVudCgpKQotICAgICAgICByZXR1cm4gTGF5b3V0VW5pdCgpOwogICAgIGlm IChzdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzSW50cmluc2ljKCkpCiAgICAgICAgIHJldHVybiBj b21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGhSZXNwZWN0aW5nTWluTWF4V2lkdGgoY29tcHV0ZVJl cGxhY2VkTG9naWNhbFdpZHRoVXNpbmcoTWFpbk9yUHJlZmVycmVkU2l6ZSwgc3R5bGUoKS5sb2dp Y2FsV2lkdGgoKSksIHNob3VsZENvbXB1dGVQcmVmZXJyZWQpOwogCkBAIC01ODksOCArNTg3LDgg QEAgTGF5b3V0VW5pdCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRo KFNob3VsZENvbXB1dGVQcmVmZXJyZWQgc2gKIAogICAgIGlmIChzdHlsZSgpLmxvZ2ljYWxXaWR0 aCgpLmlzQXV0bygpKSB7CiAgICAgICAgIGJvb2wgY29tcHV0ZWRIZWlnaHRJc0F1dG8gPSBzdHls ZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0F1dG8oKTsKLSAgICAgICAgYm9vbCBoYXNJbnRyaW5zaWNX aWR0aCA9IGNvbnN0cmFpbmVkU2l6ZS53aWR0aCgpID4gMDsKLSAgICAgICAgYm9vbCBoYXNJbnRy aW5zaWNIZWlnaHQgPSBjb25zdHJhaW5lZFNpemUuaGVpZ2h0KCkgPiAwOworICAgICAgICBib29s IGhhc0ludHJpbnNpY1dpZHRoID0gY29uc3RyYWluZWRTaXplLndpZHRoKCkgPiAwIHx8IHNob3Vs ZEFwcGx5U2l6ZU9ySW5saW5lU2l6ZUNvbnRhaW5tZW50KCk7CisgICAgICAgIGJvb2wgaGFzSW50 cmluc2ljSGVpZ2h0ID0gY29uc3RyYWluZWRTaXplLmhlaWdodCgpID4gMCB8fCBzaG91bGRBcHBs eVNpemVDb250YWlubWVudCgpOwogCiAgICAgICAgIC8vIEZvciBmbGV4IG9yIGdyaWQgaXRlbXMg d2hlcmUgdGhlIGxvZ2ljYWwgaGVpZ2h0IGhhcyBiZWVuIG92ZXJyaWRlbiB0aGVuIHdlIHNob3Vs ZCB1c2UgdGhhdCBzaXplIHRvIGNvbXB1dGUgdGhlIHJlcGxhY2VkIHdpZHRoIGFzIGxvbmcgYXMg dGhlIGZsZXggb3IKICAgICAgICAgLy8gZ3JpZCBpdGVtIGhhcyBhbiBpbnRyaW5zaWMgc2l6ZS4g SXQgaXMgcG9zc2libGUgKGluZGVlZCwgY29tbW9uKSBmb3IgYW4gU1ZHIGdyYXBoaWMgdG8gaGF2 ZSBhbiBpbnRyaW5zaWMgYXNwZWN0IHJhdGlvIGJ1dCBub3QgdG8gaGF2ZSBhbiBpbnRyaW5zaWMK QEAgLTY1OSw4ICs2NTcsOCBAQCBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlUmVw bGFjZWRMb2dpY2FsSGVpZ2h0KHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdAogICAgIGNvbXB1dGVJ bnRyaW5zaWNTaXplc0NvbnN0cmFpbmVkQnlUcmFuc2ZlcnJlZE1pbk1heFNpemVzKGNvbnRlbnRS ZW5kZXJlciwgY29uc3RyYWluZWRTaXplLCBpbnRyaW5zaWNSYXRpbyk7CiAKICAgICBib29sIHdp ZHRoSXNBdXRvID0gc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKTsKLSAgICBib29sIGhh c0ludHJpbnNpY0hlaWdodCA9IGNvbnN0cmFpbmVkU2l6ZS5oZWlnaHQoKSA+IDA7Ci0gICAgYm9v bCBoYXNJbnRyaW5zaWNXaWR0aCA9IGNvbnN0cmFpbmVkU2l6ZS53aWR0aCgpID4gMDsKKyAgICBi b29sIGhhc0ludHJpbnNpY0hlaWdodCA9IGNvbnN0cmFpbmVkU2l6ZS5oZWlnaHQoKSA+IDAgfHwg c2hvdWxkQXBwbHlTaXplQ29udGFpbm1lbnQoKTsKKyAgICBib29sIGhhc0ludHJpbnNpY1dpZHRo ID0gY29uc3RyYWluZWRTaXplLndpZHRoKCkgPiAwIHx8IHNob3VsZEFwcGx5U2l6ZU9ySW5saW5l U2l6ZUNvbnRhaW5tZW50KCk7CiAKICAgICAvLyBTZWUgY29tcHV0ZVJlcGxhY2VkTG9naWNhbEhl aWdodCgpIGZvciBhIHNpbWlsYXIgY2hlY2sgZm9yIGhlaWdodHMuCiAgICAgaWYgKCFpbnRyaW5z aWNSYXRpby5pc0VtcHR5KCkgJiYgKGlzRmxleEl0ZW0oKSB8fCBpc0dyaWRJdGVtKCkpICYmIGhh c092ZXJyaWRpbmdMb2dpY2FsV2lkdGgoKSAmJiBoYXNJbnRyaW5zaWNTaXplKGNvbnRlbnRSZW5k ZXJlciwgaGFzSW50cmluc2ljV2lkdGgsIGhhc0ludHJpbnNpY0hlaWdodCkpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuaCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5oCmluZGV4IDkzMDhkZmM4MjExYS4uYmJmYTFl NGZlY2VlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFj ZWQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuaApAQCAt NDAsMTUgKzQwLDE0IEBAIHB1YmxpYzoKIAogICAgIExheW91dFNpemUgaW50cmluc2ljU2l6ZSgp IGNvbnN0IGZpbmFsCiAgICAgewotICAgICAgICBpZiAoc2hvdWxkQXBwbHlTaXplQ29udGFpbm1l bnQoKSkgewotICAgICAgICAgICAgTGF5b3V0U2l6ZSBzaXplOwotICAgICAgICAgICAgaWYgKGF1 dG8gd2lkdGggPSBleHBsaWNpdEludHJpbnNpY0lubmVyV2lkdGgoKSkKLSAgICAgICAgICAgICAg ICBzaXplLnNldFdpZHRoKHdpZHRoLnZhbHVlKCkpOwotICAgICAgICAgICAgaWYgKGF1dG8gaGVp Z2h0ID0gZXhwbGljaXRJbnRyaW5zaWNJbm5lckhlaWdodCgpKQotICAgICAgICAgICAgICAgIHNp emUuc2V0SGVpZ2h0KGhlaWdodC52YWx1ZSgpKTsKLSAgICAgICAgICAgIHJldHVybiBzaXplOwor ICAgICAgICBMYXlvdXRTaXplIHNpemUgPSBtX2ludHJpbnNpY1NpemU7CisgICAgICAgIGlmIChp c0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gc2hvdWxkQXBwbHlTaXplT3JJbmxpbmVTaXplQ29u dGFpbm1lbnQoKSA6IHNob3VsZEFwcGx5U2l6ZUNvbnRhaW5tZW50KCkpIHsKKyAgICAgICAgICAg IHNpemUuc2V0V2lkdGgoZXhwbGljaXRJbnRyaW5zaWNJbm5lcldpZHRoKCkudmFsdWVfb3IoMCkp OwogICAgICAgICB9Ci0gICAgICAgIHJldHVybiBtX2ludHJpbnNpY1NpemU7CisgICAgICAgIGlm IChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gc2hvdWxkQXBwbHlTaXplQ29udGFpbm1lbnQo KSA6IHNob3VsZEFwcGx5U2l6ZU9ySW5saW5lU2l6ZUNvbnRhaW5tZW50KCkpIHsKKyAgICAgICAg ICAgIHNpemUuc2V0SGVpZ2h0KGV4cGxpY2l0SW50cmluc2ljSW5uZXJIZWlnaHQoKS52YWx1ZV9v cigwKSk7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIHNpemU7CiAgICAgfQogICAgIAogICAg IFJvdW5kZWRSZWN0IHJvdW5kZWRDb250ZW50Qm94UmVjdCgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZGVvLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJWaWRlby5jcHAKaW5kZXggZmU0NjUzZTA2YTg4Li42NTk4OTI1Yjdl N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWRlby5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZGVvLmNwcApAQCAtMTE3LDYg KzExNywxNiBAQCBMYXlvdXRTaXplIFJlbmRlclZpZGVvOjpjYWxjdWxhdGVJbnRyaW5zaWNTaXpl KCkKICAgICBpZiAoc2hvdWxkQXBwbHlTaXplQ29udGFpbm1lbnQoKSkKICAgICAgICAgcmV0dXJu IGludHJpbnNpY1NpemUoKTsKIAorICAgIExheW91dFNpemUgc2l6ZSA9IGRlZmF1bHRTaXplKCk7 CisgICAgYXV0byBhZGp1c3RTaXplRm9ySW5saW5lU2l6ZUNvbnRhaW5tZW50ID0gWyZdKCkgewor ICAgICAgICBpZiAoc2hvdWxkQXBwbHlJbmxpbmVTaXplQ29udGFpbm1lbnQoKSkgeworICAgICAg ICAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCisgICAgICAgICAgICAgICAgc2l6 ZS5zZXRXaWR0aChpbnRyaW5zaWNTaXplKCkud2lkdGgoKSk7CisgICAgICAgICAgICBlbHNlCisg ICAgICAgICAgICAgICAgc2l6ZS5zZXRIZWlnaHQoaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpKTsK KyAgICAgICAgfQorICAgIH07CisKICAgICAvLyBTcGVjIHRleHQgZnJvbSA0LjguNgogICAgIC8v CiAgICAgLy8gVGhlIGludHJpbnNpYyB3aWR0aCBvZiBhIHZpZGVvIGVsZW1lbnQncyBwbGF5YmFj ayBhcmVhIGlzIHRoZSBpbnRyaW5zaWMgd2lkdGggCkBAIC0xMjgsMjIgKzEzOCwzMSBAQCBMYXlv dXRTaXplIFJlbmRlclZpZGVvOjpjYWxjdWxhdGVJbnRyaW5zaWNTaXplKCkKICAgICAvLyBoZWln aHQgb2YgdGhlIHBvc3RlciBmcmFtZSwgaWYgdGhhdCBpcyBhdmFpbGFibGU7IG90aGVyd2lzZSBp dCBpcyAxNTAgQ1NTIHBpeGVscy4KICAgICBhdXRvIHBsYXllciA9IHZpZGVvRWxlbWVudCgpLnBs YXllcigpOwogICAgIGlmIChwbGF5ZXIgJiYgdmlkZW9FbGVtZW50KCkucmVhZHlTdGF0ZSgpID49 IEhUTUxWaWRlb0VsZW1lbnQ6OkhBVkVfTUVUQURBVEEpIHsKLSAgICAgICAgTGF5b3V0U2l6ZSBz aXplKHBsYXllci0+bmF0dXJhbFNpemUoKSk7Ci0gICAgICAgIGlmICghc2l6ZS5pc0VtcHR5KCkp CisgICAgICAgIHNpemUgPSBMYXlvdXRTaXplKHBsYXllci0+bmF0dXJhbFNpemUoKSk7CisgICAg ICAgIGlmICghc2l6ZS5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgIGFkanVzdFNpemVGb3JJbmxp bmVTaXplQ29udGFpbm1lbnQoKTsKICAgICAgICAgICAgIHJldHVybiBzaXplOworICAgICAgICB9 CiAgICAgfQogCi0gICAgaWYgKGhhc1Bvc3RlckZyYW1lU2l6ZSgpKQotICAgICAgICByZXR1cm4g bV9jYWNoZWRJbWFnZVNpemU7CisgICAgaWYgKGhhc1Bvc3RlckZyYW1lU2l6ZSgpKSB7CisgICAg ICAgIHNpemUgPSBtX2NhY2hlZEltYWdlU2l6ZTsKKyAgICAgICAgYWRqdXN0U2l6ZUZvcklubGlu ZVNpemVDb250YWlubWVudCgpOworICAgICAgICByZXR1cm4gc2l6ZTsKKyAgICB9CiAKICAgICAv LyA8dmlkZW8+IGluIHN0YW5kYWxvbmUgbWVkaWEgZG9jdW1lbnRzIHNob3VsZCBub3QgdXNlIHRo ZSBkZWZhdWx0IDMwMHgxNTAKICAgICAvLyBzaXplIHNpbmNlIHRoZXkgYWxzbyBoYXZlIGF1ZGlv LW9ubHkgZmlsZXMuIEJ5IHNldHRpbmcgdGhlIGludHJpbnNpYwogICAgIC8vIHNpemUgdG8gMzAw eDEgdGhlIHZpZGVvIHdpbGwgcmVzaXplIGl0c2VsZiBpbiB0aGVzZSBjYXNlcywgYW5kIGF1ZGlv IHdpbGwKICAgICAvLyBoYXZlIHRoZSBjb3JyZWN0IGhlaWdodCAoaXQgbmVlZHMgdG8gYmUgPiAw IGZvciBjb250cm9scyB0byByZW5kZXIgcHJvcGVybHkpLgotICAgIGlmICh2aWRlb0VsZW1lbnQo KS5kb2N1bWVudCgpLmlzTWVkaWFEb2N1bWVudCgpKQotICAgICAgICByZXR1cm4gTGF5b3V0U2l6 ZShkZWZhdWx0U2l6ZSgpLndpZHRoKCksIDEpOworICAgIGlmICh2aWRlb0VsZW1lbnQoKS5kb2N1 bWVudCgpLmlzTWVkaWFEb2N1bWVudCgpKSB7CisgICAgICAgIHNpemUgPSBMYXlvdXRTaXplKGRl ZmF1bHRTaXplKCkud2lkdGgoKSwgMSk7CisgICAgICAgIGFkanVzdFNpemVGb3JJbmxpbmVTaXpl Q29udGFpbm1lbnQoKTsKKyAgICAgICAgcmV0dXJuIHNpemU7CisgICAgfQogCi0gICAgcmV0dXJu IGRlZmF1bHRTaXplKCk7CisgICAgYWRqdXN0U2l6ZUZvcklubGluZVNpemVDb250YWlubWVudCgp OworICAgIHJldHVybiBzaXplOwogfQogCiB2b2lkIFJlbmRlclZpZGVvOjppbWFnZUNoYW5nZWQo V3JhcHBlZEltYWdlUHRyIG5ld0ltYWdlLCBjb25zdCBJbnRSZWN0KiByZWN0KQpAQCAtMzMyLDcg KzM1MSwxMCBAQCBib29sIFJlbmRlclZpZGVvOjpoYXNWaWRlb01ldGFkYXRhKCkgY29uc3QKIAog Ym9vbCBSZW5kZXJWaWRlbzo6aGFzUG9zdGVyRnJhbWVTaXplKCkgY29uc3QKIHsKLSAgICByZXR1 cm4gdmlkZW9FbGVtZW50KCkuc2hvdWxkRGlzcGxheVBvc3RlckltYWdlKCkgJiYgIW1fY2FjaGVk SW1hZ2VTaXplLmlzRW1wdHkoKSAmJiAhaW1hZ2VSZXNvdXJjZSgpLmVycm9yT2NjdXJyZWQoKTsK KyAgICBib29sIGlzRW1wdHkgPSBtX2NhY2hlZEltYWdlU2l6ZS5pc0VtcHR5KCk7CisgICAgaWYg KHNob3VsZEFwcGx5SW5saW5lU2l6ZUNvbnRhaW5tZW50KCkpCisgICAgICAgIGlzRW1wdHkgPSAh bV9jYWNoZWRJbWFnZVNpemUud2lkdGgoKSAmJiAgIW1fY2FjaGVkSW1hZ2VTaXplLmhlaWdodCgp OworICAgIHJldHVybiB2aWRlb0VsZW1lbnQoKS5zaG91bGREaXNwbGF5UG9zdGVySW1hZ2UoKSAm JiAhaXNFbXB0eSAmJiAhaW1hZ2VSZXNvdXJjZSgpLmVycm9yT2NjdXJyZWQoKTsKIH0KIAogYm9v bCBSZW5kZXJWaWRlbzo6aGFzRGVmYXVsdE9iamVjdFNpemUoKSBjb25zdAo=