315423 2026-05-23 06:30:29 -0700 [cleanup] Refactor RenderFlexibleBox::computeFlexItemMinMaxSizes into spec-aligned helpers 2026-05-25 05:54: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 2213518 0 zalan 2026-05-23 06:30:29 -0700 ssia 2213519 1 479785 zalan 2026-05-23 06:38:02 -0700 Created attachment 479785 [fast-cq]Patch 2213816 2 ews-feeder 2026-05-25 05:53:57 -0700 Committed 313839@main (0cccc0f3cab8): <https://commits.webkit.org/313839@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 479785. 2213817 3 webkit-bug-importer 2026-05-25 05:54:13 -0700 <rdar://problem/177873050> 479785 2026-05-23 06:38:02 -0700 2026-05-25 05:53:57 -0700 [fast-cq]Patch bug-315423-20260523063801.patch text/plain 14838 zalan RnJvbSAyZTFkOGZlZjNlNTk0YThlNTE5Y2VhY2MyNTYzZDcwNGZkYjg2MWQyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMjMgTWF5IDIwMjYgMDY6MzM6NDMgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbY2xlYW51 cF0gUmVmYWN0b3IKIFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlRmxleEl0ZW1NaW5NYXhTaXpl cyBpbnRvIHNwZWMtYWxpZ25lZCBoZWxwZXJzCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzE1NDIzCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClNwbGl0IHRo ZSB+NzUtbGluZSBtb25vbGl0aCBpbnRvIGZvdXIgZnVuY3Rpb25zLCBlYWNoIG5hbWVkIGFmdGVy IHRoZSBzcGVjCnNlY3Rpb24gaXQgaW1wbGVtZW50czoKCi0gY29tcHV0ZVVzZWRNYXhNYWluU2l6 ZSAoQ1NTIEZsZXhib3ggc2VjdGlvbiA2LCBtYXggbWFpbiBzaXplKQotIGNvbXB1dGVVc2VkTm9u QXV0b01pbk1haW5TaXplIChDU1MgRmxleGJveCBzZWN0aW9uIDYsIG5vbi1hdXRvIGNhc2VzKQot IGNvbXB1dGVDb250ZW50QmFzZWRNaW5NYWluU2l6ZSAoQ1NTIEZsZXhib3ggc2VjdGlvbiA0LjUs IGNvbnRlbnQtYmFzZWQgbWluKQotIGNvbXB1dGVGbGV4SXRlbU1pbk1heE1haW5TaXplcyAoZGlz cGF0Y2hlciwgcmV0dXJucyB0aGUgdXNlZCBtaW4vbWF4IHBhaXIpCgpSZW9yZGVyZWQgdGhlIG1h aW4gZnVuY3Rpb24gc28gdGhlIGF1dG8tZXF1aXZhbGVudCBjaGVjawoodXNlQ29udGVudEJhc2Vk TWluaW11bVNpemUpIHJ1bnMgZmlyc3QsIHdoaWNoIGxldHMgdGhlIHNlY29uZCBicmFuY2ggY29s bGFwc2UKdG8gIW1pbi5pc0F1dG8oKSBhbmQgdGhlIGZhbGwtdGhyb3VnaCB0byB0aGUgc3BlYydz ICJhdXRvbWF0aWMgbWluaW11bSBzaXplIGlzCnplcm8gZm9yIHNjcm9sbCBjb250YWluZXJzIiBy dWxlLgoKKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgoo V2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc0V4dGVudEZvckZsZXhJ dGVtKToKKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlVXNlZE1heE1haW5TaXpl KToKKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlVXNlZE5vbkF1dG9NaW5NYWlu U2l6ZSk6CihXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUNvbnRlbnRCYXNlZE1p bk1haW5TaXplKToKKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlRmxleEl0ZW1N aW5NYXhNYWluU2l6ZXMpOgooV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbnN0cnVjdEZs ZXhMYXlvdXRJdGVtKToKKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlRmxleEl0 ZW1NaW5NYXhTaXplcyk6IERlbGV0ZWQuCiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckZsZXhpYmxlQm94Lmg6Ci0tLQogLi4uL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxl Qm94LmNwcCAgIHwgMTQ4ICsrKysrKysrKystLS0tLS0tLQogU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckZsZXhpYmxlQm94LmggIHwgICA1ICstCiAyIGZpbGVzIGNoYW5nZWQsIDkwIGlu c2VydGlvbnMoKyksIDYzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IGZmY2E4ZmZhZTk0YS4uNDVmNjZkMTgwOGM0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3gu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAK QEAgLTkyNCwxMiArOTI0LDEzIEBAIHRlbXBsYXRlPHR5cGVuYW1lIFNpemVUeXBlPiBzdGQ6Om9w dGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlCiAgICAgLy8gd3Jp dGluZyBtb2RlLiBPdGhlcndpc2Ugd2UgbmVlZCB0aGUgbG9naWNhbCBoZWlnaHQuCiAgICAgaWYg KCFtYWluQXhpc0lzRmxleEl0ZW1JbmxpbmVBeGlzKGZsZXhJdGVtKSkgewogICAgICAgICAvLyBX ZSBkb24ndCBoYXZlIHRvIGNoZWNrIGZvciAiYXV0byIgaGVyZSAtIGNvbXB1dGVDb250ZW50TG9n aWNhbEhlaWdodAotICAgICAgICAvLyB3aWxsIGp1c3QgcmV0dXJuIGEgbnVsbCBPcHRpb25hbCBm b3IgdGhhdCBjYXNlIGFueXdheS4gSXQncyBzYWZlIHRvIGFjY2VzcwotICAgICAgICAvLyBzY3Jv bGxiYXJMb2dpY2FsSGVpZ2h0IGhlcmUgYmVjYXVzZSBDb21wdXRlTmV4dEZsZXhMaW5lIHdpbGwg aGF2ZQotICAgICAgICAvLyBhbHJlYWR5IGZvcmNlZCBsYXlvdXQgb24gdGhlIGNoaWxkLiBXZSBw cmV2aW91c2x5IGRpZCBhIGxheW91dCBvdXQgdGhlIGNoaWxkCi0gICAgICAgIC8vIGlmIG5lY2Vz c2FyeSAoc2VlIENvbXB1dGVOZXh0RmxleExpbmUgYW5kIHRoZSBjYWxsIHRvCi0gICAgICAgIC8v IGZsZXhJdGVtTmVlZHNCbG9ja0F4aXNTaXplKSBzbyB3ZSBjYW4gYmUgc3VyZSB0aGF0IHRoZSB0 d28gaGVpZ2h0Ci0gICAgICAgIC8vIGNhbGxzIGhlcmUgd2lsbCByZXR1cm4gdXAtdG8tZGF0ZSBk YXRhLgorICAgICAgICAvLyB3aWxsIGp1c3QgcmV0dXJuIGEgbnVsbCBPcHRpb25hbCBmb3IgdGhh dCBjYXNlIGFueXdheS4gZmxleEJhc2VTaXplRm9yRmxleEl0ZW0KKyAgICAgICAgLy8gY2FsbHMg YmxvY2tBeGlzU2l6ZUZvckZsZXhJdGVtICh3aGljaCBmb3JjZXMgbGF5b3V0IHZpYSBsYXlvdXRJ Zk5lZWRlZCkgd2hlbgorICAgICAgICAvLyBmbGV4SXRlbU5lZWRzQmxvY2tBeGlzU2l6ZSBpcyB0 cnVlOyBvbiB0aGUgcGF0aCB3aGVyZSBpdCByZXR1cm5zIGZhbHNlIChlLmcuCisgICAgICAgIC8v IGRlZmluaXRlIGZsZXgtYmFzaXMgd2l0aCBub24tYXV0byBtaW4tc2l6ZSBhbmQgbm9uLXZpc2li bGUvY2xpcCBvdmVyZmxvdyksCisgICAgICAgIC8vIHRoZSBjaGlsZCBtYXkgbm90IHlldCBoYXZl IGJlZW4gbGFpZCBvdXQsIHNvIHNjcm9sbGJhckxvZ2ljYWxIZWlnaHQoKSBjYW4KKyAgICAgICAg Ly8gcmV0dXJuIDAgaGVyZS4gVGhhdCBoYXBwZW5zIHRvIGNvaW5jaWRlIHdpdGggdGhlIHNwZWMs IHdoaWNoIGRvZXNuJ3QKKyAgICAgICAgLy8gYXR0cmlidXRlIGEgc2Nyb2xsYmFyIGNvbnRyaWJ1 dGlvbiB0byB0aGUgZmxleCBiYXNlIHNpemUgb24gdGhpcyBwYXRoLgogICAgICAgICBhdXRvIGhl aWdodCA9IGZsZXhJdGVtLmNvbXB1dGVDb250ZW50TG9naWNhbEhlaWdodChzaXplLCBmbGV4SXRl bUNvbnRlbnRMb2dpY2FsSGVpZ2h0KGZsZXhJdGVtKSk7CiAgICAgICAgIGlmICghaGVpZ2h0KQog ICAgICAgICAgICAgcmV0dXJuIGhlaWdodDsKQEAgLTE5MTIsNzcgKzE5MTMsMTAwIEBAIHZvaWQg UmVuZGVyRmxleGlibGVCb3g6OnByZXBhcmVPcmRlckl0ZXJhdG9yQW5kTWFyZ2lucygpCiAgICAg fQogfQogCi1zdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4gUmVuZGVyRmxleGlibGVC b3g6OmNvbXB1dGVGbGV4SXRlbU1pbk1heFNpemVzKFJlbmRlckJveCYgZmxleEl0ZW0pCitzdGQ6 Om9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlVXNlZE1heE1h aW5TaXplKFJlbmRlckJveCYgZmxleEl0ZW0pCiB7CiAgICAgYXV0byBtYXggPSBtYXhNYWluU2l6 ZUxlbmd0aEZvckZsZXhJdGVtKGZsZXhJdGVtKTsKLSAgICBzdGQ6Om9wdGlvbmFsPExheW91dFVu aXQ+IG1heEV4dGVudCA9IHN0ZDo6bnVsbG9wdDsKLSAgICBpZiAobWF4LmlzU3BlY2lmaWVkKCkp IHsKLSAgICAgICAgbWF4RXh0ZW50ID0gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yRmxleEl0ZW0o ZmxleEl0ZW0sIG1heCk7Ci0gICAgfSBlbHNlIGlmIChtYXguaXNJbnRyaW5zaWNPclN0cmV0Y2go KSkgeworICAgIGlmIChtYXguaXNTcGVjaWZpZWQoKSkKKyAgICAgICAgcmV0dXJuIGNvbXB1dGVN YWluQXhpc0V4dGVudEZvckZsZXhJdGVtKGZsZXhJdGVtLCBtYXgpOworICAgIGlmIChtYXguaXNJ bnRyaW5zaWNPclN0cmV0Y2goKSkgewogICAgICAgICBTY29wZWRDcm9zc0F4aXNPdmVycmlkZUZv ckZsZXhJdGVtIHNjb3BlZENyb3NzQXhpc092ZXJyaWRlKCp0aGlzLCBmbGV4SXRlbSwgSW52YWxp ZGF0ZVByZWZlcnJlZFdpZHRoczo6Tm8pOwotICAgICAgICBtYXhFeHRlbnQgPSBjb21wdXRlTWFp bkF4aXNFeHRlbnRGb3JGbGV4SXRlbShmbGV4SXRlbSwgbWF4KTsKKyAgICAgICAgcmV0dXJuIGNv bXB1dGVNYWluQXhpc0V4dGVudEZvckZsZXhJdGVtKGZsZXhJdGVtLCBtYXgpOwogICAgIH0KKyAg ICByZXR1cm4geyB9OworfQogCi0gICAgYXV0byBtaW4gPSBtaW5NYWluU2l6ZUxlbmd0aEZvckZs ZXhJdGVtKGZsZXhJdGVtKTsKLSAgICAvLyBJbnRyaW5zaWMgc2l6ZXMgaW4gY2hpbGQncyBibG9j ayBheGlzIGFyZSBoYW5kbGVkIGJ5IHRoZSBtaW4tc2l6ZTphdXRvIGNvZGUgcGF0aCwKLSAgICAv LyBidXQgc3RyZXRjaCBhbHdheXMgcmVzb2x2ZXMgdG8gYSBkZWZpbml0ZSB2YWx1ZSBhbmQgc2hv dWxkIGJlIGNvbXB1dGVkIGRpcmVjdGx5LgotICAgIGlmIChtaW4uaXNTcGVjaWZpZWQoKSB8fCBt aW4uaXNTdHJldGNoKCkgfHwgKG1pbi5pc0ludHJpbnNpYygpICYmIG1haW5BeGlzSXNGbGV4SXRl bUlubGluZUF4aXMoZmxleEl0ZW0pKSkgewotICAgICAgICBhdXRvIGNvbXB1dGVNaW5FeHRlbnQg PSBbJl0gewotICAgICAgICAgICAgaWYgKG1pbi5pc0ludHJpbnNpY09yU3RyZXRjaCgpKSB7Ci0g ICAgICAgICAgICAgICAgU2NvcGVkQ3Jvc3NBeGlzT3ZlcnJpZGVGb3JGbGV4SXRlbSBzY29wZWRD cm9zc0F4aXNPdmVycmlkZSgqdGhpcywgZmxleEl0ZW0sIEludmFsaWRhdGVQcmVmZXJyZWRXaWR0 aHM6Ok5vKTsKLSAgICAgICAgICAgICAgICByZXR1cm4gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9y RmxleEl0ZW0oZmxleEl0ZW0sIG1pbikudmFsdWVfb3IoMF9sdSk7Ci0gICAgICAgICAgICB9CitM YXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlVXNlZE5vbkF1dG9NaW5NYWluU2l6 ZShSZW5kZXJCb3gmIGZsZXhJdGVtLCBjb25zdCBTdHlsZTo6TWluaW11bVNpemUmIG1pbikKK3sK KyAgICAvLyBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWZsZXhib3gvI21haW4tc2l6ZS1w cm9wZXJ0eQorICAgIC8vIFJlc29sdmVzIHRoZSB1c2VkIG1pbiBtYWluIHNpemUgZm9yIGV2ZXJ5 IGNhc2UgZXhjZXB0IG1pbjphdXRvLiBUaHJlZSB2YWx1ZXMKKyAgICAvLyByb3V0ZSBoZXJlOiBh IHNwZWNpZmllZCBsZW5ndGgvcGVyY2VudGFnZSwgdGhlIHN0cmV0Y2gga2V5d29yZCwgYW5kIGlu dHJpbnNpYworICAgIC8vIGtleXdvcmRzIChtaW4tY29udGVudC9tYXgtY29udGVudC9maXQtY29u dGVudCkgb24gdGhlIGlubGluZSBheGlzLiBQZXIgQ1NTCisgICAgLy8gU2l6aW5nIDMgwqcgNS4y LCBpbnRyaW5zaWMga2V5d29yZHMgb24gdGhlIGJsb2NrIGF4aXMgYmVoYXZlIGxpa2UgYXV0bywg c28KKyAgICAvLyB0aG9zZSBnbyB0aHJvdWdoIGNvbXB1dGVDb250ZW50QmFzZWRNaW5NYWluU2l6 ZSBpbnN0ZWFkLgorICAgIGF1dG8gbWluRXh0ZW50ID0gWyZdIHsKKyAgICAgICAgaWYgKG1pbi5p c0ludHJpbnNpY09yU3RyZXRjaCgpKSB7CisgICAgICAgICAgICBTY29wZWRDcm9zc0F4aXNPdmVy cmlkZUZvckZsZXhJdGVtIHNjb3BlZENyb3NzQXhpc092ZXJyaWRlKCp0aGlzLCBmbGV4SXRlbSwg SW52YWxpZGF0ZVByZWZlcnJlZFdpZHRoczo6Tm8pOwogICAgICAgICAgICAgcmV0dXJuIGNvbXB1 dGVNYWluQXhpc0V4dGVudEZvckZsZXhJdGVtKGZsZXhJdGVtLCBtaW4pLnZhbHVlX29yKDBfbHUp OwotICAgICAgICB9OwotICAgICAgICBhdXRvIG1pbkV4dGVudCA9IGNvbXB1dGVNaW5FeHRlbnQo KTsKLSAgICAgICAgLy8gV2UgbXVzdCBuZXZlciByZXR1cm4gYSBtaW4gc2l6ZSBzbWFsbGVyIHRo YW4gdGhlIG1pbiBwcmVmZXJyZWQgc2l6ZSBmb3IgdGFibGVzLgotICAgICAgICBpZiAoZmxleEl0 ZW0uaXNSZW5kZXJUYWJsZSgpICYmIG1haW5BeGlzSXNGbGV4SXRlbUlubGluZUF4aXMoZmxleEl0 ZW0pKSB7Ci0gICAgICAgICAgICBTY29wZWRDcm9zc0F4aXNPdmVycmlkZUZvckZsZXhJdGVtIHNj b3BlZENyb3NzQXhpc092ZXJyaWRlKCp0aGlzLCBmbGV4SXRlbSwgSW52YWxpZGF0ZVByZWZlcnJl ZFdpZHRoczo6WWVzKTsKLSAgICAgICAgICAgIG1pbkV4dGVudCA9IHN0ZDo6bWF4KG1pbkV4dGVu dCwgZmxleEl0ZW0ubWluUHJlZmVycmVkTG9naWNhbFdpZHRoKCkpOwogICAgICAgICB9Ci0gICAg ICAgIHJldHVybiB7IG1pbkV4dGVudCwgbWF4RXh0ZW50LnZhbHVlX29yKExheW91dFVuaXQ6Om1h eCgpKSB9OworICAgICAgICByZXR1cm4gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yRmxleEl0ZW0o ZmxleEl0ZW0sIG1pbikudmFsdWVfb3IoMF9sdSk7CisgICAgfSgpOworCisgICAgLy8gV2UgbXVz dCBuZXZlciByZXR1cm4gYSBtaW4gc2l6ZSBzbWFsbGVyIHRoYW4gdGhlIG1pbiBwcmVmZXJyZWQg c2l6ZSBmb3IgdGFibGVzLgorICAgIGlmIChmbGV4SXRlbS5pc1JlbmRlclRhYmxlKCkgJiYgbWFp bkF4aXNJc0ZsZXhJdGVtSW5saW5lQXhpcyhmbGV4SXRlbSkpIHsKKyAgICAgICAgU2NvcGVkQ3Jv c3NBeGlzT3ZlcnJpZGVGb3JGbGV4SXRlbSBzY29wZWRDcm9zc0F4aXNPdmVycmlkZSgqdGhpcywg ZmxleEl0ZW0sIEludmFsaWRhdGVQcmVmZXJyZWRXaWR0aHM6Olllcyk7CisgICAgICAgIG1pbkV4 dGVudCA9IHN0ZDo6bWF4KG1pbkV4dGVudCwgZmxleEl0ZW0ubWluUHJlZmVycmVkTG9naWNhbFdp ZHRoKCkpOwogICAgIH0KKyAgICByZXR1cm4gbWluRXh0ZW50OworfQogCi0gICAgaWYgKHVzZUNv bnRlbnRCYXNlZE1pbmltdW1TaXplKGZsZXhJdGVtKSkgewotICAgICAgICAvLyBGSVhNRTogSWYg dGhlIG1pbiB2YWx1ZSBpcyBleHBlY3RlZCB0byBiZSB2YWxpZCBoZXJlLCB3ZSBuZWVkIHRvIGNv bWUgdXAgd2l0aCBhIG5vbiBvcHRpb25hbCB2ZXJzaW9uIG9mIGNvbXB1dGVNYWluQXhpc0V4dGVu dEZvckZsZXhJdGVtIGFuZAotICAgICAgICAvLyBlbnN1cmUgaXQncyB2YWxpZCB0aHJvdWdoIHRo ZSB2aXJ0dWFsIGNhbGxzIG9mIGNvbXB1dGVTaXppbmdLZXl3b3JkTG9naWNhbENvbnRlbnRIZWln aHRVc2luZy4KLSAgICAgICAgTGF5b3V0VW5pdCBjb250ZW50U2l6ZTsKLSAgICAgICAgYXV0byYg ZmxleEl0ZW1Dcm9zc1NpemVMZW5ndGggPSBwcmVmZXJyZWRDcm9zc1NpemVMZW5ndGhGb3JGbGV4 SXRlbShmbGV4SXRlbSk7CitMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlQ29u dGVudEJhc2VkTWluTWFpblNpemUoUmVuZGVyQm94JiBmbGV4SXRlbSwgc3RkOjpvcHRpb25hbDxM YXlvdXRVbml0PiBtYXhFeHRlbnQpCit7CisgICAgLy8gRklYTUU6IElmIHRoZSBtaW4gdmFsdWUg aXMgZXhwZWN0ZWQgdG8gYmUgdmFsaWQgaGVyZSwgd2UgbmVlZCB0byBjb21lIHVwIHdpdGggYSBu b24gb3B0aW9uYWwgdmVyc2lvbiBvZiBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JGbGV4SXRlbSBh bmQKKyAgICAvLyBlbnN1cmUgaXQncyB2YWxpZCB0aHJvdWdoIHRoZSB2aXJ0dWFsIGNhbGxzIG9m IGNvbXB1dGVTaXppbmdLZXl3b3JkTG9naWNhbENvbnRlbnRIZWlnaHRVc2luZy4KKyAgICBMYXlv dXRVbml0IGNvbnRlbnRTaXplOworICAgIGF1dG8mIGZsZXhJdGVtQ3Jvc3NTaXplTGVuZ3RoID0g cHJlZmVycmVkQ3Jvc3NTaXplTGVuZ3RoRm9yRmxleEl0ZW0oZmxleEl0ZW0pOwogCi0gICAgICAg IGJvb2wgY2FuQ29tcHV0ZVNpemVUaHJvdWdoQXNwZWN0UmF0aW8gPSBmbGV4SXRlbUhhc0NvbXB1 dGFibGVBc3BlY3RSYXRpbyhmbGV4SXRlbSkgJiYgZmxleEl0ZW1Dcm9zc1NpemVJc0RlZmluaXRl KGZsZXhJdGVtLCBmbGV4SXRlbUNyb3NzU2l6ZUxlbmd0aCk7CisgICAgYm9vbCBjYW5Db21wdXRl U2l6ZVRocm91Z2hBc3BlY3RSYXRpbyA9IGZsZXhJdGVtSGFzQ29tcHV0YWJsZUFzcGVjdFJhdGlv KGZsZXhJdGVtKSAmJiBmbGV4SXRlbUNyb3NzU2l6ZUlzRGVmaW5pdGUoZmxleEl0ZW0sIGZsZXhJ dGVtQ3Jvc3NTaXplTGVuZ3RoKTsKKyAgICBpZiAoY2FuQ29tcHV0ZVNpemVUaHJvdWdoQXNwZWN0 UmF0aW8pCisgICAgICAgIGNvbnRlbnRTaXplID0gY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJh dGlvVXNpbmcoZmxleEl0ZW0sIGZsZXhJdGVtQ3Jvc3NTaXplTGVuZ3RoKTsKIAotICAgICAgICBp ZiAoY2FuQ29tcHV0ZVNpemVUaHJvdWdoQXNwZWN0UmF0aW8pCi0gICAgICAgICAgICBjb250ZW50 U2l6ZSA9IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGZsZXhJdGVtLCBmbGV4 SXRlbUNyb3NzU2l6ZUxlbmd0aCk7Ci0gICAgICAgIGlmICghY2FuQ29tcHV0ZVNpemVUaHJvdWdo QXNwZWN0UmF0aW8gfHwgIWZsZXhJdGVtLmlzUmVuZGVyUmVwbGFjZWQoKSkgewotICAgICAgICAg ICAgU2NvcGVkQ3Jvc3NBeGlzT3ZlcnJpZGVGb3JGbGV4SXRlbSBzY29wZWRDcm9zc0F4aXNPdmVy cmlkZSgqdGhpcywgZmxleEl0ZW0sIEludmFsaWRhdGVQcmVmZXJyZWRXaWR0aHM6Ok5vKTsKLSAg ICAgICAgICAgIGF1dG8gbWluQ29udGVudFNpemUgPSBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JG bGV4SXRlbShmbGV4SXRlbSwgU3R5bGU6Ok1pbmltdW1TaXplIHsgQ1NTOjpLZXl3b3JkOjpNaW5D b250ZW50IHsgfSB9KS52YWx1ZV9vcigwX2x1KTsKLSAgICAgICAgICAgIGNvbnRlbnRTaXplID0g c3RkOjptYXgoY29udGVudFNpemUsIG1pbkNvbnRlbnRTaXplKTsKLSAgICAgICAgfQorICAgIGlm ICghY2FuQ29tcHV0ZVNpemVUaHJvdWdoQXNwZWN0UmF0aW8gfHwgIWZsZXhJdGVtLmlzUmVuZGVy UmVwbGFjZWQoKSkgeworICAgICAgICBTY29wZWRDcm9zc0F4aXNPdmVycmlkZUZvckZsZXhJdGVt IHNjb3BlZENyb3NzQXhpc092ZXJyaWRlKCp0aGlzLCBmbGV4SXRlbSwgSW52YWxpZGF0ZVByZWZl cnJlZFdpZHRoczo6Tm8pOworICAgICAgICBhdXRvIG1pbkNvbnRlbnRTaXplID0gY29tcHV0ZU1h aW5BeGlzRXh0ZW50Rm9yRmxleEl0ZW0oZmxleEl0ZW0sIFN0eWxlOjpNaW5pbXVtU2l6ZSB7IENT Uzo6S2V5d29yZDo6TWluQ29udGVudCB7IH0gfSkudmFsdWVfb3IoMF9sdSk7CisgICAgICAgIGNv bnRlbnRTaXplID0gc3RkOjptYXgoY29udGVudFNpemUsIG1pbkNvbnRlbnRTaXplKTsKKyAgICB9 CiAKLSAgICAgICAgaWYgKGZsZXhJdGVtSGFzQXNwZWN0UmF0aW8oZmxleEl0ZW0pKQotICAgICAg ICAgICAgY29udGVudFNpemUgPSBhZGp1c3RGbGV4SXRlbVNpemVGb3JBc3BlY3RSYXRpb0Nyb3Nz QXhpc01pbkFuZE1heChmbGV4SXRlbSwgY29udGVudFNpemUpOwotICAgICAgICBjb250ZW50U2l6 ZSA9IHN0ZDo6bWF4KDBfbHUsIGNvbnRlbnRTaXplKTsKLSAgICAgICAgQVNTRVJUKGNvbnRlbnRT aXplID49IDApOwotICAgICAgICBjb250ZW50U2l6ZSA9IHN0ZDo6bWluKGNvbnRlbnRTaXplLCBt YXhFeHRlbnQudmFsdWVfb3IoY29udGVudFNpemUpKTsKLSAgICAgICAgCi0gICAgICAgIGF1dG8g bWFpblNpemUgPSBwcmVmZXJyZWRNYWluU2l6ZUxlbmd0aEZvckZsZXhJdGVtKGZsZXhJdGVtKTsK LSAgICAgICAgaWYgKGZsZXhJdGVtTWFpblNpemVJc0RlZmluaXRlKGZsZXhJdGVtLCBtYWluU2l6 ZSkpIHsKLSAgICAgICAgICAgIExheW91dFVuaXQgcmVzb2x2ZWRNYWluU2l6ZSA9IGNvbXB1dGVN YWluQXhpc0V4dGVudEZvckZsZXhJdGVtKGZsZXhJdGVtLCBtYWluU2l6ZSkudmFsdWVfb3IoMCk7 Ci0gICAgICAgICAgICBBU1NFUlQocmVzb2x2ZWRNYWluU2l6ZSA+PSAwKTsKLSAgICAgICAgICAg IExheW91dFVuaXQgc3BlY2lmaWVkU2l6ZSA9IHN0ZDo6bWluKHJlc29sdmVkTWFpblNpemUsIG1h eEV4dGVudC52YWx1ZV9vcihyZXNvbHZlZE1haW5TaXplKSk7Ci0gICAgICAgICAgICByZXR1cm4g eyBzdGQ6Om1pbihzcGVjaWZpZWRTaXplLCBjb250ZW50U2l6ZSksIG1heEV4dGVudC52YWx1ZV9v cihMYXlvdXRVbml0OjptYXgoKSkgfTsKLSAgICAgICAgfQorICAgIGlmIChmbGV4SXRlbUhhc0Fz cGVjdFJhdGlvKGZsZXhJdGVtKSkKKyAgICAgICAgY29udGVudFNpemUgPSBhZGp1c3RGbGV4SXRl bVNpemVGb3JBc3BlY3RSYXRpb0Nyb3NzQXhpc01pbkFuZE1heChmbGV4SXRlbSwgY29udGVudFNp emUpOwogCi0gICAgICAgIGlmIChmbGV4SXRlbS5pc1JlbmRlclJlcGxhY2VkKCkgJiYgZmxleEl0 ZW1IYXNDb21wdXRhYmxlQXNwZWN0UmF0aW9BbmRDcm9zc1NpemVJc0NvbnNpZGVyZWREZWZpbml0 ZShmbGV4SXRlbSkpIHsKLSAgICAgICAgICAgIExheW91dFVuaXQgdHJhbnNmZXJyZWRTaXplID0g Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoZmxleEl0ZW0sIGZsZXhJdGVtQ3Jv c3NTaXplTGVuZ3RoKTsKLSAgICAgICAgICAgIHRyYW5zZmVycmVkU2l6ZSA9IGFkanVzdEZsZXhJ dGVtU2l6ZUZvckFzcGVjdFJhdGlvQ3Jvc3NBeGlzTWluQW5kTWF4KGZsZXhJdGVtLCB0cmFuc2Zl cnJlZFNpemUpOwotICAgICAgICAgICAgcmV0dXJuIHsgc3RkOjptaW4odHJhbnNmZXJyZWRTaXpl LCBjb250ZW50U2l6ZSksIG1heEV4dGVudC52YWx1ZV9vcihMYXlvdXRVbml0OjptYXgoKSkgfTsK LSAgICAgICAgfQorICAgIGNvbnRlbnRTaXplID0gc3RkOjptYXgoMF9sdSwgY29udGVudFNpemUp OworICAgIEFTU0VSVChjb250ZW50U2l6ZSA+PSAwKTsKKyAgICBjb250ZW50U2l6ZSA9IHN0ZDo6 bWluKGNvbnRlbnRTaXplLCBtYXhFeHRlbnQudmFsdWVfb3IoY29udGVudFNpemUpKTsKIAotICAg ICAgICByZXR1cm4geyBjb250ZW50U2l6ZSwgbWF4RXh0ZW50LnZhbHVlX29yKExheW91dFVuaXQ6 Om1heCgpKSB9OworICAgIGF1dG8gbWFpblNpemUgPSBwcmVmZXJyZWRNYWluU2l6ZUxlbmd0aEZv ckZsZXhJdGVtKGZsZXhJdGVtKTsKKyAgICBpZiAoZmxleEl0ZW1NYWluU2l6ZUlzRGVmaW5pdGUo ZmxleEl0ZW0sIG1haW5TaXplKSkgeworICAgICAgICBhdXRvIHJlc29sdmVkTWFpblNpemUgPSBj b21wdXRlTWFpbkF4aXNFeHRlbnRGb3JGbGV4SXRlbShmbGV4SXRlbSwgbWFpblNpemUpLnZhbHVl X29yKDApOworICAgICAgICBBU1NFUlQocmVzb2x2ZWRNYWluU2l6ZSA+PSAwKTsKKyAgICAgICAg YXV0byBzcGVjaWZpZWRTaXplID0gc3RkOjptaW4ocmVzb2x2ZWRNYWluU2l6ZSwgbWF4RXh0ZW50 LnZhbHVlX29yKHJlc29sdmVkTWFpblNpemUpKTsKKyAgICAgICAgcmV0dXJuIHN0ZDo6bWluKHNw ZWNpZmllZFNpemUsIGNvbnRlbnRTaXplKTsKICAgICB9CiAKLSAgICByZXR1cm4geyAwX2x1LCBt YXhFeHRlbnQudmFsdWVfb3IoTGF5b3V0VW5pdDo6bWF4KCkpIH07CisgICAgaWYgKGZsZXhJdGVt LmlzUmVuZGVyUmVwbGFjZWQoKSAmJiBmbGV4SXRlbUhhc0NvbXB1dGFibGVBc3BlY3RSYXRpb0Fu ZENyb3NzU2l6ZUlzQ29uc2lkZXJlZERlZmluaXRlKGZsZXhJdGVtKSkgeworICAgICAgICBhdXRv IHRyYW5zZmVycmVkU2l6ZSA9IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGZs ZXhJdGVtLCBmbGV4SXRlbUNyb3NzU2l6ZUxlbmd0aCk7CisgICAgICAgIHRyYW5zZmVycmVkU2l6 ZSA9IGFkanVzdEZsZXhJdGVtU2l6ZUZvckFzcGVjdFJhdGlvQ3Jvc3NBeGlzTWluQW5kTWF4KGZs ZXhJdGVtLCB0cmFuc2ZlcnJlZFNpemUpOworICAgICAgICByZXR1cm4gc3RkOjptaW4odHJhbnNm ZXJyZWRTaXplLCBjb250ZW50U2l6ZSk7CisgICAgfQorCisgICAgcmV0dXJuIGNvbnRlbnRTaXpl OworfQorCitzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4gUmVuZGVyRmxleGlibGVC b3g6OmNvbXB1dGVGbGV4SXRlbU1pbk1heE1haW5TaXplcyhSZW5kZXJCb3gmIGZsZXhJdGVtKQor eworICAgIGF1dG8gbWF4RXh0ZW50ID0gY29tcHV0ZVVzZWRNYXhNYWluU2l6ZShmbGV4SXRlbSk7 CisgICAgYXV0byByZXNvbHZlZE1heCA9IG1heEV4dGVudC52YWx1ZV9vcihMYXlvdXRVbml0Ojpt YXgoKSk7CisKKyAgICAvLyB1c2VDb250ZW50QmFzZWRNaW5pbXVtU2l6ZSBjb3ZlcnMgYm90aCBh dXRvLWVxdWl2YWxlbnQgY2FzZXM6IG1pbjphdXRvIHdpdGgKKyAgICAvLyBub24tc2Nyb2xsYWJs ZSBvdmVyZmxvdyAowqcgNC41KSBhbmQgYmxvY2stYXhpcyBpbnRyaW5zaWMga2V5d29yZHMgKENT UyBTaXppbmcKKyAgICAvLyAzIMKnIDUuMiBtYWtlcyB0aG9zZSBiZWhhdmUgbGlrZSBhdXRvLCBy ZWdhcmRsZXNzIG9mIG92ZXJmbG93KS4KKyAgICBpZiAodXNlQ29udGVudEJhc2VkTWluaW11bVNp emUoZmxleEl0ZW0pKQorICAgICAgICByZXR1cm4geyBjb21wdXRlQ29udGVudEJhc2VkTWluTWFp blNpemUoZmxleEl0ZW0sIG1heEV4dGVudCksIHJlc29sdmVkTWF4IH07CisKKyAgICBhdXRvIG1p biA9IG1pbk1haW5TaXplTGVuZ3RoRm9yRmxleEl0ZW0oZmxleEl0ZW0pOworICAgIGlmICghbWlu LmlzQXV0bygpKQorICAgICAgICByZXR1cm4geyBjb21wdXRlVXNlZE5vbkF1dG9NaW5NYWluU2l6 ZShmbGV4SXRlbSwgbWluKSwgcmVzb2x2ZWRNYXggfTsKKworICAgIC8vIG1pbjphdXRvIG9uIGEg c2Nyb2xsIGNvbnRhaW5lciDigJQgc3BlYyBzYXlzIHRoZSBhdXRvbWF0aWMgbWluaW11bSBzaXpl IGlzIHplcm8uCisgICAgcmV0dXJuIHsgMF9sdSwgcmVzb2x2ZWRNYXggfTsKIH0KIAogYm9vbCBS ZW5kZXJGbGV4aWJsZUJveDo6Y2FuVXNlRmxleEl0ZW1Gb3JQZXJjZW50YWdlUmVzb2x1dGlvbihj b25zdCBSZW5kZXJCb3gmIGZsZXhJdGVtKQpAQCAtMjExOCw3ICsyMTQyLDcgQEAgUmVuZGVyRmxl eGlibGVCb3g6OkZsZXhMYXlvdXRJdGVtIFJlbmRlckZsZXhpYmxlQm94Ojpjb25zdHJ1Y3RGbGV4 TGF5b3V0SXRlbShSZW4KICAgICBMYXlvdXRVbml0IGlubmVyRmxleEJhc2VTaXplID0gZmxleEJh c2VTaXplRm9yRmxleEl0ZW0oZmxleEl0ZW0sIHJlbGF5b3V0Q2hpbGRyZW4pOwogICAgIExheW91 dFVuaXQgYm9yZGVyQW5kUGFkZGluZyA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IGZsZXhJdGVtLmhv cml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkgOiBmbGV4SXRlbS52ZXJ0aWNhbEJvcmRl ckFuZFBhZGRpbmdFeHRlbnQoKTsKICAgICBMYXlvdXRVbml0IG1hcmdpbiA9IGlzSG9yaXpvbnRh bEZsb3coKSA/IGZsZXhJdGVtLmhvcml6b250YWxNYXJnaW5FeHRlbnQoKSA6IGZsZXhJdGVtLnZl cnRpY2FsTWFyZ2luRXh0ZW50KCk7Ci0gICAgcmV0dXJuIEZsZXhMYXlvdXRJdGVtKGZsZXhJdGVt LCBpbm5lckZsZXhCYXNlU2l6ZSwgYm9yZGVyQW5kUGFkZGluZywgbWFyZ2luLCBjb21wdXRlRmxl eEl0ZW1NaW5NYXhTaXplcyhmbGV4SXRlbSksIGV2ZXJIYWRMYXlvdXQpOworICAgIHJldHVybiBG bGV4TGF5b3V0SXRlbShmbGV4SXRlbSwgaW5uZXJGbGV4QmFzZVNpemUsIGJvcmRlckFuZFBhZGRp bmcsIG1hcmdpbiwgY29tcHV0ZUZsZXhJdGVtTWluTWF4TWFpblNpemVzKGZsZXhJdGVtKSwgZXZl ckhhZExheW91dCk7CiB9CiAgICAgCiB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpmcmVlemVWaW9s YXRpb25zKFZlY3RvcjxGbGV4TGF5b3V0SXRlbSosIDQ+JiB2aW9sYXRpb25zLCBMYXlvdXRVbml0 JiBhdmFpbGFibGVGcmVlU3BhY2UsIGRvdWJsZSYgdG90YWxGbGV4R3JvdywgZG91YmxlJiB0b3Rh bEZsZXhTaHJpbmssIGRvdWJsZSYgdG90YWxXZWlnaHRlZEZsZXhTaHJpbmspCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCmluZGV4IDRhZDg3ZDJkNGQyZC4u M2NjY2RiYTBhMmFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy RmxleGlibGVCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGli bGVCb3guaApAQCAtMjYzLDcgKzI2MywxMCBAQCBwcml2YXRlOgogICAgIAogICAgIExheW91dFVu aXQgY29tcHV0ZUZsZXhJdGVtTWFyZ2luVmFsdWUoY29uc3QgU3R5bGU6Ok1hcmdpbkVkZ2UmKTsK ICAgICB2b2lkIHByZXBhcmVPcmRlckl0ZXJhdG9yQW5kTWFyZ2lucygpOwotICAgIHN0ZDo6cGFp cjxMYXlvdXRVbml0LCBMYXlvdXRVbml0PiBjb21wdXRlRmxleEl0ZW1NaW5NYXhTaXplcyhSZW5k ZXJCb3gmIGZsZXhJdGVtKTsKKyAgICBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4g Y29tcHV0ZUZsZXhJdGVtTWluTWF4TWFpblNpemVzKFJlbmRlckJveCYgZmxleEl0ZW0pOworICAg IHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gY29tcHV0ZVVzZWRNYXhNYWluU2l6ZShSZW5kZXJC b3gmIGZsZXhJdGVtKTsKKyAgICBMYXlvdXRVbml0IGNvbXB1dGVVc2VkTm9uQXV0b01pbk1haW5T aXplKFJlbmRlckJveCYgZmxleEl0ZW0sIGNvbnN0IFN0eWxlOjpNaW5pbXVtU2l6ZSYpOworICAg IExheW91dFVuaXQgY29tcHV0ZUNvbnRlbnRCYXNlZE1pbk1haW5TaXplKFJlbmRlckJveCYgZmxl eEl0ZW0sIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gbWF4RXh0ZW50KTsKICAgICBMYXlvdXRV bml0IGFkanVzdEZsZXhJdGVtU2l6ZUZvckFzcGVjdFJhdGlvQ3Jvc3NBeGlzTWluQW5kTWF4KGNv bnN0IFJlbmRlckJveCYgZmxleEl0ZW0sIExheW91dFVuaXQgZmxleEl0ZW1TaXplKTsKICAgICBG bGV4TGF5b3V0SXRlbSBjb25zdHJ1Y3RGbGV4TGF5b3V0SXRlbShSZW5kZXJCb3gmLCBSZWxheW91 dENoaWxkcmVuKTsKICAgICAK