226452 2021-05-30 22:01:14 -0700 [LFC][TFC] Decouple stretching and final cell layouts 2021-05-31 21:32:17 -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 1765322 0 zalan 2021-05-30 22:01:14 -0700 ssia 1765323 1 430173 zalan 2021-05-30 22:03:02 -0700 Created attachment 430173 Patch 1765502 2 430227 zalan 2021-05-31 20:08:17 -0700 Created attachment 430227 [fast-cq] Patch 1765505 3 ews-feeder 2021-05-31 21:31:13 -0700 Committed r278294 (238331@main): <https://commits.webkit.org/238331@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430227. 1765506 4 webkit-bug-importer 2021-05-31 21:32:17 -0700 <rdar://problem/78699356> 430173 2021-05-30 22:03:02 -0700 2021-05-31 20:08:15 -0700 Patch bug-226452-20210530220302.patch text/plain 15526 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjQ2NDRkZTAzNzEyMTMx YzMwOWVhOTRkYWMxZTI2N2QzZDg1MDAyYy4uM2JhMzU5MWMyYzk4N2U4NzRmNTljNTJiMjZkZDAz ZmEwZWNlNTg0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA1LTMwICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtURkNdIERlY291cGxl IHN0cmV0Y2hpbmcgYW5kIGZpbmFsIGNlbGwgbGF5b3V0cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2NDUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RyZXRjaGluZyBsYXlvdXQgaXMgc2xpZ2h0bHkg ZGlmZmVyZW50IGZyb20gdGhlIGZpbmFsIGNlbGwgbGF5b3V0LgorCisgICAgICAgICogbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nQ29udGV4dDo6c2V0VXNlZEdl b21ldHJ5Rm9yQ2VsbHMpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRp bmdDb250ZXh0Ojpjb21wdXRlQW5kRGlzdHJpYnV0ZUV4dHJhU3BhY2UpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRDZWxsKTogRGVsZXRl ZC4KKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0 dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxl L1RhYmxlRm9ybWF0dGluZ0dlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 VGFibGVGb3JtYXR0aW5nR2VvbWV0cnk6Omhvcml6b250YWxTcGFjZUZvckNlbGxDb250ZW50IGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nR2VvbWV0cnk6 OnZlcnRpY2FsU3BhY2VGb3JDZWxsQ29udGVudCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdHZW9tZXRyeS5oOgorCiAyMDIx LTA1LTMwICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXSBU aWdodGVuIHRoZSBjb25zdHJhaW50IGNsYXNzZXMgKENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVu dC9Db25zdHJhaW50c0Zvck91dE9mRmxvd0NvbnRlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ0NvbnRl eHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9U YWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCBlMWZiY2VlYzRmZDYyNmI0NDk1MDQ4Mjg5 MTM4ZjlkMzg5OThiYTk0Li45NTI5YzRjZDg0MTdkZDFmNDQzNGU0ZGNlMmVhYmFhZWVmODc3Y2Q3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3Rh YmxlL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAg LTgwLDYgKzgwLDcgQEAgdm9pZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpzZXRVc2VkR2VvbWV0 cnlGb3JDZWxscyhMYXlvdXRVbml0IGF2YWlsYWJsZUhvcml6b24KICAgICBhdXRvJiBncmlkID0g Zm9ybWF0dGluZ1N0YXRlKCkudGFibGVHcmlkKCk7CiAgICAgYXV0byYgY29sdW1uTGlzdCA9IGdy aWQuY29sdW1ucygpLmxpc3QoKTsKICAgICBhdXRvJiByb3dMaXN0ID0gZ3JpZC5yb3dzKCkubGlz dCgpOworICAgIGF1dG8mIGZvcm1hdHRpbmdHZW9tZXRyeSA9IHRoaXMtPmZvcm1hdHRpbmdHZW9t ZXRyeSgpOwogICAgIC8vIEZpbmFsIHRhYmxlIGNlbGwgbGF5b3V0LiBBdCB0aGlzIHBvaW50IGFs bCBwZXJjZW50YWdlIHZhbHVlcyBjYW4gYmUgcmVzb2x2ZWQuCiAgICAgYXV0byBzZWN0aW9uT2Zm c2V0ID0gTGF5b3V0VW5pdCB7IH07CiAgICAgYXV0byogY3VycmVudFNlY3Rpb24gPSAmcm93TGlz dC5maXJzdCgpLmJveCgpLnBhcmVudCgpOwpAQCAtOTIsMTYgKzkzLDMwIEBAIHZvaWQgVGFibGVG b3JtYXR0aW5nQ29udGV4dDo6c2V0VXNlZEdlb21ldHJ5Rm9yQ2VsbHMoTGF5b3V0VW5pdCBhdmFp bGFibGVIb3Jpem9uCiAgICAgICAgICAgICAvLyBXaGlsZSB0aGUgZ3JpZCBpcyBhIGNvbnRpbnVv dXMgZmxvdyBvZiByb3dzLCBpbiB0aGUgZGlzcGxheSB0cmVlIHRoZXkgYXJlIHJlbGF0aXZlIHRv IHRoZWlyIHNlY3Rpb25zLgogICAgICAgICAgICAgc2VjdGlvbk9mZnNldCA9IHJvd0xpc3RbY2Vs bC0+c3RhcnRSb3coKV0ubG9naWNhbFRvcCgpOwogICAgICAgICB9CisgICAgICAgIC8vIEludGVy bmFsIHRhYmxlIGVsZW1lbnRzIGRvIG5vdCBoYXZlIG1hcmdpbnMuCisgICAgICAgIGNlbGxCb3hH ZW9tZXRyeS5zZXRIb3Jpem9udGFsTWFyZ2luKHsgfSk7CisgICAgICAgIGNlbGxCb3hHZW9tZXRy eS5zZXRWZXJ0aWNhbE1hcmdpbih7IH0pOworCisgICAgICAgIGNlbGxCb3hHZW9tZXRyeS5zZXRC b3JkZXIoZm9ybWF0dGluZ0dlb21ldHJ5LmNvbXB1dGVkQ2VsbEJvcmRlcigqY2VsbCkpOworICAg ICAgICBjZWxsQm94R2VvbWV0cnkuc2V0UGFkZGluZyhmb3JtYXR0aW5nR2VvbWV0cnkuY29tcHV0 ZWRQYWRkaW5nKGNlbGxCb3gsIGF2YWlsYWJsZUhvcml6b250YWxTcGFjZSkpOwogICAgICAgICBj ZWxsQm94R2VvbWV0cnkuc2V0TG9naWNhbFRvcChyb3dMaXN0W2NlbGwtPnN0YXJ0Um93KCldLmxv Z2ljYWxUb3AoKSAtIHNlY3Rpb25PZmZzZXQpOwogICAgICAgICBjZWxsQm94R2VvbWV0cnkuc2V0 TG9naWNhbExlZnQoY29sdW1uTGlzdFtjZWxsLT5zdGFydENvbHVtbigpXS5sb2dpY2FsTGVmdCgp KTsKLQotICAgICAgICBhdXRvIGF2YWlsYWJsZVZlcnRpY2FsU3BhY2UgPSByb3dMaXN0W2NlbGwt PnN0YXJ0Um93KCldLmxvZ2ljYWxIZWlnaHQoKTsKLSAgICAgICAgZm9yIChzaXplX3Qgcm93SW5k ZXggPSBjZWxsLT5zdGFydFJvdygpICsgMTsgcm93SW5kZXggPCBjZWxsLT5lbmRSb3coKTsgKyty b3dJbmRleCkKLSAgICAgICAgICAgIGF2YWlsYWJsZVZlcnRpY2FsU3BhY2UgKz0gcm93TGlzdFty b3dJbmRleF0ubG9naWNhbEhlaWdodCgpOwotICAgICAgICBhdmFpbGFibGVWZXJ0aWNhbFNwYWNl ICs9IChjZWxsLT5yb3dTcGFuKCkgLSAxKSAqIGdyaWQudmVydGljYWxTcGFjaW5nKCk7Ci0gICAg ICAgIGxheW91dENlbGwoKmNlbGwsIGF2YWlsYWJsZUhvcml6b250YWxTcGFjZSk7CisgICAgICAg IGNlbGxCb3hHZW9tZXRyeS5zZXRDb250ZW50Qm94V2lkdGgoZm9ybWF0dGluZ0dlb21ldHJ5Lmhv cml6b250YWxTcGFjZUZvckNlbGxDb250ZW50KCpjZWxsKSk7CisKKyAgICAgICAgaWYgKGNlbGxC b3guaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxkKCkpIHsKKyAgICAgICAgICAgIGF1dG8gaW52YWxp ZGF0aW9uU3RhdGUgPSBJbnZhbGlkYXRpb25TdGF0ZSB7IH07CisgICAgICAgICAgICAvLyBGSVhN RTogVGhpcyBzaG91bGQgcHJvYmFibHkgYmUgcGFydCBvZiB0aGUgaW52YWxpZGF0aW9uIHN0YXRl IHRvIGluZGljYXRlIHdoZW4gd2UgcmUtbGF5b3V0IHRoZSBjZWxsIG11bHRpcGxlIHRpbWVzIGFz IHBhcnQgb2YgdGhlIG11bHRpLXBhc3MgdGFibGUgYWxnb3JpdGhtLgorICAgICAgICAgICAgYXV0 byYgZmxvYXRpbmdTdGF0ZUZvckNlbGxDb250ZW50ID0gbGF5b3V0U3RhdGUoKS5lbnN1cmVCbG9j a0Zvcm1hdHRpbmdTdGF0ZShjZWxsQm94KS5mbG9hdGluZ1N0YXRlKCk7CisgICAgICAgICAgICBm bG9hdGluZ1N0YXRlRm9yQ2VsbENvbnRlbnQuY2xlYXIoKTsKKyAgICAgICAgICAgIExheW91dENv bnRleHQ6OmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KGNlbGxCb3gsIGxheW91dFN0YXRlKCkpLT5s YXlvdXRJbkZsb3dDb250ZW50KGludmFsaWRhdGlvblN0YXRlLCBmb3JtYXR0aW5nR2VvbWV0cnku Y29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50KGNlbGxCb3gpKTsKKyAgICAgICAgfQorICAgICAg ICBjZWxsQm94R2VvbWV0cnkuc2V0Q29udGVudEJveEhlaWdodChmb3JtYXR0aW5nR2VvbWV0cnku dmVydGljYWxTcGFjZUZvckNlbGxDb250ZW50KCpjZWxsKSk7CiAKICAgICAgICAgYXV0byBjb21w dXRlSW50cmluc2ljVmVydGljYWxQYWRkaW5nRm9yQ2VsbCA9IFsmXSB7CisgICAgICAgICAgICBh dXRvIGNlbGxMb2dpY2FsSGVpZ2h0ID0gcm93TGlzdFtjZWxsLT5zdGFydFJvdygpXS5sb2dpY2Fs SGVpZ2h0KCk7CisgICAgICAgICAgICBmb3IgKHNpemVfdCByb3dJbmRleCA9IGNlbGwtPnN0YXJ0 Um93KCkgKyAxOyByb3dJbmRleCA8IGNlbGwtPmVuZFJvdygpOyArK3Jvd0luZGV4KQorICAgICAg ICAgICAgICAgIGNlbGxMb2dpY2FsSGVpZ2h0ICs9IHJvd0xpc3Rbcm93SW5kZXhdLmxvZ2ljYWxI ZWlnaHQoKTsKKyAgICAgICAgICAgIGNlbGxMb2dpY2FsSGVpZ2h0ICs9IChjZWxsLT5yb3dTcGFu KCkgLSAxKSAqIGdyaWQudmVydGljYWxTcGFjaW5nKCk7CiAgICAgICAgICAgICAvLyBJbnRyaW5z aWMgcGFkZGluZyBpcyB0aGUgZXh0cmEgcGFkZGluZyBmb3IgdGhlIGNlbGwgYm94IHdoZW4gaXQg aXMgc2hvcnRlciB0aGFuIHRoZSByb3cuIENlbGwgYm94ZXMgaGF2ZSB0bwogICAgICAgICAgICAg Ly8gZmlsbCB0aGUgYXZhaWxhYmxlIHZlcnRpY2FsIHNwYWNlCiAgICAgICAgICAgICAvLyBlLmcg PHRkIGhlaWdodD0xMDBweD48L3RkPjx0ZCBoZWlnaHQ9MXB4PjwvdGQ+CkBAIC0xMTYsNyArMTMx LDcgQEAgdm9pZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpzZXRVc2VkR2VvbWV0cnlGb3JDZWxs cyhMYXlvdXRVbml0IGF2YWlsYWJsZUhvcml6b24KIAogICAgICAgICAgICAgc3dpdGNoIChjZWxs Qm94LnN0eWxlKCkudmVydGljYWxBbGlnbigpKSB7CiAgICAgICAgICAgICBjYXNlIFZlcnRpY2Fs QWxpZ246Ok1pZGRsZTogewotICAgICAgICAgICAgICAgIGF1dG8gaW50cmluc2ljVmVydGljYWxQ YWRkaW5nID0gc3RkOjptYXgoMF9sdSwgYXZhaWxhYmxlVmVydGljYWxTcGFjZSAtIGNlbGxCb3hH ZW9tZXRyeS52ZXJ0aWNhbE1hcmdpbkJvcmRlckFuZFBhZGRpbmcoKSAtIGNlbGxCb3hHZW9tZXRy eS5jb250ZW50Qm94SGVpZ2h0KCkpOworICAgICAgICAgICAgICAgIGF1dG8gaW50cmluc2ljVmVy dGljYWxQYWRkaW5nID0gc3RkOjptYXgoMF9sdSwgY2VsbExvZ2ljYWxIZWlnaHQgLSBjZWxsQm94 R2VvbWV0cnkudmVydGljYWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKCkgLSBjZWxsQm94R2VvbWV0 cnkuY29udGVudEJveEhlaWdodCgpKTsKICAgICAgICAgICAgICAgICBpbnRyaW5zaWNQYWRkaW5n VG9wID0gaW50cmluc2ljVmVydGljYWxQYWRkaW5nIC8gMjsKICAgICAgICAgICAgICAgICBpbnRy aW5zaWNQYWRkaW5nQm90dG9tID0gaW50cmluc2ljVmVydGljYWxQYWRkaW5nIC8gMjsKICAgICAg ICAgICAgICAgICBicmVhazsKQEAgLTEyNSw3ICsxNDAsNyBAQCB2b2lkIFRhYmxlRm9ybWF0dGlu Z0NvbnRleHQ6OnNldFVzZWRHZW9tZXRyeUZvckNlbGxzKExheW91dFVuaXQgYXZhaWxhYmxlSG9y aXpvbgogICAgICAgICAgICAgICAgIGF1dG8gcm93QmFzZWxpbmUgPSBMYXlvdXRVbml0IHsgcm93 TGlzdFtjZWxsLT5zdGFydFJvdygpXS5iYXNlbGluZSgpIH07CiAgICAgICAgICAgICAgICAgYXV0 byBjZWxsQmFzZWxpbmUgPSBMYXlvdXRVbml0IHsgY2VsbC0+YmFzZWxpbmUoKSB9OwogICAgICAg ICAgICAgICAgIGludHJpbnNpY1BhZGRpbmdUb3AgPSBzdGQ6Om1heCgwX2x1LCByb3dCYXNlbGlu ZSAtIGNlbGxCYXNlbGluZSAtIGNlbGxCb3hHZW9tZXRyeS5ib3JkZXJUb3AoKSk7Ci0gICAgICAg ICAgICAgICAgaW50cmluc2ljUGFkZGluZ0JvdHRvbSA9IHN0ZDo6bWF4KDBfbHUsIGF2YWlsYWJs ZVZlcnRpY2FsU3BhY2UgLSBjZWxsQm94R2VvbWV0cnkudmVydGljYWxNYXJnaW5Cb3JkZXJBbmRQ YWRkaW5nKCkgLSBpbnRyaW5zaWNQYWRkaW5nVG9wIC0gY2VsbEJveEdlb21ldHJ5LmNvbnRlbnRC b3hIZWlnaHQoKSk7CisgICAgICAgICAgICAgICAgaW50cmluc2ljUGFkZGluZ0JvdHRvbSA9IHN0 ZDo6bWF4KDBfbHUsIGNlbGxMb2dpY2FsSGVpZ2h0IC0gY2VsbEJveEdlb21ldHJ5LnZlcnRpY2Fs TWFyZ2luQm9yZGVyQW5kUGFkZGluZygpIC0gaW50cmluc2ljUGFkZGluZ1RvcCAtIGNlbGxCb3hH ZW9tZXRyeS5jb250ZW50Qm94SGVpZ2h0KCkpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICAgICAgfQogICAgICAgICAgICAgZGVmYXVsdDoKQEAgLTI3Nyw1MCArMjkyLDYgQEAgdm9p ZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpzZXRVc2VkR2VvbWV0cnlGb3JTZWN0aW9ucyhjb25z dCBDb25zdHJhaW50c0ZvckluRmwKICAgICB9CiB9CiAKLXZvaWQgVGFibGVGb3JtYXR0aW5nQ29u dGV4dDo6bGF5b3V0Q2VsbChjb25zdCBUYWJsZUdyaWQ6OkNlbGwmIGNlbGwsIExheW91dFVuaXQg YXZhaWxhYmxlSG9yaXpvbnRhbFNwYWNlKQotewotICAgIEFTU0VSVChjZWxsLmJveCgpLmVzdGFi bGlzaGVzQmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpKTsKLQotICAgIGF1dG8mIGZvcm1hdHRpbmdH ZW9tZXRyeSA9IHRoaXMtPmZvcm1hdHRpbmdHZW9tZXRyeSgpOwotICAgIGF1dG8mIGdyaWQgPSBm b3JtYXR0aW5nU3RhdGUoKS50YWJsZUdyaWQoKTsKLSAgICBhdXRvJiBjZWxsQm94ID0gY2VsbC5i b3goKTsKLSAgICBhdXRvJiBjZWxsQm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUoKS5ib3hH ZW9tZXRyeShjZWxsQm94KTsKLQotICAgIGNlbGxCb3hHZW9tZXRyeS5zZXRCb3JkZXIoZm9ybWF0 dGluZ0dlb21ldHJ5LmNvbXB1dGVkQ2VsbEJvcmRlcihjZWxsKSk7Ci0gICAgY2VsbEJveEdlb21l dHJ5LnNldFBhZGRpbmcoZm9ybWF0dGluZ0dlb21ldHJ5LmNvbXB1dGVkUGFkZGluZyhjZWxsQm94 LCBhdmFpbGFibGVIb3Jpem9udGFsU3BhY2UpKTsKLSAgICAvLyBJbnRlcm5hbCB0YWJsZSBlbGVt ZW50cyBkbyBub3QgaGF2ZSBtYXJnaW5zLgotICAgIGNlbGxCb3hHZW9tZXRyeS5zZXRIb3Jpem9u dGFsTWFyZ2luKHsgfSk7Ci0gICAgY2VsbEJveEdlb21ldHJ5LnNldFZlcnRpY2FsTWFyZ2luKHsg fSk7Ci0KLSAgICBhdXRvIGF2YWlsYWJsZVNwYWNlRm9yQ29udGVudCA9IFsmXSB7Ci0gICAgICAg IGF1dG8mIGNvbHVtbkxpc3QgPSBncmlkLmNvbHVtbnMoKS5saXN0KCk7Ci0gICAgICAgIGF1dG8g bG9naWNhbFdpZHRoID0gTGF5b3V0VW5pdCB7IH07Ci0gICAgICAgIGZvciAoYXV0byBjb2x1bW5J bmRleCA9IGNlbGwuc3RhcnRDb2x1bW4oKTsgY29sdW1uSW5kZXggPCBjZWxsLmVuZENvbHVtbigp OyArK2NvbHVtbkluZGV4KQotICAgICAgICAgICAgbG9naWNhbFdpZHRoICs9IGNvbHVtbkxpc3Qu YXQoY29sdW1uSW5kZXgpLmxvZ2ljYWxXaWR0aCgpOwotICAgICAgICAvLyBObyBjb2x1bW4gc3Bh Y2luZyB3aGVuIHNwYW5uaW5nLgotICAgICAgICBsb2dpY2FsV2lkdGggKz0gKGNlbGwuY29sdW1u U3BhbigpIC0gMSkgKiBncmlkLmhvcml6b250YWxTcGFjaW5nKCk7Ci0gICAgICAgIHJldHVybiBs b2dpY2FsV2lkdGggLSBjZWxsQm94R2VvbWV0cnkuaG9yaXpvbnRhbE1hcmdpbkJvcmRlckFuZFBh ZGRpbmcoKTsKLSAgICB9KCk7Ci0gICAgY2VsbEJveEdlb21ldHJ5LnNldENvbnRlbnRCb3hXaWR0 aChhdmFpbGFibGVTcGFjZUZvckNvbnRlbnQpOwotCi0gICAgaWYgKGNlbGxCb3guaGFzSW5GbG93 T3JGbG9hdGluZ0NoaWxkKCkpIHsKLSAgICAgICAgYXV0byBjb25zdHJhaW50c0ZvckNlbGxDb250 ZW50ID0gZm9ybWF0dGluZ0dlb21ldHJ5LmNvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudChjZWxs Qm94KTsKLSAgICAgICAgYXV0byBpbnZhbGlkYXRpb25TdGF0ZSA9IEludmFsaWRhdGlvblN0YXRl IHsgfTsKLSAgICAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIHByb2JhYmx5IGJlIHBhcnQgb2Yg dGhlIGludmFsaWRhdGlvbiBzdGF0ZSB0byBpbmRpY2F0ZSB3aGVuIHdlIHJlLWxheW91dCB0aGUg Y2VsbCBtdWx0aXBsZSB0aW1lcyBhcyBwYXJ0IG9mIHRoZSBtdWx0aS1wYXNzIHRhYmxlIGFsZ29y aXRobS4KLSAgICAgICAgYXV0byYgZmxvYXRpbmdTdGF0ZUZvckNlbGxDb250ZW50ID0gbGF5b3V0 U3RhdGUoKS5lbnN1cmVCbG9ja0Zvcm1hdHRpbmdTdGF0ZShjZWxsQm94KS5mbG9hdGluZ1N0YXRl KCk7Ci0gICAgICAgIGZsb2F0aW5nU3RhdGVGb3JDZWxsQ29udGVudC5jbGVhcigpOwotICAgICAg ICBMYXlvdXRDb250ZXh0OjpjcmVhdGVGb3JtYXR0aW5nQ29udGV4dChjZWxsQm94LCBsYXlvdXRT dGF0ZSgpKS0+bGF5b3V0SW5GbG93Q29udGVudChpbnZhbGlkYXRpb25TdGF0ZSwgY29uc3RyYWlu dHNGb3JDZWxsQ29udGVudCk7Ci0gICAgfQotICAgIGF1dG8gY29udGVudEJveEhlaWdodCA9IGZv cm1hdHRpbmdHZW9tZXRyeS5jZWxsQm94Q29udGVudEhlaWdodChjZWxsQm94KTsKLSAgICBpZiAo YXV0byBjb21wdXRlZEhlaWdodCA9IGZvcm1hdHRpbmdHZW9tZXRyeS5jb21wdXRlZEhlaWdodChj ZWxsQm94KSkgewotICAgICAgICBhdXRvIGhlaWdodFVzZXNCb3JkZXJCb3ggPSBsYXlvdXRTdGF0 ZSgpLmluUXVpcmtzTW9kZSgpIHx8IGNlbGxCb3guc3R5bGUoKS5ib3hTaXppbmcoKSA9PSBCb3hT aXppbmc6OkJvcmRlckJveDsKLSAgICAgICAgaWYgKGhlaWdodFVzZXNCb3JkZXJCb3gpCi0gICAg ICAgICAgICAqY29tcHV0ZWRIZWlnaHQgLT0gY2VsbEJveEdlb21ldHJ5LnZlcnRpY2FsTWFyZ2lu Qm9yZGVyQW5kUGFkZGluZygpOwotICAgICAgICBjb250ZW50Qm94SGVpZ2h0ID0gc3RkOjptYXgo Y29udGVudEJveEhlaWdodCwgKmNvbXB1dGVkSGVpZ2h0KTsKLSAgICB9Ci0gICAgY2VsbEJveEdl b21ldHJ5LnNldENvbnRlbnRCb3hIZWlnaHQoY29udGVudEJveEhlaWdodCk7Ci19Ci0KIEludHJp bnNpY1dpZHRoQ29uc3RyYWludHMgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZWRJbnRy aW5zaWNXaWR0aENvbnN0cmFpbnRzKCkKIHsKICAgICBBU1NFUlQoIXJvb3QoKS5pc1NpemVDb250 YWlubWVudEJveCgpKTsKQEAgLTQ1Myw2ICs0MjQsNyBAQCB2b2lkIFRhYmxlRm9ybWF0dGluZ0Nv bnRleHQ6OmNvbXB1dGVBbmREaXN0cmlidXRlRXh0cmFTcGFjZShMYXlvdXRVbml0IGF2YWlsYWJs ZQogICAgICAgICBjb2x1bW5Mb2dpY2FsTGVmdCArPSBkaXN0cmlidXRlZEhvcml6b250YWxTcGFj ZXNbY29sdW1uSW5kZXhdICsgZ3JpZC5ob3Jpem9udGFsU3BhY2luZygpOwogICAgIH0KIAorICAg IGF1dG8mIGZvcm1hdHRpbmdHZW9tZXRyeSA9IHRoaXMtPmZvcm1hdHRpbmdHZW9tZXRyeSgpOwog ICAgIC8vIFJvd3Mgc2Vjb25kLgogICAgIGF1dG8mIHJvd3MgPSBncmlkLnJvd3MoKS5saXN0KCk7 CiAgICAgZm9yIChzaXplX3Qgcm93SW5kZXggPSAwOyByb3dJbmRleCA8IHJvd3Muc2l6ZSgpOyAr K3Jvd0luZGV4KSB7CkBAIC00NjAsMTMgKzQzMiwyNiBAQCB2b2lkIFRhYmxlRm9ybWF0dGluZ0Nv bnRleHQ6OmNvbXB1dGVBbmREaXN0cmlidXRlRXh0cmFTcGFjZShMYXlvdXRVbml0IGF2YWlsYWJs ZQogICAgICAgICAgICAgYXV0byYgc2xvdCA9ICpncmlkLnNsb3QoeyBjb2x1bW5JbmRleCwgcm93 SW5kZXggfSk7CiAgICAgICAgICAgICBpZiAoc2xvdC5pc1Jvd1NwYW5uZWQoKSkKICAgICAgICAg ICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIGxheW91dENlbGwoc2xvdC5jZWxsKCksIGF2 YWlsYWJsZUhvcml6b250YWxTcGFjZSk7CisgICAgICAgICAgICBhdXRvIGxheW91dENlbGxDb250 ZW50ID0gWyZdKGF1dG8mIGNlbGwpIHsKKyAgICAgICAgICAgICAgICBhdXRvJiBjZWxsQm94ID0g Y2VsbC5ib3goKTsKKyAgICAgICAgICAgICAgICBhdXRvJiBjZWxsQm94R2VvbWV0cnkgPSBmb3Jt YXR0aW5nU3RhdGUoKS5ib3hHZW9tZXRyeShjZWxsQm94KTsKKyAgICAgICAgICAgICAgICBjZWxs Qm94R2VvbWV0cnkuc2V0Qm9yZGVyKGZvcm1hdHRpbmdHZW9tZXRyeS5jb21wdXRlZENlbGxCb3Jk ZXIoY2VsbCkpOworICAgICAgICAgICAgICAgIGNlbGxCb3hHZW9tZXRyeS5zZXRQYWRkaW5nKGZv cm1hdHRpbmdHZW9tZXRyeS5jb21wdXRlZFBhZGRpbmcoY2VsbEJveCwgYXZhaWxhYmxlSG9yaXpv bnRhbFNwYWNlKSk7CisgICAgICAgICAgICAgICAgY2VsbEJveEdlb21ldHJ5LnNldENvbnRlbnRC b3hXaWR0aChmb3JtYXR0aW5nR2VvbWV0cnkuaG9yaXpvbnRhbFNwYWNlRm9yQ2VsbENvbnRlbnQo Y2VsbCkpOworCisgICAgICAgICAgICAgICAgaWYgKGNlbGxCb3guaGFzSW5GbG93T3JGbG9hdGlu Z0NoaWxkKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgYXV0byBpbnZhbGlkYXRpb25TdGF0ZSA9 IEludmFsaWRhdGlvblN0YXRlIHsgfTsKKyAgICAgICAgICAgICAgICAgICAgTGF5b3V0Q29udGV4 dDo6Y3JlYXRlRm9ybWF0dGluZ0NvbnRleHQoY2VsbEJveCwgbGF5b3V0U3RhdGUoKSktPmxheW91 dEluRmxvd0NvbnRlbnQoaW52YWxpZGF0aW9uU3RhdGUsIGZvcm1hdHRpbmdHZW9tZXRyeS5jb25z dHJhaW50c0ZvckluRmxvd0NvbnRlbnQoY2VsbEJveCkpOworICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICAgICBjZWxsQm94R2VvbWV0cnkuc2V0Q29udGVudEJveEhlaWdodChmb3JtYXR0 aW5nR2VvbWV0cnkudmVydGljYWxTcGFjZUZvckNlbGxDb250ZW50KGNlbGwpKTsKKyAgICAgICAg ICAgIH07CisgICAgICAgICAgICBsYXlvdXRDZWxsQ29udGVudChzbG90LmNlbGwoKSk7CiAgICAg ICAgICAgICBpZiAoc2xvdC5oYXNSb3dTcGFuKCkpCiAgICAgICAgICAgICAgICAgY29udGludWU7 CiAgICAgICAgICAgICAvLyBUaGUgbWluaW11bSBoZWlnaHQgb2YgYSByb3cgKHdpdGhvdXQgc3Bh bm5pbmctcmVsYXRlZCBoZWlnaHQgZGlzdHJpYnV0aW9uKSBpcyBkZWZpbmVkIGFzIHRoZSBoZWln aHQgb2YgYW4gaHlwb3RoZXRpY2FsCiAgICAgICAgICAgICAvLyBsaW5lYm94IGNvbnRhaW5pbmcg dGhlIGNlbGxzIG9yaWdpbmF0aW5nIGluIHRoZSByb3cuCiAgICAgICAgICAgICBhdXRvJiBjZWxs ID0gc2xvdC5jZWxsKCk7Ci0gICAgICAgICAgICBjZWxsLnNldEJhc2VsaW5lKGZvcm1hdHRpbmdH ZW9tZXRyeSgpLnVzZWRCYXNlbGluZUZvckNlbGwoY2VsbC5ib3goKSkpOworICAgICAgICAgICAg Y2VsbC5zZXRCYXNlbGluZShmb3JtYXR0aW5nR2VvbWV0cnkudXNlZEJhc2VsaW5lRm9yQ2VsbChj ZWxsLmJveCgpKSk7CiAgICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4 dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJs ZUZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggNzUxZTgxNTY5OTA1MWVkMDk2NjZmYjIxMWQ4MjJk OGE1MTNlM2ZmZS4uYTY4M2Y3NjE1OGQzMzc3NmMyY2M2NGM2ZTc0N2U4NWY5YmRmZmRjNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9U YWJsZUZvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTcyLDcgKzcy LDYgQEAgcHJpdmF0ZToKICAgICBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpUYWJsZUxheW91dCB0 YWJsZUxheW91dCgpIGNvbnN0IHsgcmV0dXJuIFRhYmxlTGF5b3V0KCp0aGlzLCBmb3JtYXR0aW5n U3RhdGUoKS50YWJsZUdyaWQoKSk7IH0KIAogICAgIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMg Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCkgb3ZlcnJpZGU7Ci0gICAgdm9pZCBs YXlvdXRDZWxsKGNvbnN0IFRhYmxlR3JpZDo6Q2VsbCYsIExheW91dFVuaXQgYXZhaWxhYmxlSG9y aXpvbnRhbFNwYWNlKTsKICAgICB2b2lkIHNldFVzZWRHZW9tZXRyeUZvckNlbGxzKExheW91dFVu aXQgYXZhaWxhYmxlSG9yaXpvbnRhbFNwYWNlKTsKICAgICB2b2lkIHNldFVzZWRHZW9tZXRyeUZv clJvd3MoTGF5b3V0VW5pdCBhdmFpbGFibGVIb3Jpem9udGFsU3BhY2UpOwogICAgIHZvaWQgc2V0 VXNlZEdlb21ldHJ5Rm9yU2VjdGlvbnMoY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50 Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L3RhYmxlL1RhYmxlRm9ybWF0dGluZ0dlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nR2VvbWV0cnkuY3BwCmlu ZGV4IGMyZGQxNmRkYTg3ZmNkZTBiYjk3NGE4YTBkYWYxMTM3MTZlYjQ0ODEuLjA5NGJkNWM4ZmE4 ZjE4NzQ2MmI5MGQyNjU0YmE1MjI1YmQ2YTRkYjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nR2VvbWV0cnku Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUv VGFibGVGb3JtYXR0aW5nR2VvbWV0cnkuY3BwCkBAIC0xNjYsNiArMTY2LDM1IEBAIElubGluZUxh eW91dFVuaXQgVGFibGVGb3JtYXR0aW5nR2VvbWV0cnk6OnVzZWRCYXNlbGluZUZvckNlbGwoY29u c3QgQ29udGFpbmVyQm94CiAgICAgcmV0dXJuIGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlG b3JCb3goY2VsbEJveCkuY29udGVudEJveEJvdHRvbSgpOwogfQogCitMYXlvdXRVbml0IFRhYmxl Rm9ybWF0dGluZ0dlb21ldHJ5Ojpob3Jpem9udGFsU3BhY2VGb3JDZWxsQ29udGVudChjb25zdCBU YWJsZUdyaWQ6OkNlbGwmIGNlbGwpIGNvbnN0Cit7CisgICAgYXV0byYgZ3JpZCA9IGZvcm1hdHRp bmdDb250ZXh0KCkuZm9ybWF0dGluZ1N0YXRlKCkudGFibGVHcmlkKCk7CisgICAgYXV0byYgY29s dW1uTGlzdCA9IGdyaWQuY29sdW1ucygpLmxpc3QoKTsKKyAgICBhdXRvIGxvZ2ljYWxXaWR0aCA9 IExheW91dFVuaXQgeyB9OworICAgIGZvciAoYXV0byBjb2x1bW5JbmRleCA9IGNlbGwuc3RhcnRD b2x1bW4oKTsgY29sdW1uSW5kZXggPCBjZWxsLmVuZENvbHVtbigpOyArK2NvbHVtbkluZGV4KQor ICAgICAgICBsb2dpY2FsV2lkdGggKz0gY29sdW1uTGlzdC5hdChjb2x1bW5JbmRleCkubG9naWNh bFdpZHRoKCk7CisgICAgLy8gTm8gY29sdW1uIHNwYWNpbmcgd2hlbiBzcGFubmluZy4KKyAgICBs b2dpY2FsV2lkdGggKz0gKGNlbGwuY29sdW1uU3BhbigpIC0gMSkgKiBncmlkLmhvcml6b250YWxT cGFjaW5nKCk7CisgICAgYXV0byYgY2VsbEJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQo KS5nZW9tZXRyeUZvckJveChjZWxsLmJveCgpKTsKKyAgICBsb2dpY2FsV2lkdGggLT0gKGNlbGxC b3hHZW9tZXRyeS5ob3Jpem9udGFsQm9yZGVyKCkgKyBjZWxsQm94R2VvbWV0cnkuaG9yaXpvbnRh bFBhZGRpbmcoKS52YWx1ZV9vcigwKSk7CisgICAgcmV0dXJuIGxvZ2ljYWxXaWR0aDsKK30KKwor TGF5b3V0VW5pdCBUYWJsZUZvcm1hdHRpbmdHZW9tZXRyeTo6dmVydGljYWxTcGFjZUZvckNlbGxD b250ZW50KGNvbnN0IFRhYmxlR3JpZDo6Q2VsbCYgY2VsbCkgY29uc3QKK3sKKyAgICBhdXRvJiBj ZWxsQm94ID0gY2VsbC5ib3goKTsKKyAgICBhdXRvIGNvbnRlbnRIZWlnaHQgPSBjZWxsQm94Q29u dGVudEhlaWdodChjZWxsQm94KTsKKyAgICBhdXRvIGNvbXB1dGVkSGVpZ2h0ID0gdGhpcy0+Y29t cHV0ZWRIZWlnaHQoY2VsbEJveCk7CisgICAgaWYgKCFjb21wdXRlZEhlaWdodCkKKyAgICAgICAg cmV0dXJuIGNvbnRlbnRIZWlnaHQ7CisgICAgYXV0byBoZWlnaHRVc2VzQm9yZGVyQm94ID0gbGF5 b3V0U3RhdGUoKS5pblF1aXJrc01vZGUoKSB8fCBjZWxsQm94LnN0eWxlKCkuYm94U2l6aW5nKCkg PT0gQm94U2l6aW5nOjpCb3JkZXJCb3g7CisgICAgaWYgKGhlaWdodFVzZXNCb3JkZXJCb3gpIHsK KyAgICAgICAgYXV0byYgY2VsbEJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9t ZXRyeUZvckJveChjZWxsLmJveCgpKTsKKyAgICAgICAgKmNvbXB1dGVkSGVpZ2h0IC09IChjZWxs Qm94R2VvbWV0cnkudmVydGljYWxCb3JkZXIoKSArIGNlbGxCb3hHZW9tZXRyeS52ZXJ0aWNhbFBh ZGRpbmcoKS52YWx1ZV9vcigwKSk7CisgICAgfQorICAgIHJldHVybiBzdGQ6Om1heChjb250ZW50 SGVpZ2h0LCAqY29tcHV0ZWRIZWlnaHQpOworfQorCiB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5n R2VvbWV0cnkuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFi bGUvVGFibGVGb3JtYXR0aW5nR2VvbWV0cnkuaAppbmRleCBmMTExNjM0ZjA4NTQ2ZTA1YWIwZTAw YTZiZWQzNTRkZGJlNzE0ZjA1Li5iYjc0NGI5NzUyMGMzODYwOTdhMGZkNjRlMGM5ODk2YjE3Njg2 MjlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L3RhYmxlL1RhYmxlRm9ybWF0dGluZ0dlb21ldHJ5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdHZW9tZXRyeS5oCkBA IC00NCw2ICs0NCw4IEBAIHB1YmxpYzoKICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBjb21wdXRl ZENvbHVtbldpZHRoKGNvbnN0IENvbnRhaW5lckJveCYgY29sdW1uQm94KSBjb25zdDsKICAgICBJ bnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIGludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JDZWxs KGNvbnN0IFRhYmxlR3JpZDo6Q2VsbCYpIGNvbnN0OwogICAgIElubGluZUxheW91dFVuaXQgdXNl ZEJhc2VsaW5lRm9yQ2VsbChjb25zdCBDb250YWluZXJCb3gmIGNlbGxCb3gpIGNvbnN0OworICAg IExheW91dFVuaXQgaG9yaXpvbnRhbFNwYWNlRm9yQ2VsbENvbnRlbnQoY29uc3QgVGFibGVHcmlk OjpDZWxsJikgY29uc3Q7CisgICAgTGF5b3V0VW5pdCB2ZXJ0aWNhbFNwYWNlRm9yQ2VsbENvbnRl bnQoY29uc3QgVGFibGVHcmlkOjpDZWxsJikgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgY29uc3Qg VGFibGVGb3JtYXR0aW5nQ29udGV4dCYgZm9ybWF0dGluZ0NvbnRleHQoKSBjb25zdCB7IHJldHVy biBkb3duY2FzdDxUYWJsZUZvcm1hdHRpbmdDb250ZXh0PihGb3JtYXR0aW5nR2VvbWV0cnk6OmZv cm1hdHRpbmdDb250ZXh0KCkpOyB9Cg== 430227 2021-05-31 20:08:17 -0700 2021-05-31 21:31:14 -0700 [fast-cq] Patch bug-226452-20210531200816.patch text/plain 15531 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDk2NDg0Y2ViMzg5Mzlk NmNlNTZmMDQ1NGYwZGQ1YzA2NTg1NzczYS4uMjZiNWIxYTgxODYwMzhlZjI5YTk2ZmUyMmNlZjdi NTdiOWVmMTVlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA1LTMxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtURkNdIERlY291cGxl IHN0cmV0Y2hpbmcgYW5kIGZpbmFsIGNlbGwgbGF5b3V0cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2NDUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg QW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgU3RyZXRjaGluZyBsYXlvdXQgaXMgc2xpZ2h0bHkg ZGlmZmVyZW50IGZyb20gdGhlIGZpbmFsIGNlbGwgbGF5b3V0LgorCisgICAgICAgICogbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nQ29udGV4dDo6c2V0VXNlZEdl b21ldHJ5Rm9yQ2VsbHMpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRp bmdDb250ZXh0Ojpjb21wdXRlQW5kRGlzdHJpYnV0ZUV4dHJhU3BhY2UpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRDZWxsKTogRGVsZXRl ZC4KKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0 dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxl L1RhYmxlRm9ybWF0dGluZ0dlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 VGFibGVGb3JtYXR0aW5nR2VvbWV0cnk6Omhvcml6b250YWxTcGFjZUZvckNlbGxDb250ZW50IGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nR2VvbWV0cnk6 OnZlcnRpY2FsU3BhY2VGb3JDZWxsQ29udGVudCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdHZW9tZXRyeS5oOgorCiAyMDIx LTA1LTMxICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXSBU aWdodGVuIHRoZSBjb25zdHJhaW50IGNsYXNzZXMgKENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVu dC9Db25zdHJhaW50c0Zvck91dE9mRmxvd0NvbnRlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ0NvbnRl eHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9U YWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCBlYzI2YTFjYjc4N2VjZWUxOTJlMmE2MWE2 NGY5NjQ0NjA4NmEyZWFhLi41ODhkYTliZTg0ZmViYzJiN2I5ZWNlODY0MDU4Yjg3YTdkM2I3OTc3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3Rh YmxlL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAg LTgxLDYgKzgxLDcgQEAgdm9pZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpzZXRVc2VkR2VvbWV0 cnlGb3JDZWxscyhMYXlvdXRVbml0IGF2YWlsYWJsZUhvcml6b24KICAgICBhdXRvJiBncmlkID0g Zm9ybWF0dGluZ1N0YXRlKCkudGFibGVHcmlkKCk7CiAgICAgYXV0byYgY29sdW1uTGlzdCA9IGdy aWQuY29sdW1ucygpLmxpc3QoKTsKICAgICBhdXRvJiByb3dMaXN0ID0gZ3JpZC5yb3dzKCkubGlz dCgpOworICAgIGF1dG8mIGZvcm1hdHRpbmdHZW9tZXRyeSA9IHRoaXMtPmZvcm1hdHRpbmdHZW9t ZXRyeSgpOwogICAgIC8vIEZpbmFsIHRhYmxlIGNlbGwgbGF5b3V0LiBBdCB0aGlzIHBvaW50IGFs bCBwZXJjZW50YWdlIHZhbHVlcyBjYW4gYmUgcmVzb2x2ZWQuCiAgICAgYXV0byBzZWN0aW9uT2Zm c2V0ID0gTGF5b3V0VW5pdCB7IH07CiAgICAgYXV0byogY3VycmVudFNlY3Rpb24gPSAmcm93TGlz dC5maXJzdCgpLmJveCgpLnBhcmVudCgpOwpAQCAtOTMsMTYgKzk0LDMwIEBAIHZvaWQgVGFibGVG b3JtYXR0aW5nQ29udGV4dDo6c2V0VXNlZEdlb21ldHJ5Rm9yQ2VsbHMoTGF5b3V0VW5pdCBhdmFp bGFibGVIb3Jpem9uCiAgICAgICAgICAgICAvLyBXaGlsZSB0aGUgZ3JpZCBpcyBhIGNvbnRpbnVv dXMgZmxvdyBvZiByb3dzLCBpbiB0aGUgZGlzcGxheSB0cmVlIHRoZXkgYXJlIHJlbGF0aXZlIHRv IHRoZWlyIHNlY3Rpb25zLgogICAgICAgICAgICAgc2VjdGlvbk9mZnNldCA9IHJvd0xpc3RbY2Vs bC0+c3RhcnRSb3coKV0ubG9naWNhbFRvcCgpOwogICAgICAgICB9CisgICAgICAgIC8vIEludGVy bmFsIHRhYmxlIGVsZW1lbnRzIGRvIG5vdCBoYXZlIG1hcmdpbnMuCisgICAgICAgIGNlbGxCb3hH ZW9tZXRyeS5zZXRIb3Jpem9udGFsTWFyZ2luKHsgfSk7CisgICAgICAgIGNlbGxCb3hHZW9tZXRy eS5zZXRWZXJ0aWNhbE1hcmdpbih7IH0pOworCisgICAgICAgIGNlbGxCb3hHZW9tZXRyeS5zZXRC b3JkZXIoZm9ybWF0dGluZ0dlb21ldHJ5LmNvbXB1dGVkQ2VsbEJvcmRlcigqY2VsbCkpOworICAg ICAgICBjZWxsQm94R2VvbWV0cnkuc2V0UGFkZGluZyhmb3JtYXR0aW5nR2VvbWV0cnkuY29tcHV0 ZWRQYWRkaW5nKGNlbGxCb3gsIGF2YWlsYWJsZUhvcml6b250YWxTcGFjZSkpOwogICAgICAgICBj ZWxsQm94R2VvbWV0cnkuc2V0TG9naWNhbFRvcChyb3dMaXN0W2NlbGwtPnN0YXJ0Um93KCldLmxv Z2ljYWxUb3AoKSAtIHNlY3Rpb25PZmZzZXQpOwogICAgICAgICBjZWxsQm94R2VvbWV0cnkuc2V0 TG9naWNhbExlZnQoY29sdW1uTGlzdFtjZWxsLT5zdGFydENvbHVtbigpXS5sb2dpY2FsTGVmdCgp KTsKLQotICAgICAgICBhdXRvIGF2YWlsYWJsZVZlcnRpY2FsU3BhY2UgPSByb3dMaXN0W2NlbGwt PnN0YXJ0Um93KCldLmxvZ2ljYWxIZWlnaHQoKTsKLSAgICAgICAgZm9yIChzaXplX3Qgcm93SW5k ZXggPSBjZWxsLT5zdGFydFJvdygpICsgMTsgcm93SW5kZXggPCBjZWxsLT5lbmRSb3coKTsgKyty b3dJbmRleCkKLSAgICAgICAgICAgIGF2YWlsYWJsZVZlcnRpY2FsU3BhY2UgKz0gcm93TGlzdFty b3dJbmRleF0ubG9naWNhbEhlaWdodCgpOwotICAgICAgICBhdmFpbGFibGVWZXJ0aWNhbFNwYWNl ICs9IChjZWxsLT5yb3dTcGFuKCkgLSAxKSAqIGdyaWQudmVydGljYWxTcGFjaW5nKCk7Ci0gICAg ICAgIGxheW91dENlbGwoKmNlbGwsIGF2YWlsYWJsZUhvcml6b250YWxTcGFjZSk7CisgICAgICAg IGNlbGxCb3hHZW9tZXRyeS5zZXRDb250ZW50Qm94V2lkdGgoZm9ybWF0dGluZ0dlb21ldHJ5Lmhv cml6b250YWxTcGFjZUZvckNlbGxDb250ZW50KCpjZWxsKSk7CisKKyAgICAgICAgaWYgKGNlbGxC b3guaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxkKCkpIHsKKyAgICAgICAgICAgIGF1dG8gaW52YWxp ZGF0aW9uU3RhdGUgPSBJbnZhbGlkYXRpb25TdGF0ZSB7IH07CisgICAgICAgICAgICAvLyBGSVhN RTogVGhpcyBzaG91bGQgcHJvYmFibHkgYmUgcGFydCBvZiB0aGUgaW52YWxpZGF0aW9uIHN0YXRl IHRvIGluZGljYXRlIHdoZW4gd2UgcmUtbGF5b3V0IHRoZSBjZWxsIG11bHRpcGxlIHRpbWVzIGFz IHBhcnQgb2YgdGhlIG11bHRpLXBhc3MgdGFibGUgYWxnb3JpdGhtLgorICAgICAgICAgICAgYXV0 byYgZmxvYXRpbmdTdGF0ZUZvckNlbGxDb250ZW50ID0gbGF5b3V0U3RhdGUoKS5lbnN1cmVCbG9j a0Zvcm1hdHRpbmdTdGF0ZShjZWxsQm94KS5mbG9hdGluZ1N0YXRlKCk7CisgICAgICAgICAgICBm bG9hdGluZ1N0YXRlRm9yQ2VsbENvbnRlbnQuY2xlYXIoKTsKKyAgICAgICAgICAgIExheW91dENv bnRleHQ6OmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KGNlbGxCb3gsIGxheW91dFN0YXRlKCkpLT5s YXlvdXRJbkZsb3dDb250ZW50KGludmFsaWRhdGlvblN0YXRlLCBmb3JtYXR0aW5nR2VvbWV0cnku Y29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50KGNlbGxCb3gpKTsKKyAgICAgICAgfQorICAgICAg ICBjZWxsQm94R2VvbWV0cnkuc2V0Q29udGVudEJveEhlaWdodChmb3JtYXR0aW5nR2VvbWV0cnku dmVydGljYWxTcGFjZUZvckNlbGxDb250ZW50KCpjZWxsKSk7CiAKICAgICAgICAgYXV0byBjb21w dXRlSW50cmluc2ljVmVydGljYWxQYWRkaW5nRm9yQ2VsbCA9IFsmXSB7CisgICAgICAgICAgICBh dXRvIGNlbGxMb2dpY2FsSGVpZ2h0ID0gcm93TGlzdFtjZWxsLT5zdGFydFJvdygpXS5sb2dpY2Fs SGVpZ2h0KCk7CisgICAgICAgICAgICBmb3IgKHNpemVfdCByb3dJbmRleCA9IGNlbGwtPnN0YXJ0 Um93KCkgKyAxOyByb3dJbmRleCA8IGNlbGwtPmVuZFJvdygpOyArK3Jvd0luZGV4KQorICAgICAg ICAgICAgICAgIGNlbGxMb2dpY2FsSGVpZ2h0ICs9IHJvd0xpc3Rbcm93SW5kZXhdLmxvZ2ljYWxI ZWlnaHQoKTsKKyAgICAgICAgICAgIGNlbGxMb2dpY2FsSGVpZ2h0ICs9IChjZWxsLT5yb3dTcGFu KCkgLSAxKSAqIGdyaWQudmVydGljYWxTcGFjaW5nKCk7CiAgICAgICAgICAgICAvLyBJbnRyaW5z aWMgcGFkZGluZyBpcyB0aGUgZXh0cmEgcGFkZGluZyBmb3IgdGhlIGNlbGwgYm94IHdoZW4gaXQg aXMgc2hvcnRlciB0aGFuIHRoZSByb3cuIENlbGwgYm94ZXMgaGF2ZSB0bwogICAgICAgICAgICAg Ly8gZmlsbCB0aGUgYXZhaWxhYmxlIHZlcnRpY2FsIHNwYWNlCiAgICAgICAgICAgICAvLyBlLmcg PHRkIGhlaWdodD0xMDBweD48L3RkPjx0ZCBoZWlnaHQ9MXB4PjwvdGQ+CkBAIC0xMTcsNyArMTMy LDcgQEAgdm9pZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpzZXRVc2VkR2VvbWV0cnlGb3JDZWxs cyhMYXlvdXRVbml0IGF2YWlsYWJsZUhvcml6b24KIAogICAgICAgICAgICAgc3dpdGNoIChjZWxs Qm94LnN0eWxlKCkudmVydGljYWxBbGlnbigpKSB7CiAgICAgICAgICAgICBjYXNlIFZlcnRpY2Fs QWxpZ246Ok1pZGRsZTogewotICAgICAgICAgICAgICAgIGF1dG8gaW50cmluc2ljVmVydGljYWxQ YWRkaW5nID0gc3RkOjptYXgoMF9sdSwgYXZhaWxhYmxlVmVydGljYWxTcGFjZSAtIGNlbGxCb3hH ZW9tZXRyeS52ZXJ0aWNhbE1hcmdpbkJvcmRlckFuZFBhZGRpbmcoKSAtIGNlbGxCb3hHZW9tZXRy eS5jb250ZW50Qm94SGVpZ2h0KCkpOworICAgICAgICAgICAgICAgIGF1dG8gaW50cmluc2ljVmVy dGljYWxQYWRkaW5nID0gc3RkOjptYXgoMF9sdSwgY2VsbExvZ2ljYWxIZWlnaHQgLSBjZWxsQm94 R2VvbWV0cnkudmVydGljYWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKCkgLSBjZWxsQm94R2VvbWV0 cnkuY29udGVudEJveEhlaWdodCgpKTsKICAgICAgICAgICAgICAgICBpbnRyaW5zaWNQYWRkaW5n VG9wID0gaW50cmluc2ljVmVydGljYWxQYWRkaW5nIC8gMjsKICAgICAgICAgICAgICAgICBpbnRy aW5zaWNQYWRkaW5nQm90dG9tID0gaW50cmluc2ljVmVydGljYWxQYWRkaW5nIC8gMjsKICAgICAg ICAgICAgICAgICBicmVhazsKQEAgLTEyNiw3ICsxNDEsNyBAQCB2b2lkIFRhYmxlRm9ybWF0dGlu Z0NvbnRleHQ6OnNldFVzZWRHZW9tZXRyeUZvckNlbGxzKExheW91dFVuaXQgYXZhaWxhYmxlSG9y aXpvbgogICAgICAgICAgICAgICAgIGF1dG8gcm93QmFzZWxpbmUgPSBMYXlvdXRVbml0IHsgcm93 TGlzdFtjZWxsLT5zdGFydFJvdygpXS5iYXNlbGluZSgpIH07CiAgICAgICAgICAgICAgICAgYXV0 byBjZWxsQmFzZWxpbmUgPSBMYXlvdXRVbml0IHsgY2VsbC0+YmFzZWxpbmUoKSB9OwogICAgICAg ICAgICAgICAgIGludHJpbnNpY1BhZGRpbmdUb3AgPSBzdGQ6Om1heCgwX2x1LCByb3dCYXNlbGlu ZSAtIGNlbGxCYXNlbGluZSAtIGNlbGxCb3hHZW9tZXRyeS5ib3JkZXJUb3AoKSk7Ci0gICAgICAg ICAgICAgICAgaW50cmluc2ljUGFkZGluZ0JvdHRvbSA9IHN0ZDo6bWF4KDBfbHUsIGF2YWlsYWJs ZVZlcnRpY2FsU3BhY2UgLSBjZWxsQm94R2VvbWV0cnkudmVydGljYWxNYXJnaW5Cb3JkZXJBbmRQ YWRkaW5nKCkgLSBpbnRyaW5zaWNQYWRkaW5nVG9wIC0gY2VsbEJveEdlb21ldHJ5LmNvbnRlbnRC b3hIZWlnaHQoKSk7CisgICAgICAgICAgICAgICAgaW50cmluc2ljUGFkZGluZ0JvdHRvbSA9IHN0 ZDo6bWF4KDBfbHUsIGNlbGxMb2dpY2FsSGVpZ2h0IC0gY2VsbEJveEdlb21ldHJ5LnZlcnRpY2Fs TWFyZ2luQm9yZGVyQW5kUGFkZGluZygpIC0gaW50cmluc2ljUGFkZGluZ1RvcCAtIGNlbGxCb3hH ZW9tZXRyeS5jb250ZW50Qm94SGVpZ2h0KCkpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICAgICAgfQogICAgICAgICAgICAgZGVmYXVsdDoKQEAgLTI3OCw1MCArMjkzLDYgQEAgdm9p ZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpzZXRVc2VkR2VvbWV0cnlGb3JTZWN0aW9ucyhjb25z dCBDb25zdHJhaW50c0ZvckluRmwKICAgICB9CiB9CiAKLXZvaWQgVGFibGVGb3JtYXR0aW5nQ29u dGV4dDo6bGF5b3V0Q2VsbChjb25zdCBUYWJsZUdyaWQ6OkNlbGwmIGNlbGwsIExheW91dFVuaXQg YXZhaWxhYmxlSG9yaXpvbnRhbFNwYWNlKQotewotICAgIEFTU0VSVChjZWxsLmJveCgpLmVzdGFi bGlzaGVzQmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpKTsKLQotICAgIGF1dG8mIGZvcm1hdHRpbmdH ZW9tZXRyeSA9IHRoaXMtPmZvcm1hdHRpbmdHZW9tZXRyeSgpOwotICAgIGF1dG8mIGdyaWQgPSBm b3JtYXR0aW5nU3RhdGUoKS50YWJsZUdyaWQoKTsKLSAgICBhdXRvJiBjZWxsQm94ID0gY2VsbC5i b3goKTsKLSAgICBhdXRvJiBjZWxsQm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUoKS5ib3hH ZW9tZXRyeShjZWxsQm94KTsKLQotICAgIGNlbGxCb3hHZW9tZXRyeS5zZXRCb3JkZXIoZm9ybWF0 dGluZ0dlb21ldHJ5LmNvbXB1dGVkQ2VsbEJvcmRlcihjZWxsKSk7Ci0gICAgY2VsbEJveEdlb21l dHJ5LnNldFBhZGRpbmcoZm9ybWF0dGluZ0dlb21ldHJ5LmNvbXB1dGVkUGFkZGluZyhjZWxsQm94 LCBhdmFpbGFibGVIb3Jpem9udGFsU3BhY2UpKTsKLSAgICAvLyBJbnRlcm5hbCB0YWJsZSBlbGVt ZW50cyBkbyBub3QgaGF2ZSBtYXJnaW5zLgotICAgIGNlbGxCb3hHZW9tZXRyeS5zZXRIb3Jpem9u dGFsTWFyZ2luKHsgfSk7Ci0gICAgY2VsbEJveEdlb21ldHJ5LnNldFZlcnRpY2FsTWFyZ2luKHsg fSk7Ci0KLSAgICBhdXRvIGF2YWlsYWJsZVNwYWNlRm9yQ29udGVudCA9IFsmXSB7Ci0gICAgICAg IGF1dG8mIGNvbHVtbkxpc3QgPSBncmlkLmNvbHVtbnMoKS5saXN0KCk7Ci0gICAgICAgIGF1dG8g bG9naWNhbFdpZHRoID0gTGF5b3V0VW5pdCB7IH07Ci0gICAgICAgIGZvciAoYXV0byBjb2x1bW5J bmRleCA9IGNlbGwuc3RhcnRDb2x1bW4oKTsgY29sdW1uSW5kZXggPCBjZWxsLmVuZENvbHVtbigp OyArK2NvbHVtbkluZGV4KQotICAgICAgICAgICAgbG9naWNhbFdpZHRoICs9IGNvbHVtbkxpc3Qu YXQoY29sdW1uSW5kZXgpLmxvZ2ljYWxXaWR0aCgpOwotICAgICAgICAvLyBObyBjb2x1bW4gc3Bh Y2luZyB3aGVuIHNwYW5uaW5nLgotICAgICAgICBsb2dpY2FsV2lkdGggKz0gKGNlbGwuY29sdW1u U3BhbigpIC0gMSkgKiBncmlkLmhvcml6b250YWxTcGFjaW5nKCk7Ci0gICAgICAgIHJldHVybiBs b2dpY2FsV2lkdGggLSBjZWxsQm94R2VvbWV0cnkuaG9yaXpvbnRhbE1hcmdpbkJvcmRlckFuZFBh ZGRpbmcoKTsKLSAgICB9KCk7Ci0gICAgY2VsbEJveEdlb21ldHJ5LnNldENvbnRlbnRCb3hXaWR0 aChhdmFpbGFibGVTcGFjZUZvckNvbnRlbnQpOwotCi0gICAgaWYgKGNlbGxCb3guaGFzSW5GbG93 T3JGbG9hdGluZ0NoaWxkKCkpIHsKLSAgICAgICAgYXV0byBjb25zdHJhaW50c0ZvckNlbGxDb250 ZW50ID0gZm9ybWF0dGluZ0dlb21ldHJ5LmNvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudChjZWxs Qm94KTsKLSAgICAgICAgYXV0byBpbnZhbGlkYXRpb25TdGF0ZSA9IEludmFsaWRhdGlvblN0YXRl IHsgfTsKLSAgICAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIHByb2JhYmx5IGJlIHBhcnQgb2Yg dGhlIGludmFsaWRhdGlvbiBzdGF0ZSB0byBpbmRpY2F0ZSB3aGVuIHdlIHJlLWxheW91dCB0aGUg Y2VsbCBtdWx0aXBsZSB0aW1lcyBhcyBwYXJ0IG9mIHRoZSBtdWx0aS1wYXNzIHRhYmxlIGFsZ29y aXRobS4KLSAgICAgICAgYXV0byYgZmxvYXRpbmdTdGF0ZUZvckNlbGxDb250ZW50ID0gbGF5b3V0 U3RhdGUoKS5lbnN1cmVCbG9ja0Zvcm1hdHRpbmdTdGF0ZShjZWxsQm94KS5mbG9hdGluZ1N0YXRl KCk7Ci0gICAgICAgIGZsb2F0aW5nU3RhdGVGb3JDZWxsQ29udGVudC5jbGVhcigpOwotICAgICAg ICBMYXlvdXRDb250ZXh0OjpjcmVhdGVGb3JtYXR0aW5nQ29udGV4dChjZWxsQm94LCBsYXlvdXRT dGF0ZSgpKS0+bGF5b3V0SW5GbG93Q29udGVudChpbnZhbGlkYXRpb25TdGF0ZSwgY29uc3RyYWlu dHNGb3JDZWxsQ29udGVudCk7Ci0gICAgfQotICAgIGF1dG8gY29udGVudEJveEhlaWdodCA9IGZv cm1hdHRpbmdHZW9tZXRyeS5jZWxsQm94Q29udGVudEhlaWdodChjZWxsQm94KTsKLSAgICBpZiAo YXV0byBjb21wdXRlZEhlaWdodCA9IGZvcm1hdHRpbmdHZW9tZXRyeS5jb21wdXRlZEhlaWdodChj ZWxsQm94KSkgewotICAgICAgICBhdXRvIGhlaWdodFVzZXNCb3JkZXJCb3ggPSBsYXlvdXRTdGF0 ZSgpLmluUXVpcmtzTW9kZSgpIHx8IGNlbGxCb3guc3R5bGUoKS5ib3hTaXppbmcoKSA9PSBCb3hT aXppbmc6OkJvcmRlckJveDsKLSAgICAgICAgaWYgKGhlaWdodFVzZXNCb3JkZXJCb3gpCi0gICAg ICAgICAgICAqY29tcHV0ZWRIZWlnaHQgLT0gY2VsbEJveEdlb21ldHJ5LnZlcnRpY2FsTWFyZ2lu Qm9yZGVyQW5kUGFkZGluZygpOwotICAgICAgICBjb250ZW50Qm94SGVpZ2h0ID0gc3RkOjptYXgo Y29udGVudEJveEhlaWdodCwgKmNvbXB1dGVkSGVpZ2h0KTsKLSAgICB9Ci0gICAgY2VsbEJveEdl b21ldHJ5LnNldENvbnRlbnRCb3hIZWlnaHQoY29udGVudEJveEhlaWdodCk7Ci19Ci0KIEludHJp bnNpY1dpZHRoQ29uc3RyYWludHMgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZWRJbnRy aW5zaWNXaWR0aENvbnN0cmFpbnRzKCkKIHsKICAgICBBU1NFUlQoIXJvb3QoKS5pc1NpemVDb250 YWlubWVudEJveCgpKTsKQEAgLTQ1NCw2ICs0MjUsNyBAQCB2b2lkIFRhYmxlRm9ybWF0dGluZ0Nv bnRleHQ6OmNvbXB1dGVBbmREaXN0cmlidXRlRXh0cmFTcGFjZShMYXlvdXRVbml0IGF2YWlsYWJs ZQogICAgICAgICBjb2x1bW5Mb2dpY2FsTGVmdCArPSBkaXN0cmlidXRlZEhvcml6b250YWxTcGFj ZXNbY29sdW1uSW5kZXhdICsgZ3JpZC5ob3Jpem9udGFsU3BhY2luZygpOwogICAgIH0KIAorICAg IGF1dG8mIGZvcm1hdHRpbmdHZW9tZXRyeSA9IHRoaXMtPmZvcm1hdHRpbmdHZW9tZXRyeSgpOwog ICAgIC8vIFJvd3Mgc2Vjb25kLgogICAgIGF1dG8mIHJvd3MgPSBncmlkLnJvd3MoKS5saXN0KCk7 CiAgICAgZm9yIChzaXplX3Qgcm93SW5kZXggPSAwOyByb3dJbmRleCA8IHJvd3Muc2l6ZSgpOyAr K3Jvd0luZGV4KSB7CkBAIC00NjEsMTMgKzQzMywyNiBAQCB2b2lkIFRhYmxlRm9ybWF0dGluZ0Nv bnRleHQ6OmNvbXB1dGVBbmREaXN0cmlidXRlRXh0cmFTcGFjZShMYXlvdXRVbml0IGF2YWlsYWJs ZQogICAgICAgICAgICAgYXV0byYgc2xvdCA9ICpncmlkLnNsb3QoeyBjb2x1bW5JbmRleCwgcm93 SW5kZXggfSk7CiAgICAgICAgICAgICBpZiAoc2xvdC5pc1Jvd1NwYW5uZWQoKSkKICAgICAgICAg ICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIGxheW91dENlbGwoc2xvdC5jZWxsKCksIGF2 YWlsYWJsZUhvcml6b250YWxTcGFjZSk7CisgICAgICAgICAgICBhdXRvIGxheW91dENlbGxDb250 ZW50ID0gWyZdKGF1dG8mIGNlbGwpIHsKKyAgICAgICAgICAgICAgICBhdXRvJiBjZWxsQm94ID0g Y2VsbC5ib3goKTsKKyAgICAgICAgICAgICAgICBhdXRvJiBjZWxsQm94R2VvbWV0cnkgPSBmb3Jt YXR0aW5nU3RhdGUoKS5ib3hHZW9tZXRyeShjZWxsQm94KTsKKyAgICAgICAgICAgICAgICBjZWxs Qm94R2VvbWV0cnkuc2V0Qm9yZGVyKGZvcm1hdHRpbmdHZW9tZXRyeS5jb21wdXRlZENlbGxCb3Jk ZXIoY2VsbCkpOworICAgICAgICAgICAgICAgIGNlbGxCb3hHZW9tZXRyeS5zZXRQYWRkaW5nKGZv cm1hdHRpbmdHZW9tZXRyeS5jb21wdXRlZFBhZGRpbmcoY2VsbEJveCwgYXZhaWxhYmxlSG9yaXpv bnRhbFNwYWNlKSk7CisgICAgICAgICAgICAgICAgY2VsbEJveEdlb21ldHJ5LnNldENvbnRlbnRC b3hXaWR0aChmb3JtYXR0aW5nR2VvbWV0cnkuaG9yaXpvbnRhbFNwYWNlRm9yQ2VsbENvbnRlbnQo Y2VsbCkpOworCisgICAgICAgICAgICAgICAgaWYgKGNlbGxCb3guaGFzSW5GbG93T3JGbG9hdGlu Z0NoaWxkKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgYXV0byBpbnZhbGlkYXRpb25TdGF0ZSA9 IEludmFsaWRhdGlvblN0YXRlIHsgfTsKKyAgICAgICAgICAgICAgICAgICAgTGF5b3V0Q29udGV4 dDo6Y3JlYXRlRm9ybWF0dGluZ0NvbnRleHQoY2VsbEJveCwgbGF5b3V0U3RhdGUoKSktPmxheW91 dEluRmxvd0NvbnRlbnQoaW52YWxpZGF0aW9uU3RhdGUsIGZvcm1hdHRpbmdHZW9tZXRyeS5jb25z dHJhaW50c0ZvckluRmxvd0NvbnRlbnQoY2VsbEJveCkpOworICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICAgICBjZWxsQm94R2VvbWV0cnkuc2V0Q29udGVudEJveEhlaWdodChmb3JtYXR0 aW5nR2VvbWV0cnkudmVydGljYWxTcGFjZUZvckNlbGxDb250ZW50KGNlbGwpKTsKKyAgICAgICAg ICAgIH07CisgICAgICAgICAgICBsYXlvdXRDZWxsQ29udGVudChzbG90LmNlbGwoKSk7CiAgICAg ICAgICAgICBpZiAoc2xvdC5oYXNSb3dTcGFuKCkpCiAgICAgICAgICAgICAgICAgY29udGludWU7 CiAgICAgICAgICAgICAvLyBUaGUgbWluaW11bSBoZWlnaHQgb2YgYSByb3cgKHdpdGhvdXQgc3Bh bm5pbmctcmVsYXRlZCBoZWlnaHQgZGlzdHJpYnV0aW9uKSBpcyBkZWZpbmVkIGFzIHRoZSBoZWln aHQgb2YgYW4gaHlwb3RoZXRpY2FsCiAgICAgICAgICAgICAvLyBsaW5lYm94IGNvbnRhaW5pbmcg dGhlIGNlbGxzIG9yaWdpbmF0aW5nIGluIHRoZSByb3cuCiAgICAgICAgICAgICBhdXRvJiBjZWxs ID0gc2xvdC5jZWxsKCk7Ci0gICAgICAgICAgICBjZWxsLnNldEJhc2VsaW5lKGZvcm1hdHRpbmdH ZW9tZXRyeSgpLnVzZWRCYXNlbGluZUZvckNlbGwoY2VsbC5ib3goKSkpOworICAgICAgICAgICAg Y2VsbC5zZXRCYXNlbGluZShmb3JtYXR0aW5nR2VvbWV0cnkudXNlZEJhc2VsaW5lRm9yQ2VsbChj ZWxsLmJveCgpKSk7CiAgICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4 dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJs ZUZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggOGJjMjMwOWQwYzBkNGU4MDc0NjY1YzQ5YjU0NDJj NDhhYWZmY2IzNy4uNzhlMGZmMGY2NTYzOWMyNGM0YTllNzliOWZjNzU0MjcyMDk1NTZhZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9U YWJsZUZvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTcyLDcgKzcy LDYgQEAgcHJpdmF0ZToKICAgICBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpUYWJsZUxheW91dCB0 YWJsZUxheW91dCgpIGNvbnN0IHsgcmV0dXJuIFRhYmxlTGF5b3V0KCp0aGlzLCBmb3JtYXR0aW5n U3RhdGUoKS50YWJsZUdyaWQoKSk7IH0KIAogICAgIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMg Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCkgb3ZlcnJpZGU7Ci0gICAgdm9pZCBs YXlvdXRDZWxsKGNvbnN0IFRhYmxlR3JpZDo6Q2VsbCYsIExheW91dFVuaXQgYXZhaWxhYmxlSG9y aXpvbnRhbFNwYWNlKTsKICAgICB2b2lkIHNldFVzZWRHZW9tZXRyeUZvckNlbGxzKExheW91dFVu aXQgYXZhaWxhYmxlSG9yaXpvbnRhbFNwYWNlKTsKICAgICB2b2lkIHNldFVzZWRHZW9tZXRyeUZv clJvd3MoTGF5b3V0VW5pdCBhdmFpbGFibGVIb3Jpem9udGFsU3BhY2UpOwogICAgIHZvaWQgc2V0 VXNlZEdlb21ldHJ5Rm9yU2VjdGlvbnMoY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50 Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L3RhYmxlL1RhYmxlRm9ybWF0dGluZ0dlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nR2VvbWV0cnkuY3BwCmlu ZGV4IDJhODUwM2JlMmU2ODhlMGQwZDI5ZDY5ZjNlNTEyMTVjZWM1MjEwNGEuLjRmZjNmZGU4YmJk ZTA4YjMwNjc1YTUxYmQ5MTlkYjIyMTgxOTMyZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nR2VvbWV0cnku Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUv VGFibGVGb3JtYXR0aW5nR2VvbWV0cnkuY3BwCkBAIC0xNjYsNiArMTY2LDM1IEBAIElubGluZUxh eW91dFVuaXQgVGFibGVGb3JtYXR0aW5nR2VvbWV0cnk6OnVzZWRCYXNlbGluZUZvckNlbGwoY29u c3QgQ29udGFpbmVyQm94CiAgICAgcmV0dXJuIGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlG b3JCb3goY2VsbEJveCkuY29udGVudEJveEJvdHRvbSgpOwogfQogCitMYXlvdXRVbml0IFRhYmxl Rm9ybWF0dGluZ0dlb21ldHJ5Ojpob3Jpem9udGFsU3BhY2VGb3JDZWxsQ29udGVudChjb25zdCBU YWJsZUdyaWQ6OkNlbGwmIGNlbGwpIGNvbnN0Cit7CisgICAgYXV0byYgZ3JpZCA9IGZvcm1hdHRp bmdDb250ZXh0KCkuZm9ybWF0dGluZ1N0YXRlKCkudGFibGVHcmlkKCk7CisgICAgYXV0byYgY29s dW1uTGlzdCA9IGdyaWQuY29sdW1ucygpLmxpc3QoKTsKKyAgICBhdXRvIGxvZ2ljYWxXaWR0aCA9 IExheW91dFVuaXQgeyB9OworICAgIGZvciAoYXV0byBjb2x1bW5JbmRleCA9IGNlbGwuc3RhcnRD b2x1bW4oKTsgY29sdW1uSW5kZXggPCBjZWxsLmVuZENvbHVtbigpOyArK2NvbHVtbkluZGV4KQor ICAgICAgICBsb2dpY2FsV2lkdGggKz0gY29sdW1uTGlzdC5hdChjb2x1bW5JbmRleCkubG9naWNh bFdpZHRoKCk7CisgICAgLy8gTm8gY29sdW1uIHNwYWNpbmcgd2hlbiBzcGFubmluZy4KKyAgICBs b2dpY2FsV2lkdGggKz0gKGNlbGwuY29sdW1uU3BhbigpIC0gMSkgKiBncmlkLmhvcml6b250YWxT cGFjaW5nKCk7CisgICAgYXV0byYgY2VsbEJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQo KS5nZW9tZXRyeUZvckJveChjZWxsLmJveCgpKTsKKyAgICBsb2dpY2FsV2lkdGggLT0gKGNlbGxC b3hHZW9tZXRyeS5ob3Jpem9udGFsQm9yZGVyKCkgKyBjZWxsQm94R2VvbWV0cnkuaG9yaXpvbnRh bFBhZGRpbmcoKS52YWx1ZV9vcigwKSk7CisgICAgcmV0dXJuIGxvZ2ljYWxXaWR0aDsKK30KKwor TGF5b3V0VW5pdCBUYWJsZUZvcm1hdHRpbmdHZW9tZXRyeTo6dmVydGljYWxTcGFjZUZvckNlbGxD b250ZW50KGNvbnN0IFRhYmxlR3JpZDo6Q2VsbCYgY2VsbCkgY29uc3QKK3sKKyAgICBhdXRvJiBj ZWxsQm94ID0gY2VsbC5ib3goKTsKKyAgICBhdXRvIGNvbnRlbnRIZWlnaHQgPSBjZWxsQm94Q29u dGVudEhlaWdodChjZWxsQm94KTsKKyAgICBhdXRvIGNvbXB1dGVkSGVpZ2h0ID0gdGhpcy0+Y29t cHV0ZWRIZWlnaHQoY2VsbEJveCk7CisgICAgaWYgKCFjb21wdXRlZEhlaWdodCkKKyAgICAgICAg cmV0dXJuIGNvbnRlbnRIZWlnaHQ7CisgICAgYXV0byBoZWlnaHRVc2VzQm9yZGVyQm94ID0gbGF5 b3V0U3RhdGUoKS5pblF1aXJrc01vZGUoKSB8fCBjZWxsQm94LnN0eWxlKCkuYm94U2l6aW5nKCkg PT0gQm94U2l6aW5nOjpCb3JkZXJCb3g7CisgICAgaWYgKGhlaWdodFVzZXNCb3JkZXJCb3gpIHsK KyAgICAgICAgYXV0byYgY2VsbEJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9t ZXRyeUZvckJveChjZWxsLmJveCgpKTsKKyAgICAgICAgKmNvbXB1dGVkSGVpZ2h0IC09IChjZWxs Qm94R2VvbWV0cnkudmVydGljYWxCb3JkZXIoKSArIGNlbGxCb3hHZW9tZXRyeS52ZXJ0aWNhbFBh ZGRpbmcoKS52YWx1ZV9vcigwKSk7CisgICAgfQorICAgIHJldHVybiBzdGQ6Om1heChjb250ZW50 SGVpZ2h0LCAqY29tcHV0ZWRIZWlnaHQpOworfQorCiB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5n R2VvbWV0cnkuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFi bGUvVGFibGVGb3JtYXR0aW5nR2VvbWV0cnkuaAppbmRleCBiMGI0NTc4MGYyMzQwZWZlNDdjMjY3 YTJkNjM4ODA1ZjBkMzRjOGZkLi5jYThmNWExNDM4OTczNmVkMjQwZmU1MGM5ZjNlNDg5MDEwNTlj ZmEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L3RhYmxlL1RhYmxlRm9ybWF0dGluZ0dlb21ldHJ5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdHZW9tZXRyeS5oCkBA IC00NCw2ICs0NCw4IEBAIHB1YmxpYzoKICAgICBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IGNv bXB1dGVkQ29sdW1uV2lkdGgoY29uc3QgQ29udGFpbmVyQm94JiBjb2x1bW5Cb3gpIGNvbnN0Owog ICAgIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgaW50cmluc2ljV2lkdGhDb25zdHJhaW50c0Zv ckNlbGwoY29uc3QgVGFibGVHcmlkOjpDZWxsJikgY29uc3Q7CiAgICAgSW5saW5lTGF5b3V0VW5p dCB1c2VkQmFzZWxpbmVGb3JDZWxsKGNvbnN0IENvbnRhaW5lckJveCYgY2VsbEJveCkgY29uc3Q7 CisgICAgTGF5b3V0VW5pdCBob3Jpem9udGFsU3BhY2VGb3JDZWxsQ29udGVudChjb25zdCBUYWJs ZUdyaWQ6OkNlbGwmKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IHZlcnRpY2FsU3BhY2VGb3JDZWxs Q29udGVudChjb25zdCBUYWJsZUdyaWQ6OkNlbGwmKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICBj b25zdCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0JiBmb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0IHsg cmV0dXJuIGRvd25jYXN0PFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ+KEZvcm1hdHRpbmdHZW9tZXRy eTo6Zm9ybWF0dGluZ0NvbnRleHQoKSk7IH0K