219581 2020-12-06 09:31:22 -0800 [LFC Display] Move border radii to BoxRareGeometry 2020-12-06 10:48:16 -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 simon.fraser webkit-bug-importer zalan oldest_to_newest 1712325 0 simon.fraser 2020-12-06 09:31:22 -0800 [LFC Display] Move border radii to BoxRareGeometry 1712326 1 415518 simon.fraser 2020-12-06 09:32:24 -0800 Created attachment 415518 Patch 1712328 2 ews-feeder 2020-12-06 10:47:36 -0800 Committed r270484: <https://trac.webkit.org/changeset/270484> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415518. 1712329 3 webkit-bug-importer 2020-12-06 10:48:16 -0800 <rdar://problem/72024562> 415518 2020-12-06 09:32:24 -0800 2020-12-06 10:47:36 -0800 Patch bug-219581-20201206093223.patch text/plain 19788 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNDc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjQ1NTRhYTQ1OGYxNTUz OGY3NjQ3ZjY5NjEzY2UwODkwYjAwMDE2NS4uMmIzNTIzZDFjNWRhZGQ5MzRkODU4Yjg5YWVlNzkw ZjMxNzlhNmM2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDIwLTEyLTA2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtMRkMgRGlzcGxh eV0gTW92ZSBib3JkZXIgcmFkaWkgdG8gQm94UmFyZUdlb21ldHJ5CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk1ODEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCb3JkZXIgcmFkaXVzIGlzIG5vdCBhIGJv eCBkZWNvcmF0aW9uLCBzaW5jZSBpdCBhZmZlY3RzIHJlbmRlcmluZyAoZS5nLiBjbGlwcGluZykK KyAgICAgICAgd2hlbiB0aGVyZSBhcmUgbm8gZGVjb3JhdGlvbnMsIHNvIG1vdmUgaXQgdG8gQm94 UmFyZUdlb21ldHJ5LgorCisgICAgICAgICogZGlzcGxheS9jc3MvRGlzcGxheUJveERlY29yYXRp b25EYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OnJvdW5kZWRSZWN0V2l0aElu Y2x1ZGVkUmFkaWkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6cm91bmRl ZEluc2V0Qm9yZGVyRm9yUmVjdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5 OjpCb3hEZWNvcmF0aW9uRGF0YTo6aGFzQm9yZGVyUmFkaXVzIGNvbnN0KTogRGVsZXRlZC4KKyAg ICAgICAgKiBkaXNwbGF5L2Nzcy9EaXNwbGF5Qm94RGVjb3JhdGlvbkRhdGEuaDoKKyAgICAgICAg KFdlYkNvcmU6OkRpc3BsYXk6OkJveERlY29yYXRpb25EYXRhOjpib3JkZXJSYWRpaSBjb25zdCk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpCb3hEZWNvcmF0aW9uRGF0YTo6 c2V0Qm9yZGVyUmFkaWkpOiBEZWxldGVkLgorICAgICAgICAqIGRpc3BsYXkvY3NzL0Rpc3BsYXlC b3hEZWNvcmF0aW9uUGFpbnRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpCb3hE ZWNvcmF0aW9uUGFpbnRlcjo6Qm94RGVjb3JhdGlvblBhaW50ZXIpOgorICAgICAgICAoV2ViQ29y ZTo6RGlzcGxheTo6Qm94RGVjb3JhdGlvblBhaW50ZXI6OnBhaW50Qm94U2hhZG93IGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveERlY29yYXRpb25QYWludGVyOjpwYWludEJh Y2tncm91bmQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6Qm94RGVjb3JhdGlv blBhaW50ZXI6OmRldGVybWluZUJhY2tncm91bmRCbGVlZEF2b2lkYW5jZSk6CisgICAgICAgIChX ZWJDb3JlOjpEaXNwbGF5OjpCb3hEZWNvcmF0aW9uUGFpbnRlcjo6Y29tcHV0ZUJvcmRlclJlY3Qp OiBEZWxldGVkLgorICAgICAgICAqIGRpc3BsYXkvY3NzL0Rpc3BsYXlCb3hEZWNvcmF0aW9uUGFp bnRlci5oOgorICAgICAgICAqIGRpc3BsYXkvY3NzL0Rpc3BsYXlCb3hGYWN0b3J5LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveEZhY3Rvcnk6OmNvbnN0cnVjdEJveERlY29yYXRp b25EYXRhIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveEZhY3Rvcnk6OmNv bnN0cnVjdEJveFJhcmVHZW9tZXRyeSBjb25zdCk6CisgICAgICAgICogZGlzcGxheS9jc3MvRGlz cGxheUJveE1vZGVsQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveE1vZGVs Qm94OjpoYXNCb3JkZXJSYWRpdXMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6 Qm94TW9kZWxCb3g6OmJvcmRlclJvdW5kZWRSZWN0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkRpc3BsYXk6OkJveE1vZGVsQm94Ojppbm5lckJvcmRlclJvdW5kZWRSZWN0IGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveE1vZGVsQm94OjpjbGlwRm9yRGVzY2VuZGFudHMg Y29uc3QpOgorICAgICAgICAqIGRpc3BsYXkvY3NzL0Rpc3BsYXlCb3hNb2RlbEJveC5oOgorICAg ICAgICAqIGRpc3BsYXkvY3NzL0Rpc3BsYXlCb3hSYXJlR2VvbWV0cnkuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RGlzcGxheTo6Qm94UmFyZUdlb21ldHJ5OjpoYXNCb3JkZXJSYWRpdXMgY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6cm91bmRlZFJlY3RXaXRoSW5jbHVkZWRSYWRp aSk6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5Ojpyb3VuZGVkSW5zZXRCb3JkZXJGb3JSZWN0 KToKKyAgICAgICAgKiBkaXNwbGF5L2Nzcy9EaXNwbGF5Qm94UmFyZUdlb21ldHJ5Lmg6CisgICAg ICAgIChXZWJDb3JlOjpEaXNwbGF5OjpCb3hSYXJlR2VvbWV0cnk6OmJvcmRlclJhZGlpIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveFJhcmVHZW9tZXRyeTo6c2V0Qm9yZGVy UmFkaWkpOgorCiAyMDIwLTEyLTA1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUu Y29tPgogCiAgICAgICAgIFtMRkMgRGlzcGxheV0gU3RvcmUgdGhlIGRpc3BsYXkgdHJlZSBhcyBh IHRyZWUgb2Ygc3RhY2tpbmcgaXRlbXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rpc3Bs YXkvY3NzL0Rpc3BsYXlCb3hEZWNvcmF0aW9uRGF0YS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kaXNw bGF5L2Nzcy9EaXNwbGF5Qm94RGVjb3JhdGlvbkRhdGEuY3BwCmluZGV4IDdhYTQ3M2FlMmFmMWE1 NGZmNGMzMjYwMjZjMzliMDgzZWJjZDUzN2EuLjJiMzBiMjRhMGRlMjQ2ZjNkMjE3OTZmZDE3MGE0 ZGE3OTU5NGU5MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3Bs YXlCb3hEZWNvcmF0aW9uRGF0YS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3Mv RGlzcGxheUJveERlY29yYXRpb25EYXRhLmNwcApAQCAtOTgsMzggKzk4LDYgQEAgUmVjdEVkZ2Vz PEJvcmRlckVkZ2U+IGNhbGN1bGF0ZUJvcmRlckVkZ2VzKGNvbnN0IFJlbmRlclN0eWxlJiBzdHls ZSwgZmxvYXQgcGl4ZWwKICAgICB9OwogfQogCi1GbG9hdFJvdW5kZWRSZWN0IHJvdW5kZWRSZWN0 V2l0aEluY2x1ZGVkUmFkaWkoY29uc3QgRmxvYXRSZWN0JiByZWN0LCBjb25zdCBGbG9hdFJvdW5k ZWRSZWN0OjpSYWRpaSYgcmFkaWksIGJvb2wgaW5jbHVkZUxlZnRFZGdlLCBib29sIGluY2x1ZGVS aWdodEVkZ2UpCi17Ci0gICAgRmxvYXRSb3VuZGVkUmVjdDo6UmFkaWkgcmVzdWx0UmFkaWk7Ci0K LSAgICBpZiAoaW5jbHVkZUxlZnRFZGdlKSB7Ci0gICAgICAgIHJlc3VsdFJhZGlpLnNldFRvcExl ZnQocmFkaWkudG9wTGVmdCgpKTsKLSAgICAgICAgcmVzdWx0UmFkaWkuc2V0Qm90dG9tTGVmdChy YWRpaS5ib3R0b21MZWZ0KCkpOwotICAgIH0KLQotICAgIGlmIChpbmNsdWRlUmlnaHRFZGdlKSB7 Ci0gICAgICAgIHJlc3VsdFJhZGlpLnNldFRvcFJpZ2h0KHJhZGlpLnRvcFJpZ2h0KCkpOwotICAg ICAgICByZXN1bHRSYWRpaS5zZXRCb3R0b21SaWdodChyYWRpaS5ib3R0b21SaWdodCgpKTsKLSAg ICB9Ci0KLSAgICByZXN1bHRSYWRpaS5zY2FsZShjYWxjQm9yZGVyUmFkaWlDb25zdHJhaW50U2Nh bGVGb3IocmVjdCwgcmVzdWx0UmFkaWkpKTsKLSAgICByZXR1cm4gRmxvYXRSb3VuZGVkUmVjdCB7 IHJlY3QsIHJlc3VsdFJhZGlpIH07Ci19Ci0KLUZsb2F0Um91bmRlZFJlY3Qgcm91bmRlZEluc2V0 Qm9yZGVyRm9yUmVjdChjb25zdCBGbG9hdFJlY3QmIGJvcmRlclJlY3QsIGNvbnN0IEZsb2F0Um91 bmRlZFJlY3Q6OlJhZGlpJiByYWRpaSwgY29uc3QgUmVjdEVkZ2VzPGZsb2F0PiYgYm9yZGVyV2lk dGgsIGJvb2wgaW5jbHVkZUxlZnRFZGdlLCBib29sIGluY2x1ZGVSaWdodEVkZ2UpCi17Ci0gICAg YXV0byBpbnNldFJlY3QgPSBGbG9hdFJlY3QgeyBib3JkZXJSZWN0LngoKSArIGJvcmRlcldpZHRo LmxlZnQoKSwgYm9yZGVyUmVjdC55KCkgKyBib3JkZXJXaWR0aC50b3AoKSwKLSAgICAgICAgYm9y ZGVyUmVjdC53aWR0aCgpIC0gYm9yZGVyV2lkdGgubGVmdCgpIC0gYm9yZGVyV2lkdGgucmlnaHQo KSwgYm9yZGVyUmVjdC5oZWlnaHQoKSAtIGJvcmRlcldpZHRoLnRvcCgpIC0gYm9yZGVyV2lkdGgu Ym90dG9tKCkgfTsKLQotICAgIGlmICghcmFkaWkuaXNaZXJvKCkpIHsKLSAgICAgICAgYXV0byBh ZGp1c3RlZFJhZGlpID0gcmFkaWk7Ci0gICAgICAgIGFkanVzdGVkUmFkaWkuc2hyaW5rKGJvcmRl cldpZHRoLnRvcCgpLCBib3JkZXJXaWR0aC5ib3R0b20oKSwgYm9yZGVyV2lkdGgubGVmdCgpLCBi b3JkZXJXaWR0aC5yaWdodCgpKTsKLSAgICAgICAgcmV0dXJuIHJvdW5kZWRSZWN0V2l0aEluY2x1 ZGVkUmFkaWkoaW5zZXRSZWN0LCBhZGp1c3RlZFJhZGlpLCBpbmNsdWRlTGVmdEVkZ2UsIGluY2x1 ZGVSaWdodEVkZ2UpOwotICAgIH0KLQotICAgIHJldHVybiBGbG9hdFJvdW5kZWRSZWN0IHsgaW5z ZXRSZWN0LCB7IH0gfTsKLX0KLQogc3RkOjpwYWlyPEJveFNpZGUsIEJveFNpZGU+IGFkamFjZW50 U2lkZXNGb3JTaWRlKEJveFNpZGUgc2lkZSkKIHsKICAgICBzd2l0Y2ggKHNpZGUpIHsKQEAgLTE1 NywxMSArMTI1LDYgQEAgYm9vbCBCb3hEZWNvcmF0aW9uRGF0YTo6aGFzQm9yZGVyKCkgY29uc3QK ICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWJvb2wgQm94RGVjb3JhdGlvbkRhdGE6Omhhc0JvcmRl clJhZGl1cygpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1fYm9yZGVyUmFkaWkgJiYgIW1fYm9yZGVy UmFkaWktPmlzWmVybygpOwotfQotCiBib29sIEJveERlY29yYXRpb25EYXRhOjpib3JkZXJPYnNj dXJlc0JhY2tncm91bmQoKSBjb25zdAogewogICAgIGlmICghaGFzQm9yZGVyKCkpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5Qm94RGVjb3JhdGlvbkRhdGEu aCBiL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlCb3hEZWNvcmF0aW9uRGF0YS5o CmluZGV4IDBjNzM4MDFkMGJkMTE0ZTc4YWI0NjE5YjUyY2IwNTEwNmM3MzY3ZjEuLmVjZjQ4ZDVh ZTQ5ZWUyODljNDIyZjBhZDcwOTU2M2E3ZGRkNjJiNWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlCb3hEZWNvcmF0aW9uRGF0YS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlCb3hEZWNvcmF0aW9uRGF0YS5oCkBAIC0xMDQsMTIg KzEwNCw4IEBAIHB1YmxpYzoKICAgICBjb25zdCBSZWN0RWRnZXM8Qm9yZGVyRWRnZT4mIGJvcmRl ckVkZ2VzKCkgY29uc3QgeyByZXR1cm4gbV9ib3JkZXJFZGdlczsgfQogICAgIHZvaWQgc2V0Qm9y ZGVyRWRnZXMoUmVjdEVkZ2VzPEJvcmRlckVkZ2U+JiYgZWRnZXMpIHsgbV9ib3JkZXJFZGdlcyA9 IFdURk1vdmUoZWRnZXMpOyB9CiAKLSAgICBjb25zdCBGbG9hdFJvdW5kZWRSZWN0OjpSYWRpaSog Ym9yZGVyUmFkaWkoKSBjb25zdCB7IHJldHVybiBtX2JvcmRlclJhZGlpLmdldCgpOyB9Ci0gICAg dm9pZCBzZXRCb3JkZXJSYWRpaShzdGQ6OnVuaXF1ZV9wdHI8RmxvYXRSb3VuZGVkUmVjdDo6UmFk aWk+JiYgcmFkaWkpIHsgbV9ib3JkZXJSYWRpaSA9IFdURk1vdmUocmFkaWkpOyB9Ci0KICAgICBi b29sIGhhc0JvcmRlckltYWdlKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0gLy8gRklYTUU6IElt cGxlbWVudCBib3JkZXItaW1hZ2UuCiAgICAgYm9vbCBoYXNCb3JkZXIoKSBjb25zdDsKLSAgICBi b29sIGhhc0JvcmRlclJhZGl1cygpIGNvbnN0OwogCiAgICAgYm9vbCBib3JkZXJPYnNjdXJlc0Jh Y2tncm91bmQoKSBjb25zdDsKICAgICBib29sIGJvcmRlck9ic2N1cmVzQmFja2dyb3VuZEVkZ2Uo Y29uc3QgRmxvYXRTaXplJiBjb250ZXh0U2NhbGUpIGNvbnN0OwpAQCAtMTE3LDEyICsxMTMsOCBA QCBwdWJsaWM6CiBwcml2YXRlOgogICAgIFZlY3RvcjxGaWxsTGF5ZXJJbWFnZUdlb21ldHJ5LCAx PiBtX2JhY2tncm91bmRJbWFnZUdlb21ldHJ5OwogICAgIFJlY3RFZGdlczxCb3JkZXJFZGdlPiBt X2JvcmRlckVkZ2VzOwotICAgIHN0ZDo6dW5pcXVlX3B0cjxGbG9hdFJvdW5kZWRSZWN0OjpSYWRp aT4gbV9ib3JkZXJSYWRpaTsKIH07CiAKLUZsb2F0Um91bmRlZFJlY3Qgcm91bmRlZFJlY3RXaXRo SW5jbHVkZWRSYWRpaShjb25zdCBGbG9hdFJlY3QmLCBjb25zdCBGbG9hdFJvdW5kZWRSZWN0OjpS YWRpaSYsIGJvb2wgaW5jbHVkZUxlZnRFZGdlID0gdHJ1ZSwgYm9vbCBpbmNsdWRlUmlnaHRFZGdl ID0gdHJ1ZSk7Ci1GbG9hdFJvdW5kZWRSZWN0IHJvdW5kZWRJbnNldEJvcmRlckZvclJlY3QoY29u c3QgRmxvYXRSZWN0JiwgY29uc3QgRmxvYXRSb3VuZGVkUmVjdDo6UmFkaWkmLCBjb25zdCBSZWN0 RWRnZXM8ZmxvYXQ+JiwgYm9vbCBpbmNsdWRlTGVmdEVkZ2UgPSB0cnVlLCBib29sIGluY2x1ZGVS aWdodEVkZ2UgPSB0cnVlKTsKLQogfSAvLyBuYW1lc3BhY2UgRGlzcGxheQogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNw bGF5Qm94RGVjb3JhdGlvblBhaW50ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3Mv RGlzcGxheUJveERlY29yYXRpb25QYWludGVyLmNwcAppbmRleCA1ODc3NWQ2Y2Y0ZTdmZTAyZWYz MWJjZjkxNDFlNTdlN2NmNmRkNDNhLi4wMDk3OWQwMDliODU1NjNlNTI3ZjgyODFmZTcyYTlkMTc5 OTMwYWUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5Qm94 RGVjb3JhdGlvblBhaW50ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rp c3BsYXlCb3hEZWNvcmF0aW9uUGFpbnRlci5jcHAKQEAgLTMyLDYgKzMyLDcgQEAKICNpbmNsdWRl ICJDb2xvci5oIgogI2luY2x1ZGUgIkRpc3BsYXlCb3hEZWNvcmF0aW9uRGF0YS5oIgogI2luY2x1 ZGUgIkRpc3BsYXlCb3hNb2RlbEJveC5oIgorI2luY2x1ZGUgIkRpc3BsYXlCb3hSYXJlR2VvbWV0 cnkuaCIKICNpbmNsdWRlICJEaXNwbGF5UGFpbnRpbmdDb250ZXh0LmgiCiAjaW5jbHVkZSAiRGlz cGxheVN0eWxlLmgiCiAjaW5jbHVkZSAiRGlzcGxheVRyZWUuaCIKQEAgLTExNzUsNyArMTE3Niw3 IEBAIHZvaWQgQm9yZGVyUGFpbnRlcjo6cGFpbnRCb3JkZXJzKFBhaW50aW5nQ29udGV4dCYgcGFp bnRpbmdDb250ZXh0KSBjb25zdAogCiBCb3hEZWNvcmF0aW9uUGFpbnRlcjo6Qm94RGVjb3JhdGlv blBhaW50ZXIoY29uc3QgQm94TW9kZWxCb3gmIGJveCwgUGFpbnRpbmdDb250ZXh0JiBwYWludGlu Z0NvbnRleHQsIGJvb2wgaW5jbHVkZUxlZnRFZGdlLCBib29sIGluY2x1ZGVSaWdodEVkZ2UpCiAg ICAgOiBtX2JveChib3gpCi0gICAgLCBtX2JvcmRlclJlY3QoY29tcHV0ZUJvcmRlclJlY3QoYm94 KSkKKyAgICAsIG1fYm9yZGVyUmVjdChib3guYm9yZGVyUm91bmRlZFJlY3QoKSkKICAgICAsIG1f YmxlZWRBdm9pZGFuY2UoZGV0ZXJtaW5lQmFja2dyb3VuZEJsZWVkQXZvaWRhbmNlKGJveCwgcGFp bnRpbmdDb250ZXh0KSkKICAgICAsIG1faW5jbHVkZUxlZnRFZGdlKGluY2x1ZGVMZWZ0RWRnZSkK ICAgICAsIG1faW5jbHVkZVJpZ2h0RWRnZShpbmNsdWRlUmlnaHRFZGdlKQpAQCAtMTI2MSw3ICsx MjYyLDcgQEAgdm9pZCBCb3hEZWNvcmF0aW9uUGFpbnRlcjo6cGFpbnRCb3hTaGFkb3coUGFpbnRp bmdDb250ZXh0JiBwYWludGluZ0NvbnRleHQsIFNoYWQKIAogICAgIGF1dG8gYm9yZGVyUmVjdCA9 IHNoYWRvd1N0eWxlID09IFNoYWRvd1N0eWxlOjpJbnNldCA/IGlubmVyQm9yZGVyUm91bmRlZFJl Y3QoKSA6IGJvcmRlclJvdW5kZWRSZWN0KCk7CiAgICAgYXV0byogYm94RGVjb3JhdGlvbkRhdGEg PSBtX2JveC5ib3hEZWNvcmF0aW9uRGF0YSgpOwotICAgIGJvb2wgaGFzQm9yZGVyUmFkaXVzID0g Ym94RGVjb3JhdGlvbkRhdGEgJiYgYm94RGVjb3JhdGlvbkRhdGEtPmhhc0JvcmRlclJhZGl1cygp OworICAgIGJvb2wgaGFzQm9yZGVyUmFkaXVzID0gbV9ib3guaGFzQm9yZGVyUmFkaXVzKCk7CiAK ICAgICBib29sIGhhc09wYXF1ZUJhY2tncm91bmQgPSBtX2JveC5zdHlsZSgpLmJhY2tncm91bmRD b2xvcigpLmlzT3BhcXVlKCk7CiAKQEAgLTE0MzUsMTYgKzE0MzYsNiBAQCB2b2lkIEJveERlY29y YXRpb25QYWludGVyOjpwYWludEJveFNoYWRvdyhQYWludGluZ0NvbnRleHQmIHBhaW50aW5nQ29u dGV4dCwgU2hhZAogICAgIH0KIH0KIAotRmxvYXRSb3VuZGVkUmVjdCBCb3hEZWNvcmF0aW9uUGFp bnRlcjo6Y29tcHV0ZUJvcmRlclJlY3QoY29uc3QgQm94TW9kZWxCb3gmIGJveCkKLXsKLSAgICBh dXRvIGJvcmRlclJlY3QgPSBGbG9hdFJvdW5kZWRSZWN0IHsgYm94LmFic29sdXRlQm9yZGVyQm94 UmVjdCgpLCB7IH0gfTsKLSAgICBhdXRvKiBib3JkZXJSYWRpaSA9IGJveC5ib3hEZWNvcmF0aW9u RGF0YSgpID8gYm94LmJveERlY29yYXRpb25EYXRhKCktPmJvcmRlclJhZGlpKCkgOiBudWxscHRy OwotICAgIGlmIChib3JkZXJSYWRpaSkKLSAgICAgICAgYm9yZGVyUmVjdC5zZXRSYWRpaSgqYm9y ZGVyUmFkaWkpOwotICAgIAotICAgIHJldHVybiBib3JkZXJSZWN0OwotfQotCiB2b2lkIEJveERl Y29yYXRpb25QYWludGVyOjpwYWludEJhY2tncm91bmRJbWFnZXMoUGFpbnRpbmdDb250ZXh0JiBw YWludGluZ0NvbnRleHQpIGNvbnN0CiB7CiAgICAgY29uc3QgYXV0byYgc3R5bGUgPSBtX2JveC5z dHlsZSgpOwpAQCAtMTQ4OCwxMSArMTQ3OSwxMCBAQCB2b2lkIEJveERlY29yYXRpb25QYWludGVy OjpwYWludEJhY2tncm91bmQoUGFpbnRpbmdDb250ZXh0JiBwYWludGluZ0NvbnRleHQpIGNvbgog ewogICAgIGF1dG8gYm9yZGVyQm94UmVjdCA9IG1fYm94LmFic29sdXRlQm9yZGVyQm94UmVjdCgp OwogICAgIGNvbnN0IGF1dG8mIHN0eWxlID0gbV9ib3guc3R5bGUoKTsKLSAgICBhdXRvKiBib3hE ZWNvcmF0aW9uRGF0YSA9IG1fYm94LmJveERlY29yYXRpb25EYXRhKCk7CiAKICAgICBpZiAoc3R5 bGUuaGFzQmFja2dyb3VuZCgpKSB7CiAgICAgICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIg c3RhdGVTYXZlcihwYWludGluZ0NvbnRleHQuY29udGV4dCwgZmFsc2UpOwotICAgICAgICBpZiAo bV9ibGVlZEF2b2lkYW5jZSAhPSBCYWNrZ3JvdW5kQmxlZWRBdm9pZGFuY2U6OlVzZVRyYW5zcGFy ZW5jeUxheWVyICYmIGJveERlY29yYXRpb25EYXRhICYmIGJveERlY29yYXRpb25EYXRhLT5oYXNC b3JkZXJSYWRpdXMoKSkgeworICAgICAgICBpZiAobV9ibGVlZEF2b2lkYW5jZSAhPSBCYWNrZ3Jv dW5kQmxlZWRBdm9pZGFuY2U6OlVzZVRyYW5zcGFyZW5jeUxheWVyICYmIG1fYm94Lmhhc0JvcmRl clJhZGl1cygpKSB7CiAgICAgICAgICAgICBzdGF0ZVNhdmVyLnNhdmUoKTsKICAgICAgICAgICAg IGF1dG8gb3V0ZXJCb3JkZXIgPSBiYWNrZ3JvdW5kUm91bmRlZFJlY3RBZGp1c3RlZEZvckJsZWVk QXZvaWRhbmNlKHBhaW50aW5nQ29udGV4dCk7CiAgICAgICAgICAgICBwYWludGluZ0NvbnRleHQu Y29udGV4dC5jbGlwUm91bmRlZFJlY3Qob3V0ZXJCb3JkZXIpOwpAQCAtMTUxOCw3ICsxNTA4LDcg QEAgQmFja2dyb3VuZEJsZWVkQXZvaWRhbmNlIEJveERlY29yYXRpb25QYWludGVyOjpkZXRlcm1p bmVCYWNrZ3JvdW5kQmxlZWRBdm9pZGFuY2UKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAog ICAgICAgICAvLyBGSVhNRTogQ29uc3VsdCBib3JkZXItaW1hZ2UuCi0gICAgICAgIHJldHVybiBz dHlsZS5oYXNCYWNrZ3JvdW5kKCkgJiYgYm94RGVjb3JhdGlvbkRhdGEtPmhhc0JvcmRlcigpICYm IGJveERlY29yYXRpb25EYXRhLT5oYXNCb3JkZXJSYWRpdXMoKTsKKyAgICAgICAgcmV0dXJuIHN0 eWxlLmhhc0JhY2tncm91bmQoKSAmJiBib3hEZWNvcmF0aW9uRGF0YS0+aGFzQm9yZGVyKCkgJiYg Ym94Lmhhc0JvcmRlclJhZGl1cygpOwogICAgIH07CiAKICAgICBpZiAoIWhhc0JhY2tncm91bmRB bmRSb3VuZGVkQm9yZGVyKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nz cy9EaXNwbGF5Qm94RGVjb3JhdGlvblBhaW50ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkv Y3NzL0Rpc3BsYXlCb3hEZWNvcmF0aW9uUGFpbnRlci5oCmluZGV4IDdkNTZkMjgyZjc3NzkyMTkx NDUxYjMyYWY4NzdjNGQ2YjhiYWI4MmQuLjU3NWE3YWFmYjM4OGMwNWYyZTEzNDU5YTI4ODllYzU5 YjRkMDhhMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlC b3hEZWNvcmF0aW9uUGFpbnRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rp c3BsYXlCb3hEZWNvcmF0aW9uUGFpbnRlci5oCkBAIC01Nyw5ICs1Nyw2IEBAIHByaXZhdGU6CiAg ICAgZnJpZW5kIGNsYXNzIEJvcmRlclBhaW50ZXI7CiAKICAgICBzdGF0aWMgQmFja2dyb3VuZEJs ZWVkQXZvaWRhbmNlIGRldGVybWluZUJhY2tncm91bmRCbGVlZEF2b2lkYW5jZShjb25zdCBCb3hN b2RlbEJveCYsIFBhaW50aW5nQ29udGV4dCYpOwotICAgIHN0YXRpYyBGbG9hdFJvdW5kZWRSZWN0 IGNvbXB1dGVCb3JkZXJSZWN0KGNvbnN0IEJveE1vZGVsQm94Jik7Ci0KLSAgICB2b2lkIGNvbXB1 dGVCb3JkZXJSZWN0KCk7CiAKICAgICB2b2lkIHBhaW50Qm9yZGVycyhQYWludGluZ0NvbnRleHQm KSBjb25zdDsKICAgICB2b2lkIHBhaW50Qm94U2hhZG93KFBhaW50aW5nQ29udGV4dCYsIFNoYWRv d1N0eWxlKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rp c3BsYXlCb3hGYWN0b3J5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlC b3hGYWN0b3J5LmNwcAppbmRleCA2NTIwNGJkMGMzMGE4YjcxYjE5MWMxYjA0NDRmOGVjZjFjMGEx YTc5Li5hZmNmMDAzZjhkMWExOTFhYWViY2UzZmJkYTMyN2NkMDEzOWVkMzU5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5Qm94RmFjdG9yeS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheUJveEZhY3RvcnkuY3BwCkBAIC0xOTQs MTcgKzE5NCw2IEBAIHN0ZDo6dW5pcXVlX3B0cjxCb3hEZWNvcmF0aW9uRGF0YT4gQm94RmFjdG9y eTo6Y29uc3RydWN0Qm94RGVjb3JhdGlvbkRhdGEoY29uc3QKICAgICBhdXRvIGJvcmRlckVkZ2Vz ID0gY2FsY3VsYXRlQm9yZGVyRWRnZXMobGF5b3V0Qm94LnN0eWxlKCksIG1fcGl4ZWxTbmFwcGlu Z0ZhY3RvciwgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2Up OwogICAgIGJveERlY29yYXRpb25EYXRhLT5zZXRCb3JkZXJFZGdlcyhXVEZNb3ZlKGJvcmRlckVk Z2VzKSk7CiAKLSAgICBhdXRvJiByZW5kZXJTdHlsZSA9IGxheW91dEJveC5zdHlsZSgpOwotCi0g ICAgaWYgKHJlbmRlclN0eWxlLmhhc0JvcmRlclJhZGl1cygpKSB7Ci0gICAgICAgIGF1dG8gYm9y ZGVyQm94UmVjdCA9IExheW91dFJlY3QgeyBMYXlvdXQ6OkJveEdlb21ldHJ5Ojpib3JkZXJCb3hS ZWN0KGxheW91dEdlb21ldHJ5KSB9OwotICAgICAgICBhdXRvIGJvcmRlclJvdW5kZWRSZWN0ID0g cmVuZGVyU3R5bGUuZ2V0Um91bmRlZEJvcmRlckZvcihib3JkZXJCb3hSZWN0LCBpbmNsdWRlTG9n aWNhbExlZnRFZGdlLCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSk7Ci0gICAgICAgIGF1dG8gc25h cHBlZFJvdW5kZWRSZWN0ID0gYm9yZGVyUm91bmRlZFJlY3QucGl4ZWxTbmFwcGVkUm91bmRlZFJl Y3RGb3JQYWludGluZyhtX3BpeGVsU25hcHBpbmdGYWN0b3IpOwotCi0gICAgICAgIGF1dG8gYm9y ZGVyUmFkaWkgPSBtYWtlVW5pcXVlPEZsb2F0Um91bmRlZFJlY3Q6OlJhZGlpPihzbmFwcGVkUm91 bmRlZFJlY3QucmFkaWkoKSk7Ci0gICAgICAgIGJveERlY29yYXRpb25EYXRhLT5zZXRCb3JkZXJS YWRpaShXVEZNb3ZlKGJvcmRlclJhZGlpKSk7Ci0gICAgfQotCiAgICAgcmV0dXJuIGJveERlY29y YXRpb25EYXRhOwogfQogCkBAIC0yNDQsMTEgKzIzMywyNSBAQCBUcmFuc2Zvcm1hdGlvbk1hdHJp eCBCb3hGYWN0b3J5Ojpjb21wdXRlVHJhbnNmb3JtYXRpb25NYXRyaXgoY29uc3QgQm94TW9kZWxC b3gmCiAKIHN0ZDo6dW5pcXVlX3B0cjxCb3hSYXJlR2VvbWV0cnk+IEJveEZhY3Rvcnk6OmNvbnN0 cnVjdEJveFJhcmVHZW9tZXRyeShjb25zdCBCb3hNb2RlbEJveCYgYm94LCBjb25zdCBMYXlvdXQ6 OkJveCYgbGF5b3V0Qm94LCBjb25zdCBMYXlvdXQ6OkJveEdlb21ldHJ5JiBsYXlvdXRHZW9tZXRy eSwgTGF5b3V0U2l6ZSBvZmZzZXRGcm9tUm9vdCkgY29uc3QKIHsKLSAgICBpZiAoIWJveC5zdHls ZSgpLmhhc1RyYW5zZm9ybSgpKQorICAgIGF1dG8mIHJlbmRlclN0eWxlID0gbGF5b3V0Qm94LnN0 eWxlKCk7CisKKyAgICBpZiAoIWJveC5zdHlsZSgpLmhhc1RyYW5zZm9ybSgpICYmICFyZW5kZXJT dHlsZS5oYXNCb3JkZXJSYWRpdXMoKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBh dXRvIGJveFJhcmVHZW9tZXRyeSA9IG1ha2VVbmlxdWU8Qm94UmFyZUdlb21ldHJ5PigpOwogCisg ICAgaWYgKHJlbmRlclN0eWxlLmhhc0JvcmRlclJhZGl1cygpKSB7CisgICAgICAgIGJvb2wgaW5j bHVkZUxvZ2ljYWxMZWZ0RWRnZSA9IHRydWU7IC8vIEZJWE1FLgorICAgICAgICBib29sIGluY2x1 ZGVMb2dpY2FsUmlnaHRFZGdlID0gdHJ1ZTsgLy8gRklYTUUuCisKKyAgICAgICAgYXV0byBib3Jk ZXJCb3hSZWN0ID0gTGF5b3V0UmVjdCB7IExheW91dDo6Qm94R2VvbWV0cnk6OmJvcmRlckJveFJl Y3QobGF5b3V0R2VvbWV0cnkpIH07CisgICAgICAgIGF1dG8gYm9yZGVyUm91bmRlZFJlY3QgPSBy ZW5kZXJTdHlsZS5nZXRSb3VuZGVkQm9yZGVyRm9yKGJvcmRlckJveFJlY3QsIGluY2x1ZGVMb2dp Y2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKTsKKyAgICAgICAgYXV0byBzbmFw cGVkUm91bmRlZFJlY3QgPSBib3JkZXJSb3VuZGVkUmVjdC5waXhlbFNuYXBwZWRSb3VuZGVkUmVj dEZvclBhaW50aW5nKG1fcGl4ZWxTbmFwcGluZ0ZhY3Rvcik7CisKKyAgICAgICAgYXV0byBib3Jk ZXJSYWRpaSA9IG1ha2VVbmlxdWU8RmxvYXRSb3VuZGVkUmVjdDo6UmFkaWk+KHNuYXBwZWRSb3Vu ZGVkUmVjdC5yYWRpaSgpKTsKKyAgICAgICAgYm94UmFyZUdlb21ldHJ5LT5zZXRCb3JkZXJSYWRp aShXVEZNb3ZlKGJvcmRlclJhZGlpKSk7CisgICAgfQorCiAgICAgYXV0byB0cmFuc2Zvcm1hdGlv bk1hdHJpeCA9IGNvbXB1dGVUcmFuc2Zvcm1hdGlvbk1hdHJpeChib3gsIGxheW91dEdlb21ldHJ5 LCBsYXlvdXRCb3guc3R5bGUoKSwgb2Zmc2V0RnJvbVJvb3QpOwogICAgIGJveFJhcmVHZW9tZXRy eS0+c2V0VHJhbnNmb3JtKFdURk1vdmUodHJhbnNmb3JtYXRpb25NYXRyaXgpKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheUJveE1vZGVsQm94LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlCb3hNb2RlbEJveC5jcHAKaW5kZXgg ZjEyODAyNTkyM2RmMDg1YjllMTk2ZTYwMjI5YTE3NGNmNWJjNTYyZi4uM2Q0ODc2YzE5NDYwMjRi YmEzNWZhYjZiOGQ2NGZkNGYxYWFmODQ3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZGlz cGxheS9jc3MvRGlzcGxheUJveE1vZGVsQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kaXNw bGF5L2Nzcy9EaXNwbGF5Qm94TW9kZWxCb3guY3BwCkBAIC01NCwxMCArNTQsMTUgQEAgdm9pZCBC b3hNb2RlbEJveDo6c2V0Qm94UmFyZUdlb21ldHJ5KHN0ZDo6dW5pcXVlX3B0cjxCb3hSYXJlR2Vv bWV0cnk+JiYgcmFyZUdlb20KICAgICBtX2JveFJhcmVHZW9tZXRyeSA9IFdURk1vdmUocmFyZUdl b21ldHJ5KTsKIH0KIAorYm9vbCBCb3hNb2RlbEJveDo6aGFzQm9yZGVyUmFkaXVzKCkgY29uc3QK K3sKKyAgICByZXR1cm4gbV9ib3hSYXJlR2VvbWV0cnkgJiYgbV9ib3hSYXJlR2VvbWV0cnktPmhh c0JvcmRlclJhZGl1cygpOworfQorCiBGbG9hdFJvdW5kZWRSZWN0IEJveE1vZGVsQm94Ojpib3Jk ZXJSb3VuZGVkUmVjdCgpIGNvbnN0CiB7CiAgICAgYXV0byBib3JkZXJSZWN0ID0gRmxvYXRSb3Vu ZGVkUmVjdCB7IGFic29sdXRlQm9yZGVyQm94UmVjdCgpLCB7IH0gfTsKLSAgICBhdXRvKiBib3Jk ZXJSYWRpaSA9IG1fYm94RGVjb3JhdGlvbkRhdGEgPyBtX2JveERlY29yYXRpb25EYXRhLT5ib3Jk ZXJSYWRpaSgpIDogbnVsbHB0cjsKKyAgICBhdXRvKiBib3JkZXJSYWRpaSA9IG1fYm94UmFyZUdl b21ldHJ5ID8gbV9ib3hSYXJlR2VvbWV0cnktPmJvcmRlclJhZGlpKCkgOiBudWxscHRyOwogICAg IGlmIChib3JkZXJSYWRpaSkKICAgICAgICAgYm9yZGVyUmVjdC5zZXRSYWRpaSgqYm9yZGVyUmFk aWkpOwogICAgIApAQCAtNjksMTAgKzc0LDEwIEBAIEZsb2F0Um91bmRlZFJlY3QgQm94TW9kZWxC b3g6OmlubmVyQm9yZGVyUm91bmRlZFJlY3QoKSBjb25zdAogICAgIGlmICghbV9ib3hEZWNvcmF0 aW9uRGF0YSkKICAgICAgICAgcmV0dXJuIGJvcmRlclJvdW5kZWRSZWN0KCk7CiAKLSAgICBpZiAo IW1fYm94RGVjb3JhdGlvbkRhdGEtPmJvcmRlclJhZGlpKCkpCisgICAgaWYgKCFoYXNCb3JkZXJS YWRpdXMoKSkKICAgICAgICAgcmV0dXJuIHJvdW5kZWRJbnNldEJvcmRlckZvclJlY3QoYWJzb2x1 dGVCb3JkZXJCb3hSZWN0KCksIHsgfSwgYm9yZGVyV2lkdGhzKG1fYm94RGVjb3JhdGlvbkRhdGEt PmJvcmRlckVkZ2VzKCkpKTsKIAotICAgIHJldHVybiByb3VuZGVkSW5zZXRCb3JkZXJGb3JSZWN0 KGFic29sdXRlQm9yZGVyQm94UmVjdCgpLCAqbV9ib3hEZWNvcmF0aW9uRGF0YS0+Ym9yZGVyUmFk aWkoKSwgYm9yZGVyV2lkdGhzKG1fYm94RGVjb3JhdGlvbkRhdGEtPmJvcmRlckVkZ2VzKCkpKTsK KyAgICByZXR1cm4gcm91bmRlZEluc2V0Qm9yZGVyRm9yUmVjdChhYnNvbHV0ZUJvcmRlckJveFJl Y3QoKSwgKm1fYm94UmFyZUdlb21ldHJ5LT5ib3JkZXJSYWRpaSgpLCBib3JkZXJXaWR0aHMobV9i b3hEZWNvcmF0aW9uRGF0YS0+Ym9yZGVyRWRnZXMoKSkpOwogfQogCiB2b2lkIEJveE1vZGVsQm94 OjpzZXRBbmNlc3RvckNsaXAoUmVmUHRyPEJveENsaXA+JiYgY2xpcCkKQEAgLTkzLDcgKzk4LDcg QEAgUmVmUHRyPEJveENsaXA+IEJveE1vZGVsQm94OjpjbGlwRm9yRGVzY2VuZGFudHMoKSBjb25z dAogICAgIGF1dG8gY2xpcCA9IG1fYW5jZXN0b3JDbGlwID8gbV9hbmNlc3RvckNsaXAtPmNvcHko KSA6IEJveENsaXA6OmNyZWF0ZSgpOwogCiAgICAgYXV0byBwdXNoQ2xpcCA9IFsmXShCb3hDbGlw JiBib3hDbGlwKSB7Ci0gICAgICAgIGlmIChtX2JveERlY29yYXRpb25EYXRhICYmIG1fYm94RGVj b3JhdGlvbkRhdGEtPmhhc0JvcmRlclJhZGl1cygpKSB7CisgICAgICAgIGlmIChoYXNCb3JkZXJS YWRpdXMoKSkgewogICAgICAgICAgICAgYXV0byByb3VuZGVkSW5uZXJCb3JkZXIgPSBpbm5lckJv cmRlclJvdW5kZWRSZWN0KCk7CiAgICAgICAgICAgICBpZiAocm91bmRlZElubmVyQm9yZGVyLmlz Um91bmRlZCgpKSB7CiAgICAgICAgICAgICAgICAgYm94Q2xpcC5wdXNoUm91bmRlZENsaXAocm91 bmRlZElubmVyQm9yZGVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3Nz L0Rpc3BsYXlCb3hNb2RlbEJveC5oIGIvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxh eUJveE1vZGVsQm94LmgKaW5kZXggYzRlMGZmMzA0MDE3N2VmN2ViYjBkZDIyODZkNTU3Y2U4M2E5 YjRjNS4uOWU2NmJkNGUwMGQ3ZDNlNjk3ZDEzYzQxYWYyZjM3NzM4MDRhN2JlNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheUJveE1vZGVsQm94LmgKKysrIGIv U291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheUJveE1vZGVsQm94LmgKQEAgLTU1LDYg KzU1LDcgQEAgcHVibGljOgogICAgIGNvbnN0IEJveENsaXAqIGFuY2VzdG9yQ2xpcCgpIGNvbnN0 IHsgcmV0dXJuIG1fYW5jZXN0b3JDbGlwLmdldCgpOyB9CiAgICAgYm9vbCBoYXNBbmNlc3RvckNs aXAoKSBjb25zdDsKIAorICAgIGJvb2wgaGFzQm9yZGVyUmFkaXVzKCkgY29uc3Q7CiAgICAgRmxv YXRSb3VuZGVkUmVjdCBib3JkZXJSb3VuZGVkUmVjdCgpIGNvbnN0OwogICAgIEZsb2F0Um91bmRl ZFJlY3QgaW5uZXJCb3JkZXJSb3VuZGVkUmVjdCgpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5Qm94UmFyZUdlb21ldHJ5LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlCb3hSYXJlR2VvbWV0cnkuY3BwCmluZGV4IGJi N2EyMDg5NzgyMzEwZDZmMWMwYTJiYzIwOTdhYWIwYTFhNmNlNTAuLmJkMzQ3MDdiYmMxMjMxZTQ1 ZTZlMjFjMjVmMTc2MjMxNTA2MDAwZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rpc3Bs YXkvY3NzL0Rpc3BsYXlCb3hSYXJlR2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rp c3BsYXkvY3NzL0Rpc3BsYXlCb3hSYXJlR2VvbWV0cnkuY3BwCkBAIC0zMyw2ICszMyw0MiBAQAog bmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIERpc3BsYXkgewogCitib29sIEJveFJhcmVH ZW9tZXRyeTo6aGFzQm9yZGVyUmFkaXVzKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9ib3JkZXJS YWRpaSAmJiAhbV9ib3JkZXJSYWRpaS0+aXNaZXJvKCk7Cit9CisKK0Zsb2F0Um91bmRlZFJlY3Qg cm91bmRlZFJlY3RXaXRoSW5jbHVkZWRSYWRpaShjb25zdCBGbG9hdFJlY3QmIHJlY3QsIGNvbnN0 IEZsb2F0Um91bmRlZFJlY3Q6OlJhZGlpJiByYWRpaSwgYm9vbCBpbmNsdWRlTGVmdEVkZ2UsIGJv b2wgaW5jbHVkZVJpZ2h0RWRnZSkKK3sKKyAgICBGbG9hdFJvdW5kZWRSZWN0OjpSYWRpaSByZXN1 bHRSYWRpaTsKKworICAgIGlmIChpbmNsdWRlTGVmdEVkZ2UpIHsKKyAgICAgICAgcmVzdWx0UmFk aWkuc2V0VG9wTGVmdChyYWRpaS50b3BMZWZ0KCkpOworICAgICAgICByZXN1bHRSYWRpaS5zZXRC b3R0b21MZWZ0KHJhZGlpLmJvdHRvbUxlZnQoKSk7CisgICAgfQorCisgICAgaWYgKGluY2x1ZGVS aWdodEVkZ2UpIHsKKyAgICAgICAgcmVzdWx0UmFkaWkuc2V0VG9wUmlnaHQocmFkaWkudG9wUmln aHQoKSk7CisgICAgICAgIHJlc3VsdFJhZGlpLnNldEJvdHRvbVJpZ2h0KHJhZGlpLmJvdHRvbVJp Z2h0KCkpOworICAgIH0KKworICAgIHJlc3VsdFJhZGlpLnNjYWxlKGNhbGNCb3JkZXJSYWRpaUNv bnN0cmFpbnRTY2FsZUZvcihyZWN0LCByZXN1bHRSYWRpaSkpOworICAgIHJldHVybiBGbG9hdFJv dW5kZWRSZWN0IHsgcmVjdCwgcmVzdWx0UmFkaWkgfTsKK30KKworRmxvYXRSb3VuZGVkUmVjdCBy b3VuZGVkSW5zZXRCb3JkZXJGb3JSZWN0KGNvbnN0IEZsb2F0UmVjdCYgYm9yZGVyUmVjdCwgY29u c3QgRmxvYXRSb3VuZGVkUmVjdDo6UmFkaWkmIHJhZGlpLCBjb25zdCBSZWN0RWRnZXM8ZmxvYXQ+ JiBib3JkZXJXaWR0aCwgYm9vbCBpbmNsdWRlTGVmdEVkZ2UsIGJvb2wgaW5jbHVkZVJpZ2h0RWRn ZSkKK3sKKyAgICBhdXRvIGluc2V0UmVjdCA9IEZsb2F0UmVjdCB7IGJvcmRlclJlY3QueCgpICsg Ym9yZGVyV2lkdGgubGVmdCgpLCBib3JkZXJSZWN0LnkoKSArIGJvcmRlcldpZHRoLnRvcCgpLAor ICAgICAgICBib3JkZXJSZWN0LndpZHRoKCkgLSBib3JkZXJXaWR0aC5sZWZ0KCkgLSBib3JkZXJX aWR0aC5yaWdodCgpLCBib3JkZXJSZWN0LmhlaWdodCgpIC0gYm9yZGVyV2lkdGgudG9wKCkgLSBi b3JkZXJXaWR0aC5ib3R0b20oKSB9OworCisgICAgaWYgKCFyYWRpaS5pc1plcm8oKSkgeworICAg ICAgICBhdXRvIGFkanVzdGVkUmFkaWkgPSByYWRpaTsKKyAgICAgICAgYWRqdXN0ZWRSYWRpaS5z aHJpbmsoYm9yZGVyV2lkdGgudG9wKCksIGJvcmRlcldpZHRoLmJvdHRvbSgpLCBib3JkZXJXaWR0 aC5sZWZ0KCksIGJvcmRlcldpZHRoLnJpZ2h0KCkpOworICAgICAgICByZXR1cm4gcm91bmRlZFJl Y3RXaXRoSW5jbHVkZWRSYWRpaShpbnNldFJlY3QsIGFkanVzdGVkUmFkaWksIGluY2x1ZGVMZWZ0 RWRnZSwgaW5jbHVkZVJpZ2h0RWRnZSk7CisgICAgfQorCisgICAgcmV0dXJuIEZsb2F0Um91bmRl ZFJlY3QgeyBpbnNldFJlY3QsIHsgfSB9OworfQogCiB9IC8vIG5hbWVzcGFjZSBEaXNwbGF5CiB9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5 L2Nzcy9EaXNwbGF5Qm94UmFyZUdlb21ldHJ5LmggYi9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nz cy9EaXNwbGF5Qm94UmFyZUdlb21ldHJ5LmgKaW5kZXggZDIwNTE5MDc0ZmVhNTZlOWI1MGIyZDQ2 M2Q2Mjc2ZGM4ZDE0MzRiZC4uZjhkMWIxMWFmZDQyZWY2YjRkZjlhYThhOGUwYzQ0MDdlMGFiNzYy YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheUJveFJhcmVH ZW9tZXRyeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlCb3hSYXJl R2VvbWV0cnkuaApAQCAtMjcsNyArMjcsNiBAQAogCiAjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRU SU5HX0NPTlRFWFQpCiAKLSNpbmNsdWRlICJGbG9hdFBvaW50M0QuaCIKICNpbmNsdWRlICJGbG9h dFJvdW5kZWRSZWN0LmgiCiAjaW5jbHVkZSAiVHJhbnNmb3JtYXRpb25NYXRyaXguaCIKICNpbmNs dWRlIDx3dGYvSXNvTWFsbG9jLmg+CkBAIC00MSw4ICs0MCwxMCBAQCBjbGFzcyBCb3hSYXJlR2Vv bWV0cnkgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEX1dJVEhfSEVBUF9JREVOVElGSUVS KEJveFJhcmVHZW9tZXRyeSk7CiBwdWJsaWM6CiAKLSAgICAvLyBGSVhNRTogTW92ZSBib3JkZXIg cmFkaWkgaGVyZS4KKyAgICBjb25zdCBGbG9hdFJvdW5kZWRSZWN0OjpSYWRpaSogYm9yZGVyUmFk aWkoKSBjb25zdCB7IHJldHVybiBtX2JvcmRlclJhZGlpLmdldCgpOyB9CisgICAgdm9pZCBzZXRC b3JkZXJSYWRpaShzdGQ6OnVuaXF1ZV9wdHI8RmxvYXRSb3VuZGVkUmVjdDo6UmFkaWk+JiYgcmFk aWkpIHsgbV9ib3JkZXJSYWRpaSA9IFdURk1vdmUocmFkaWkpOyB9CiAKKyAgICBib29sIGhhc0Jv cmRlclJhZGl1cygpIGNvbnN0OwogCiAgICAgLy8gRnJvbSB0cmFuc2Zvcm0sIHRyYW5zbGF0ZSwg cm90YXRlLCBzY2FsZSBwcm9wZXJ0aWVzLgogICAgIGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4 JiB0cmFuc2Zvcm0oKSBjb25zdCB7IHJldHVybiBtX3RyYW5zZm9ybTsgfQpAQCAtNTAsOCArNTEs MTMgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IG1fdHJh bnNmb3JtOworICAgIHN0ZDo6dW5pcXVlX3B0cjxGbG9hdFJvdW5kZWRSZWN0OjpSYWRpaT4gbV9i b3JkZXJSYWRpaTsKIH07CiAKK0Zsb2F0Um91bmRlZFJlY3Qgcm91bmRlZFJlY3RXaXRoSW5jbHVk ZWRSYWRpaShjb25zdCBGbG9hdFJlY3QmLCBjb25zdCBGbG9hdFJvdW5kZWRSZWN0OjpSYWRpaSYs IGJvb2wgaW5jbHVkZUxlZnRFZGdlID0gdHJ1ZSwgYm9vbCBpbmNsdWRlUmlnaHRFZGdlID0gdHJ1 ZSk7CitGbG9hdFJvdW5kZWRSZWN0IHJvdW5kZWRJbnNldEJvcmRlckZvclJlY3QoY29uc3QgRmxv YXRSZWN0JiwgY29uc3QgRmxvYXRSb3VuZGVkUmVjdDo6UmFkaWkmLCBjb25zdCBSZWN0RWRnZXM8 ZmxvYXQ+JiwgYm9vbCBpbmNsdWRlTGVmdEVkZ2UgPSB0cnVlLCBib29sIGluY2x1ZGVSaWdodEVk Z2UgPSB0cnVlKTsKKworCiB9IC8vIG5hbWVzcGFjZSBEaXNwbGF5CiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCiAK