226822 2021-06-09 08:51:53 -0700 [css-flexbox] Move flex item preferred width computation specifics to RenderFlexibleBox class 2021-06-25 01:09:33 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 svillar svillar bfulgham changseok esprehn+autocc ews-watchlist glenn jfernandez koivisto kondapallykalyan pdr sam simon.fraser svillar webkit-bug-importer zalan oldest_to_newest 1768193 0 svillar 2021-06-09 08:51:53 -0700 [css-flexbox] Move flex item preferred width computation specifics to RenderFlexibleBox class 1768199 1 430969 svillar 2021-06-09 09:06:14 -0700 Created attachment 430969 Patch 1770206 2 webkit-bug-importer 2021-06-16 08:52:19 -0700 <rdar://problem/79399711> 1772577 3 svillar 2021-06-25 01:09:33 -0700 Committed r279268 (239147@main): <https://commits.webkit.org/239147@main> 430969 2021-06-09 09:06:14 -0700 2021-06-24 20:28:08 -0700 Patch bug-226822-20210609180612.patch text/plain 12762 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjgxNWY5YTdiMjFhYmE3 NjRhZDExYmIwYjJkODI4NWI3MGViZDViNC4uYzhmZmE2MDJhM2YyNjE3NzQ1YzFhZTFlZTI1MTg3 ZTYzYTg2MTI2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIxLTA2LTA5ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZmxl eGJveF0gTW92ZSBmbGV4IGl0ZW0gcHJlZmVycmVkIHdpZHRoIGNvbXB1dGF0aW9uIHNwZWNpZmlj cyB0byBSZW5kZXJGbGV4aWJsZUJveCBjbGFzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2ODIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVuZGVyQmxvY2sgaGFkIHNvbWUgc3BlY2lmaWMgY29kZSBm b3IgZmxleCBpdGVtcyB0aGF0IGNsZWFyZWQgdGhlIG92ZXJyaWRpbmcgc2l6ZXMgYmVmb3JlCisg ICAgICAgIGNvbXB1dGluZyB0aGUge21pbnxtYXh9UHJlZmVycmVkV2lkdGhzIGFuZCB0aGVuIHJl c3RvcmVkIHRoZW0gYWZ0ZXJ3YXJkcy4gVGhhdCBpcyBkb25lIHRvCisgICAgICAgIHByb3Blcmx5 IGNvbXB1dGUgZmxleCBpdGVtcyBpbnRyaW5zaWMgc2l6ZXMuIFRoYXQgY29kZSBpcyBmbGV4Ym94 IHNwZWNpZmljIHNvIHdlIGJldHRlciBtb3ZlCisgICAgICAgIGl0IHRvIFJlbmRlckZsZXhpYmxl Qm94LiBJbiBvcmRlciB0byBkbyB0aGF0IGEgbmV3IHZpcnR1YWwgbWV0aG9kIHdhcyBhZGRlZCB0 byBSZW5kZXJCbG9jayB3aGljaAorICAgICAgICBqdXN0IGNhbGxzIG1pblByZWZlcnJlZExvZ2lj YWxXaWR0aCgpIGFuZCBtYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSBmb3IgZXZlcnkgYmxvY2sg ZXhjZXB0CisgICAgICAgIGZsZXhib3ggY29udGFpbmVycy4KKworICAgICAgICBJbiB0aGUgY2Fz ZSBvZiBmbGV4Ym94IGNvbnRhaW5lcnMsIGl0IHdyYXBzIHRob3NlIGNhbGxzIHdpdGggYSBSQUlJ IGNsYXNzIHRoYXQgcHJvcGVybHkKKyAgICAgICAgY2xlYXJzIHRoZSBvdmVycmlkaW5nIHNpemVz IG9uIGluc3RhbnRpYXRpb24gYW5kIGNsZWFycyB0aGVtIG9uIGRlc3RydWN0aW9uLiBOb3cgdGhh dCB0aGUgUkFJSQorICAgICAgICBjbGFzcyBpcyBhdmFpbGFibGUgd2UgdXNlIGl0IGFsc28gZm9y IGFub3RoZXIgZXhpc3RpbmcgY29kZSBwYXRoIHRoYXQgcmVxdWlyZXMgdG8KKyAgICAgICAgdGVt cG9yYXJpbHkgc2V0IGFuIG92ZXJyaWRpbmcgc2l6ZSBpbiBhIGdpdmVuIHNjb3BlLgorCisgICAg ICAgIE5vIG5lZWQgZm9yIG5ldyB0ZXN0cyBhcyB0aGVyZSBpcyBubyBjaGFuZ2UgaW4gYmVoYXZp b3VyLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRJbnRyaW5zaWNMb2dpY2FsV2lkdGhzIGNv bnN0KTogTmV3IHZpcnR1YWwgbWV0aG9kLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6 OmNvbXB1dGVDaGlsZFByZWZlcnJlZExvZ2ljYWxXaWR0aHMgY29uc3QpOiBDYWxsIGNvbXB1dGVD aGlsZEludHJpbnNpY0xvZ2ljYWxXaWR0aHMoKS4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy QmxvY2suaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAg ICAgICAoV2ViQ29yZTo6T3ZlcnJpZGluZ1NpemVzU2NvcGU6Ok92ZXJyaWRpbmdTaXplc1Njb3Bl KTogTmV3IFJBSUkgY2xhc3MgdG8gc2V0L2NsZWFyIG92ZXJyaWRpbmcgc2l6ZXMgaW4gYSBzY29w ZS4KKyAgICAgICAgKFdlYkNvcmU6Ok92ZXJyaWRpbmdTaXplc1Njb3BlOjp+T3ZlcnJpZGluZ1Np emVzU2NvcGUpOgorICAgICAgICAoV2ViQ29yZTo6T3ZlcnJpZGluZ1NpemVzU2NvcGU6OnNldE9y Q2xlYXJPdmVycmlkaW5nU2l6ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJv eDo6Y29tcHV0ZUNoaWxkSW50cmluc2ljTG9naWNhbFdpZHRocyBjb25zdCk6IFJlZGVmaW5pdGlv biBmb3IgZmxleGJveCBjb250YWluZXJzLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGli bGVCb3g6OmNoaWxkSW50cmluc2ljTG9naWNhbEhlaWdodCBjb25zdCk6IFJlbW92ZWQgY29uc3Ru ZXNzIGZyb20gYXR0cmlidXRlLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6 OmNoaWxkSW50cmluc2ljTG9naWNhbFdpZHRoKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJGbGV4aWJsZUJveDo6Y3Jvc3NBeGlzSW50cmluc2ljRXh0ZW50Rm9yQ2hpbGQpOiBEaXR0 by4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaDoKKwogMjAyMS0wNi0w NyAgSW1hbm9sIEZlcm5hbmRleiAgPGlmZXJuYW5kZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBD aGFuZ2UgV2ViWFJTcGFjZTo6ZWZlY3RpdmVPcmlnaW4oKSBtYXRyaXggbXVsdGlwbGljYXRpb24g b3JkZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IGNlODVi ZDVlZGE0ZGJjOGUzMDExZDQwZWVkMDc1Yjc3YmVlM2U1OGQuLjkyZTlmNGIyODE3NzcyNTUzM2Vk ZGYzODgxMTE2YjhlMTQ4NTNkMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmNwcApAQCAtMjM4Myw2ICsyMzgzLDEyIEBAIHZvaWQgUmVuZGVyQmxvY2s6OmNvbXB1dGVC bG9ja1ByZWZlcnJlZExvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRoCiAg ICAgbWF4TG9naWNhbFdpZHRoID0gc3RkOjptYXgoZmxvYXRMZWZ0V2lkdGggKyBmbG9hdFJpZ2h0 V2lkdGgsIG1heExvZ2ljYWxXaWR0aCk7CiB9CiAKK3ZvaWQgUmVuZGVyQmxvY2s6OmNvbXB1dGVD aGlsZEludHJpbnNpY0xvZ2ljYWxXaWR0aHMoUmVuZGVyT2JqZWN0JiBjaGlsZCwgTGF5b3V0VW5p dCYgbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0JiBtYXhQcmVmZXJyZWRMb2dp Y2FsV2lkdGgpIGNvbnN0Cit7CisgICAgbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gY2hpbGQu bWluUHJlZmVycmVkTG9naWNhbFdpZHRoKCk7CisgICAgbWF4UHJlZmVycmVkTG9naWNhbFdpZHRo ID0gY2hpbGQubWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCk7Cit9CisKIHZvaWQgUmVuZGVyQmxv Y2s6OmNvbXB1dGVDaGlsZFByZWZlcnJlZExvZ2ljYWxXaWR0aHMoUmVuZGVyT2JqZWN0JiBjaGls ZCwgTGF5b3V0VW5pdCYgbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0JiBtYXhQ cmVmZXJyZWRMb2dpY2FsV2lkdGgpIGNvbnN0CiB7CiAgICAgaWYgKGNoaWxkLmlzQm94KCkgJiYg Y2hpbGQuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSAhPSBpc0hvcml6b250YWxXcml0aW5nTW9k ZSgpKSB7CkBAIC0yNDAzLDMyICsyNDA5LDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6Y29tcHV0ZUNo aWxkUHJlZmVycmVkTG9naWNhbFdpZHRocyhSZW5kZXJPYmplY3QmIGNoaWxkLCBMYXlvdXQKICAg ICAgICAgcmV0dXJuOwogICAgIH0KICAgICAKLSAgICAvLyBUaGUgcHJlZmVycmVkIHdpZHRocyBv ZiBmbGV4Ym94IGNoaWxkcmVuIHNob3VsZCBuZXZlciBkZXBlbmQgb24gb3ZlcnJpZGluZyBzaXpl cy4gVGhleSBzaG91bGQKLSAgICAvLyBhbHdheXMgYmUgY29tcHV0ZWQgd2l0aG91dCByZWdhcmQg Zm9yIGFueSBvdmVycmlkZXMgdGhhdCBhcmUgcHJlc2VudC4KLSAgICBzdGQ6Om9wdGlvbmFsPExh eW91dFVuaXQ+IG92ZXJyaWRpbmdIZWlnaHQ7Ci0gICAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0 PiBvdmVycmlkaW5nV2lkdGg7Ci0gICAgCi0gICAgaWYgKGNoaWxkLmlzQm94KCkpIHsKLSAgICAg ICAgYXV0byYgYm94ID0gZG93bmNhc3Q8UmVuZGVyQm94PihjaGlsZCk7Ci0gICAgICAgIGlmIChi b3guaXNGbGV4SXRlbSgpKSB7Ci0gICAgICAgICAgICBpZiAoYm94Lmhhc092ZXJyaWRpbmdMb2dp Y2FsSGVpZ2h0KCkpCi0gICAgICAgICAgICAgICAgb3ZlcnJpZGluZ0hlaWdodCA9IHN0ZDo6b3B0 aW9uYWw8TGF5b3V0VW5pdD4oYm94Lm92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KCkpOwotICAgICAg ICAgICAgaWYgKGJveC5oYXNPdmVycmlkaW5nTG9naWNhbFdpZHRoKCkpCi0gICAgICAgICAgICAg ICAgb3ZlcnJpZGluZ1dpZHRoID0gc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0Pihib3gub3ZlcnJp ZGluZ0xvZ2ljYWxXaWR0aCgpKTsKLSAgICAgICAgICAgIGJveC5jbGVhck92ZXJyaWRpbmdDb250 ZW50U2l6ZSgpOwotICAgICAgICB9Ci0gICAgfQotICAgIAotICAgIG1pblByZWZlcnJlZExvZ2lj YWxXaWR0aCA9IGNoaWxkLm1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgpOwotICAgIG1heFByZWZl cnJlZExvZ2ljYWxXaWR0aCA9IGNoaWxkLm1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCgpOwotICAg IAotICAgIGlmIChjaGlsZC5pc0JveCgpKSB7Ci0gICAgICAgIGF1dG8mIGJveCA9IGRvd25jYXN0 PFJlbmRlckJveD4oY2hpbGQpOwotICAgICAgICBpZiAob3ZlcnJpZGluZ0hlaWdodCkKLSAgICAg ICAgICAgIGJveC5zZXRPdmVycmlkaW5nTG9naWNhbEhlaWdodChvdmVycmlkaW5nSGVpZ2h0LnZh bHVlKCkpOwotICAgICAgICBpZiAob3ZlcnJpZGluZ1dpZHRoKQotICAgICAgICAgICAgYm94LnNl dE92ZXJyaWRpbmdMb2dpY2FsV2lkdGgob3ZlcnJpZGluZ1dpZHRoLnZhbHVlKCkpOwotICAgIH0K KyAgICBjb21wdXRlQ2hpbGRJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKGNoaWxkLCBtaW5QcmVmZXJy ZWRMb2dpY2FsV2lkdGgsIG1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCk7CiAKICAgICAvLyBGb3Ig bm9uLXJlcGxhY2VkIGJsb2NrcyBpZiB0aGUgaW5saW5lIHNpemUgaXMgbWlufG1heC1jb250ZW50 IG9yIGEgZGVmaW5pdGUKICAgICAvLyBzaXplIHRoZSBtaW58bWF4LWNvbnRlbnQgY29udHJpYnV0 aW9uIGlzIHRoYXQgc2l6ZSBwbHVzIGJvcmRlciwgcGFkZGluZyBhbmQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmgKaW5kZXggOTQ2N2VlMmFlMDI1ZmQ5YWMzODUyMDQ0OTUzNjJm NDE2Mzc3NDg4OS4uNjUwYzY2M2ZkODIyMjg2MmI4ZDQyNGE0M2JmZGQ5N2FiNmQ3ODkyNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKQEAgLTQyNiw2ICs0MjYsOCBAQCBw cm90ZWN0ZWQ6CiAKICAgICB2b2lkIGJsb2NrV2lsbEJlRGVzdHJveWVkKCk7CiAKKyAgICB2aXJ0 dWFsIHZvaWQgY29tcHV0ZUNoaWxkSW50cmluc2ljTG9naWNhbFdpZHRocyhSZW5kZXJPYmplY3Qm LCBMYXlvdXRVbml0JiBtaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1heFBy ZWZlcnJlZExvZ2ljYWxXaWR0aCkgY29uc3Q7CisKIHByaXZhdGU6CiAgICAgc3RhdGljIFJlbmRl clB0cjxSZW5kZXJCbG9jaz4gY3JlYXRlQW5vbnltb3VzQmxvY2tXaXRoU3R5bGVBbmREaXNwbGF5 KERvY3VtZW50JiwgY29uc3QgUmVuZGVyU3R5bGUmLCBEaXNwbGF5VHlwZSk7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IGM5ZGZiZGNj MmVmODYwNTUzNDYxMzYyMzVmZDZhOGEwZWFhZGI1M2IuLmVmMzQxZDZkYzg0MDQxMzA4ZTFkN2Nj NGQ1OGU3Y2I2OWQ3ZTkxYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckZsZXhpYmxlQm94LmNwcApAQCAtMTUzLDYgKzE1Myw3NyBAQCB2b2lkIFJlbmRlckZsZXhpYmxl Qm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2Fs V2lkdAogICAgIGFkZFNjcm9sbGJhcldpZHRoKCk7CiB9CiAKKy8vIFJBSUkgY2xhc3Mgd2hpY2gg ZGVmaW5lcyBhIHNjb3BlIGluIHdoaWNoIG92ZXJyaWRpbmcgc2l6ZXMgb2YgYSBib3ggYXJlIGVp dGhlcjoKKy8vICAgMSkgcmVwbGFjZWQgYnkgb3RoZXIgc2l6ZSBpbiBvbmUgYXhpcyBpZiBzaXpl IGlzIHNwZWNpZmllZAorLy8gICAyKSBjbGVhcmVkIGluIGJvdGggYXhpcyBpZiBzaXplID09IHN0 ZDo6bnVsbG9wdAorLy8KKy8vIEluIGFueSBjYXNlIHRoZSBwcmV2aW91cyBvdmVycmlkaW5nIHNp emVzIGFyZSByZXN0b3JlZCBvbiBkZXN0cnVjdGlvbiAoaW4gY2FzZSBvZgorLy8gbm90IGhhdmlu ZyBhIHByZXZpb3VzIHZhbHVlIGl0J3Mgc2ltcGx5IGNsZWFyZWQpLgorY2xhc3MgT3ZlcnJpZGlu Z1NpemVzU2NvcGUgeworcHVibGljOgorICAgIGVudW0gY2xhc3MgQXhpcyB7CisgICAgICAgIElu bGluZSwKKyAgICAgICAgQmxvY2ssCisgICAgICAgIEJvdGgKKyAgICB9OworCisgICAgT3ZlcnJp ZGluZ1NpemVzU2NvcGUoUmVuZGVyQm94JiBib3gsIEF4aXMgYXhpcywgc3RkOjpvcHRpb25hbDxM YXlvdXRVbml0PiBzaXplID0gc3RkOjpudWxsb3B0KQorICAgICAgICA6IG1fYm94KGJveCkKKyAg ICAgICAgLCBtX2F4aXMoYXhpcykKKyAgICB7CisgICAgICAgIEFTU0VSVCghc2l6ZSB8fCAoYXhp cyAhPSBBeGlzOjpCb3RoKSk7CisgICAgICAgIGlmIChheGlzID09IEF4aXM6OkJvdGggfHwgYXhp cyA9PSBBeGlzOjpJbmxpbmUpIHsKKyAgICAgICAgICAgIGlmIChib3guaGFzT3ZlcnJpZGluZ0xv Z2ljYWxXaWR0aCgpKQorICAgICAgICAgICAgICAgIG1fb3ZlcnJpZGluZ1dpZHRoID0gYm94Lm92 ZXJyaWRpbmdMb2dpY2FsV2lkdGgoKTsKKyAgICAgICAgICAgIHNldE9yQ2xlYXJPdmVycmlkaW5n U2l6ZShzaXplLCBBeGlzOjpJbmxpbmUpOworICAgICAgICB9CisgICAgICAgIGlmIChheGlzID09 IEF4aXM6OkJvdGggfHwgYXhpcyA9PSBBeGlzOjpCbG9jaykgeworICAgICAgICAgICAgaWYgKGJv eC5oYXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgpKQorICAgICAgICAgICAgICAgIG1fb3ZlcnJp ZGluZ0hlaWdodCA9IGJveC5vdmVycmlkaW5nTG9naWNhbEhlaWdodCgpOworICAgICAgICAgICAg c2V0T3JDbGVhck92ZXJyaWRpbmdTaXplKHNpemUsIEF4aXM6OkJsb2NrKTsKKyAgICAgICAgfQor ICAgIH0KKyAgICB+T3ZlcnJpZGluZ1NpemVzU2NvcGUoKQorICAgIHsKKyAgICAgICAgaWYgKG1f YXhpcyA9PSBBeGlzOjpCb3RoIHx8IG1fYXhpcyA9PSBBeGlzOjpJbmxpbmUpCisgICAgICAgICAg ICBzZXRPckNsZWFyT3ZlcnJpZGluZ1NpemUobV9vdmVycmlkaW5nV2lkdGgsIEF4aXM6OklubGlu ZSk7CisKKyAgICAgICAgaWYgKG1fYXhpcyA9PSBBeGlzOjpCb3RoIHx8IG1fYXhpcyA9PSBBeGlz OjpCbG9jaykKKyAgICAgICAgICAgIHNldE9yQ2xlYXJPdmVycmlkaW5nU2l6ZShtX292ZXJyaWRp bmdIZWlnaHQsIEF4aXM6OkJsb2NrKTsKKyAgICB9CisKK3ByaXZhdGU6CisgICAgdm9pZCBzZXRP ckNsZWFyT3ZlcnJpZGluZ1NpemUoc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBzaXplLCBBeGlz IGF4aXMpCisgICAgeworICAgICAgICBBU1NFUlQoYXhpcyAhPSBBeGlzOjpCb3RoKTsKKyAgICAg ICAgaWYgKHNpemUpIHsKKyAgICAgICAgICAgIGlmIChheGlzID09IEF4aXM6OklubGluZSkKKyAg ICAgICAgICAgICAgICBtX2JveC5zZXRPdmVycmlkaW5nTG9naWNhbFdpZHRoKCpzaXplKTsKKyAg ICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBtX2JveC5zZXRPdmVycmlkaW5nTG9naWNh bEhlaWdodCgqc2l6ZSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAg aWYgKGF4aXMgPT0gQXhpczo6SW5saW5lKQorICAgICAgICAgICAgbV9ib3guY2xlYXJPdmVycmlk aW5nTG9naWNhbFdpZHRoKCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIG1fYm94LmNsZWFy T3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQoKTsKKyAgICB9CisKKyAgICBSZW5kZXJCb3gmIG1fYm94 OworICAgIEF4aXMgbV9heGlzOworICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gbV9vdmVy cmlkaW5nV2lkdGg7CisgICAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBtX292ZXJyaWRpbmdI ZWlnaHQ7Cit9OworCit2b2lkIFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlQ2hpbGRJbnRyaW5z aWNMb2dpY2FsV2lkdGhzKFJlbmRlck9iamVjdCYgY2hpbGRPYmplY3QsIExheW91dFVuaXQmIG1p blByZWZlcnJlZExvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYgbWF4UHJlZmVycmVkTG9naWNhbFdp ZHRoKSBjb25zdAoreworICAgIEFTU0VSVChjaGlsZE9iamVjdC5pc0JveCgpKTsKKyAgICBSZW5k ZXJCb3gmIGNoaWxkID0gZG93bmNhc3Q8UmVuZGVyQm94PihjaGlsZE9iamVjdCk7CisKKyAgICBP dmVycmlkaW5nU2l6ZXNTY29wZSBjbGVhbk92ZXJyaWRpbmdTaXplc1Njb3BlKGNoaWxkLCBPdmVy cmlkaW5nU2l6ZXNTY29wZTo6QXhpczo6Qm90aCk7CisgICAgUmVuZGVyQmxvY2s6OmNvbXB1dGVD aGlsZEludHJpbnNpY0xvZ2ljYWxXaWR0aHMoY2hpbGRPYmplY3QsIG1pblByZWZlcnJlZExvZ2lj YWxXaWR0aCwgbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKTsKK30KKwogTGF5b3V0VW5pdCBSZW5k ZXJGbGV4aWJsZUJveDo6YmFzZWxpbmVQb3NpdGlvbihGb250QmFzZWxpbmUsIGJvb2wsIExpbmVE aXJlY3Rpb25Nb2RlIGRpcmVjdGlvbiwgTGluZVBvc2l0aW9uTW9kZSkgY29uc3QKIHsKICAgICBh dXRvIGJhc2VsaW5lID0gZmlyc3RMaW5lQmFzZWxpbmUoKTsKQEAgLTQ3Niw3ICs1NDcsNyBAQCB2 b2lkIFJlbmRlckZsZXhpYmxlQm94OjpjbGVhckNhY2hlZENoaWxkSW50cmluc2ljQ29udGVudExv Z2ljYWxIZWlnaHQoY29uc3QgUmVuZAogICAgIG1faW50cmluc2ljQ29udGVudExvZ2ljYWxIZWln aHRzLnJlbW92ZSgmY2hpbGQpOwogfQogCi1MYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpj aGlsZEludHJpbnNpY0xvZ2ljYWxIZWlnaHQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QK K0xheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNoaWxkSW50cmluc2ljTG9naWNhbEhlaWdo dChSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAogewogICAgIC8vIFRoaXMgc2hvdWxkIG9ubHkgYmUg Y2FsbGVkIGlmIHRoZSBsb2dpY2FsIGhlaWdodCBpcyB0aGUgY3Jvc3Mgc2l6ZQogICAgIEFTU0VS VChtYWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSk7CkBAIC00ODgsMjcgKzU1OSwyMiBA QCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjpjaGlsZEludHJpbnNpY0xvZ2ljYWxIZWln aHQoY29uc3QgUmVuZGVyQm94JiBjaGlsZAogICAgIHJldHVybiBjaGlsZC5sb2dpY2FsSGVpZ2h0 KCk7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNoaWxkSW50cmluc2ljTG9n aWNhbFdpZHRoKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCitMYXlvdXRVbml0IFJlbmRlckZsZXhp YmxlQm94OjpjaGlsZEludHJpbnNpY0xvZ2ljYWxXaWR0aChSZW5kZXJCb3gmIGNoaWxkKQogewog ICAgIC8vIFRoaXMgc2hvdWxkIG9ubHkgYmUgY2FsbGVkIGlmIHRoZSBsb2dpY2FsIHdpZHRoIGlz IHRoZSBjcm9zcyBzaXplCiAgICAgQVNTRVJUKCFtYWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNo aWxkKSk7CiAgICAgaWYgKGNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZShjaGlsZCwgY2hpbGQuc3R5 bGUoKS5sb2dpY2FsV2lkdGgoKSkpCiAgICAgICAgIHJldHVybiBjaGlsZC5sb2dpY2FsV2lkdGgo KTsKIAotICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gY2hpbGRPdmVycmlkaW5nV2lkdGg7 Ci0gICAgaWYgKGNoaWxkLmhhc092ZXJyaWRpbmdMb2dpY2FsV2lkdGgoKSkgewotICAgICAgICAv LyBUZW1wb3JhcmlseSBjbGVhciBwb3RlbnRpYWwgb3ZlcnJpZGVzIHRvIGNvbXB1dGUgdGhlIGxv Z2ljYWwgd2lkdGggb3RoZXJ3aXNlIGl0J2xsIHJldHVybiB0aGUgb3ZlcnJpZGUgc2l6ZS4KLSAg ICAgICAgY2hpbGRPdmVycmlkaW5nV2lkdGggPSBjaGlsZC5vdmVycmlkaW5nTG9naWNhbFdpZHRo KCk7Ci0gICAgICAgIGNvbnN0X2Nhc3Q8UmVuZGVyQm94Kj4oJmNoaWxkKS0+Y2xlYXJPdmVycmlk aW5nTG9naWNhbFdpZHRoKCk7Ci0gICAgfQogICAgIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVl cyB2YWx1ZXM7Ci0gICAgY2hpbGQuY29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnQodmFsdWVz KTsKLSAgICBpZiAoY2hpbGRPdmVycmlkaW5nV2lkdGgpCi0gICAgICAgIGNvbnN0X2Nhc3Q8UmVu ZGVyQm94Kj4oJmNoaWxkKS0+c2V0T3ZlcnJpZGluZ0xvZ2ljYWxXaWR0aCgqY2hpbGRPdmVycmlk aW5nV2lkdGgpOworICAgIHsKKyAgICAgICAgT3ZlcnJpZGluZ1NpemVzU2NvcGUgY2xlYW5PdmVy cmlkaW5nV2lkdGhTY29wZShjaGlsZCwgT3ZlcnJpZGluZ1NpemVzU2NvcGU6OkF4aXM6OklubGlu ZSk7CisgICAgICAgIGNoaWxkLmNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50KHZhbHVlcyk7 CisgICAgfQogICAgIHJldHVybiB2YWx1ZXMubV9leHRlbnQ7CiB9CiAKLUxheW91dFVuaXQgUmVu ZGVyRmxleGlibGVCb3g6OmNyb3NzQXhpc0ludHJpbnNpY0V4dGVudEZvckNoaWxkKGNvbnN0IFJl bmRlckJveCYgY2hpbGQpCitMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjcm9zc0F4aXNJ bnRyaW5zaWNFeHRlbnRGb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkKQogewogICAgIHJldHVybiBt YWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSA/IGNoaWxkSW50cmluc2ljTG9naWNhbEhl aWdodChjaGlsZCkgOiBjaGlsZEludHJpbnNpY0xvZ2ljYWxXaWR0aChjaGlsZCk7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCmluZGV4IDljNTlhNjYz YWIwOGEyM2UwYzYyZjRkYWU1NjkwMmJmYzBiZDQ2MDMuLmEyOGI3MmUwZjM3NDJiYmNlODJkNDk3 ZmVlZmRmMTM5ZTZmM2JjMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJGbGV4aWJsZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG bGV4aWJsZUJveC5oCkBAIC04OSw2ICs4OSw3IEBAIHB1YmxpYzoKIAogcHJvdGVjdGVkOgogICAg IHZvaWQgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNh bFdpZHRoLCBMYXlvdXRVbml0JiBtYXhMb2dpY2FsV2lkdGgpIGNvbnN0IG92ZXJyaWRlOworICAg IHZvaWQgY29tcHV0ZUNoaWxkSW50cmluc2ljTG9naWNhbFdpZHRocyhSZW5kZXJPYmplY3QmLCBM YXlvdXRVbml0JiBtaW5Mb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1heExvZ2ljYWxXaWR0aCkg Y29uc3Qgb3ZlcnJpZGU7CiAKICAgICBib29sIHNob3VsZFJlc2V0Q2hpbGRMb2dpY2FsSGVpZ2h0 QmVmb3JlTGF5b3V0KGNvbnN0IFJlbmRlckJveCYpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIG1f c2hvdWxkUmVzZXRDaGlsZExvZ2ljYWxIZWlnaHRCZWZvcmVMYXlvdXQ7IH0KIApAQCAtMTE2LDkg KzExNyw5IEBAIHByaXZhdGU6CiAgICAgTGVuZ3RoIGNyb3NzU2l6ZUxlbmd0aEZvckNoaWxkKFNp emVUeXBlLCBjb25zdCBSZW5kZXJCb3gmKSBjb25zdDsKICAgICBib29sIHNob3VsZEFwcGx5TWlu U2l6ZUF1dG9Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmKSBjb25zdDsKICAgICBMYXlvdXRVbml0 IGNyb3NzQXhpc0V4dGVudEZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0Owot ICAgIExheW91dFVuaXQgY3Jvc3NBeGlzSW50cmluc2ljRXh0ZW50Rm9yQ2hpbGQoY29uc3QgUmVu ZGVyQm94JiBjaGlsZCk7Ci0gICAgTGF5b3V0VW5pdCBjaGlsZEludHJpbnNpY0xvZ2ljYWxIZWln aHQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBjaGlsZElu dHJpbnNpY0xvZ2ljYWxXaWR0aChjb25zdCBSZW5kZXJCb3gmIGNoaWxkKTsKKyAgICBMYXlvdXRV bml0IGNyb3NzQXhpc0ludHJpbnNpY0V4dGVudEZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQpOwor ICAgIExheW91dFVuaXQgY2hpbGRJbnRyaW5zaWNMb2dpY2FsSGVpZ2h0KFJlbmRlckJveCYgY2hp bGQpIGNvbnN0OworICAgIExheW91dFVuaXQgY2hpbGRJbnRyaW5zaWNMb2dpY2FsV2lkdGgoUmVu ZGVyQm94JiBjaGlsZCk7CiAgICAgTGF5b3V0VW5pdCBtYWluQXhpc0V4dGVudEZvckNoaWxkKGNv bnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0OwogICAgIExheW91dFVuaXQgbWFpbkF4aXNDb250 ZW50RXh0ZW50Rm9yQ2hpbGRJbmNsdWRpbmdTY3JvbGxiYXIoY29uc3QgUmVuZGVyQm94JiBjaGls ZCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjcm9zc0F4aXNFeHRlbnQoKSBjb25zdDsK