219307 2020-11-27 08:40:37 -0800 [LFC Display] Clean up CSS stacking context painting code 2020-11-27 10:51:17 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1710304 0 simon.fraser 2020-11-27 08:40:37 -0800 [LFC Display] Clean up CSS stacking context painting code 1710305 1 414946 simon.fraser 2020-11-27 08:40:52 -0800 Created attachment 414946 Patch 1710329 2 414952 simon.fraser 2020-11-27 09:49:43 -0800 Created attachment 414952 Patch 1710348 3 ews-feeder 2020-11-27 10:50:48 -0800 Committed r270200: <https://trac.webkit.org/changeset/270200> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414952. 1710349 4 webkit-bug-importer 2020-11-27 10:51:17 -0800 <rdar://problem/71766825> 414946 2020-11-27 08:40:52 -0800 2020-11-27 10:02:55 -0800 Patch bug-219307-20201127084051.patch text/plain 14708 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWY1MDdmM2M5YWQ2OGZi M2E3Y2ZiZTQxMDcwZTkxNTRiMTg3MDFkYy4uZDhlM2VjNmY1NTkzYWU5NTY2M2E1MTYyYTQ0OWQ2 ZGJhYjAwMDAxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIwLTExLTIzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtMRkMgRGlzcGxh eV0gQ2xlYW4gdXAgQ1NTIHN0YWNraW5nIGNvbnRleHQgcGFpbnRpbmcgY29kZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5MzA3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xhcmlmeSB0aGUgY29kZSBp biBEaXNwbGF5OjpDU1NQYWludGVyIHRoYXQgcGFpbnRzIHN0YWNraW5nIGNvbnRleHRzIGFuZCBw b3NpdGlvbmVkCisgICAgICAgIGVsZW1lbnRzLiBOb24tc3RhY2tpbmcgcG9zaXRpb25lZCBlbGVt ZW50cyBwYWludCBhdG9taWNhbGx5LCBidXQgZG9uJ3QgcGFpbnQgZGVzY2VuZGFudAorICAgICAg ICBzdGFja2luZyBjb250ZXh0cyAoc29tZXRpbWVzIHRoZXNlIGFyZSBjYWxsZWQgInBzZXVkby1z dGFja2luZyBjb250ZXh0cyIgYnV0IHRoYXQgdGVybQorICAgICAgICBpcyBhdm9pZGVkIGhlcmUg dG8gcmVkdWNlIGNvbmZ1c2lvbikuIFNoYXJlIGNvZGUgYmV0d2VlbiBwYWludGluZyB0aGVzZSBh bmQgc3RhY2tpbmcKKyAgICAgICAgY29udGV4dHMgdmlhIHBhaW50QXRvbWljYWxseVBhaW50ZWRC b3goKS4KKworICAgICAgICBBbHNvIG1ha2Ugc3VyZSB3ZSBwYWludCB0aGUgY29udGVudHMgb2Yg bm9uLWNvbnRhaW5lciBjaGlsZCBib3hlcywgc28gdGhhdCB0aGluZ3MgbGlrZQorICAgICAgICBw b3NpdGlvbmVkIGltYWdlcyBwYWludC4KKworICAgICAgICBSZW1vdmUgc29tZSBpbmNvcnJlY3Qg aW1hZ2UgcGFpbnRpbmcgY29kZSBpbiBCb3hQYWludGVyOjpwYWludEJveCgpLgorCisgICAgICAg ICogZGlzcGxheS9EaXNwbGF5VHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGlz cGxheTo6VHJlZUJ1aWxkZXI6OnJlY3Vyc2l2ZUJ1aWxkRGlzcGxheVRyZWUgY29uc3QpOgorICAg ICAgICAqIGRpc3BsYXkvY3NzL0Rpc3BsYXlCb3hQYWludGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkRpc3BsYXk6OkJveFBhaW50ZXI6OnBhaW50Qm94KToKKyAgICAgICAgKiBkaXNwbGF5L2Nz cy9EaXNwbGF5Q1NTUGFpbnRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpDU1NQ YWludGVyOjpyZWN1cnNpdmVQYWludERlc2NlbmRhbnRzRm9yUGhhc2UpOgorICAgICAgICAoV2Vi Q29yZTo6RGlzcGxheTo6Q1NTUGFpbnRlcjo6cmVjdXJzaXZlUGFpbnREZXNjZW5kYW50cyk6Cisg ICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpDU1NQYWludGVyOjpwYWludEF0b21pY2FsbHlQYWlu dGVkQm94KToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkNTU1BhaW50ZXI6OnBhaW50U3Rh Y2tpbmdDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkNTU1BhaW50ZXI6OnBh cnRpY2lwYXRlc0luWk9yZGVyU29ydGluZyk6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpD U1NQYWludGVyOjpjb2xsZWN0U3RhY2tpbmdDb250ZXh0RGVzY2VuZGFudHMpOgorICAgICAgICAo V2ViQ29yZTo6RGlzcGxheTo6Q1NTUGFpbnRlcjo6cmVjdXJzaXZlQ29sbGVjdExheWVycyk6Cisg ICAgICAgICogZGlzcGxheS9jc3MvRGlzcGxheUNTU1BhaW50ZXIuaDoKKwogMjAyMC0xMS0yMSAg U2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBQcm9wYWdh dGUgdGhlICd3aGVlbEV2ZW50R2VzdHVyZXNCZWNvbWVOb25CbG9ja2luZycgc2V0dGluZyB0byB0 aGUgU2Nyb2xsaW5nVHJlZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZGlzcGxheS9EaXNw bGF5VHJlZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvZGlzcGxheS9EaXNwbGF5VHJlZUJ1 aWxkZXIuY3BwCmluZGV4IGYyNjg1YWY5ZDM4NmQwNWM1MGNiNmIwNWI5YTM0Zjg1MTYyZTIyNWUu Ljc4MGZlMDRhY2Y1YWIyN2U5NjAxOTlmMzhlYjU5YjRlN2YzOTg1MmIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2Rpc3BsYXkvRGlzcGxheVRyZWVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9kaXNwbGF5L0Rpc3BsYXlUcmVlQnVpbGRlci5jcHAKQEAgLTE0MSw4ICsxNDEsOSBA QCB2b2lkIFRyZWVCdWlsZGVyOjpyZWN1cnNpdmVCdWlsZERpc3BsYXlUcmVlKGNvbnN0IExheW91 dDo6TGF5b3V0U3RhdGUmIGxheW91dFN0YQogICAgIG9mZnNldEZyb21Sb290ICs9IHRvTGF5b3V0 U2l6ZShib3JkZXJCb3hSZWN0LmxvY2F0aW9uKCkpOwogCiAgICAgYXV0byBwb3NpdGlvbkZvckNo aWxkcmVuID0gSW5zZXJ0aW9uUG9zaXRpb24geyBkb3duY2FzdDxDb250YWluZXJCb3g+KCppbnNl cnRpb25Qb3NpdGlvbi5jdXJyZW50Q2hpbGQpIH07Ci0gICAgCi0gICAgaWYgKGxheW91dENvbnRh aW5lckJveC5lc3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkpIHsKKworICAgIC8v IEZJWE1FOiBUaGlzIGNhbiBkb3VibGUtYWRkIHNvbWUgYm94ZXMgYXMgY2hpbGRyZW4gKGUuZy4g cmVwbGFjZWQgZWxlbWVudCBib3hlcykuCisgICAgaWYgKGxheW91dENvbnRhaW5lckJveC5lc3Rh Ymxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkpCiAgICAgICAgIGJ1aWxkSW5saW5lRGlz cGxheVRyZWUobGF5b3V0U3RhdGUsIG9mZnNldEZyb21Sb290LCBkb3duY2FzdDxMYXlvdXQ6OkNv bnRhaW5lckJveD4obGF5b3V0Q29udGFpbmVyQm94KSwgcG9zaXRpb25Gb3JDaGlsZHJlbik7CiAg ICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5 L2Nzcy9EaXNwbGF5Qm94UGFpbnRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9E aXNwbGF5Qm94UGFpbnRlci5jcHAKaW5kZXggYjA2ZWUwM2M1MTZiZTUwYzNmNjViZmFlNzBkMTAy OGY0Yjg5NzQ0My4uMWY2NWJiZmMwM2ExNmMzNzBmOGVhYzU5MmNiYzk4Yjk3NDY1YzU3NyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheUJveFBhaW50ZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlCb3hQYWludGVyLmNwcApA QCAtOTQsMTYgKzk0LDYgQEAgdm9pZCBCb3hQYWludGVyOjpwYWludEJveChjb25zdCBCb3gmIGJv eCwgUGFpbnRpbmdDb250ZXh0JiBwYWludGluZ0NvbnRleHQsIGNvbnMKICAgICBpZiAoIWRpcnR5 UmVjdC5pbnRlcnNlY3RzKGVuY2xvc2luZ0ludFJlY3QoYWJzb2x1dGVSZWN0KSkpCiAgICAgICAg IHJldHVybjsKIAotICAgIGlmIChpczxJbWFnZUJveD4oYm94KSkgewotICAgICAgICBhdXRvJiBp bWFnZUJveCA9IGRvd25jYXN0PEltYWdlQm94Pihib3gpOwotICAgICAgICAKLSAgICAgICAgYXV0 byogaW1hZ2UgPSBpbWFnZUJveC5pbWFnZSgpOwotICAgICAgICBhdXRvIGltYWdlUmVjdCA9IGlt YWdlQm94LnJlcGxhY2VkQ29udGVudFJlY3QoKTsKLQotICAgICAgICBpZiAoaW1hZ2UpCi0gICAg ICAgICAgICBwYWludGluZ0NvbnRleHQuY29udGV4dC5kcmF3SW1hZ2UoKmltYWdlLCBpbWFnZVJl Y3QpOwotICAgIH0KLQogICAgIGlmIChpczxCb3hNb2RlbEJveD4oYm94KSkKICAgICAgICAgcGFp bnRCb3hEZWNvcmF0aW9ucyhkb3duY2FzdDxCb3hNb2RlbEJveD4oYm94KSwgcGFpbnRpbmdDb250 ZXh0KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheUNT U1BhaW50ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheUNTU1BhaW50 ZXIuY3BwCmluZGV4IDIwYTE0YmQ0Y2M4MTdhOGZhNTdhOWNiMWQ4OTNlMTZlYjI5MTI4NWIuLjUw YmM0ZTA4OTc3ZGI0YjZhOGE3NTZiYzU5MWNlOGY5MTc1ZDYwZjIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlDU1NQYWludGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5Q1NTUGFpbnRlci5jcHAKQEAgLTQwLDExICs0MCwx MSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgRGlzcGxheSB7CiAKIC8vIEZJWE1F OiBNYWtlIHRoaXMgYW4gaXRlcmF0b3IuCi12b2lkIENTU1BhaW50ZXI6OnJlY3Vyc2l2ZVBhaW50 RGVzY2VuZGFudHMoY29uc3QgQ29udGFpbmVyQm94JiBjb250YWluZXJCb3gsIFBhaW50aW5nQ29u dGV4dCYgcGFpbnRpbmdDb250ZXh0LCBQYWludFBoYXNlIHBhaW50UGhhc2UpCit2b2lkIENTU1Bh aW50ZXI6OnJlY3Vyc2l2ZVBhaW50RGVzY2VuZGFudHNGb3JQaGFzZShjb25zdCBDb250YWluZXJC b3gmIGNvbnRhaW5lckJveCwgUGFpbnRpbmdDb250ZXh0JiBwYWludGluZ0NvbnRleHQsIFBhaW50 UGhhc2UgcGFpbnRQaGFzZSkKIHsKICAgICBmb3IgKGNvbnN0IGF1dG8qIGNoaWxkID0gY29udGFp bmVyQm94LmZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkp IHsKICAgICAgICAgYXV0byYgYm94ID0gKmNoaWxkOwotICAgICAgICBpZiAoaXNTdGFja2luZ0Nv bnRleHRQYWludGluZ0JvdW5kYXJ5KGJveCkpCisgICAgICAgIGlmIChwYXJ0aWNpcGF0ZXNJblpP cmRlclNvcnRpbmcoYm94KSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgIHN3aXRj aCAocGFpbnRQaGFzZSkgewpAQCAtNjEsNTcgKzYxLDU0IEBAIHZvaWQgQ1NTUGFpbnRlcjo6cmVj dXJzaXZlUGFpbnREZXNjZW5kYW50cyhjb25zdCBDb250YWluZXJCb3gmIGNvbnRhaW5lckJveCwg UGFpCiAgICAgICAgICAgICAgICAgQm94UGFpbnRlcjo6cGFpbnRCb3hDb250ZW50KGJveCwgcGFp bnRpbmdDb250ZXh0KTsKICAgICAgICAgfTsKICAgICAgICAgaWYgKGlzPENvbnRhaW5lckJveD4o Ym94KSkKLSAgICAgICAgICAgIHJlY3Vyc2l2ZVBhaW50RGVzY2VuZGFudHMoZG93bmNhc3Q8Q29u dGFpbmVyQm94Pihib3gpLCBwYWludGluZ0NvbnRleHQsIHBhaW50UGhhc2UpOworICAgICAgICAg ICAgcmVjdXJzaXZlUGFpbnREZXNjZW5kYW50c0ZvclBoYXNlKGRvd25jYXN0PENvbnRhaW5lckJv eD4oYm94KSwgcGFpbnRpbmdDb250ZXh0LCBwYWludFBoYXNlKTsKICAgICB9CiB9CiAKLXZvaWQg Q1NTUGFpbnRlcjo6cGFpbnRTdGFja2luZ0NvbnRleHQoY29uc3QgQm94TW9kZWxCb3gmIGNvbnRl eHRSb290LCBQYWludGluZ0NvbnRleHQmIHBhaW50aW5nQ29udGV4dCwgY29uc3QgSW50UmVjdCYg ZGlydHlSZWN0KQordm9pZCBDU1NQYWludGVyOjpyZWN1cnNpdmVQYWludERlc2NlbmRhbnRzKGNv bnN0IENvbnRhaW5lckJveCYgY29udGFpbmVyQm94LCBQYWludGluZ0NvbnRleHQmIHBhaW50aW5n Q29udGV4dCkKIHsKLSAgICBVTlVTRURfUEFSQU0oZGlydHlSZWN0KTsKKyAgICAvLyBGb3IgYWxs IGl0cyBpbi1mbG93LCBub24tcG9zaXRpb25lZCwgYmxvY2stbGV2ZWwgZGVzY2VuZGFudHMgaW4g dHJlZSBvcmRlcjogSWYgdGhlIGVsZW1lbnQgaXMgYSBibG9jaywgbGlzdC1pdGVtLCBvciBvdGhl ciBibG9jayBlcXVpdmFsZW50OgorICAgIC8vIEJveCBkZWNvcmF0aW9ucy4KKyAgICAvLyBUYWJs ZSBkZWNvcmF0aW9ucy4KKyAgICByZWN1cnNpdmVQYWludERlc2NlbmRhbnRzRm9yUGhhc2UoY29u dGFpbmVyQm94LCBwYWludGluZ0NvbnRleHQsIFBhaW50UGhhc2U6OkJsb2NrQmFja2dyb3VuZHMp OworCisgICAgLy8gQWxsIG5vbi1wb3NpdGlvbmVkIGZsb2F0aW5nIGRlc2NlbmRhbnRzLCBpbiB0 cmVlIG9yZGVyLiBGb3IgZWFjaCBvbmUgb2YgdGhlc2UsIHRyZWF0IHRoZSBlbGVtZW50IGFzIGlm IGl0IGNyZWF0ZWQgYSBuZXcgc3RhY2tpbmcgY29udGV4dCwKKyAgICAvLyBidXQgYW55IHBvc2l0 aW9uZWQgZGVzY2VuZGFudHMgYW5kIGRlc2NlbmRhbnRzIHdoaWNoIGFjdHVhbGx5IGNyZWF0ZSBh IG5ldyBzdGFja2luZyBjb250ZXh0IHNob3VsZCBiZSBjb25zaWRlcmVkIHBhcnQgb2YgdGhlIHBh cmVudAorICAgIC8vIHN0YWNraW5nIGNvbnRleHQsIG5vdCB0aGlzIG5ldyBvbmUuCisgICAgcmVj dXJzaXZlUGFpbnREZXNjZW5kYW50c0ZvclBoYXNlKGNvbnRhaW5lckJveCwgcGFpbnRpbmdDb250 ZXh0LCBQYWludFBoYXNlOjpGbG9hdHMpOworCisgICAgLy8gSWYgdGhlIGVsZW1lbnQgaXMgYW4g aW5saW5lIGVsZW1lbnQgdGhhdCBnZW5lcmF0ZXMgYSBzdGFja2luZyBjb250ZXh0LCB0aGVuOgor ICAgIC8vIEZJWE1FOiBIYW5kbGUgdGhpcyBjYXNlLgogICAgIAotICAgIEJveFBhaW50ZXI6OnBh aW50Qm94RGVjb3JhdGlvbnMoY29udGV4dFJvb3QsIHBhaW50aW5nQ29udGV4dCk7Ci0KLSAgICBh dXRvIHBhaW50RGVzY2VuZGFudHMgPSBbJl0oY29uc3QgQ29udGFpbmVyQm94JiBjb250YWluZXJC b3gpIHsKLSAgICAgICAgLy8gRm9yIGFsbCBpdHMgaW4tZmxvdywgbm9uLXBvc2l0aW9uZWQsIGJs b2NrLWxldmVsIGRlc2NlbmRhbnRzIGluIHRyZWUgb3JkZXI6IElmIHRoZSBlbGVtZW50IGlzIGEg YmxvY2ssIGxpc3QtaXRlbSwgb3Igb3RoZXIgYmxvY2sgZXF1aXZhbGVudDoKLSAgICAgICAgLy8g Qm94IGRlY29yYXRpb25zLgotICAgICAgICAvLyBUYWJsZSBkZWNvcmF0aW9ucy4KLSAgICAgICAg cmVjdXJzaXZlUGFpbnREZXNjZW5kYW50cyhjb250YWluZXJCb3gsIHBhaW50aW5nQ29udGV4dCwg UGFpbnRQaGFzZTo6QmxvY2tCYWNrZ3JvdW5kcyk7Ci0KLSAgICAgICAgLy8gQWxsIG5vbi1wb3Np dGlvbmVkIGZsb2F0aW5nIGRlc2NlbmRhbnRzLCBpbiB0cmVlIG9yZGVyLiBGb3IgZWFjaCBvbmUg b2YgdGhlc2UsIHRyZWF0IHRoZSBlbGVtZW50IGFzIGlmIGl0IGNyZWF0ZWQgYSBuZXcgc3RhY2tp bmcgY29udGV4dCwKLSAgICAgICAgLy8gYnV0IGFueSBwb3NpdGlvbmVkIGRlc2NlbmRhbnRzIGFu ZCBkZXNjZW5kYW50cyB3aGljaCBhY3R1YWxseSBjcmVhdGUgYSBuZXcgc3RhY2tpbmcgY29udGV4 dCBzaG91bGQgYmUgY29uc2lkZXJlZCBwYXJ0IG9mIHRoZSBwYXJlbnQKLSAgICAgICAgLy8gc3Rh Y2tpbmcgY29udGV4dCwgbm90IHRoaXMgbmV3IG9uZS4KLSAgICAgICAgcmVjdXJzaXZlUGFpbnRE ZXNjZW5kYW50cyhjb250YWluZXJCb3gsIHBhaW50aW5nQ29udGV4dCwgUGFpbnRQaGFzZTo6Rmxv YXRzKTsKLQotICAgICAgICAvLyBJZiB0aGUgZWxlbWVudCBpcyBhbiBpbmxpbmUgZWxlbWVudCB0 aGF0IGdlbmVyYXRlcyBhIHN0YWNraW5nIGNvbnRleHQsIHRoZW46Ci0gICAgICAgIC8vIEZJWE1F OiBIYW5kbGUgdGhpcyBjYXNlLgotICAgICAgICAKLSAgICAgICAgLy8gT3RoZXJ3aXNlOiBmaXJz dCBmb3IgdGhlIGVsZW1lbnQsIHRoZW4gZm9yIGFsbCBpdHMgaW4tZmxvdywgbm9uLXBvc2l0aW9u ZWQsIGJsb2NrLWxldmVsIGRlc2NlbmRhbnRzIGluIHRyZWUgb3JkZXI6Ci0gICAgICAgIC8vIDEu IElmIHRoZSBlbGVtZW50IGlzIGEgYmxvY2stbGV2ZWwgcmVwbGFjZWQgZWxlbWVudCwgdGhlbjog dGhlIHJlcGxhY2VkIGNvbnRlbnQsIGF0b21pY2FsbHkuCi0gICAgICAgIC8vIDIuIE90aGVyd2lz ZSwgZm9yIGVhY2ggbGluZSBib3ggb2YgdGhhdCBlbGVtZW50Li4uCi0gICAgICAgIHJlY3Vyc2l2 ZVBhaW50RGVzY2VuZGFudHMoY29udGFpbmVyQm94LCBwYWludGluZ0NvbnRleHQsIFBhaW50UGhh c2U6OkJsb2NrRm9yZWdyb3VuZHMpOwotICAgIH07Ci0KLSAgICBpZiAoaXM8Q29udGFpbmVyQm94 Pihjb250ZXh0Um9vdCkpIHsKLSAgICAgICAgYXV0byYgY29udGFpbmVyQm94ID0gZG93bmNhc3Q8 Q29udGFpbmVyQm94Pihjb250ZXh0Um9vdCk7CisgICAgLy8gT3RoZXJ3aXNlOiBmaXJzdCBmb3Ig dGhlIGVsZW1lbnQsIHRoZW4gZm9yIGFsbCBpdHMgaW4tZmxvdywgbm9uLXBvc2l0aW9uZWQsIGJs b2NrLWxldmVsIGRlc2NlbmRhbnRzIGluIHRyZWUgb3JkZXI6CisgICAgLy8gMS4gSWYgdGhlIGVs ZW1lbnQgaXMgYSBibG9jay1sZXZlbCByZXBsYWNlZCBlbGVtZW50LCB0aGVuOiB0aGUgcmVwbGFj ZWQgY29udGVudCwgYXRvbWljYWxseS4KKyAgICAvLyAyLiBPdGhlcndpc2UsIGZvciBlYWNoIGxp bmUgYm94IG9mIHRoYXQgZWxlbWVudC4uLgorICAgIHJlY3Vyc2l2ZVBhaW50RGVzY2VuZGFudHNG b3JQaGFzZShjb250YWluZXJCb3gsIHBhaW50aW5nQ29udGV4dCwgUGFpbnRQaGFzZTo6QmxvY2tG b3JlZ3JvdW5kcyk7Cit9CiAKLSAgICAgICAgVmVjdG9yPGNvbnN0IEJveE1vZGVsQm94Kj4gbmVn YXRpdmVaT3JkZXJMaXN0OwotICAgICAgICBWZWN0b3I8Y29uc3QgQm94TW9kZWxCb3gqPiBwb3Np dGl2ZVpPcmRlckxpc3Q7Cit2b2lkIENTU1BhaW50ZXI6OnBhaW50QXRvbWljYWxseVBhaW50ZWRC b3goY29uc3QgQm94JiBib3gsIFBhaW50aW5nQ29udGV4dCYgcGFpbnRpbmdDb250ZXh0LCBjb25z dCBJbnRSZWN0JiBkaXJ0eVJlY3QsIEluY2x1ZGVTdGFja2luZ0NvbnRleHREZXNjZW5kYW50cyBp bmNsdWRlU3RhY2tpbmdDb250ZXh0RGVzY2VuZGFudHMpCit7CisgICAgVU5VU0VEX1BBUkFNKGRp cnR5UmVjdCk7CiAgICAgCi0gICAgICAgIHJlY3Vyc2l2ZUNvbGxlY3RMYXllcnMoY29udGFpbmVy Qm94LCBuZWdhdGl2ZVpPcmRlckxpc3QsIHBvc2l0aXZlWk9yZGVyTGlzdCk7CisgICAgQm94UGFp bnRlcjo6cGFpbnRCb3goYm94LCBwYWludGluZ0NvbnRleHQsIGRpcnR5UmVjdCk7CisgICAgaWYg KCFpczxDb250YWluZXJCb3g+KGJveCkpCisgICAgICAgIHJldHVybjsKIAotICAgICAgICBhdXRv IGNvbXBhcmVaSW5kZXggPSBbXSAoY29uc3QgQm94TW9kZWxCb3gqIGEsIGNvbnN0IEJveE1vZGVs Qm94KiBiKSB7Ci0gICAgICAgICAgICByZXR1cm4gYS0+c3R5bGUoKS56SW5kZXgoKS52YWx1ZU9y KDApIDwgYi0+c3R5bGUoKS56SW5kZXgoKS52YWx1ZU9yKDApOwotICAgICAgICB9OworICAgIGF1 dG8mIGNvbnRhaW5lckJveCA9IGRvd25jYXN0PENvbnRhaW5lckJveD4oYm94KTsKIAotICAgICAg ICBzdGQ6OnN0YWJsZV9zb3J0KHBvc2l0aXZlWk9yZGVyTGlzdC5iZWdpbigpLCBwb3NpdGl2ZVpP cmRlckxpc3QuZW5kKCksIGNvbXBhcmVaSW5kZXgpOwotICAgICAgICBzdGQ6OnN0YWJsZV9zb3J0 KG5lZ2F0aXZlWk9yZGVyTGlzdC5iZWdpbigpLCBuZWdhdGl2ZVpPcmRlckxpc3QuZW5kKCksIGNv bXBhcmVaSW5kZXgpOworICAgIFZlY3Rvcjxjb25zdCBCb3hNb2RlbEJveCo+IG5lZ2F0aXZlWk9y ZGVyTGlzdDsKKyAgICBWZWN0b3I8Y29uc3QgQm94TW9kZWxCb3gqPiBwb3NpdGl2ZVpPcmRlckxp c3Q7CisgICAgaWYgKGluY2x1ZGVTdGFja2luZ0NvbnRleHREZXNjZW5kYW50cyA9PSBJbmNsdWRl U3RhY2tpbmdDb250ZXh0RGVzY2VuZGFudHM6OlllcykgeworICAgICAgICBjb2xsZWN0U3RhY2tp bmdDb250ZXh0RGVzY2VuZGFudHMoY29udGFpbmVyQm94LCBuZWdhdGl2ZVpPcmRlckxpc3QsIHBv c2l0aXZlWk9yZGVyTGlzdCk7CiAKICAgICAgICAgLy8gU3RhY2tpbmcgY29udGV4dHMgZm9ybWVk IGJ5IHBvc2l0aW9uZWQgZGVzY2VuZGFudHMgd2l0aCBuZWdhdGl2ZSB6LWluZGljZXMgKGV4Y2x1 ZGluZyAwKSBpbiB6LWluZGV4IG9yZGVyIChtb3N0IG5lZ2F0aXZlIGZpcnN0KSB0aGVuIHRyZWUg b3JkZXIuCiAgICAgICAgIGZvciAoYXV0byogYm94IDogbmVnYXRpdmVaT3JkZXJMaXN0KQogICAg ICAgICAgICAgcGFpbnRTdGFja2luZ0NvbnRleHQoKmJveCwgcGFpbnRpbmdDb250ZXh0LCBkaXJ0 eVJlY3QpOworICAgIH0KIAotICAgICAgICBwYWludERlc2NlbmRhbnRzKGNvbnRhaW5lckJveCk7 CisgICAgcmVjdXJzaXZlUGFpbnREZXNjZW5kYW50cyhjb250YWluZXJCb3gsIHBhaW50aW5nQ29u dGV4dCk7CiAKKyAgICBpZiAoaW5jbHVkZVN0YWNraW5nQ29udGV4dERlc2NlbmRhbnRzID09IElu Y2x1ZGVTdGFja2luZ0NvbnRleHREZXNjZW5kYW50czo6WWVzKSB7CiAgICAgICAgIC8vIEFsbCBw b3NpdGlvbmVkIGRlc2NlbmRhbnRzIHdpdGggJ3otaW5kZXg6IGF1dG8nIG9yICd6LWluZGV4OiAw JywgaW4gdHJlZSBvcmRlci4gRm9yIHRob3NlIHdpdGggJ3otaW5kZXg6IGF1dG8nLCB0cmVhdCB0 aGUgZWxlbWVudAogICAgICAgICAvLyBhcyBpZiBpdCBjcmVhdGVkIGEgbmV3IHN0YWNraW5nIGNv bnRleHQsIGJ1dCBhbnkgcG9zaXRpb25lZCBkZXNjZW5kYW50cyBhbmQgZGVzY2VuZGFudHMgd2hp Y2ggYWN0dWFsbHkgY3JlYXRlIGEgbmV3IHN0YWNraW5nIGNvbnRleHQKICAgICAgICAgLy8gc2hv dWxkIGJlIGNvbnNpZGVyZWQgcGFydCBvZiB0aGUgcGFyZW50IHN0YWNraW5nIGNvbnRleHQsIG5v dCB0aGlzIG5ldyBvbmUuIEZvciB0aG9zZSB3aXRoICd6LWluZGV4OiAwJywgdHJlYXQgdGhlIHN0 YWNraW5nIGNvbnRleHQKQEAgLTExOSwyMCArMTE2LDM5IEBAIHZvaWQgQ1NTUGFpbnRlcjo6cGFp bnRTdGFja2luZ0NvbnRleHQoY29uc3QgQm94TW9kZWxCb3gmIGNvbnRleHRSb290LCBQYWludGlu Z0NvCiAgICAgICAgIGZvciAoYXV0byogYm94IDogcG9zaXRpdmVaT3JkZXJMaXN0KSB7CiAgICAg ICAgICAgICBpZiAoYm94LT5zdHlsZSgpLmlzU3RhY2tpbmdDb250ZXh0KCkpCiAgICAgICAgICAg ICAgICAgcGFpbnRTdGFja2luZ0NvbnRleHQoKmJveCwgcGFpbnRpbmdDb250ZXh0LCBkaXJ0eVJl Y3QpOwotICAgICAgICAgICAgZWxzZSBpZiAoaXM8Q29udGFpbmVyQm94PigqYm94KSkgewotICAg ICAgICAgICAgICAgIEJveFBhaW50ZXI6OnBhaW50Qm94RGVjb3JhdGlvbnMoKmJveCwgcGFpbnRp bmdDb250ZXh0KTsKLSAgICAgICAgICAgICAgICBwYWludERlc2NlbmRhbnRzKGRvd25jYXN0PENv bnRhaW5lckJveD4oKmJveCkpOwotICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAg Qm94UGFpbnRlcjo6cGFpbnRCb3goKmJveCwgcGFpbnRpbmdDb250ZXh0LCBkaXJ0eVJlY3QpOwor ICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHBhaW50QXRvbWljYWxseVBhaW50ZWRC b3goKmJveCwgcGFpbnRpbmdDb250ZXh0LCBkaXJ0eVJlY3QpOwogICAgICAgICB9CiAgICAgfQog fQogCit2b2lkIENTU1BhaW50ZXI6OnBhaW50U3RhY2tpbmdDb250ZXh0KGNvbnN0IEJveE1vZGVs Qm94JiBjb250ZXh0Um9vdCwgUGFpbnRpbmdDb250ZXh0JiBwYWludGluZ0NvbnRleHQsIGNvbnN0 IEludFJlY3QmIGRpcnR5UmVjdCkKK3sKKyAgICBwYWludEF0b21pY2FsbHlQYWludGVkQm94KGNv bnRleHRSb290LCBwYWludGluZ0NvbnRleHQsIGRpcnR5UmVjdCwgSW5jbHVkZVN0YWNraW5nQ29u dGV4dERlc2NlbmRhbnRzOjpZZXMpOworfQorCiBib29sIENTU1BhaW50ZXI6OmlzU3RhY2tpbmdD b250ZXh0UGFpbnRpbmdCb3VuZGFyeShjb25zdCBCb3gmIGJveCkKIHsKICAgICByZXR1cm4gYm94 LnN0eWxlKCkuaXNTdGFja2luZ0NvbnRleHQoKTsKIH0KIAorYm9vbCBDU1NQYWludGVyOjpwYXJ0 aWNpcGF0ZXNJblpPcmRlclNvcnRpbmcoY29uc3QgQm94JiBib3gpCit7CisgICAgcmV0dXJuIGJv eC5zdHlsZSgpLnBhcnRpY2lwYXRlc0luWk9yZGVyU29ydGluZygpOworfQorCit2b2lkIENTU1Bh aW50ZXI6OmNvbGxlY3RTdGFja2luZ0NvbnRleHREZXNjZW5kYW50cyhjb25zdCBDb250YWluZXJC b3gmIGNvbnRhaW5lckJveCwgVmVjdG9yPGNvbnN0IEJveE1vZGVsQm94Kj4mIG5lZ2F0aXZlWk9y ZGVyTGlzdCwgVmVjdG9yPGNvbnN0IEJveE1vZGVsQm94Kj4mIHBvc2l0aXZlWk9yZGVyTGlzdCkK K3sKKyAgICByZWN1cnNpdmVDb2xsZWN0TGF5ZXJzKGNvbnRhaW5lckJveCwgbmVnYXRpdmVaT3Jk ZXJMaXN0LCBwb3NpdGl2ZVpPcmRlckxpc3QpOworCisgICAgYXV0byBjb21wYXJlWkluZGV4ID0g W10gKGNvbnN0IEJveE1vZGVsQm94KiBhLCBjb25zdCBCb3hNb2RlbEJveCogYikgeworICAgICAg ICByZXR1cm4gYS0+c3R5bGUoKS56SW5kZXgoKS52YWx1ZU9yKDApIDwgYi0+c3R5bGUoKS56SW5k ZXgoKS52YWx1ZU9yKDApOworICAgIH07CisKKyAgICBzdGQ6OnN0YWJsZV9zb3J0KHBvc2l0aXZl Wk9yZGVyTGlzdC5iZWdpbigpLCBwb3NpdGl2ZVpPcmRlckxpc3QuZW5kKCksIGNvbXBhcmVaSW5k ZXgpOworICAgIHN0ZDo6c3RhYmxlX3NvcnQobmVnYXRpdmVaT3JkZXJMaXN0LmJlZ2luKCksIG5l Z2F0aXZlWk9yZGVyTGlzdC5lbmQoKSwgY29tcGFyZVpJbmRleCk7Cit9CisKIHZvaWQgQ1NTUGFp bnRlcjo6cmVjdXJzaXZlQ29sbGVjdExheWVycyhjb25zdCBDb250YWluZXJCb3gmIGNvbnRhaW5l ckJveCwgVmVjdG9yPGNvbnN0IEJveE1vZGVsQm94Kj4mIG5lZ2F0aXZlWk9yZGVyTGlzdCwgVmVj dG9yPGNvbnN0IEJveE1vZGVsQm94Kj4mIHBvc2l0aXZlWk9yZGVyTGlzdCkKIHsKICAgICBmb3Ig KGNvbnN0IGF1dG8qIGNoaWxkID0gY29udGFpbmVyQm94LmZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNo aWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpIHsKQEAgLTE0MCw3ICsxNTYsNiBAQCB2b2lkIENT U1BhaW50ZXI6OnJlY3Vyc2l2ZUNvbGxlY3RMYXllcnMoY29uc3QgQ29udGFpbmVyQm94JiBjb250 YWluZXJCb3gsIFZlY3RvcgogICAgICAgICAgICAgYXV0byYgY2hpbGRCb3ggPSBkb3duY2FzdDxC b3hNb2RlbEJveD4oKmNoaWxkKTsKIAogICAgICAgICAgICAgYXV0byB6SW5kZXggPSBjaGlsZEJv eC5zdHlsZSgpLnpJbmRleCgpLnZhbHVlT3IoMCk7Ci0KICAgICAgICAgICAgIGlmICh6SW5kZXgg PCAwKQogICAgICAgICAgICAgICAgIG5lZ2F0aXZlWk9yZGVyTGlzdC5hcHBlbmQoJmNoaWxkQm94 KTsKICAgICAgICAgICAgIGVsc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkv Y3NzL0Rpc3BsYXlDU1NQYWludGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNw bGF5Q1NTUGFpbnRlci5oCmluZGV4IDk1YzZmYjg4OTg4NTg4YTU5NTBiNzEyMTZkMTdmMDkwNmUx MzM4YmEuLjFhNDgxMGJiMmEzNzk3NDNhMWJkOGVlOWU3YThmNmY4OGU0NjA0ODcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlDU1NQYWludGVyLmgKKysrIGIv U291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheUNTU1BhaW50ZXIuaApAQCAtNDgsNyAr NDgsNiBAQCBzdHJ1Y3QgUGFpbnRpbmdDb250ZXh0OwogCiBjbGFzcyBDU1NQYWludGVyIHsKIHB1 YmxpYzoKLSAgICBzdGF0aWMgdm9pZCBwYWludFN0YWNraW5nQ29udGV4dChjb25zdCBCb3hNb2Rl bEJveCYsIFBhaW50aW5nQ29udGV4dCYsIGNvbnN0IEludFJlY3QmIGRpcnR5UmVjdCk7CiAgICAg c3RhdGljIHZvaWQgcGFpbnRUcmVlKGNvbnN0IFRyZWUmLCBQYWludGluZ0NvbnRleHQmLCBjb25z dCBJbnRSZWN0JiBkaXJ0eVJlY3QpOwogCiBwcml2YXRlOgpAQCAtNTcsOSArNTYsMTggQEAgcHJp dmF0ZToKICAgICAgICAgRmxvYXRzLAogICAgICAgICBCbG9ja0ZvcmVncm91bmRzCiAgICAgfTsK LSAgICBzdGF0aWMgdm9pZCByZWN1cnNpdmVQYWludERlc2NlbmRhbnRzKGNvbnN0IENvbnRhaW5l ckJveCYsIFBhaW50aW5nQ29udGV4dCYsIFBhaW50UGhhc2UpOworICAgIHN0YXRpYyB2b2lkIHJl Y3Vyc2l2ZVBhaW50RGVzY2VuZGFudHMoY29uc3QgQ29udGFpbmVyQm94JiwgUGFpbnRpbmdDb250 ZXh0Jik7CisgICAgc3RhdGljIHZvaWQgcmVjdXJzaXZlUGFpbnREZXNjZW5kYW50c0ZvclBoYXNl KGNvbnN0IENvbnRhaW5lckJveCYsIFBhaW50aW5nQ29udGV4dCYsIFBhaW50UGhhc2UpOworCisg ICAgZW51bSBjbGFzcyBJbmNsdWRlU3RhY2tpbmdDb250ZXh0RGVzY2VuZGFudHMgeyBZZXMsIE5v IH07CisgICAgc3RhdGljIHZvaWQgcGFpbnRBdG9taWNhbGx5UGFpbnRlZEJveChjb25zdCBCb3gm LCBQYWludGluZ0NvbnRleHQmLCBjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QsIEluY2x1ZGVTdGFj a2luZ0NvbnRleHREZXNjZW5kYW50cyA9IEluY2x1ZGVTdGFja2luZ0NvbnRleHREZXNjZW5kYW50 czo6Tm8pOworCisgICAgc3RhdGljIHZvaWQgcGFpbnRTdGFja2luZ0NvbnRleHQoY29uc3QgQm94 TW9kZWxCb3gmLCBQYWludGluZ0NvbnRleHQmLCBjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QpOwog CiAgICAgc3RhdGljIGJvb2wgaXNTdGFja2luZ0NvbnRleHRQYWludGluZ0JvdW5kYXJ5KGNvbnN0 IEJveCYpOworICAgIHN0YXRpYyBib29sIHBhcnRpY2lwYXRlc0luWk9yZGVyU29ydGluZyhjb25z dCBCb3gmKTsKKworICAgIHN0YXRpYyB2b2lkIGNvbGxlY3RTdGFja2luZ0NvbnRleHREZXNjZW5k YW50cyhjb25zdCBDb250YWluZXJCb3gmLCBWZWN0b3I8Y29uc3QgQm94TW9kZWxCb3gqPiYgbmVn YXRpdmVaT3JkZXJMaXN0LCBWZWN0b3I8Y29uc3QgQm94TW9kZWxCb3gqPiYgcG9zaXRpdmVaT3Jk ZXJMaXN0KTsKICAgICBzdGF0aWMgdm9pZCByZWN1cnNpdmVDb2xsZWN0TGF5ZXJzKGNvbnN0IENv bnRhaW5lckJveCYsIFZlY3Rvcjxjb25zdCBCb3hNb2RlbEJveCo+JiBuZWdhdGl2ZVpPcmRlckxp c3QsIFZlY3Rvcjxjb25zdCBCb3hNb2RlbEJveCo+JiBwb3NpdGl2ZVpPcmRlckxpc3QpOwogfTsK IAo= 414952 2020-11-27 09:49:43 -0800 2020-11-27 10:50:48 -0800 Patch bug-219307-20201127094942.patch text/plain 13747 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWFjODM5YmUyNzZkZWJm YjRiYjYwZDMyMDg5NWIxNTU3MGMwMDJhNS4uYmM2NWJiZGFhNTU5N2JjNzdiMTFjNzczNDkwNGY5 NWIxMDkxN2JhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIwLTExLTIzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtMRkMgRGlzcGxh eV0gQ2xlYW4gdXAgQ1NTIHN0YWNraW5nIGNvbnRleHQgcGFpbnRpbmcgY29kZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5MzA3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xhcmlmeSB0aGUgY29kZSBp biBEaXNwbGF5OjpDU1NQYWludGVyIHRoYXQgcGFpbnRzIHN0YWNraW5nIGNvbnRleHRzIGFuZCBw b3NpdGlvbmVkCisgICAgICAgIGVsZW1lbnRzLiBOb24tc3RhY2tpbmcgcG9zaXRpb25lZCBlbGVt ZW50cyBwYWludCBhdG9taWNhbGx5LCBidXQgZG9uJ3QgcGFpbnQgZGVzY2VuZGFudAorICAgICAg ICBzdGFja2luZyBjb250ZXh0cyAoc29tZXRpbWVzIHRoZXNlIGFyZSBjYWxsZWQgInBzZXVkby1z dGFja2luZyBjb250ZXh0cyIgYnV0IHRoYXQgdGVybQorICAgICAgICBpcyBhdm9pZGVkIGhlcmUg dG8gcmVkdWNlIGNvbmZ1c2lvbikuIFNoYXJlIGNvZGUgYmV0d2VlbiBwYWludGluZyB0aGVzZSBh bmQgc3RhY2tpbmcKKyAgICAgICAgY29udGV4dHMgdmlhIHBhaW50QXRvbWljYWxseVBhaW50ZWRC b3goKS4KKworICAgICAgICBBbHNvIG1ha2Ugc3VyZSB3ZSBwYWludCB0aGUgY29udGVudHMgb2Yg bm9uLWNvbnRhaW5lciBjaGlsZCBib3hlcywgc28gdGhhdCB0aGluZ3MgbGlrZQorICAgICAgICBw b3NpdGlvbmVkIGltYWdlcyBwYWludC4KKworICAgICAgICBSZW1vdmUgc29tZSBpbmNvcnJlY3Qg aW1hZ2UgcGFpbnRpbmcgY29kZSBpbiBCb3hQYWludGVyOjpwYWludEJveCgpLgorCisgICAgICAg ICogZGlzcGxheS9EaXNwbGF5VHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGlz cGxheTo6VHJlZUJ1aWxkZXI6OnJlY3Vyc2l2ZUJ1aWxkRGlzcGxheVRyZWUgY29uc3QpOgorICAg ICAgICAqIGRpc3BsYXkvY3NzL0Rpc3BsYXlCb3hQYWludGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkRpc3BsYXk6OkJveFBhaW50ZXI6OnBhaW50Qm94KToKKyAgICAgICAgKiBkaXNwbGF5L2Nz cy9EaXNwbGF5Q1NTUGFpbnRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpDU1NQ YWludGVyOjpyZWN1cnNpdmVQYWludERlc2NlbmRhbnRzRm9yUGhhc2UpOgorICAgICAgICAoV2Vi Q29yZTo6RGlzcGxheTo6Q1NTUGFpbnRlcjo6cmVjdXJzaXZlUGFpbnREZXNjZW5kYW50cyk6Cisg ICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpDU1NQYWludGVyOjpwYWludEF0b21pY2FsbHlQYWlu dGVkQm94KToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkNTU1BhaW50ZXI6OnBhaW50U3Rh Y2tpbmdDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkNTU1BhaW50ZXI6OnBh cnRpY2lwYXRlc0luWk9yZGVyU29ydGluZyk6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpD U1NQYWludGVyOjpjb2xsZWN0U3RhY2tpbmdDb250ZXh0RGVzY2VuZGFudHMpOgorICAgICAgICAo V2ViQ29yZTo6RGlzcGxheTo6Q1NTUGFpbnRlcjo6cmVjdXJzaXZlQ29sbGVjdExheWVycyk6Cisg ICAgICAgICogZGlzcGxheS9jc3MvRGlzcGxheUNTU1BhaW50ZXIuaDoKKwogMjAyMC0xMS0yNyAg U2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDIERp c3BsYXldIEEgQ29udGFpbmVyQm94IGNhbiBlc3RhYmxpc2ggYW4gaW5saW5lIGZvcm1hdHRpbmcg Y29udGV4dCBhbmQgaGF2ZSBib3ggY2hpbGRyZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2Rpc3BsYXkvY3NzL0Rpc3BsYXlCb3hQYWludGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Rpc3Bs YXkvY3NzL0Rpc3BsYXlCb3hQYWludGVyLmNwcAppbmRleCBiMDZlZTAzYzUxNmJlNTBjM2Y2NWJm YWU3MGQxMDI4ZjRiODk3NDQzLi4xZjY1YmJmYzAzYTE2YzM3MGY4ZWFjNTkyY2JjOThiOTc0NjVj NTc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5Qm94UGFp bnRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheUJveFBhaW50 ZXIuY3BwCkBAIC05NCwxNiArOTQsNiBAQCB2b2lkIEJveFBhaW50ZXI6OnBhaW50Qm94KGNvbnN0 IEJveCYgYm94LCBQYWludGluZ0NvbnRleHQmIHBhaW50aW5nQ29udGV4dCwgY29ucwogICAgIGlm ICghZGlydHlSZWN0LmludGVyc2VjdHMoZW5jbG9zaW5nSW50UmVjdChhYnNvbHV0ZVJlY3QpKSkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKGlzPEltYWdlQm94Pihib3gpKSB7Ci0gICAgICAg IGF1dG8mIGltYWdlQm94ID0gZG93bmNhc3Q8SW1hZ2VCb3g+KGJveCk7Ci0gICAgICAgIAotICAg ICAgICBhdXRvKiBpbWFnZSA9IGltYWdlQm94LmltYWdlKCk7Ci0gICAgICAgIGF1dG8gaW1hZ2VS ZWN0ID0gaW1hZ2VCb3gucmVwbGFjZWRDb250ZW50UmVjdCgpOwotCi0gICAgICAgIGlmIChpbWFn ZSkKLSAgICAgICAgICAgIHBhaW50aW5nQ29udGV4dC5jb250ZXh0LmRyYXdJbWFnZSgqaW1hZ2Us IGltYWdlUmVjdCk7Ci0gICAgfQotCiAgICAgaWYgKGlzPEJveE1vZGVsQm94Pihib3gpKQogICAg ICAgICBwYWludEJveERlY29yYXRpb25zKGRvd25jYXN0PEJveE1vZGVsQm94Pihib3gpLCBwYWlu dGluZ0NvbnRleHQpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9E aXNwbGF5Q1NTUGFpbnRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5 Q1NTUGFpbnRlci5jcHAKaW5kZXggMjBhMTRiZDRjYzgxN2E4ZmE1N2E5Y2IxZDg5M2UxNmViMjkx Mjg1Yi4uNTBiYzRlMDg5NzdkYjRiNmE4YTc1NmJjNTkxY2U4ZjkxNzVkNjBmMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheUNTU1BhaW50ZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlDU1NQYWludGVyLmNwcApAQCAtNDAs MTEgKzQwLDExIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBEaXNwbGF5IHsKIAog Ly8gRklYTUU6IE1ha2UgdGhpcyBhbiBpdGVyYXRvci4KLXZvaWQgQ1NTUGFpbnRlcjo6cmVjdXJz aXZlUGFpbnREZXNjZW5kYW50cyhjb25zdCBDb250YWluZXJCb3gmIGNvbnRhaW5lckJveCwgUGFp bnRpbmdDb250ZXh0JiBwYWludGluZ0NvbnRleHQsIFBhaW50UGhhc2UgcGFpbnRQaGFzZSkKK3Zv aWQgQ1NTUGFpbnRlcjo6cmVjdXJzaXZlUGFpbnREZXNjZW5kYW50c0ZvclBoYXNlKGNvbnN0IENv bnRhaW5lckJveCYgY29udGFpbmVyQm94LCBQYWludGluZ0NvbnRleHQmIHBhaW50aW5nQ29udGV4 dCwgUGFpbnRQaGFzZSBwYWludFBoYXNlKQogewogICAgIGZvciAoY29uc3QgYXV0byogY2hpbGQg PSBjb250YWluZXJCb3guZmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNp YmxpbmcoKSkgewogICAgICAgICBhdXRvJiBib3ggPSAqY2hpbGQ7Ci0gICAgICAgIGlmIChpc1N0 YWNraW5nQ29udGV4dFBhaW50aW5nQm91bmRhcnkoYm94KSkKKyAgICAgICAgaWYgKHBhcnRpY2lw YXRlc0luWk9yZGVyU29ydGluZyhib3gpKQogICAgICAgICAgICAgY29udGludWU7CiAKICAgICAg ICAgc3dpdGNoIChwYWludFBoYXNlKSB7CkBAIC02MSw1NyArNjEsNTQgQEAgdm9pZCBDU1NQYWlu dGVyOjpyZWN1cnNpdmVQYWludERlc2NlbmRhbnRzKGNvbnN0IENvbnRhaW5lckJveCYgY29udGFp bmVyQm94LCBQYWkKICAgICAgICAgICAgICAgICBCb3hQYWludGVyOjpwYWludEJveENvbnRlbnQo Ym94LCBwYWludGluZ0NvbnRleHQpOwogICAgICAgICB9OwogICAgICAgICBpZiAoaXM8Q29udGFp bmVyQm94Pihib3gpKQotICAgICAgICAgICAgcmVjdXJzaXZlUGFpbnREZXNjZW5kYW50cyhkb3du Y2FzdDxDb250YWluZXJCb3g+KGJveCksIHBhaW50aW5nQ29udGV4dCwgcGFpbnRQaGFzZSk7Cisg ICAgICAgICAgICByZWN1cnNpdmVQYWludERlc2NlbmRhbnRzRm9yUGhhc2UoZG93bmNhc3Q8Q29u dGFpbmVyQm94Pihib3gpLCBwYWludGluZ0NvbnRleHQsIHBhaW50UGhhc2UpOwogICAgIH0KIH0K IAotdm9pZCBDU1NQYWludGVyOjpwYWludFN0YWNraW5nQ29udGV4dChjb25zdCBCb3hNb2RlbEJv eCYgY29udGV4dFJvb3QsIFBhaW50aW5nQ29udGV4dCYgcGFpbnRpbmdDb250ZXh0LCBjb25zdCBJ bnRSZWN0JiBkaXJ0eVJlY3QpCit2b2lkIENTU1BhaW50ZXI6OnJlY3Vyc2l2ZVBhaW50RGVzY2Vu ZGFudHMoY29uc3QgQ29udGFpbmVyQm94JiBjb250YWluZXJCb3gsIFBhaW50aW5nQ29udGV4dCYg cGFpbnRpbmdDb250ZXh0KQogewotICAgIFVOVVNFRF9QQVJBTShkaXJ0eVJlY3QpOworICAgIC8v IEZvciBhbGwgaXRzIGluLWZsb3csIG5vbi1wb3NpdGlvbmVkLCBibG9jay1sZXZlbCBkZXNjZW5k YW50cyBpbiB0cmVlIG9yZGVyOiBJZiB0aGUgZWxlbWVudCBpcyBhIGJsb2NrLCBsaXN0LWl0ZW0s IG9yIG90aGVyIGJsb2NrIGVxdWl2YWxlbnQ6CisgICAgLy8gQm94IGRlY29yYXRpb25zLgorICAg IC8vIFRhYmxlIGRlY29yYXRpb25zLgorICAgIHJlY3Vyc2l2ZVBhaW50RGVzY2VuZGFudHNGb3JQ aGFzZShjb250YWluZXJCb3gsIHBhaW50aW5nQ29udGV4dCwgUGFpbnRQaGFzZTo6QmxvY2tCYWNr Z3JvdW5kcyk7CisKKyAgICAvLyBBbGwgbm9uLXBvc2l0aW9uZWQgZmxvYXRpbmcgZGVzY2VuZGFu dHMsIGluIHRyZWUgb3JkZXIuIEZvciBlYWNoIG9uZSBvZiB0aGVzZSwgdHJlYXQgdGhlIGVsZW1l bnQgYXMgaWYgaXQgY3JlYXRlZCBhIG5ldyBzdGFja2luZyBjb250ZXh0LAorICAgIC8vIGJ1dCBh bnkgcG9zaXRpb25lZCBkZXNjZW5kYW50cyBhbmQgZGVzY2VuZGFudHMgd2hpY2ggYWN0dWFsbHkg Y3JlYXRlIGEgbmV3IHN0YWNraW5nIGNvbnRleHQgc2hvdWxkIGJlIGNvbnNpZGVyZWQgcGFydCBv ZiB0aGUgcGFyZW50CisgICAgLy8gc3RhY2tpbmcgY29udGV4dCwgbm90IHRoaXMgbmV3IG9uZS4K KyAgICByZWN1cnNpdmVQYWludERlc2NlbmRhbnRzRm9yUGhhc2UoY29udGFpbmVyQm94LCBwYWlu dGluZ0NvbnRleHQsIFBhaW50UGhhc2U6OkZsb2F0cyk7CisKKyAgICAvLyBJZiB0aGUgZWxlbWVu dCBpcyBhbiBpbmxpbmUgZWxlbWVudCB0aGF0IGdlbmVyYXRlcyBhIHN0YWNraW5nIGNvbnRleHQs IHRoZW46CisgICAgLy8gRklYTUU6IEhhbmRsZSB0aGlzIGNhc2UuCiAgICAgCi0gICAgQm94UGFp bnRlcjo6cGFpbnRCb3hEZWNvcmF0aW9ucyhjb250ZXh0Um9vdCwgcGFpbnRpbmdDb250ZXh0KTsK LQotICAgIGF1dG8gcGFpbnREZXNjZW5kYW50cyA9IFsmXShjb25zdCBDb250YWluZXJCb3gmIGNv bnRhaW5lckJveCkgewotICAgICAgICAvLyBGb3IgYWxsIGl0cyBpbi1mbG93LCBub24tcG9zaXRp b25lZCwgYmxvY2stbGV2ZWwgZGVzY2VuZGFudHMgaW4gdHJlZSBvcmRlcjogSWYgdGhlIGVsZW1l bnQgaXMgYSBibG9jaywgbGlzdC1pdGVtLCBvciBvdGhlciBibG9jayBlcXVpdmFsZW50OgotICAg ICAgICAvLyBCb3ggZGVjb3JhdGlvbnMuCi0gICAgICAgIC8vIFRhYmxlIGRlY29yYXRpb25zLgot ICAgICAgICByZWN1cnNpdmVQYWludERlc2NlbmRhbnRzKGNvbnRhaW5lckJveCwgcGFpbnRpbmdD b250ZXh0LCBQYWludFBoYXNlOjpCbG9ja0JhY2tncm91bmRzKTsKLQotICAgICAgICAvLyBBbGwg bm9uLXBvc2l0aW9uZWQgZmxvYXRpbmcgZGVzY2VuZGFudHMsIGluIHRyZWUgb3JkZXIuIEZvciBl YWNoIG9uZSBvZiB0aGVzZSwgdHJlYXQgdGhlIGVsZW1lbnQgYXMgaWYgaXQgY3JlYXRlZCBhIG5l dyBzdGFja2luZyBjb250ZXh0LAotICAgICAgICAvLyBidXQgYW55IHBvc2l0aW9uZWQgZGVzY2Vu ZGFudHMgYW5kIGRlc2NlbmRhbnRzIHdoaWNoIGFjdHVhbGx5IGNyZWF0ZSBhIG5ldyBzdGFja2lu ZyBjb250ZXh0IHNob3VsZCBiZSBjb25zaWRlcmVkIHBhcnQgb2YgdGhlIHBhcmVudAotICAgICAg ICAvLyBzdGFja2luZyBjb250ZXh0LCBub3QgdGhpcyBuZXcgb25lLgotICAgICAgICByZWN1cnNp dmVQYWludERlc2NlbmRhbnRzKGNvbnRhaW5lckJveCwgcGFpbnRpbmdDb250ZXh0LCBQYWludFBo YXNlOjpGbG9hdHMpOwotCi0gICAgICAgIC8vIElmIHRoZSBlbGVtZW50IGlzIGFuIGlubGluZSBl bGVtZW50IHRoYXQgZ2VuZXJhdGVzIGEgc3RhY2tpbmcgY29udGV4dCwgdGhlbjoKLSAgICAgICAg Ly8gRklYTUU6IEhhbmRsZSB0aGlzIGNhc2UuCi0gICAgICAgIAotICAgICAgICAvLyBPdGhlcndp c2U6IGZpcnN0IGZvciB0aGUgZWxlbWVudCwgdGhlbiBmb3IgYWxsIGl0cyBpbi1mbG93LCBub24t cG9zaXRpb25lZCwgYmxvY2stbGV2ZWwgZGVzY2VuZGFudHMgaW4gdHJlZSBvcmRlcjoKLSAgICAg ICAgLy8gMS4gSWYgdGhlIGVsZW1lbnQgaXMgYSBibG9jay1sZXZlbCByZXBsYWNlZCBlbGVtZW50 LCB0aGVuOiB0aGUgcmVwbGFjZWQgY29udGVudCwgYXRvbWljYWxseS4KLSAgICAgICAgLy8gMi4g T3RoZXJ3aXNlLCBmb3IgZWFjaCBsaW5lIGJveCBvZiB0aGF0IGVsZW1lbnQuLi4KLSAgICAgICAg cmVjdXJzaXZlUGFpbnREZXNjZW5kYW50cyhjb250YWluZXJCb3gsIHBhaW50aW5nQ29udGV4dCwg UGFpbnRQaGFzZTo6QmxvY2tGb3JlZ3JvdW5kcyk7Ci0gICAgfTsKLQotICAgIGlmIChpczxDb250 YWluZXJCb3g+KGNvbnRleHRSb290KSkgewotICAgICAgICBhdXRvJiBjb250YWluZXJCb3ggPSBk b3duY2FzdDxDb250YWluZXJCb3g+KGNvbnRleHRSb290KTsKKyAgICAvLyBPdGhlcndpc2U6IGZp cnN0IGZvciB0aGUgZWxlbWVudCwgdGhlbiBmb3IgYWxsIGl0cyBpbi1mbG93LCBub24tcG9zaXRp b25lZCwgYmxvY2stbGV2ZWwgZGVzY2VuZGFudHMgaW4gdHJlZSBvcmRlcjoKKyAgICAvLyAxLiBJ ZiB0aGUgZWxlbWVudCBpcyBhIGJsb2NrLWxldmVsIHJlcGxhY2VkIGVsZW1lbnQsIHRoZW46IHRo ZSByZXBsYWNlZCBjb250ZW50LCBhdG9taWNhbGx5LgorICAgIC8vIDIuIE90aGVyd2lzZSwgZm9y IGVhY2ggbGluZSBib3ggb2YgdGhhdCBlbGVtZW50Li4uCisgICAgcmVjdXJzaXZlUGFpbnREZXNj ZW5kYW50c0ZvclBoYXNlKGNvbnRhaW5lckJveCwgcGFpbnRpbmdDb250ZXh0LCBQYWludFBoYXNl OjpCbG9ja0ZvcmVncm91bmRzKTsKK30KIAotICAgICAgICBWZWN0b3I8Y29uc3QgQm94TW9kZWxC b3gqPiBuZWdhdGl2ZVpPcmRlckxpc3Q7Ci0gICAgICAgIFZlY3Rvcjxjb25zdCBCb3hNb2RlbEJv eCo+IHBvc2l0aXZlWk9yZGVyTGlzdDsKK3ZvaWQgQ1NTUGFpbnRlcjo6cGFpbnRBdG9taWNhbGx5 UGFpbnRlZEJveChjb25zdCBCb3gmIGJveCwgUGFpbnRpbmdDb250ZXh0JiBwYWludGluZ0NvbnRl eHQsIGNvbnN0IEludFJlY3QmIGRpcnR5UmVjdCwgSW5jbHVkZVN0YWNraW5nQ29udGV4dERlc2Nl bmRhbnRzIGluY2x1ZGVTdGFja2luZ0NvbnRleHREZXNjZW5kYW50cykKK3sKKyAgICBVTlVTRURf UEFSQU0oZGlydHlSZWN0KTsKICAgICAKLSAgICAgICAgcmVjdXJzaXZlQ29sbGVjdExheWVycyhj b250YWluZXJCb3gsIG5lZ2F0aXZlWk9yZGVyTGlzdCwgcG9zaXRpdmVaT3JkZXJMaXN0KTsKKyAg ICBCb3hQYWludGVyOjpwYWludEJveChib3gsIHBhaW50aW5nQ29udGV4dCwgZGlydHlSZWN0KTsK KyAgICBpZiAoIWlzPENvbnRhaW5lckJveD4oYm94KSkKKyAgICAgICAgcmV0dXJuOwogCi0gICAg ICAgIGF1dG8gY29tcGFyZVpJbmRleCA9IFtdIChjb25zdCBCb3hNb2RlbEJveCogYSwgY29uc3Qg Qm94TW9kZWxCb3gqIGIpIHsKLSAgICAgICAgICAgIHJldHVybiBhLT5zdHlsZSgpLnpJbmRleCgp LnZhbHVlT3IoMCkgPCBiLT5zdHlsZSgpLnpJbmRleCgpLnZhbHVlT3IoMCk7Ci0gICAgICAgIH07 CisgICAgYXV0byYgY29udGFpbmVyQm94ID0gZG93bmNhc3Q8Q29udGFpbmVyQm94Pihib3gpOwog Ci0gICAgICAgIHN0ZDo6c3RhYmxlX3NvcnQocG9zaXRpdmVaT3JkZXJMaXN0LmJlZ2luKCksIHBv c2l0aXZlWk9yZGVyTGlzdC5lbmQoKSwgY29tcGFyZVpJbmRleCk7Ci0gICAgICAgIHN0ZDo6c3Rh YmxlX3NvcnQobmVnYXRpdmVaT3JkZXJMaXN0LmJlZ2luKCksIG5lZ2F0aXZlWk9yZGVyTGlzdC5l bmQoKSwgY29tcGFyZVpJbmRleCk7CisgICAgVmVjdG9yPGNvbnN0IEJveE1vZGVsQm94Kj4gbmVn YXRpdmVaT3JkZXJMaXN0OworICAgIFZlY3Rvcjxjb25zdCBCb3hNb2RlbEJveCo+IHBvc2l0aXZl Wk9yZGVyTGlzdDsKKyAgICBpZiAoaW5jbHVkZVN0YWNraW5nQ29udGV4dERlc2NlbmRhbnRzID09 IEluY2x1ZGVTdGFja2luZ0NvbnRleHREZXNjZW5kYW50czo6WWVzKSB7CisgICAgICAgIGNvbGxl Y3RTdGFja2luZ0NvbnRleHREZXNjZW5kYW50cyhjb250YWluZXJCb3gsIG5lZ2F0aXZlWk9yZGVy TGlzdCwgcG9zaXRpdmVaT3JkZXJMaXN0KTsKIAogICAgICAgICAvLyBTdGFja2luZyBjb250ZXh0 cyBmb3JtZWQgYnkgcG9zaXRpb25lZCBkZXNjZW5kYW50cyB3aXRoIG5lZ2F0aXZlIHotaW5kaWNl cyAoZXhjbHVkaW5nIDApIGluIHotaW5kZXggb3JkZXIgKG1vc3QgbmVnYXRpdmUgZmlyc3QpIHRo ZW4gdHJlZSBvcmRlci4KICAgICAgICAgZm9yIChhdXRvKiBib3ggOiBuZWdhdGl2ZVpPcmRlckxp c3QpCiAgICAgICAgICAgICBwYWludFN0YWNraW5nQ29udGV4dCgqYm94LCBwYWludGluZ0NvbnRl eHQsIGRpcnR5UmVjdCk7CisgICAgfQogCi0gICAgICAgIHBhaW50RGVzY2VuZGFudHMoY29udGFp bmVyQm94KTsKKyAgICByZWN1cnNpdmVQYWludERlc2NlbmRhbnRzKGNvbnRhaW5lckJveCwgcGFp bnRpbmdDb250ZXh0KTsKIAorICAgIGlmIChpbmNsdWRlU3RhY2tpbmdDb250ZXh0RGVzY2VuZGFu dHMgPT0gSW5jbHVkZVN0YWNraW5nQ29udGV4dERlc2NlbmRhbnRzOjpZZXMpIHsKICAgICAgICAg Ly8gQWxsIHBvc2l0aW9uZWQgZGVzY2VuZGFudHMgd2l0aCAnei1pbmRleDogYXV0bycgb3IgJ3ot aW5kZXg6IDAnLCBpbiB0cmVlIG9yZGVyLiBGb3IgdGhvc2Ugd2l0aCAnei1pbmRleDogYXV0bycs IHRyZWF0IHRoZSBlbGVtZW50CiAgICAgICAgIC8vIGFzIGlmIGl0IGNyZWF0ZWQgYSBuZXcgc3Rh Y2tpbmcgY29udGV4dCwgYnV0IGFueSBwb3NpdGlvbmVkIGRlc2NlbmRhbnRzIGFuZCBkZXNjZW5k YW50cyB3aGljaCBhY3R1YWxseSBjcmVhdGUgYSBuZXcgc3RhY2tpbmcgY29udGV4dAogICAgICAg ICAvLyBzaG91bGQgYmUgY29uc2lkZXJlZCBwYXJ0IG9mIHRoZSBwYXJlbnQgc3RhY2tpbmcgY29u dGV4dCwgbm90IHRoaXMgbmV3IG9uZS4gRm9yIHRob3NlIHdpdGggJ3otaW5kZXg6IDAnLCB0cmVh dCB0aGUgc3RhY2tpbmcgY29udGV4dApAQCAtMTE5LDIwICsxMTYsMzkgQEAgdm9pZCBDU1NQYWlu dGVyOjpwYWludFN0YWNraW5nQ29udGV4dChjb25zdCBCb3hNb2RlbEJveCYgY29udGV4dFJvb3Qs IFBhaW50aW5nQ28KICAgICAgICAgZm9yIChhdXRvKiBib3ggOiBwb3NpdGl2ZVpPcmRlckxpc3Qp IHsKICAgICAgICAgICAgIGlmIChib3gtPnN0eWxlKCkuaXNTdGFja2luZ0NvbnRleHQoKSkKICAg ICAgICAgICAgICAgICBwYWludFN0YWNraW5nQ29udGV4dCgqYm94LCBwYWludGluZ0NvbnRleHQs IGRpcnR5UmVjdCk7Ci0gICAgICAgICAgICBlbHNlIGlmIChpczxDb250YWluZXJCb3g+KCpib3gp KSB7Ci0gICAgICAgICAgICAgICAgQm94UGFpbnRlcjo6cGFpbnRCb3hEZWNvcmF0aW9ucygqYm94 LCBwYWludGluZ0NvbnRleHQpOwotICAgICAgICAgICAgICAgIHBhaW50RGVzY2VuZGFudHMoZG93 bmNhc3Q8Q29udGFpbmVyQm94PigqYm94KSk7Ci0gICAgICAgICAgICB9IGVsc2UKLSAgICAgICAg ICAgICAgICBCb3hQYWludGVyOjpwYWludEJveCgqYm94LCBwYWludGluZ0NvbnRleHQsIGRpcnR5 UmVjdCk7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgcGFpbnRBdG9taWNhbGx5 UGFpbnRlZEJveCgqYm94LCBwYWludGluZ0NvbnRleHQsIGRpcnR5UmVjdCk7CiAgICAgICAgIH0K ICAgICB9CiB9CiAKK3ZvaWQgQ1NTUGFpbnRlcjo6cGFpbnRTdGFja2luZ0NvbnRleHQoY29uc3Qg Qm94TW9kZWxCb3gmIGNvbnRleHRSb290LCBQYWludGluZ0NvbnRleHQmIHBhaW50aW5nQ29udGV4 dCwgY29uc3QgSW50UmVjdCYgZGlydHlSZWN0KQoreworICAgIHBhaW50QXRvbWljYWxseVBhaW50 ZWRCb3goY29udGV4dFJvb3QsIHBhaW50aW5nQ29udGV4dCwgZGlydHlSZWN0LCBJbmNsdWRlU3Rh Y2tpbmdDb250ZXh0RGVzY2VuZGFudHM6Olllcyk7Cit9CisKIGJvb2wgQ1NTUGFpbnRlcjo6aXNT dGFja2luZ0NvbnRleHRQYWludGluZ0JvdW5kYXJ5KGNvbnN0IEJveCYgYm94KQogewogICAgIHJl dHVybiBib3guc3R5bGUoKS5pc1N0YWNraW5nQ29udGV4dCgpOwogfQogCitib29sIENTU1BhaW50 ZXI6OnBhcnRpY2lwYXRlc0luWk9yZGVyU29ydGluZyhjb25zdCBCb3gmIGJveCkKK3sKKyAgICBy ZXR1cm4gYm94LnN0eWxlKCkucGFydGljaXBhdGVzSW5aT3JkZXJTb3J0aW5nKCk7Cit9CisKK3Zv aWQgQ1NTUGFpbnRlcjo6Y29sbGVjdFN0YWNraW5nQ29udGV4dERlc2NlbmRhbnRzKGNvbnN0IENv bnRhaW5lckJveCYgY29udGFpbmVyQm94LCBWZWN0b3I8Y29uc3QgQm94TW9kZWxCb3gqPiYgbmVn YXRpdmVaT3JkZXJMaXN0LCBWZWN0b3I8Y29uc3QgQm94TW9kZWxCb3gqPiYgcG9zaXRpdmVaT3Jk ZXJMaXN0KQoreworICAgIHJlY3Vyc2l2ZUNvbGxlY3RMYXllcnMoY29udGFpbmVyQm94LCBuZWdh dGl2ZVpPcmRlckxpc3QsIHBvc2l0aXZlWk9yZGVyTGlzdCk7CisKKyAgICBhdXRvIGNvbXBhcmVa SW5kZXggPSBbXSAoY29uc3QgQm94TW9kZWxCb3gqIGEsIGNvbnN0IEJveE1vZGVsQm94KiBiKSB7 CisgICAgICAgIHJldHVybiBhLT5zdHlsZSgpLnpJbmRleCgpLnZhbHVlT3IoMCkgPCBiLT5zdHls ZSgpLnpJbmRleCgpLnZhbHVlT3IoMCk7CisgICAgfTsKKworICAgIHN0ZDo6c3RhYmxlX3NvcnQo cG9zaXRpdmVaT3JkZXJMaXN0LmJlZ2luKCksIHBvc2l0aXZlWk9yZGVyTGlzdC5lbmQoKSwgY29t cGFyZVpJbmRleCk7CisgICAgc3RkOjpzdGFibGVfc29ydChuZWdhdGl2ZVpPcmRlckxpc3QuYmVn aW4oKSwgbmVnYXRpdmVaT3JkZXJMaXN0LmVuZCgpLCBjb21wYXJlWkluZGV4KTsKK30KKwogdm9p ZCBDU1NQYWludGVyOjpyZWN1cnNpdmVDb2xsZWN0TGF5ZXJzKGNvbnN0IENvbnRhaW5lckJveCYg Y29udGFpbmVyQm94LCBWZWN0b3I8Y29uc3QgQm94TW9kZWxCb3gqPiYgbmVnYXRpdmVaT3JkZXJM aXN0LCBWZWN0b3I8Y29uc3QgQm94TW9kZWxCb3gqPiYgcG9zaXRpdmVaT3JkZXJMaXN0KQogewog ICAgIGZvciAoY29uc3QgYXV0byogY2hpbGQgPSBjb250YWluZXJCb3guZmlyc3RDaGlsZCgpOyBj aGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmcoKSkgewpAQCAtMTQwLDcgKzE1Niw2IEBA IHZvaWQgQ1NTUGFpbnRlcjo6cmVjdXJzaXZlQ29sbGVjdExheWVycyhjb25zdCBDb250YWluZXJC b3gmIGNvbnRhaW5lckJveCwgVmVjdG9yCiAgICAgICAgICAgICBhdXRvJiBjaGlsZEJveCA9IGRv d25jYXN0PEJveE1vZGVsQm94PigqY2hpbGQpOwogCiAgICAgICAgICAgICBhdXRvIHpJbmRleCA9 IGNoaWxkQm94LnN0eWxlKCkuekluZGV4KCkudmFsdWVPcigwKTsKLQogICAgICAgICAgICAgaWYg KHpJbmRleCA8IDApCiAgICAgICAgICAgICAgICAgbmVnYXRpdmVaT3JkZXJMaXN0LmFwcGVuZCgm Y2hpbGRCb3gpOwogICAgICAgICAgICAgZWxzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv ZGlzcGxheS9jc3MvRGlzcGxheUNTU1BhaW50ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkv Y3NzL0Rpc3BsYXlDU1NQYWludGVyLmgKaW5kZXggOTVjNmZiODg5ODg1ODhhNTk1MGI3MTIxNmQx N2YwOTA2ZTEzMzhiYS4uMWE0ODEwYmIyYTM3OTc0M2ExYmQ4ZWU5ZTdhOGY2Zjg4ZTQ2MDQ4NyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheUNTU1BhaW50ZXIu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5Q1NTUGFpbnRlci5oCkBA IC00OCw3ICs0OCw2IEBAIHN0cnVjdCBQYWludGluZ0NvbnRleHQ7CiAKIGNsYXNzIENTU1BhaW50 ZXIgewogcHVibGljOgotICAgIHN0YXRpYyB2b2lkIHBhaW50U3RhY2tpbmdDb250ZXh0KGNvbnN0 IEJveE1vZGVsQm94JiwgUGFpbnRpbmdDb250ZXh0JiwgY29uc3QgSW50UmVjdCYgZGlydHlSZWN0 KTsKICAgICBzdGF0aWMgdm9pZCBwYWludFRyZWUoY29uc3QgVHJlZSYsIFBhaW50aW5nQ29udGV4 dCYsIGNvbnN0IEludFJlY3QmIGRpcnR5UmVjdCk7CiAKIHByaXZhdGU6CkBAIC01Nyw5ICs1Niwx OCBAQCBwcml2YXRlOgogICAgICAgICBGbG9hdHMsCiAgICAgICAgIEJsb2NrRm9yZWdyb3VuZHMK ICAgICB9OwotICAgIHN0YXRpYyB2b2lkIHJlY3Vyc2l2ZVBhaW50RGVzY2VuZGFudHMoY29uc3Qg Q29udGFpbmVyQm94JiwgUGFpbnRpbmdDb250ZXh0JiwgUGFpbnRQaGFzZSk7CisgICAgc3RhdGlj IHZvaWQgcmVjdXJzaXZlUGFpbnREZXNjZW5kYW50cyhjb25zdCBDb250YWluZXJCb3gmLCBQYWlu dGluZ0NvbnRleHQmKTsKKyAgICBzdGF0aWMgdm9pZCByZWN1cnNpdmVQYWludERlc2NlbmRhbnRz Rm9yUGhhc2UoY29uc3QgQ29udGFpbmVyQm94JiwgUGFpbnRpbmdDb250ZXh0JiwgUGFpbnRQaGFz ZSk7CisKKyAgICBlbnVtIGNsYXNzIEluY2x1ZGVTdGFja2luZ0NvbnRleHREZXNjZW5kYW50cyB7 IFllcywgTm8gfTsKKyAgICBzdGF0aWMgdm9pZCBwYWludEF0b21pY2FsbHlQYWludGVkQm94KGNv bnN0IEJveCYsIFBhaW50aW5nQ29udGV4dCYsIGNvbnN0IEludFJlY3QmIGRpcnR5UmVjdCwgSW5j bHVkZVN0YWNraW5nQ29udGV4dERlc2NlbmRhbnRzID0gSW5jbHVkZVN0YWNraW5nQ29udGV4dERl c2NlbmRhbnRzOjpObyk7CisKKyAgICBzdGF0aWMgdm9pZCBwYWludFN0YWNraW5nQ29udGV4dChj b25zdCBCb3hNb2RlbEJveCYsIFBhaW50aW5nQ29udGV4dCYsIGNvbnN0IEludFJlY3QmIGRpcnR5 UmVjdCk7CiAKICAgICBzdGF0aWMgYm9vbCBpc1N0YWNraW5nQ29udGV4dFBhaW50aW5nQm91bmRh cnkoY29uc3QgQm94Jik7CisgICAgc3RhdGljIGJvb2wgcGFydGljaXBhdGVzSW5aT3JkZXJTb3J0 aW5nKGNvbnN0IEJveCYpOworCisgICAgc3RhdGljIHZvaWQgY29sbGVjdFN0YWNraW5nQ29udGV4 dERlc2NlbmRhbnRzKGNvbnN0IENvbnRhaW5lckJveCYsIFZlY3Rvcjxjb25zdCBCb3hNb2RlbEJv eCo+JiBuZWdhdGl2ZVpPcmRlckxpc3QsIFZlY3Rvcjxjb25zdCBCb3hNb2RlbEJveCo+JiBwb3Np dGl2ZVpPcmRlckxpc3QpOwogICAgIHN0YXRpYyB2b2lkIHJlY3Vyc2l2ZUNvbGxlY3RMYXllcnMo Y29uc3QgQ29udGFpbmVyQm94JiwgVmVjdG9yPGNvbnN0IEJveE1vZGVsQm94Kj4mIG5lZ2F0aXZl Wk9yZGVyTGlzdCwgVmVjdG9yPGNvbnN0IEJveE1vZGVsQm94Kj4mIHBvc2l0aXZlWk9yZGVyTGlz dCk7CiB9OwogCg==