226130 2021-05-21 18:34:29 -0700 [LFC][TFC] Add a helper function to compute the intrinsic vertical paddings for the cell 2021-05-24 10:05:26 -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 1762710 0 zalan 2021-05-21 18:34:29 -0700 ssia 1762714 1 429384 zalan 2021-05-21 18:44:33 -0700 Created attachment 429384 Patch 1762741 2 429392 zalan 2021-05-21 20:10:10 -0700 Created attachment 429392 Patch 1763170 3 ews-feeder 2021-05-24 10:04:49 -0700 Committed r277955 (238082@main): <https://commits.webkit.org/238082@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 429392. 1763171 4 webkit-bug-importer 2021-05-24 10:05:26 -0700 <rdar://problem/78405927> 429384 2021-05-21 18:44:33 -0700 2021-05-21 18:54:59 -0700 Patch bug-226130-20210521184432.patch text/plain 3069 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmEyNzBlM2YzMmU4ZDY5 MmRjYjQ5OGY0ZjE4YTUzY2FlOWIxNTRlOS4uZWRjODFjZDI4MWIxMTdkNzBjZmIwM2ZiYWI1OWM5 MmUzZGI3ZWZiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA1LTIxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXSBVc2UgdGhl IHJlc3VsdCBvZiB0aGUgc2Vjb25kIHBhc3MgYXMgdGhlIGZpbmFsIGNvbnRlbnQgYm94IGhlaWdo dCBmb3IgdGhlIGNlbGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyNjEzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZSAidXNlZENlbGxIZWlnaHQiIGlzIHRoZSByZXN1bHQgb2YgdGhlIHRhYmxlIHNw YWNlIGJhbGFuY2luZyBsb2dpYyBhbmQgaXQgaXMgdGhlIGZpbmFsCisgICAgICAgIGhlaWdodCBv ZiB0aGUgY2VsbC4KKworICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUv VGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlRh YmxlRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dENlbGwpOgorCiAyMDIxLTA1LTIwICBBbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtURkNdW1F1aXJrc10gVXNl IGJveC1zaXppbmc6IGJvcmRlci1ib3ggd2hlbiBjb21wdXRpbmcgY2VsbCBoZWlnaHQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFi bGVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDZlMjVmZDY1 NTE2ZTY4YzgyNWIyMmQxMmIwNDlmNzA1OTc2ZGZmMWEuLmM5ZWMyODFmZDAzM2Y5NWI3OTVkNWQ1 N2MxYzUzZjUxNGZlZDJiZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRp bmdDb250ZXh0LmNwcApAQCAtMzAyLDE0ICszMDIsMjIgQEAgdm9pZCBUYWJsZUZvcm1hdHRpbmdD b250ZXh0OjpsYXlvdXRDZWxsKGNvbnN0IFRhYmxlR3JpZDo6Q2VsbCYgY2VsbCwgTGF5b3V0VW5p dAogICAgICAgICBmbG9hdGluZ1N0YXRlRm9yQ2VsbENvbnRlbnQuY2xlYXIoKTsKICAgICAgICAg TGF5b3V0Q29udGV4dDo6Y3JlYXRlRm9ybWF0dGluZ0NvbnRleHQoY2VsbEJveCwgbGF5b3V0U3Rh dGUoKSktPmxheW91dEluRmxvd0NvbnRlbnQoaW52YWxpZGF0aW9uU3RhdGUsIGNvbnN0cmFpbnRz Rm9yQ2VsbENvbnRlbnQpOwogICAgIH0KLSAgICBhdXRvIGNvbnRlbnRCb3hIZWlnaHQgPSBnZW9t ZXRyeS5jZWxsQm94Q29udGVudEhlaWdodChjZWxsQm94KTsKLSAgICBpZiAoYXV0byBjb21wdXRl ZEhlaWdodCA9IGdlb21ldHJ5LmNvbXB1dGVkSGVpZ2h0KGNlbGxCb3gpKSB7Ci0gICAgICAgIGF1 dG8gaGVpZ2h0VXNlc0JvcmRlckJveCA9IGxheW91dFN0YXRlKCkuaW5RdWlya3NNb2RlKCkgfHwg Y2VsbEJveC5zdHlsZSgpLmJveFNpemluZygpID09IEJveFNpemluZzo6Qm9yZGVyQm94OwotICAg ICAgICBpZiAoaGVpZ2h0VXNlc0JvcmRlckJveCkKLSAgICAgICAgICAgICpjb21wdXRlZEhlaWdo dCAtPSBjZWxsQm94R2VvbWV0cnkudmVydGljYWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKCk7Ci0g ICAgICAgIGNvbnRlbnRCb3hIZWlnaHQgPSBzdGQ6Om1heChjb250ZW50Qm94SGVpZ2h0LCAqY29t cHV0ZWRIZWlnaHQpOwotICAgIH0KLSAgICBjZWxsQm94R2VvbWV0cnkuc2V0Q29udGVudEJveEhl aWdodChjb250ZW50Qm94SGVpZ2h0KTsKKworICAgIGF1dG8gdXNlZENvbnRlbnRCb3hIZWlnaHQg PSBbJl0geworICAgICAgICBpZiAodXNlZENlbGxIZWlnaHQpIHsKKyAgICAgICAgICAgIC8vIFRo aXMgaXMgdGhlIHNlY29uZCBwYXNzIHdoZW4gd2UgYWxyZWFkeSBrbm93IGhvdyB0YWxsIHRoZSBy b3dzIGFyZS4KKyAgICAgICAgICAgIHJldHVybiAqdXNlZENlbGxIZWlnaHQgLSBjZWxsQm94R2Vv bWV0cnkudmVydGljYWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKCk7CisgICAgICAgIH0KKyAgICAg ICAgYXV0byBjb250ZW50Qm94SGVpZ2h0ID0gZ2VvbWV0cnkuY2VsbEJveENvbnRlbnRIZWlnaHQo Y2VsbEJveCk7CisgICAgICAgIGlmIChhdXRvIGNvbXB1dGVkSGVpZ2h0ID0gZ2VvbWV0cnkuY29t cHV0ZWRIZWlnaHQoY2VsbEJveCkpIHsKKyAgICAgICAgICAgIGF1dG8gaGVpZ2h0VXNlc0JvcmRl ckJveCA9IGxheW91dFN0YXRlKCkuaW5RdWlya3NNb2RlKCkgfHwgY2VsbEJveC5zdHlsZSgpLmJv eFNpemluZygpID09IEJveFNpemluZzo6Qm9yZGVyQm94OworICAgICAgICAgICAgaWYgKGhlaWdo dFVzZXNCb3JkZXJCb3gpCisgICAgICAgICAgICAgICAgKmNvbXB1dGVkSGVpZ2h0IC09IGNlbGxC b3hHZW9tZXRyeS52ZXJ0aWNhbE1hcmdpbkJvcmRlckFuZFBhZGRpbmcoKTsKKyAgICAgICAgICAg IGNvbnRlbnRCb3hIZWlnaHQgPSBzdGQ6Om1heChjb250ZW50Qm94SGVpZ2h0LCAqY29tcHV0ZWRI ZWlnaHQpOworICAgICAgICB9CisgICAgICAgIHJldHVybiBjb250ZW50Qm94SGVpZ2h0OworICAg IH07CisgICAgY2VsbEJveEdlb21ldHJ5LnNldENvbnRlbnRCb3hIZWlnaHQodXNlZENvbnRlbnRC b3hIZWlnaHQoKSk7CiB9CiAKIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgVGFibGVGb3JtYXR0 aW5nQ29udGV4dDo6Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCkK 429392 2021-05-21 20:10:10 -0700 2021-05-24 10:04:50 -0700 Patch bug-226130-20210521201009.patch text/plain 12080 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmEyNzBlM2YzMmU4ZDY5 MmRjYjQ5OGY0ZjE4YTUzY2FlOWIxNTRlOS4uNjU2ZTViMzZmMTk2ZTE2YzBmNTdiZDJjNzdmMWRi NjcwYWE1ZWU3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA1LTIxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtURkNdIEFkZCBhIGhl bHBlciBmdW5jdGlvbiB0byBjb21wdXRlIHRoZSBpbnRyaW5zaWMgdmVydGljYWwgcGFkZGluZ3Mg Zm9yIHRoZSBjZWxsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjYxMzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBBZGQgYSBjb21tZW50IGV4cGxhaW5pbmcgd2hhdCB0aGUgaW50cmluc2ljIHZlcnRpY2Fs IHBhZGRpbmcgaXMuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxl L1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpU YWJsZUZvcm1hdHRpbmdDb250ZXh0OjpzZXRVc2VkR2VvbWV0cnlGb3JDZWxscyk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OlRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dENlbGwpOgor ICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5n Q29udGV4dC5oOgorCiAyMDIxLTA1LTIwICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K IAogICAgICAgICBbTEZDXVtURkNdW1F1aXJrc10gVXNlIGJveC1zaXppbmc6IGJvcmRlci1ib3gg d2hlbiBjb21wdXRpbmcgY2VsbCBoZWlnaHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9y bWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDZlMjVmZDY1NTE2ZTY4YzgyNWIyMmQxMmIwNDlmNzA1 OTc2ZGZmMWEuLjE2Yzg3M2YwYThiNWJkNjc1OGY4MDA2MTZkZjBjNjkyZDYxOTIxZGMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFi bGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtOTMsNjEg KzkzLDcxIEBAIHZvaWQgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6c2V0VXNlZEdlb21ldHJ5Rm9y Q2VsbHMoTGF5b3V0VW5pdCBhdmFpbGFibGVIb3Jpem9uCiAgICAgICAgIH0KICAgICAgICAgY2Vs bEJveEdlb21ldHJ5LnNldExvZ2ljYWxUb3Aocm93TGlzdFtjZWxsLT5zdGFydFJvdygpXS5sb2dp Y2FsVG9wKCkgLSBzZWN0aW9uT2Zmc2V0KTsKICAgICAgICAgY2VsbEJveEdlb21ldHJ5LnNldExv Z2ljYWxMZWZ0KGNvbHVtbkxpc3RbY2VsbC0+c3RhcnRDb2x1bW4oKV0ubG9naWNhbExlZnQoKSk7 CisKICAgICAgICAgYXV0byBhdmFpbGFibGVWZXJ0aWNhbFNwYWNlID0gcm93TGlzdFtjZWxsLT5z dGFydFJvdygpXS5sb2dpY2FsSGVpZ2h0KCk7CiAgICAgICAgIGZvciAoc2l6ZV90IHJvd0luZGV4 ID0gY2VsbC0+c3RhcnRSb3coKSArIDE7IHJvd0luZGV4IDwgY2VsbC0+ZW5kUm93KCk7ICsrcm93 SW5kZXgpCiAgICAgICAgICAgICBhdmFpbGFibGVWZXJ0aWNhbFNwYWNlICs9IHJvd0xpc3Rbcm93 SW5kZXhdLmxvZ2ljYWxIZWlnaHQoKTsKICAgICAgICAgYXZhaWxhYmxlVmVydGljYWxTcGFjZSAr PSAoY2VsbC0+cm93U3BhbigpIC0gMSkgKiBncmlkLnZlcnRpY2FsU3BhY2luZygpOwogICAgICAg ICBsYXlvdXRDZWxsKCpjZWxsLCBhdmFpbGFibGVIb3Jpem9udGFsU3BhY2UsIGF2YWlsYWJsZVZl cnRpY2FsU3BhY2UpOwotICAgICAgICAvLyBGSVhNRTogRmluZCBvdXQgaWYgaXQgaXMgb2sgdG8g dXNlIHRoZSByZWd1bGFyIHBhZGRpbmcgaGVyZSB0byBhbGlnbiB0aGUgY29udGVudCBib3ggaW5z aWRlIGEgdGFsbCBjZWxsIG9yIHdlIG5lZWQgdG8gCi0gICAgICAgIC8vIHVzZSBzb21lIGtpbmQg b2YgaW50cmluc2ljIHBhZGRpbmcgc2ltaWxhciB0byBSZW5kZXJUYWJsZUNlbGwuCi0gICAgICAg IGF1dG8gcGFkZGluZ1RvcCA9IGNlbGxCb3hHZW9tZXRyeS5wYWRkaW5nVG9wKCkudmFsdWVPcihM YXlvdXRVbml0IHsgfSk7Ci0gICAgICAgIGF1dG8gcGFkZGluZ0JvdHRvbSA9IGNlbGxCb3hHZW9t ZXRyeS5wYWRkaW5nQm90dG9tKCkudmFsdWVPcihMYXlvdXRVbml0IHsgfSk7Ci0gICAgICAgIGF1 dG8gaW50cmluc2ljUGFkZGluZ1RvcCA9IExheW91dFVuaXQgeyB9OwotICAgICAgICBhdXRvIGlu dHJpbnNpY1BhZGRpbmdCb3R0b20gPSBMYXlvdXRVbml0IHsgfTsKLQotICAgICAgICBzd2l0Y2gg KGNlbGxCb3guc3R5bGUoKS52ZXJ0aWNhbEFsaWduKCkpIHsKLSAgICAgICAgY2FzZSBWZXJ0aWNh bEFsaWduOjpNaWRkbGU6IHsKLSAgICAgICAgICAgIGF1dG8gaW50cmluc2ljVmVydGljYWxQYWRk aW5nID0gc3RkOjptYXgoMF9sdSwgYXZhaWxhYmxlVmVydGljYWxTcGFjZSAtIGNlbGxCb3hHZW9t ZXRyeS52ZXJ0aWNhbE1hcmdpbkJvcmRlckFuZFBhZGRpbmcoKSAtIGNlbGxCb3hHZW9tZXRyeS5j b250ZW50Qm94SGVpZ2h0KCkpOwotICAgICAgICAgICAgaW50cmluc2ljUGFkZGluZ1RvcCA9IGlu dHJpbnNpY1ZlcnRpY2FsUGFkZGluZyAvIDI7Ci0gICAgICAgICAgICBpbnRyaW5zaWNQYWRkaW5n Qm90dG9tID0gaW50cmluc2ljVmVydGljYWxQYWRkaW5nIC8gMjsKLSAgICAgICAgICAgIGJyZWFr OwotICAgICAgICB9Ci0gICAgICAgIGNhc2UgVmVydGljYWxBbGlnbjo6QmFzZWxpbmU6IHsKLSAg ICAgICAgICAgIGF1dG8gcm93QmFzZWxpbmUgPSBMYXlvdXRVbml0IHsgcm93TGlzdFtjZWxsLT5z dGFydFJvdygpXS5iYXNlbGluZSgpIH07Ci0gICAgICAgICAgICBhdXRvIGNlbGxCYXNlbGluZSA9 IExheW91dFVuaXQgeyBjZWxsLT5iYXNlbGluZSgpIH07Ci0gICAgICAgICAgICBpbnRyaW5zaWNQ YWRkaW5nVG9wID0gc3RkOjptYXgoMF9sdSwgcm93QmFzZWxpbmUgLSBjZWxsQmFzZWxpbmUgLSBj ZWxsQm94R2VvbWV0cnkuYm9yZGVyVG9wKCkpOwotICAgICAgICAgICAgaW50cmluc2ljUGFkZGlu Z0JvdHRvbSA9IHN0ZDo6bWF4KDBfbHUsIGF2YWlsYWJsZVZlcnRpY2FsU3BhY2UgLSBjZWxsQm94 R2VvbWV0cnkudmVydGljYWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKCkgLSBpbnRyaW5zaWNQYWRk aW5nVG9wIC0gY2VsbEJveEdlb21ldHJ5LmNvbnRlbnRCb3hIZWlnaHQoKSk7Ci0gICAgICAgICAg ICBicmVhazsKLSAgICAgICAgfQotICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgQVNTRVJU X05PVF9JTVBMRU1FTlRFRF9ZRVQoKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0g ICAgICAgIGlmIChpbnRyaW5zaWNQYWRkaW5nVG9wICYmIGNlbGxCb3guaGFzSW5GbG93T3JGbG9h dGluZ0NoaWxkKCkpIHsKLSAgICAgICAgICAgIGF1dG8gYWRqdXN0Q2VsbENvbnRlbnRXaXRoSW5z dHJpbnNpY1BhZGRpbmdCZWZvcmUgPSBbJl0gewotICAgICAgICAgICAgICAgIC8vIENoaWxkIGJv eGVzIChhbmQgcnVucykgYXJlIGFsd2F5cyBpbiB0aGUgY29vcmRpbmF0ZSBzeXN0ZW0gb2YgdGhl IGNvbnRhaW5pbmcgYmxvY2sncyBib3JkZXIgYm94LgotICAgICAgICAgICAgICAgIC8vIFRoZSBj b250ZW50IGJveCAod2hlcmUgdGhlIGNoaWxkIGNvbnRlbnQgbGl2ZXMpIGlzIGluc2lkZSB0aGUg cGFkZGluZyBib3gsIHdoaWNoIGlzIGluc2lkZSB0aGUgYm9yZGVyIGJveC4KLSAgICAgICAgICAg ICAgICAvLyBJbiBvcmRlciB0byBjb21wdXRlIHRoZSBjaGlsZCBib3ggdG9wL2xlZnQgcG9zaXRp b24sIHdlIG5lZWQgdG8ga25vdyBib3RoIHRoZSBwYWRkaW5nIGFuZCB0aGUgYm9yZGVyIG9mZnNl dHMuICAKLSAgICAgICAgICAgICAgICAvLyBOb3JtYWxseSBieSB0aGUgdGltZSB3ZSBzdGFydCBw b3NpdGlvbmluZyB0aGUgY2hpbGQgY29udGVudCwgd2UgYWxyZWFkeSBoYXZlIGNvbXB1dGVkIGJv cmRlcnMgYW5kIHBhZGRpbmcgZm9yIHRoZSBjb250YWluaW5nIGJsb2NrLgotICAgICAgICAgICAg ICAgIC8vIFRoaXMgaXMgZGlmZmVyZW50IHdpdGggdGFibGUgY2VsbHMgd2hlcmUgdGhlIGZpbmFs IHBhZGRpbmcgb2Zmc2V0IGRlcGVuZHMgb24gdGhlIGNvbnRlbnQgaGVpZ2h0IGFzIHdlIHVzZQot ICAgICAgICAgICAgICAgIC8vIHRoZSBwYWRkaW5nIGJveCB0byB2ZXJ0aWNhbGx5IGFsaWduIHRo ZSB0YWJsZSBjZWxsIGNvbnRlbnQuCi0gICAgICAgICAgICAgICAgYXV0byYgZm9ybWF0dGluZ1N0 YXRlID0gbGF5b3V0U3RhdGUoKS5lc3RhYmxpc2hlZEZvcm1hdHRpbmdTdGF0ZShjZWxsQm94KTsK LSAgICAgICAgICAgICAgICBmb3IgKGF1dG8qIGNoaWxkID0gY2VsbEJveC5maXJzdEluRmxvd09y RmxvYXRpbmdDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dEluRmxvd09yRmxvYXRp bmdTaWJsaW5nKCkpIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGNoaWxkLT5pc0lubGluZVRl eHRCb3goKSkKLSAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAg ICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkoKmNoaWxkKS5tb3ZlVmVydGljYWxs eShpbnRyaW5zaWNQYWRkaW5nVG9wKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAg ICAgaWYgKGNlbGxCb3guZXN0YWJsaXNoZXNJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCgpKSB7Ci0g ICAgICAgICAgICAgICAgICAgIGF1dG8mIGlubGluZUZvcm1hdHRpbmdTdGF0ZWUgPSBsYXlvdXRT dGF0ZSgpLmVzdGFibGlzaGVkSW5saW5lRm9ybWF0dGluZ1N0YXRlKGNlbGxCb3gpOwotICAgICAg ICAgICAgICAgICAgICBmb3IgKGF1dG8mIHJ1biA6IGlubGluZUZvcm1hdHRpbmdTdGF0ZWUubGlu ZVJ1bnMoKSkKLSAgICAgICAgICAgICAgICAgICAgICAgIHJ1bi5tb3ZlVmVydGljYWxseShpbnRy aW5zaWNQYWRkaW5nVG9wKTsKLSAgICAgICAgICAgICAgICAgICAgZm9yIChhdXRvJiBsaW5lIDog aW5saW5lRm9ybWF0dGluZ1N0YXRlZS5saW5lcygpKQotICAgICAgICAgICAgICAgICAgICAgICAg bGluZS5tb3ZlVmVydGljYWxseShpbnRyaW5zaWNQYWRkaW5nVG9wKTsKLSAgICAgICAgICAgICAg ICB9Ci0gICAgICAgICAgICB9OwotICAgICAgICAgICAgYWRqdXN0Q2VsbENvbnRlbnRXaXRoSW5z dHJpbnNpY1BhZGRpbmdCZWZvcmUoKTsKLSAgICAgICAgfQotICAgICAgICBjZWxsQm94R2VvbWV0 cnkuc2V0VmVydGljYWxQYWRkaW5nKHsgcGFkZGluZ1RvcCArIGludHJpbnNpY1BhZGRpbmdUb3As IHBhZGRpbmdCb3R0b20gKyBpbnRyaW5zaWNQYWRkaW5nQm90dG9tIH0pOworCisgICAgICAgIGF1 dG8gY29tcHV0ZUludHJpbnNpY1ZlcnRpY2FsUGFkZGluZ0ZvckNlbGwgPSBbJl0geworICAgICAg ICAgICAgLy8gSW50cmluc2ljIHBhZGRpbmcgaXMgdGhlIGV4dHJhIHBhZGRpbmcgZm9yIHRoZSBj ZWxsIGJveCB3aGVuIGl0IGlzIHNob3J0ZXIgdGhhbiB0aGUgcm93LiBDZWxsIGJveGVzIGhhdmUg dG8KKyAgICAgICAgICAgIC8vIGZpbGwgdGhlIGF2YWlsYWJsZSB2ZXJ0aWNhbCBzcGFjZQorICAg ICAgICAgICAgLy8gZS5nIDx0ZCBoZWlnaHQ9MTAwcHg+PC90ZD48dGQgaGVpZ2h0PTFweD48L3Rk PgorICAgICAgICAgICAgLy8gdGhlIHNlY29uZCA8dGQ+IGVuZHMgdXAgYmVpbmcgMTAwcHggdGFs bCB0b28gd2l0aCB0aGUgZXh0cmEgaW50cmluc2ljIHBhZGRpbmcuCisKKyAgICAgICAgICAgIC8v IEZJWE1FOiBGaW5kIG91dCBpZiBpdCBpcyBvayB0byB1c2UgdGhlIHJlZ3VsYXIgcGFkZGluZyBo ZXJlIHRvIGFsaWduIHRoZSBjb250ZW50IGJveCBpbnNpZGUgYSB0YWxsIGNlbGwgb3Igd2UgbmVl ZCB0bworICAgICAgICAgICAgLy8gdXNlIHNvbWUga2luZCBvZiBpbnRyaW5zaWMgcGFkZGluZyBz aW1pbGFyIHRvIFJlbmRlclRhYmxlQ2VsbC4KKyAgICAgICAgICAgIGF1dG8gcGFkZGluZ1RvcCA9 IGNlbGxCb3hHZW9tZXRyeS5wYWRkaW5nVG9wKCkudmFsdWVPcihMYXlvdXRVbml0IHsgfSk7Cisg ICAgICAgICAgICBhdXRvIHBhZGRpbmdCb3R0b20gPSBjZWxsQm94R2VvbWV0cnkucGFkZGluZ0Jv dHRvbSgpLnZhbHVlT3IoTGF5b3V0VW5pdCB7IH0pOworICAgICAgICAgICAgYXV0byBpbnRyaW5z aWNQYWRkaW5nVG9wID0gTGF5b3V0VW5pdCB7IH07CisgICAgICAgICAgICBhdXRvIGludHJpbnNp Y1BhZGRpbmdCb3R0b20gPSBMYXlvdXRVbml0IHsgfTsKKworICAgICAgICAgICAgc3dpdGNoIChj ZWxsQm94LnN0eWxlKCkudmVydGljYWxBbGlnbigpKSB7CisgICAgICAgICAgICBjYXNlIFZlcnRp Y2FsQWxpZ246Ok1pZGRsZTogeworICAgICAgICAgICAgICAgIGF1dG8gaW50cmluc2ljVmVydGlj YWxQYWRkaW5nID0gc3RkOjptYXgoMF9sdSwgYXZhaWxhYmxlVmVydGljYWxTcGFjZSAtIGNlbGxC b3hHZW9tZXRyeS52ZXJ0aWNhbE1hcmdpbkJvcmRlckFuZFBhZGRpbmcoKSAtIGNlbGxCb3hHZW9t ZXRyeS5jb250ZW50Qm94SGVpZ2h0KCkpOworICAgICAgICAgICAgICAgIGludHJpbnNpY1BhZGRp bmdUb3AgPSBpbnRyaW5zaWNWZXJ0aWNhbFBhZGRpbmcgLyAyOworICAgICAgICAgICAgICAgIGlu dHJpbnNpY1BhZGRpbmdCb3R0b20gPSBpbnRyaW5zaWNWZXJ0aWNhbFBhZGRpbmcgLyAyOworICAg ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICAgICAgY2FzZSBWZXJ0 aWNhbEFsaWduOjpCYXNlbGluZTogeworICAgICAgICAgICAgICAgIGF1dG8gcm93QmFzZWxpbmUg PSBMYXlvdXRVbml0IHsgcm93TGlzdFtjZWxsLT5zdGFydFJvdygpXS5iYXNlbGluZSgpIH07Cisg ICAgICAgICAgICAgICAgYXV0byBjZWxsQmFzZWxpbmUgPSBMYXlvdXRVbml0IHsgY2VsbC0+YmFz ZWxpbmUoKSB9OworICAgICAgICAgICAgICAgIGludHJpbnNpY1BhZGRpbmdUb3AgPSBzdGQ6Om1h eCgwX2x1LCByb3dCYXNlbGluZSAtIGNlbGxCYXNlbGluZSAtIGNlbGxCb3hHZW9tZXRyeS5ib3Jk ZXJUb3AoKSk7CisgICAgICAgICAgICAgICAgaW50cmluc2ljUGFkZGluZ0JvdHRvbSA9IHN0ZDo6 bWF4KDBfbHUsIGF2YWlsYWJsZVZlcnRpY2FsU3BhY2UgLSBjZWxsQm94R2VvbWV0cnkudmVydGlj YWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKCkgLSBpbnRyaW5zaWNQYWRkaW5nVG9wIC0gY2VsbEJv eEdlb21ldHJ5LmNvbnRlbnRCb3hIZWlnaHQoKSk7CisgICAgICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgICAgICB9CisgICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgIEFTU0VS VF9OT1RfSU1QTEVNRU5URURfWUVUKCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAg ICAgICB9CisgICAgICAgICAgICBpZiAoaW50cmluc2ljUGFkZGluZ1RvcCAmJiBjZWxsQm94Lmhh c0luRmxvd09yRmxvYXRpbmdDaGlsZCgpKSB7CisgICAgICAgICAgICAgICAgYXV0byBhZGp1c3RD ZWxsQ29udGVudFdpdGhJbnN0cmluc2ljUGFkZGluZ0JlZm9yZSA9IFsmXSB7CisgICAgICAgICAg ICAgICAgICAgIC8vIENoaWxkIGJveGVzIChhbmQgcnVucykgYXJlIGFsd2F5cyBpbiB0aGUgY29v cmRpbmF0ZSBzeXN0ZW0gb2YgdGhlIGNvbnRhaW5pbmcgYmxvY2sncyBib3JkZXIgYm94LgorICAg ICAgICAgICAgICAgICAgICAvLyBUaGUgY29udGVudCBib3ggKHdoZXJlIHRoZSBjaGlsZCBjb250 ZW50IGxpdmVzKSBpcyBpbnNpZGUgdGhlIHBhZGRpbmcgYm94LCB3aGljaCBpcyBpbnNpZGUgdGhl IGJvcmRlciBib3guCisgICAgICAgICAgICAgICAgICAgIC8vIEluIG9yZGVyIHRvIGNvbXB1dGUg dGhlIGNoaWxkIGJveCB0b3AvbGVmdCBwb3NpdGlvbiwgd2UgbmVlZCB0byBrbm93IGJvdGggdGhl IHBhZGRpbmcgYW5kIHRoZSBib3JkZXIgb2Zmc2V0cy4KKyAgICAgICAgICAgICAgICAgICAgLy8g Tm9ybWFsbHkgYnkgdGhlIHRpbWUgd2Ugc3RhcnQgcG9zaXRpb25pbmcgdGhlIGNoaWxkIGNvbnRl bnQsIHdlIGFscmVhZHkgaGF2ZSBjb21wdXRlZCBib3JkZXJzIGFuZCBwYWRkaW5nIGZvciB0aGUg Y29udGFpbmluZyBibG9jay4KKyAgICAgICAgICAgICAgICAgICAgLy8gVGhpcyBpcyBkaWZmZXJl bnQgd2l0aCB0YWJsZSBjZWxscyB3aGVyZSB0aGUgZmluYWwgcGFkZGluZyBvZmZzZXQgZGVwZW5k cyBvbiB0aGUgY29udGVudCBoZWlnaHQgYXMgd2UgdXNlCisgICAgICAgICAgICAgICAgICAgIC8v IHRoZSBwYWRkaW5nIGJveCB0byB2ZXJ0aWNhbGx5IGFsaWduIHRoZSB0YWJsZSBjZWxsIGNvbnRl bnQuCisgICAgICAgICAgICAgICAgICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IGxheW91dFN0 YXRlKCkuZXN0YWJsaXNoZWRGb3JtYXR0aW5nU3RhdGUoY2VsbEJveCk7CisgICAgICAgICAgICAg ICAgICAgIGZvciAoYXV0byogY2hpbGQgPSBjZWxsQm94LmZpcnN0SW5GbG93T3JGbG9hdGluZ0No aWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0SW5GbG93T3JGbG9hdGluZ1NpYmxpbmco KSkgeworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGNoaWxkLT5pc0lubGluZVRleHRCb3go KSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgICAg ICAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5ib3hHZW9tZXRyeSgqY2hpbGQpLm1vdmVWZXJ0aWNh bGx5KGludHJpbnNpY1BhZGRpbmdUb3ApOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAg ICAgICAgICAgICAgIGlmIChjZWxsQm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQoKSkgeworICAgICAgICAgICAgICAgICAgICAgICAgYXV0byYgaW5saW5lRm9ybWF0dGluZ1N0 YXRlZSA9IGxheW91dFN0YXRlKCkuZXN0YWJsaXNoZWRJbmxpbmVGb3JtYXR0aW5nU3RhdGUoY2Vs bEJveCk7CisgICAgICAgICAgICAgICAgICAgICAgICBmb3IgKGF1dG8mIHJ1biA6IGlubGluZUZv cm1hdHRpbmdTdGF0ZWUubGluZVJ1bnMoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBy dW4ubW92ZVZlcnRpY2FsbHkoaW50cmluc2ljUGFkZGluZ1RvcCk7CisgICAgICAgICAgICAgICAg ICAgICAgICBmb3IgKGF1dG8mIGxpbmUgOiBpbmxpbmVGb3JtYXR0aW5nU3RhdGVlLmxpbmVzKCkp CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGluZS5tb3ZlVmVydGljYWxseShpbnRyaW5z aWNQYWRkaW5nVG9wKTsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH07 CisgICAgICAgICAgICAgICAgYWRqdXN0Q2VsbENvbnRlbnRXaXRoSW5zdHJpbnNpY1BhZGRpbmdC ZWZvcmUoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGNlbGxCb3hHZW9tZXRyeS5zZXRW ZXJ0aWNhbFBhZGRpbmcoeyBwYWRkaW5nVG9wICsgaW50cmluc2ljUGFkZGluZ1RvcCwgcGFkZGlu Z0JvdHRvbSArIGludHJpbnNpY1BhZGRpbmdCb3R0b20gfSk7CisgICAgICAgIH07CisgICAgICAg IGNvbXB1dGVJbnRyaW5zaWNWZXJ0aWNhbFBhZGRpbmdGb3JDZWxsKCk7CiAgICAgfQogfQogCkBA IC0yNjYsNyArMjc2LDcgQEAgdm9pZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpzZXRVc2VkR2Vv bWV0cnlGb3JTZWN0aW9ucyhjb25zdCBDb25zdHJhaW50c0ZvckluRmwKICAgICB9CiB9CiAKLXZv aWQgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0Q2VsbChjb25zdCBUYWJsZUdyaWQ6OkNl bGwmIGNlbGwsIExheW91dFVuaXQgYXZhaWxhYmxlSG9yaXpvbnRhbFNwYWNlLCBPcHRpb25hbDxM YXlvdXRVbml0PiB1c2VkQ2VsbEhlaWdodCkKK3ZvaWQgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6 bGF5b3V0Q2VsbChjb25zdCBUYWJsZUdyaWQ6OkNlbGwmIGNlbGwsIExheW91dFVuaXQgYXZhaWxh YmxlSG9yaXpvbnRhbFNwYWNlLCBPcHRpb25hbDxMYXlvdXRVbml0PiBhdmFpbGFibGVWZXJ0aWNh bFNwYWNlRm9yQ29udGVudCkKIHsKICAgICBBU1NFUlQoY2VsbC5ib3goKS5lc3RhYmxpc2hlc0Js b2NrRm9ybWF0dGluZ0NvbnRleHQoKSk7CiAKQEAgLTI5NCw3ICszMDQsNyBAQCB2b2lkIFRhYmxl Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dENlbGwoY29uc3QgVGFibGVHcmlkOjpDZWxsJiBjZWxs LCBMYXlvdXRVbml0CiAKICAgICBpZiAoY2VsbEJveC5oYXNJbkZsb3dPckZsb2F0aW5nQ2hpbGQo KSkgewogICAgICAgICBhdXRvIGNvbnN0cmFpbnRzRm9yQ2VsbENvbnRlbnQgPSBnZW9tZXRyeS5j b25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQoY2VsbEJveCk7Ci0gICAgICAgIGNvbnN0cmFpbnRz Rm9yQ2VsbENvbnRlbnQudmVydGljYWwubG9naWNhbEhlaWdodCA9IHVzZWRDZWxsSGVpZ2h0Owor ICAgICAgICBjb25zdHJhaW50c0ZvckNlbGxDb250ZW50LnZlcnRpY2FsLmxvZ2ljYWxIZWlnaHQg PSBhdmFpbGFibGVWZXJ0aWNhbFNwYWNlRm9yQ29udGVudDsKICAgICAgICAgYXV0byBpbnZhbGlk YXRpb25TdGF0ZSA9IEludmFsaWRhdGlvblN0YXRlIHsgfTsKICAgICAgICAgLy8gRklYTUU6IFRo aXMgc2hvdWxkIHByb2JhYmx5IGJlIHBhcnQgb2YgdGhlIGludmFsaWRhdGlvbiBzdGF0ZSB0byBp bmRpY2F0ZSB3aGVuIHdlIHJlLWxheW91dCB0aGUgY2VsbAogICAgICAgICAvLyBtdWx0aXBsZSB0 aW1lcyBhcyBwYXJ0IG9mIHRoZSBtdWx0aS1wYXNzIHRhYmxlIGFsZ29yaXRobS4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVG b3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggMmIxZjBhYjk0YTMxNDAy YWYzNGFhOGFjY2RhYzAzMmJjYWNhMmEzMS4uYjA4YTg3N2ExZDBiOGQ2YWU2NWVkMjNlMWQ5NjZl YzkxYTE5YmZhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdDb250ZXh0 LmgKQEAgLTY5LDcgKzY5LDcgQEAgcHJpdmF0ZToKICAgICBUYWJsZUZvcm1hdHRpbmdDb250ZXh0 OjpUYWJsZUxheW91dCB0YWJsZUxheW91dCgpIGNvbnN0IHsgcmV0dXJuIFRhYmxlTGF5b3V0KCp0 aGlzLCBmb3JtYXR0aW5nU3RhdGUoKS50YWJsZUdyaWQoKSk7IH0KIAogICAgIEludHJpbnNpY1dp ZHRoQ29uc3RyYWludHMgY29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCkgb3ZlcnJp ZGU7Ci0gICAgdm9pZCBsYXlvdXRDZWxsKGNvbnN0IFRhYmxlR3JpZDo6Q2VsbCYsIExheW91dFVu aXQgYXZhaWxhYmxlSG9yaXpvbnRhbFNwYWNlLCBPcHRpb25hbDxMYXlvdXRVbml0PiB1c2VkQ2Vs bEhlaWdodCA9IFdURjo6bnVsbG9wdCk7CisgICAgdm9pZCBsYXlvdXRDZWxsKGNvbnN0IFRhYmxl R3JpZDo6Q2VsbCYsIExheW91dFVuaXQgYXZhaWxhYmxlSG9yaXpvbnRhbFNwYWNlLCBPcHRpb25h bDxMYXlvdXRVbml0PiBhdmFpbGFibGVWZXJ0aWNhbFNwYWNlRm9yQ29udGVudCA9IFdURjo6bnVs bG9wdCk7CiAgICAgdm9pZCBzZXRVc2VkR2VvbWV0cnlGb3JDZWxscyhMYXlvdXRVbml0IGF2YWls YWJsZUhvcml6b250YWxTcGFjZSk7CiAgICAgdm9pZCBzZXRVc2VkR2VvbWV0cnlGb3JSb3dzKExh eW91dFVuaXQgYXZhaWxhYmxlSG9yaXpvbnRhbFNwYWNlKTsKICAgICB2b2lkIHNldFVzZWRHZW9t ZXRyeUZvclNlY3Rpb25zKGNvbnN0IENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudCYpOwo=