312800 2026-04-20 12:51:08 -0700 [cleanup] Split RenderFlexibleBox's mainAxisContentExtent into clearer helpers 2026-04-21 05:23:13 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan koivisto webkit-bug-importer oldest_to_newest 2202340 0 zalan 2026-04-20 12:51:08 -0700 ssia 2202346 1 479220 zalan 2026-04-20 12:57:42 -0700 Created attachment 479220 Patch 2202459 2 479222 zalan 2026-04-20 16:16:34 -0700 Created attachment 479222 [fast-cq]Patch 2202690 3 ews-feeder 2026-04-21 05:23:00 -0700 Committed 311669@main (eac0d0aee29a): <https://commits.webkit.org/311669@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 479222. 2202691 4 webkit-bug-importer 2026-04-21 05:23:13 -0700 <rdar://problem/175244172> 479220 2026-04-20 12:57:42 -0700 2026-04-20 16:16:33 -0700 Patch bug-312800-20260420125741.patch text/plain 5609 zalan RnJvbSA3ZDk2MTBjNzAxM2FhMjFmODg1Y2RhNTU2NjA5Y2E1NGI4NTI4NzViIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IE1vbiwgMjAgQXByIDIwMjYgMTI6NDk6MDkgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbRmxleF0g U3BsaXQgbWFpbkF4aXNDb250ZW50RXh0ZW50IGludG8gY2xlYXJlciBoZWxwZXJzCiBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzEyODAwCgpSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KCm1haW5BeGlzQ29udGVudEV4dGVudCBzZXJ2ZWQgdHdvIHB1cnBvc2VzIHdp dGggYSBzaW5nbGUKZnVuY3Rpb246IGRpc3RyaWJ1dGlvbiAoY29udGFpbmVyIG1haW4gaW5uZXIg c2l6ZSkgYW5kIHBvc2l0aW9uZWQgaXRlbSBwbGFjZW1lbnQuCkZvciByb3cgZmxleCBpdCBpZ25v cmVkIGl0cyBpbnB1dCBhbmQgcmV0dXJuZWQgY29udGVudEJveExvZ2ljYWxXaWR0aCgpLgpGb3Ig Y29sdW1uIGZsZXggaXQgY29uc3RyYWluZWQgdGhlIGlucHV0IHRocm91Z2ggY29tcHV0ZUxvZ2lj YWxIZWlnaHQuClRoZSBvdmVybG9hZGVkIHNlbWFudGljcyBtYWRlIGl0IHVuY2xlYXIgd2hhdCBj YWxsZXJzIGFjdHVhbGx5IG5lZWRlZC4KClNwbGl0IGludG86Ci0gY29sdW1uSW5uZXJNYWluU2l6 ZShoeXBvdGhldGljYWxNYWluU2l6ZSk6IHJlc29sdmVzIHRoZSBjb2x1bW4gZmxleAogIGNvbnRh aW5lcidzIGlubmVyIG1haW4gc2l6ZSBieSBjb25zdHJhaW5pbmcgdGhlIGh5cG90aGV0aWNhbCBt YWluCiAgc2l6ZSBzdW0gdGhyb3VnaCBjb21wdXRlTG9naWNhbEhlaWdodC4gQ29sdW1uLW9ubHks IGFzc2VydGVkLiBVc2VkCiAgZm9yIGZsZXggZGlzdHJpYnV0aW9uIChzcGVjOiAiZmxleCBjb250 YWluZXIncyBpbm5lciBtYWluIHNpemUiKS4KCi0gSW5saW5lOiBwb3NpdGlvbmVkIGl0ZW0gcGxh Y2VtZW50IG5vdyB1c2VzCiAgaXNDb2x1bW5GbG93KCkgPyBjb250ZW50Qm94TG9naWNhbEhlaWdo dCgpIDogY29udGVudEJveExvZ2ljYWxXaWR0aCgpCiAgZGlyZWN0bHksIHNpbmNlIHRoZSByb3Vu ZC10cmlwIHRocm91Z2ggY29tcHV0ZUxvZ2ljYWxIZWlnaHQgd2FzIGEKICBuby1vcCBmb3IgYW4g YWxyZWFkeS1sYWlkLW91dCBjb250YWluZXIuCgpObyBiZWhhdmlvciBjaGFuZ2UuCgoqIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CihXZWJDb3JlOjpSZW5k ZXJGbGV4aWJsZUJveDo6Y29sdW1uSW5uZXJNYWluU2l6ZSk6CihXZWJDb3JlOjpSZW5kZXJGbGV4 aWJsZUJveDo6bWFpbkF4aXNBdmFpbGFibGVTcGFjZSk6CihXZWJDb3JlOjpSZW5kZXJGbGV4aWJs ZUJveDo6Y2FuRml0SXRlbVdpdGhUcmltbWVkTWFyZ2luRW5kIGNvbnN0KToKKFdlYkNvcmU6OlJl bmRlckZsZXhpYmxlQm94OjpwZXJmb3JtRmxleExheW91dCk6CihXZWJDb3JlOjpSZW5kZXJGbGV4 aWJsZUJveDo6c3RhdGljTWFpbkF4aXNQb3NpdGlvbkZvclBvc2l0aW9uZWRGbGV4SXRlbSk6CihX ZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU5leHRGbGV4TGluZSk6CihXZWJDb3Jl OjpSZW5kZXJGbGV4aWJsZUJveDo6bWFpbkF4aXNDb250ZW50RXh0ZW50KTogRGVsZXRlZC4KKiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaDoKLS0tCiAuLi4vV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwICAgfCAyMCArKysrKysrKy0tLS0t LS0tLS0tCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaCAgfCAg MiArLQogMiBmaWxlcyBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4 IGE4NjBhMmMzMzRmOS4uNjMyMTRlZTgxZTVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTgyOSwxNyArODI5LDEyIEBAIExheW91dFVu aXQgUmVuZGVyRmxleGlibGVCb3g6OmNyb3NzQXhpc0NvbnRlbnRFeHRlbnQoKSBjb25zdAogICAg IHJldHVybiBpc0hvcml6b250YWxGbG93KCkgPyBjb250ZW50Qm94SGVpZ2h0KCkgOiBjb250ZW50 Qm94V2lkdGgoKTsKIH0KIAotTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6bWFpbkF4aXND b250ZW50RXh0ZW50KExheW91dFVuaXQgY29udGVudExvZ2ljYWxIZWlnaHQpCitMYXlvdXRVbml0 IFJlbmRlckZsZXhpYmxlQm94Ojpjb2x1bW5Jbm5lck1haW5TaXplKExheW91dFVuaXQgaHlwb3Ro ZXRpY2FsTWFpblNpemUpCiB7Ci0gICAgaWYgKCFpc0NvbHVtbkZsb3coKSkKLSAgICAgICAgcmV0 dXJuIGNvbnRlbnRCb3hMb2dpY2FsV2lkdGgoKTsKLQotICAgIExheW91dFVuaXQgYm9yZGVyUGFk ZGluZ0FuZFNjcm9sbGJhciA9IGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCkgKyBzY3Jv bGxiYXJMb2dpY2FsSGVpZ2h0KCk7Ci0gICAgTGF5b3V0VW5pdCBib3JkZXJCb3hMb2dpY2FsSGVp Z2h0ID0gY29udGVudExvZ2ljYWxIZWlnaHQgKyBib3JkZXJQYWRkaW5nQW5kU2Nyb2xsYmFyOwot ICAgIGF1dG8gY29tcHV0ZWRWYWx1ZXMgPSBjb21wdXRlTG9naWNhbEhlaWdodChib3JkZXJCb3hM b2dpY2FsSGVpZ2h0LCBsb2dpY2FsVG9wKCkpOwotICAgIGlmIChjb21wdXRlZFZhbHVlcy5leHRl bnQgPT0gTGF5b3V0VW5pdDo6bWF4KCkpCi0gICAgICAgIHJldHVybiBjb21wdXRlZFZhbHVlcy5l eHRlbnQ7Ci0gICAgcmV0dXJuIHN0ZDo6bWF4KDBfbHUsIGNvbXB1dGVkVmFsdWVzLmV4dGVudCAt IGJvcmRlclBhZGRpbmdBbmRTY3JvbGxiYXIpOworICAgIEFTU0VSVChpc0NvbHVtbkZsb3coKSk7 CisgICAgYXV0byBib3JkZXJQYWRkaW5nQW5kU2Nyb2xsYmFyID0gYm9yZGVyQW5kUGFkZGluZ0xv Z2ljYWxIZWlnaHQoKSArIHNjcm9sbGJhckxvZ2ljYWxIZWlnaHQoKTsKKyAgICBhdXRvIGxvZ2lj YWxIZWlnaHQgPSBjb21wdXRlTG9naWNhbEhlaWdodChoeXBvdGhldGljYWxNYWluU2l6ZSArIGJv cmRlclBhZGRpbmdBbmRTY3JvbGxiYXIsIGxvZ2ljYWxUb3AoKSkuZXh0ZW50OworICAgIHJldHVy biBsb2dpY2FsSGVpZ2h0ID09IExheW91dFVuaXQ6Om1heCgpID8gbG9naWNhbEhlaWdodCA6IHN0 ZDo6bWF4KDBfbHUsIGxvZ2ljYWxIZWlnaHQgLSBib3JkZXJQYWRkaW5nQW5kU2Nyb2xsYmFyKTsK IH0KIAogTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6bWFpbkF4aXNBdmFpbGFibGVTcGFj ZSgpCkBAIC0xNTkwLDcgKzE1ODUsNyBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpwZXJmb3Jt RmxleExheW91dChSZWxheW91dENoaWxkcmVuIHJlbGF5b3V0Q2hpbGRyZW4pCiAgICAgICAgICAg ICAgICAgICAgIHRyaW1Dcm9zc0F4aXNNYXJnaW5FbmQoZmxleExheW91dEl0ZW0pOwogICAgICAg ICAgICAgfQogICAgICAgICB9Ci0gICAgICAgIGF1dG8gY29udGFpbmVyTWFpbklubmVyU2l6ZSA9 IG1haW5BeGlzQ29udGVudEV4dGVudChsaW5lRGF0YS0+c3VtSHlwb3RoZXRpY2FsTWFpblNpemUp OworICAgICAgICBhdXRvIGNvbnRhaW5lck1haW5Jbm5lclNpemUgPSBpc0NvbHVtbkZsb3coKSA/ IGNvbHVtbklubmVyTWFpblNpemUobGluZURhdGEtPnN1bUh5cG90aGV0aWNhbE1haW5TaXplKSA6 IGNvbnRlbnRCb3hMb2dpY2FsV2lkdGgoKTsKICAgICAgICAgYXV0byByZW1haW5pbmdGcmVlU3Bh Y2UgPSByZXNvbHZlRmxleGlibGVMZW5ndGhzRm9yTGluZUl0ZW1zKGxpbmVJdGVtcywgY29udGFp bmVyTWFpbklubmVyU2l6ZSwgZ2FwQmV0d2Vlbkl0ZW1zKTsKIAogICAgICAgICAvLyBSZWNhbGN1 bGF0ZSB0aGUgcmVtYWluaW5nIGZyZWUgc3BhY2UuIFRoZSBhZGp1c3RtZW50IGZvciBmbGV4IGZh Y3RvcnMKQEAgLTIyNTUsNyArMjI1MCw4IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OnNldE92 ZXJyaWRpbmdNYWluU2l6ZUZvckZsZXhJdGVtKFJlbmRlckJveCYgZmxleEl0ZW0sIExhCiBMYXlv dXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjpzdGF0aWNNYWluQXhpc1Bvc2l0aW9uRm9yUG9zaXRp b25lZEZsZXhJdGVtKGNvbnN0IFJlbmRlckJveCYgZmxleEl0ZW0pCiB7CiAgICAgYXV0byBmbGV4 SXRlbU1haW5FeHRlbnQgPSBtYWluQXhpc01hcmdpbkV4dGVudEZvckZsZXhJdGVtKGZsZXhJdGVt KSArIG1haW5BeGlzRXh0ZW50Rm9yRmxleEl0ZW0oZmxleEl0ZW0pOwotICAgIGF1dG8gYXZhaWxh YmxlU3BhY2UgPSBtYWluQXhpc0NvbnRlbnRFeHRlbnQoY29udGVudEJveExvZ2ljYWxIZWlnaHQo KSkgLSBmbGV4SXRlbU1haW5FeHRlbnQ7CisgICAgYXV0byBtYWluQXhpc0NvbnRlbnRTaXplID0g aXNDb2x1bW5GbG93KCkgPyBjb250ZW50Qm94TG9naWNhbEhlaWdodCgpIDogY29udGVudEJveExv Z2ljYWxXaWR0aCgpOworICAgIGF1dG8gYXZhaWxhYmxlU3BhY2UgPSBtYWluQXhpc0NvbnRlbnRT aXplIC0gZmxleEl0ZW1NYWluRXh0ZW50OwogICAgIGF1dG8gaXNSZXZlcnNlID0gaXNDb2x1bW5P clJvd1JldmVyc2UoKTsKICAgICBMYXlvdXRVbml0IG9mZnNldCA9IGluaXRpYWxKdXN0aWZ5Q29u dGVudE9mZnNldChzdHlsZSgpLCBhdmFpbGFibGVTcGFjZSwgeyB9LCBpc1JldmVyc2UpOwogICAg IGlmIChpc1JldmVyc2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRmxleGlibGVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs ZUJveC5oCmluZGV4IGVkODViOGNmMDgyZi4uNzYxN2FlZDEwOTQzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaApAQCAtMTczLDcgKzE3Myw3IEBAIHBy aXZhdGU6CiAgICAgTGF5b3V0VW5pdCBOT0RFTEVURSBjcm9zc0F4aXNFeHRlbnQoKSBjb25zdDsK ICAgICBMYXlvdXRVbml0IE5PREVMRVRFIG1haW5BeGlzRXh0ZW50KCkgY29uc3Q7CiAgICAgTGF5 b3V0VW5pdCBjcm9zc0F4aXNDb250ZW50RXh0ZW50KCkgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBt YWluQXhpc0NvbnRlbnRFeHRlbnQoTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbEhlaWdodCk7Cisg ICAgTGF5b3V0VW5pdCBjb2x1bW5Jbm5lck1haW5TaXplKExheW91dFVuaXQgaHlwb3RoZXRpY2Fs TWFpblNpemUpOwogICAgIExheW91dFVuaXQgbWFpbkF4aXNBdmFpbGFibGVTcGFjZSgpOwogICAg IHRlbXBsYXRlPHR5cGVuYW1lIFNpemVUeXBlPiBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IGNv bXB1dGVNYWluQXhpc0V4dGVudEZvckZsZXhJdGVtKFJlbmRlckJveCYgZmxleEl0ZW0sIGNvbnN0 IFNpemVUeXBlJik7CiAgICAgRmxvd0RpcmVjdGlvbiBOT0RFTEVURSB0cmFuc2Zvcm1lZEJsb2Nr Rmxvd0RpcmVjdGlvbigpIGNvbnN0Owo= 479222 2026-04-20 16:16:34 -0700 2026-04-21 05:23:01 -0700 [fast-cq]Patch bug-312800-20260420161634.patch text/plain 5505 zalan RnJvbSBjYTViOGI0NzNlNTlmYWZmZjNmZTRiNDJiM2RjOWIyMGJkMjFlZmQ3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IE1vbiwgMjAgQXByIDIwMjYgMTI6NDk6MDkgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbRmxleF0g U3BsaXQgbWFpbkF4aXNDb250ZW50RXh0ZW50IGludG8gY2xlYXJlciBoZWxwZXJzCiBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzEyODAwCgpSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KCm1haW5BeGlzQ29udGVudEV4dGVudCBzZXJ2ZWQgdHdvIHB1cnBvc2VzIHdp dGggYSBzaW5nbGUgZnVuY3Rpb246CmRpc3RyaWJ1dGlvbiAoY29udGFpbmVyIG1haW4gaW5uZXIg c2l6ZSkgYW5kIHBvc2l0aW9uZWQgaXRlbSBwbGFjZW1lbnQuCkZvciByb3cgZmxleCBpdCBpZ25v cmVkIGl0cyBpbnB1dCBhbmQgcmV0dXJuZWQgY29udGVudEJveExvZ2ljYWxXaWR0aCgpLgpGb3Ig Y29sdW1uIGZsZXggaXQgY29uc3RyYWluZWQgdGhlIGlucHV0IHRocm91Z2ggY29tcHV0ZUxvZ2lj YWxIZWlnaHQuClRoZSBvdmVybG9hZGVkIHNlbWFudGljcyBtYWRlIGl0IHVuY2xlYXIgd2hhdCBj YWxsZXJzIGFjdHVhbGx5IG5lZWRlZC4KClNwbGl0IGludG86Ci0gY29sdW1uSW5uZXJNYWluU2l6 ZShoeXBvdGhldGljYWxNYWluU2l6ZSk6IHJlc29sdmVzIHRoZSBjb2x1bW4gZmxleAogIGNvbnRh aW5lcidzIGlubmVyIG1haW4gc2l6ZSBieSBjb25zdHJhaW5pbmcgdGhlIGh5cG90aGV0aWNhbCBt YWluCiAgc2l6ZSBzdW0gdGhyb3VnaCBjb21wdXRlTG9naWNhbEhlaWdodC4gQ29sdW1uLW9ubHks IGFzc2VydGVkLiBVc2VkCiAgZm9yIGZsZXggZGlzdHJpYnV0aW9uIChzcGVjOiAiZmxleCBjb250 YWluZXIncyBpbm5lciBtYWluIHNpemUiKS4KLSBJbmxpbmU6IHBvc2l0aW9uZWQgaXRlbSBwbGFj ZW1lbnQgbm93IHVzZXMKICBpc0NvbHVtbkZsb3coKSA/IGNvbnRlbnRCb3hMb2dpY2FsSGVpZ2h0 KCkgOiBjb250ZW50Qm94TG9naWNhbFdpZHRoKCkKICBkaXJlY3RseSwgc2luY2UgdGhlIHJvdW5k LXRyaXAgdGhyb3VnaCBjb21wdXRlTG9naWNhbEhlaWdodCB3YXMgYQogIG5vLW9wIGZvciBhbiBh bHJlYWR5LWxhaWQtb3V0IGNvbnRhaW5lci4KCk5vIGJlaGF2aW9yIGNoYW5nZS4KCiogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcDoKKFdlYkNvcmU6OlJlbmRl ckZsZXhpYmxlQm94Ojpjb2x1bW5Jbm5lck1haW5TaXplKToKKFdlYkNvcmU6OlJlbmRlckZsZXhp YmxlQm94OjpwZXJmb3JtRmxleExheW91dCk6CihXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6 c3RhdGljTWFpbkF4aXNQb3NpdGlvbkZvclBvc2l0aW9uZWRGbGV4SXRlbSk6CihXZWJDb3JlOjpS ZW5kZXJGbGV4aWJsZUJveDo6bWFpbkF4aXNDb250ZW50RXh0ZW50KTogRGVsZXRlZC4KKiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaDoKCkNvLUF1dGhvcmVkLUJ5 OiBDbGF1ZGUgT3B1cyA0LjYgKDFNIGNvbnRleHQpIDxub3JlcGx5QGFudGhyb3BpYy5jb20+Ci0t LQogLi4uL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCAgIHwgMjAgKysr KysrKystLS0tLS0tLS0tLQogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxl Qm94LmggIHwgIDIgKy0KIDIgZmlsZXMgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspLCAxMyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl eGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94 LmNwcAppbmRleCBhODYwYTJjMzM0ZjkuLjYzMjE0ZWU4MWU1ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC04MjksMTcgKzgyOSwxMiBA QCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjcm9zc0F4aXNDb250ZW50RXh0ZW50KCkg Y29uc3QKICAgICByZXR1cm4gaXNIb3Jpem9udGFsRmxvdygpID8gY29udGVudEJveEhlaWdodCgp IDogY29udGVudEJveFdpZHRoKCk7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6 Om1haW5BeGlzQ29udGVudEV4dGVudChMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsSGVpZ2h0KQor TGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29sdW1uSW5uZXJNYWluU2l6ZShMYXlvdXRV bml0IGh5cG90aGV0aWNhbE1haW5TaXplKQogewotICAgIGlmICghaXNDb2x1bW5GbG93KCkpCi0g ICAgICAgIHJldHVybiBjb250ZW50Qm94TG9naWNhbFdpZHRoKCk7Ci0KLSAgICBMYXlvdXRVbml0 IGJvcmRlclBhZGRpbmdBbmRTY3JvbGxiYXIgPSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdo dCgpICsgc2Nyb2xsYmFyTG9naWNhbEhlaWdodCgpOwotICAgIExheW91dFVuaXQgYm9yZGVyQm94 TG9naWNhbEhlaWdodCA9IGNvbnRlbnRMb2dpY2FsSGVpZ2h0ICsgYm9yZGVyUGFkZGluZ0FuZFNj cm9sbGJhcjsKLSAgICBhdXRvIGNvbXB1dGVkVmFsdWVzID0gY29tcHV0ZUxvZ2ljYWxIZWlnaHQo Ym9yZGVyQm94TG9naWNhbEhlaWdodCwgbG9naWNhbFRvcCgpKTsKLSAgICBpZiAoY29tcHV0ZWRW YWx1ZXMuZXh0ZW50ID09IExheW91dFVuaXQ6Om1heCgpKQotICAgICAgICByZXR1cm4gY29tcHV0 ZWRWYWx1ZXMuZXh0ZW50OwotICAgIHJldHVybiBzdGQ6Om1heCgwX2x1LCBjb21wdXRlZFZhbHVl cy5leHRlbnQgLSBib3JkZXJQYWRkaW5nQW5kU2Nyb2xsYmFyKTsKKyAgICBBU1NFUlQoaXNDb2x1 bW5GbG93KCkpOworICAgIGF1dG8gYm9yZGVyUGFkZGluZ0FuZFNjcm9sbGJhciA9IGJvcmRlckFu ZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCkgKyBzY3JvbGxiYXJMb2dpY2FsSGVpZ2h0KCk7CisgICAg YXV0byBsb2dpY2FsSGVpZ2h0ID0gY29tcHV0ZUxvZ2ljYWxIZWlnaHQoaHlwb3RoZXRpY2FsTWFp blNpemUgKyBib3JkZXJQYWRkaW5nQW5kU2Nyb2xsYmFyLCBsb2dpY2FsVG9wKCkpLmV4dGVudDsK KyAgICByZXR1cm4gbG9naWNhbEhlaWdodCA9PSBMYXlvdXRVbml0OjptYXgoKSA/IGxvZ2ljYWxI ZWlnaHQgOiBzdGQ6Om1heCgwX2x1LCBsb2dpY2FsSGVpZ2h0IC0gYm9yZGVyUGFkZGluZ0FuZFNj cm9sbGJhcik7CiB9CiAKIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6Om1haW5BeGlzQXZh aWxhYmxlU3BhY2UoKQpAQCAtMTU5MCw3ICsxNTg1LDcgQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJv eDo6cGVyZm9ybUZsZXhMYXlvdXQoUmVsYXlvdXRDaGlsZHJlbiByZWxheW91dENoaWxkcmVuKQog ICAgICAgICAgICAgICAgICAgICB0cmltQ3Jvc3NBeGlzTWFyZ2luRW5kKGZsZXhMYXlvdXRJdGVt KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgICAgICBhdXRvIGNvbnRhaW5lck1haW5J bm5lclNpemUgPSBtYWluQXhpc0NvbnRlbnRFeHRlbnQobGluZURhdGEtPnN1bUh5cG90aGV0aWNh bE1haW5TaXplKTsKKyAgICAgICAgYXV0byBjb250YWluZXJNYWluSW5uZXJTaXplID0gaXNDb2x1 bW5GbG93KCkgPyBjb2x1bW5Jbm5lck1haW5TaXplKGxpbmVEYXRhLT5zdW1IeXBvdGhldGljYWxN YWluU2l6ZSkgOiBjb250ZW50Qm94TG9naWNhbFdpZHRoKCk7CiAgICAgICAgIGF1dG8gcmVtYWlu aW5nRnJlZVNwYWNlID0gcmVzb2x2ZUZsZXhpYmxlTGVuZ3Roc0ZvckxpbmVJdGVtcyhsaW5lSXRl bXMsIGNvbnRhaW5lck1haW5Jbm5lclNpemUsIGdhcEJldHdlZW5JdGVtcyk7CiAKICAgICAgICAg Ly8gUmVjYWxjdWxhdGUgdGhlIHJlbWFpbmluZyBmcmVlIHNwYWNlLiBUaGUgYWRqdXN0bWVudCBm b3IgZmxleCBmYWN0b3JzCkBAIC0yMjU1LDcgKzIyNTAsOCBAQCB2b2lkIFJlbmRlckZsZXhpYmxl Qm94OjpzZXRPdmVycmlkaW5nTWFpblNpemVGb3JGbGV4SXRlbShSZW5kZXJCb3gmIGZsZXhJdGVt LCBMYQogTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6c3RhdGljTWFpbkF4aXNQb3NpdGlv bkZvclBvc2l0aW9uZWRGbGV4SXRlbShjb25zdCBSZW5kZXJCb3gmIGZsZXhJdGVtKQogewogICAg IGF1dG8gZmxleEl0ZW1NYWluRXh0ZW50ID0gbWFpbkF4aXNNYXJnaW5FeHRlbnRGb3JGbGV4SXRl bShmbGV4SXRlbSkgKyBtYWluQXhpc0V4dGVudEZvckZsZXhJdGVtKGZsZXhJdGVtKTsKLSAgICBh dXRvIGF2YWlsYWJsZVNwYWNlID0gbWFpbkF4aXNDb250ZW50RXh0ZW50KGNvbnRlbnRCb3hMb2dp Y2FsSGVpZ2h0KCkpIC0gZmxleEl0ZW1NYWluRXh0ZW50OworICAgIGF1dG8gbWFpbkF4aXNDb250 ZW50U2l6ZSA9IGlzQ29sdW1uRmxvdygpID8gY29udGVudEJveExvZ2ljYWxIZWlnaHQoKSA6IGNv bnRlbnRCb3hMb2dpY2FsV2lkdGgoKTsKKyAgICBhdXRvIGF2YWlsYWJsZVNwYWNlID0gbWFpbkF4 aXNDb250ZW50U2l6ZSAtIGZsZXhJdGVtTWFpbkV4dGVudDsKICAgICBhdXRvIGlzUmV2ZXJzZSA9 IGlzQ29sdW1uT3JSb3dSZXZlcnNlKCk7CiAgICAgTGF5b3V0VW5pdCBvZmZzZXQgPSBpbml0aWFs SnVzdGlmeUNvbnRlbnRPZmZzZXQoc3R5bGUoKSwgYXZhaWxhYmxlU3BhY2UsIHsgfSwgaXNSZXZl cnNlKTsKICAgICBpZiAoaXNSZXZlcnNlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRmxleGlibGVCb3guaAppbmRleCBlZDg1YjhjZjA4MmYuLjc2MTdhZWQxMDk0MyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKQEAgLTE3Myw3ICsx NzMsNyBAQCBwcml2YXRlOgogICAgIExheW91dFVuaXQgTk9ERUxFVEUgY3Jvc3NBeGlzRXh0ZW50 KCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBOT0RFTEVURSBtYWluQXhpc0V4dGVudCgpIGNvbnN0 OwogICAgIExheW91dFVuaXQgY3Jvc3NBeGlzQ29udGVudEV4dGVudCgpIGNvbnN0OwotICAgIExh eW91dFVuaXQgbWFpbkF4aXNDb250ZW50RXh0ZW50KExheW91dFVuaXQgY29udGVudExvZ2ljYWxI ZWlnaHQpOworICAgIExheW91dFVuaXQgY29sdW1uSW5uZXJNYWluU2l6ZShMYXlvdXRVbml0IGh5 cG90aGV0aWNhbE1haW5TaXplKTsKICAgICBMYXlvdXRVbml0IG1haW5BeGlzQXZhaWxhYmxlU3Bh Y2UoKTsKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBTaXplVHlwZT4gc3RkOjpvcHRpb25hbDxMYXlv dXRVbml0PiBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JGbGV4SXRlbShSZW5kZXJCb3gmIGZsZXhJ dGVtLCBjb25zdCBTaXplVHlwZSYpOwogICAgIEZsb3dEaXJlY3Rpb24gTk9ERUxFVEUgdHJhbnNm b3JtZWRCbG9ja0Zsb3dEaXJlY3Rpb24oKSBjb25zdDsK