229289 2021-08-19 09:06:44 -0700 Implement CSS Cascade Layers 2021-08-24 15:19:26 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 220779 P2 Normal --- 229441 1 koivisto webkit-unassigned esprehn+autocc ews-watchlist glenn gyuyoung.kim macpherson menard simon.fraser oldest_to_newest 1785465 0 koivisto 2021-08-19 09:06:44 -0700 https://www.w3.org/TR/css-cascade-5/#layering 1785466 1 435867 koivisto 2021-08-19 09:08:13 -0700 Created attachment 435867 wip 1786968 2 simon.fraser 2021-08-24 15:19:26 -0700 *** This bug has been marked as a duplicate of bug 220779 *** 435867 2021-08-19 09:08:13 -0700 2021-08-19 09:08:13 -0700 wip cascade-layers-3.patch text/plain 23067 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGUuY3BwIGIvU291cmNlL1dl YkNvcmUvY3NzL1N0eWxlUnVsZS5jcHAKaW5kZXggNjVlNWM1MGE3OTJmLi42OGFiNDc4YzZlOWYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGUuY3BwCkBAIC05NCw2ICs5NCw5IEBAIHZvaWQgU3R5bGVS dWxlQmFzZTo6ZGVzdHJveSgpCiAgICAgY2FzZSBTdHlsZVJ1bGVUeXBlOjpDb3VudGVyU3R5bGU6 CiAgICAgICAgIGRlbGV0ZSBkb3duY2FzdDxTdHlsZVJ1bGVDb3VudGVyU3R5bGU+KHRoaXMpOwog ICAgICAgICByZXR1cm47CisgICAgY2FzZSBTdHlsZVJ1bGVUeXBlOjpMYXllcjoKKyAgICAgICAg ZGVsZXRlIGRvd25jYXN0PFN0eWxlUnVsZUxheWVyPih0aGlzKTsKKyAgICAgICAgcmV0dXJuOwog ICAgIGNhc2UgU3R5bGVSdWxlVHlwZTo6VW5rbm93bjoKICAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CiAgICAgICAgIHJldHVybjsKQEAgLTExOCw2ICsxMjEsOCBAQCBSZWY8U3R5bGVSdWxl QmFzZT4gU3R5bGVSdWxlQmFzZTo6Y29weSgpIGNvbnN0CiAgICAgICAgIHJldHVybiBkb3duY2Fz dDxTdHlsZVJ1bGVLZXlmcmFtZXM+KCp0aGlzKS5jb3B5KCk7CiAgICAgY2FzZSBTdHlsZVJ1bGVU eXBlOjpDb3VudGVyU3R5bGU6CiAgICAgICAgIHJldHVybiBkb3duY2FzdDxTdHlsZVJ1bGVDb3Vu dGVyU3R5bGU+KCp0aGlzKS5jb3B5KCk7CisgICAgY2FzZSBTdHlsZVJ1bGVUeXBlOjpMYXllcjoK KyAgICAgICAgcmV0dXJuIGRvd25jYXN0PFN0eWxlUnVsZUxheWVyPigqdGhpcykuY29weSgpOwog ICAgIGNhc2UgU3R5bGVSdWxlVHlwZTo6SW1wb3J0OgogICAgIGNhc2UgU3R5bGVSdWxlVHlwZTo6 TmFtZXNwYWNlOgogICAgICAgICAvLyBGSVhNRTogQ29weSBpbXBvcnQgYW5kIG5hbWVzcGFjZSBy dWxlcy4KQEAgLTE2Miw2ICsxNjcsOCBAQCBSZWY8Q1NTUnVsZT4gU3R5bGVSdWxlQmFzZTo6Y3Jl YXRlQ1NTT01XcmFwcGVyKENTU1N0eWxlU2hlZXQqIHBhcmVudFNoZWV0LCBDU1NSdQogICAgIGNh c2UgU3R5bGVSdWxlVHlwZTo6Q291bnRlclN0eWxlOgogICAgICAgICBydWxlID0gQ1NTQ291bnRl clN0eWxlUnVsZTo6Y3JlYXRlKGRvd25jYXN0PFN0eWxlUnVsZUNvdW50ZXJTdHlsZT4oc2VsZiks IHBhcmVudFNoZWV0KTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBTdHlsZVJ1bGVUeXBlOjpM YXllcjoKKyAgICAgICAgLy8gRklYTUU6IEltcGxlbWVudC4KICAgICBjYXNlIFN0eWxlUnVsZVR5 cGU6OlVua25vd246CiAgICAgY2FzZSBTdHlsZVJ1bGVUeXBlOjpDaGFyc2V0OgogICAgIGNhc2Ug U3R5bGVSdWxlVHlwZTo6S2V5ZnJhbWU6CkBAIC00MjQsNiArNDMxLDcgQEAgU3R5bGVSdWxlU3Vw cG9ydHM6OlN0eWxlUnVsZVN1cHBvcnRzKGNvbnN0IFN0eWxlUnVsZVN1cHBvcnRzJiBvKQogewog fQogCisKIFJlZjxTdHlsZVJ1bGVTdXBwb3J0cz4gU3R5bGVSdWxlU3VwcG9ydHM6OmNyZWF0ZShj b25zdCBTdHJpbmcmIGNvbmRpdGlvblRleHQsIGJvb2wgY29uZGl0aW9uSXNTdXBwb3J0ZWQsIFZl Y3RvcjxSZWZQdHI8U3R5bGVSdWxlQmFzZT4+JiYgcnVsZXMpCiB7CiAgICAgcmV0dXJuIGFkb3B0 UmVmKCpuZXcgU3R5bGVSdWxlU3VwcG9ydHMoY29uZGl0aW9uVGV4dCwgY29uZGl0aW9uSXNTdXBw b3J0ZWQsIFdURk1vdmUocnVsZXMpKSk7CkBAIC00MzQsNiArNDQyLDQ1IEBAIFJlZjxTdHlsZVJ1 bGVTdXBwb3J0cz4gU3R5bGVSdWxlU3VwcG9ydHM6OmNyZWF0ZShjb25zdCBTdHJpbmcmIGNvbmRp dGlvblRleHQsIGJvCiAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgU3R5bGVSdWxlU3VwcG9ydHMo Y29uZGl0aW9uVGV4dCwgY29uZGl0aW9uSXNTdXBwb3J0ZWQsIFdURk1vdmUocnVsZXMpKSk7CiB9 CiAKK1N0eWxlUnVsZUxheWVyOjpTdHlsZVJ1bGVMYXllcihWZWN0b3I8Q2FzY2FkZUxheWVyTmFt ZT4mJiBuYW1lTGlzdCkKKyAgICA6IFN0eWxlUnVsZUdyb3VwKFN0eWxlUnVsZVR5cGU6OkxheWVy LCBWZWN0b3I8UmVmUHRyPFN0eWxlUnVsZUJhc2U+PiB7IH0pCisgICAgLCBtX25hbWVWYXJpYW50 KFdURk1vdmUobmFtZUxpc3QpKQoreworfQorCitTdHlsZVJ1bGVMYXllcjo6U3R5bGVSdWxlTGF5 ZXIoQ2FzY2FkZUxheWVyTmFtZSYmIG5hbWUsIFZlY3RvcjxSZWZQdHI8U3R5bGVSdWxlQmFzZT4+ JiYgcnVsZXMpCisgICAgOiBTdHlsZVJ1bGVHcm91cChTdHlsZVJ1bGVUeXBlOjpMYXllciwgV1RG TW92ZShydWxlcykpCisgICAgLCBtX25hbWVWYXJpYW50KFdURk1vdmUobmFtZSkpCit7Cit9CisK K1N0eWxlUnVsZUxheWVyOjpTdHlsZVJ1bGVMYXllcihDYXNjYWRlTGF5ZXJOYW1lJiYgbmFtZSwg c3RkOjp1bmlxdWVfcHRyPERlZmVycmVkU3R5bGVHcm91cFJ1bGVMaXN0PiYmIHJ1bGVzKQorICAg IDogU3R5bGVSdWxlR3JvdXAoU3R5bGVSdWxlVHlwZTo6TGF5ZXIsIFdURk1vdmUocnVsZXMpKQor ICAgICwgbV9uYW1lVmFyaWFudChXVEZNb3ZlKG5hbWUpKQoreworfQorCitTdHlsZVJ1bGVMYXll cjo6U3R5bGVSdWxlTGF5ZXIoY29uc3QgU3R5bGVSdWxlTGF5ZXImIG90aGVyKQorICAgIDogU3R5 bGVSdWxlR3JvdXAob3RoZXIpCisgICAgLCBtX25hbWVWYXJpYW50KG90aGVyLm1fbmFtZVZhcmlh bnQpCit7Cit9CisKK1JlZjxTdHlsZVJ1bGVMYXllcj4gU3R5bGVSdWxlTGF5ZXI6OmNyZWF0ZShW ZWN0b3I8Q2FzY2FkZUxheWVyTmFtZT4mJiBuYW1lTGlzdCkKK3sKKyAgICByZXR1cm4gYWRvcHRS ZWYoKm5ldyBTdHlsZVJ1bGVMYXllcihXVEZNb3ZlKG5hbWVMaXN0KSkpOworfQorCitSZWY8U3R5 bGVSdWxlTGF5ZXI+IFN0eWxlUnVsZUxheWVyOjpjcmVhdGUoQ2FzY2FkZUxheWVyTmFtZSYmIG5h bWUsIFZlY3RvcjxSZWZQdHI8U3R5bGVSdWxlQmFzZT4+JiYgcnVsZXMpCit7CisgICAgcmV0dXJu IGFkb3B0UmVmKCpuZXcgU3R5bGVSdWxlTGF5ZXIoV1RGTW92ZShuYW1lKSwgV1RGTW92ZShydWxl cykpKTsKK30KKworUmVmPFN0eWxlUnVsZUxheWVyPiBTdHlsZVJ1bGVMYXllcjo6Y3JlYXRlKENh c2NhZGVMYXllck5hbWUmJiBuYW1lLCBzdGQ6OnVuaXF1ZV9wdHI8RGVmZXJyZWRTdHlsZUdyb3Vw UnVsZUxpc3Q+JiYgcnVsZXMpCit7CisgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgU3R5bGVSdWxl TGF5ZXIoV1RGTW92ZShuYW1lKSwgV1RGTW92ZShydWxlcykpKTsKK30KKwogU3R5bGVSdWxlQ2hh cnNldDo6U3R5bGVSdWxlQ2hhcnNldCgpCiAgICAgOiBTdHlsZVJ1bGVCYXNlKFN0eWxlUnVsZVR5 cGU6OkNoYXJzZXQpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSdWxl LmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSdWxlLmgKaW5kZXggZTAyYzU2YTE0N2M5Li40 YjdmZDkwMzY1ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGUuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSdWxlLmgKQEAgLTI4LDYgKzI4LDcgQEAKICNp bmNsdWRlIDx3dGYvUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1R5cGVDYXN0cy5oPgogI2luY2x1 ZGUgPHd0Zi9VbmlxdWVBcnJheS5oPgorI2luY2x1ZGUgPHd0Zi9WYXJpYW50Lmg+CiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIApAQCAtMzksNiArNDAsOCBAQCBjbGFzcyBNdXRhYmxlU3R5bGVQcm9w ZXJ0aWVzOwogY2xhc3MgU3R5bGVSdWxlS2V5ZnJhbWU7CiBjbGFzcyBTdHlsZVByb3BlcnRpZXM7 CiBjbGFzcyBTdHlsZVJ1bGVLZXlmcmFtZXM7CisKK3VzaW5nIENhc2NhZGVMYXllck5hbWUgPSBW ZWN0b3I8QXRvbVN0cmluZz47CiAgICAgCiBERUNMQVJFX0FMTE9DQVRPUl9XSVRIX0hFQVBfSURF TlRJRklFUihTdHlsZVJ1bGVCYXNlKTsKIGNsYXNzIFN0eWxlUnVsZUJhc2UgOiBwdWJsaWMgV1RG OjpSZWZDb3VudGVkQmFzZSB7CkBAIC01NSw4ICs1OCwxMCBAQCBwdWJsaWM6CiAgICAgYm9vbCBp c01lZGlhUnVsZSgpIGNvbnN0IHsgcmV0dXJuIHR5cGUoKSA9PSBTdHlsZVJ1bGVUeXBlOjpNZWRp YTsgfQogICAgIGJvb2wgaXNQYWdlUnVsZSgpIGNvbnN0IHsgcmV0dXJuIHR5cGUoKSA9PSBTdHls ZVJ1bGVUeXBlOjpQYWdlOyB9CiAgICAgYm9vbCBpc1N0eWxlUnVsZSgpIGNvbnN0IHsgcmV0dXJu IHR5cGUoKSA9PSBTdHlsZVJ1bGVUeXBlOjpTdHlsZTsgfQorICAgIGJvb2wgaXNHcm91cFJ1bGUo KSBjb25zdCB7IHJldHVybiB0eXBlKCkgPT0gU3R5bGVSdWxlVHlwZTo6TWVkaWEgfHwgdHlwZSgp ID09IFN0eWxlUnVsZVR5cGU6OlN1cHBvcnRzIHx8IHR5cGUoKSA9PSBTdHlsZVJ1bGVUeXBlOjpM YXllcjsgfQogICAgIGJvb2wgaXNTdXBwb3J0c1J1bGUoKSBjb25zdCB7IHJldHVybiB0eXBlKCkg PT0gU3R5bGVSdWxlVHlwZTo6U3VwcG9ydHM7IH0KICAgICBib29sIGlzSW1wb3J0UnVsZSgpIGNv bnN0IHsgcmV0dXJuIHR5cGUoKSA9PSBTdHlsZVJ1bGVUeXBlOjpJbXBvcnQ7IH0KKyAgICBib29s IGlzTGF5ZXJSdWxlKCkgY29uc3QgeyByZXR1cm4gdHlwZSgpID09IFN0eWxlUnVsZVR5cGU6Okxh eWVyOyB9CiAKICAgICBSZWY8U3R5bGVSdWxlQmFzZT4gY29weSgpIGNvbnN0OwogCkBAIC0yMzEs NiArMjM2LDI3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2NvbmRpdGlvbklzU3VwcG9ydGVkOwog fTsKIAorY2xhc3MgU3R5bGVSdWxlTGF5ZXIgZmluYWwgOiBwdWJsaWMgU3R5bGVSdWxlR3JvdXAg eworcHVibGljOgorICAgIHN0YXRpYyBSZWY8U3R5bGVSdWxlTGF5ZXI+IGNyZWF0ZShWZWN0b3I8 Q2FzY2FkZUxheWVyTmFtZT4mJik7CisgICAgc3RhdGljIFJlZjxTdHlsZVJ1bGVMYXllcj4gY3Jl YXRlKENhc2NhZGVMYXllck5hbWUmJiwgVmVjdG9yPFJlZlB0cjxTdHlsZVJ1bGVCYXNlPj4mJik7 CisgICAgc3RhdGljIFJlZjxTdHlsZVJ1bGVMYXllcj4gY3JlYXRlKENhc2NhZGVMYXllck5hbWUm Jiwgc3RkOjp1bmlxdWVfcHRyPERlZmVycmVkU3R5bGVHcm91cFJ1bGVMaXN0PiYmKTsKKyAgICBS ZWY8U3R5bGVSdWxlTGF5ZXI+IGNvcHkoKSBjb25zdCB7IHJldHVybiBhZG9wdFJlZigqbmV3IFN0 eWxlUnVsZUxheWVyKCp0aGlzKSk7IH0KKworICAgIGJvb2wgaXNMaXN0KCkgY29uc3QgeyByZXR1 cm4gV1RGOjpob2xkc19hbHRlcm5hdGl2ZTxWZWN0b3I8Q2FzY2FkZUxheWVyTmFtZT4+KG1fbmFt ZVZhcmlhbnQpOyB9CisKKyAgICBhdXRvJiBuYW1lKCkgY29uc3QgeyByZXR1cm4gV1RGOjpnZXQ8 Q2FzY2FkZUxheWVyTmFtZT4obV9uYW1lVmFyaWFudCk7IH0KKyAgICBhdXRvJiBuYW1lTGlzdCgp IGNvbnN0IHsgcmV0dXJuIFdURjo6Z2V0PFZlY3RvcjxDYXNjYWRlTGF5ZXJOYW1lPj4obV9uYW1l VmFyaWFudCk7IH0KKworcHJpdmF0ZToKKyAgICBTdHlsZVJ1bGVMYXllcihWZWN0b3I8Q2FzY2Fk ZUxheWVyTmFtZT4mJik7CisgICAgU3R5bGVSdWxlTGF5ZXIoQ2FzY2FkZUxheWVyTmFtZSYmLCBW ZWN0b3I8UmVmUHRyPFN0eWxlUnVsZUJhc2U+PiYmKTsKKyAgICBTdHlsZVJ1bGVMYXllcihDYXNj YWRlTGF5ZXJOYW1lJiYsIHN0ZDo6dW5pcXVlX3B0cjxEZWZlcnJlZFN0eWxlR3JvdXBSdWxlTGlz dD4mJik7CisgICAgU3R5bGVSdWxlTGF5ZXIoY29uc3QgU3R5bGVSdWxlTGF5ZXImKTsKKworICAg IFZhcmlhbnQ8Q2FzY2FkZUxheWVyTmFtZSwgVmVjdG9yPENhc2NhZGVMYXllck5hbWU+PiBtX25h bWVWYXJpYW50OworfTsKKwogLy8gVGhpcyBpcyBvbmx5IHVzZWQgYnkgdGhlIENTUyBwYXJzZXIu CiBjbGFzcyBTdHlsZVJ1bGVDaGFyc2V0IGZpbmFsIDogcHVibGljIFN0eWxlUnVsZUJhc2Ugewog cHVibGljOgpAQCAtMzE1LDYgKzM0MSwxMCBAQCBTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0JFR0lO KFdlYkNvcmU6OlN0eWxlUnVsZSkKICAgICBzdGF0aWMgYm9vbCBpc1R5cGUoY29uc3QgV2ViQ29y ZTo6U3R5bGVSdWxlQmFzZSYgcnVsZSkgeyByZXR1cm4gcnVsZS5pc1N0eWxlUnVsZSgpOyB9CiBT UEVDSUFMSVpFX1RZUEVfVFJBSVRTX0VORCgpCiAKK1NQRUNJQUxJWkVfVFlQRV9UUkFJVFNfQkVH SU4oV2ViQ29yZTo6U3R5bGVSdWxlR3JvdXApCisgICAgc3RhdGljIGJvb2wgaXNUeXBlKGNvbnN0 IFdlYkNvcmU6OlN0eWxlUnVsZUJhc2UmIHJ1bGUpIHsgcmV0dXJuIHJ1bGUuaXNHcm91cFJ1bGUo KTsgfQorU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19FTkQoKQorCiBTUEVDSUFMSVpFX1RZUEVfVFJB SVRTX0JFR0lOKFdlYkNvcmU6OlN0eWxlUnVsZUZvbnRGYWNlKQogICAgIHN0YXRpYyBib29sIGlz VHlwZShjb25zdCBXZWJDb3JlOjpTdHlsZVJ1bGVCYXNlJiBydWxlKSB7IHJldHVybiBydWxlLmlz Rm9udEZhY2VSdWxlKCk7IH0KIFNQRUNJQUxJWkVfVFlQRV9UUkFJVFNfRU5EKCkKQEAgLTM0Miwz ICszNzIsNyBAQCBTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0VORCgpCiBTUEVDSUFMSVpFX1RZUEVf VFJBSVRTX0JFR0lOKFdlYkNvcmU6OlN0eWxlUnVsZUNoYXJzZXQpCiAgICAgc3RhdGljIGJvb2wg aXNUeXBlKGNvbnN0IFdlYkNvcmU6OlN0eWxlUnVsZUJhc2UmIHJ1bGUpIHsgcmV0dXJuIHJ1bGUu aXNDaGFyc2V0UnVsZSgpOyB9CiBTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0VORCgpCisKK1NQRUNJ QUxJWkVfVFlQRV9UUkFJVFNfQkVHSU4oV2ViQ29yZTo6U3R5bGVSdWxlTGF5ZXIpCisgICAgc3Rh dGljIGJvb2wgaXNUeXBlKGNvbnN0IFdlYkNvcmU6OlN0eWxlUnVsZUJhc2UmIHJ1bGUpIHsgcmV0 dXJuIHJ1bGUuaXNMYXllclJ1bGUoKTsgfQorU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19FTkQoKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUnVsZVR5cGUuaCBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9TdHlsZVJ1bGVUeXBlLmgKaW5kZXggYzQwNDc0NmFlOTQ1Li5jOWU1MThkYmU2 MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGVUeXBlLmgKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUnVsZVR5cGUuaApAQCAtNDAsNiArNDAsNyBAQCBlbnVt IGNsYXNzIFN0eWxlUnVsZVR5cGUgOiB1aW50OF90IHsKICAgICBOYW1lc3BhY2UgPSAxMCwKICAg ICBDb3VudGVyU3R5bGUgPSAxMSwKICAgICBTdXBwb3J0cyA9IDEyLAorICAgIExheWVyID0gMTMs CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvU3R5bGVTaGVldENvbnRlbnRzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVNo ZWV0Q29udGVudHMuY3BwCmluZGV4IGExYTBlNDZlYzFjNC4uODZiNDc0Mjg0YjMyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVTaGVldENvbnRlbnRzLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvU3R5bGVTaGVldENvbnRlbnRzLmNwcApAQCAtNDIzLDggKzQyMywxMCBA QCBzdGF0aWMgYm9vbCB0cmF2ZXJzZVJ1bGVzSW5WZWN0b3IoY29uc3QgVmVjdG9yPFJlZlB0cjxT dHlsZVJ1bGVCYXNlPj4mIHJ1bGVzLCBjbwogICAgICAgICBpZiAoaGFuZGxlcigqcnVsZSkpCiAg ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgc3dpdGNoIChydWxlLT50eXBlKCkpIHsK LSAgICAgICAgY2FzZSBTdHlsZVJ1bGVUeXBlOjpNZWRpYTogewotICAgICAgICAgICAgYXV0byog Y2hpbGRSdWxlcyA9IGRvd25jYXN0PFN0eWxlUnVsZU1lZGlhPigqcnVsZSkuY2hpbGRSdWxlc1dp dGhvdXREZWZlcnJlZFBhcnNpbmcoKTsKKyAgICAgICAgY2FzZSBTdHlsZVJ1bGVUeXBlOjpNZWRp YToKKyAgICAgICAgY2FzZSBTdHlsZVJ1bGVUeXBlOjpTdXBwb3J0czoKKyAgICAgICAgY2FzZSBT dHlsZVJ1bGVUeXBlOjpMYXllcjogeworICAgICAgICAgICAgYXV0byogY2hpbGRSdWxlcyA9IGRv d25jYXN0PFN0eWxlUnVsZUdyb3VwPigqcnVsZSkuY2hpbGRSdWxlc1dpdGhvdXREZWZlcnJlZFBh cnNpbmcoKTsKICAgICAgICAgICAgIGlmIChjaGlsZFJ1bGVzICYmIHRyYXZlcnNlUnVsZXNJblZl Y3RvcigqY2hpbGRSdWxlcywgaGFuZGxlcikpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgICAgICAgICBicmVhazsKQEAgLTQ0MSw3ICs0NDMsNiBAQCBzdGF0aWMgYm9vbCB0cmF2 ZXJzZVJ1bGVzSW5WZWN0b3IoY29uc3QgVmVjdG9yPFJlZlB0cjxTdHlsZVJ1bGVCYXNlPj4mIHJ1 bGVzLCBjbwogICAgICAgICBjYXNlIFN0eWxlUnVsZVR5cGU6OkNoYXJzZXQ6CiAgICAgICAgIGNh c2UgU3R5bGVSdWxlVHlwZTo6Q291bnRlclN0eWxlOgogICAgICAgICBjYXNlIFN0eWxlUnVsZVR5 cGU6OktleWZyYW1lOgotICAgICAgICBjYXNlIFN0eWxlUnVsZVR5cGU6OlN1cHBvcnRzOgogICAg ICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICB9CkBAIC00ODQsNiArNDg1LDcgQEAgYm9v bCBTdHlsZVNoZWV0Q29udGVudHM6OnRyYXZlcnNlU3VicmVzb3VyY2VzKGNvbnN0IFdURjo6RnVu Y3Rpb248Ym9vbCAoY29uc3QgQ2EKICAgICAgICAgY2FzZSBTdHlsZVJ1bGVUeXBlOjpDaGFyc2V0 OgogICAgICAgICBjYXNlIFN0eWxlUnVsZVR5cGU6OktleWZyYW1lOgogICAgICAgICBjYXNlIFN0 eWxlUnVsZVR5cGU6OlN1cHBvcnRzOgorICAgICAgICBjYXNlIFN0eWxlUnVsZVR5cGU6OkxheWVy OgogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9OwogICAgICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NT QXRSdWxlSUQuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NBdFJ1bGVJRC5jcHAK aW5kZXggZTRiN2QzMzBlNmZkLi4wODI1NzIzOGM4YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9wYXJzZXIvQ1NTQXRSdWxlSUQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9w YXJzZXIvQ1NTQXRSdWxlSUQuY3BwCkBAIC01OCw2ICs1OCw4IEBAIENTU0F0UnVsZUlEIGNzc0F0 UnVsZUlEKFN0cmluZ1ZpZXcgbmFtZSkKICAgICAgICAgcmV0dXJuIENTU0F0UnVsZUFwcGx5Owog ICAgIGlmIChlcXVhbElnbm9yaW5nQVNDSUlDYXNlKG5hbWUsICJjb3VudGVyLXN0eWxlIikpCiAg ICAgICAgIHJldHVybiBDU1NBdFJ1bGVDb3VudGVyU3R5bGU7CisgICAgaWYgKGVxdWFsSWdub3Jp bmdBU0NJSUNhc2UobmFtZSwgImxheWVyIikpCisgICAgICAgIHJldHVybiBDU1NBdFJ1bGVMYXll cjsKICAgICByZXR1cm4gQ1NTQXRSdWxlSW52YWxpZDsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL3BhcnNlci9DU1NBdFJ1bGVJRC5oIGIvU291cmNlL1dlYkNvcmUvY3NzL3Bh cnNlci9DU1NBdFJ1bGVJRC5oCmluZGV4IDk2ODUyNjg3MDhlOC4uMzMwZjZjYmUyZTI1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU0F0UnVsZUlELmgKKysrIGIvU291 cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NBdFJ1bGVJRC5oCkBAIC00OCw2ICs0OCw3IEBAIGVu dW0gQ1NTQXRSdWxlSUQgewogICAgIENTU0F0UnVsZVdlYmtpdEtleWZyYW1lcyA9IDEwLAogICAg IENTU0F0UnVsZUFwcGx5ID0gMTEsCiAgICAgQ1NTQXRSdWxlQ291bnRlclN0eWxlID0gMTIsCisg ICAgQ1NTQXRSdWxlTGF5ZXIgPSAxMywKIH07CiAKIENTU0F0UnVsZUlEIGNzc0F0UnVsZUlEKFN0 cmluZ1ZpZXcgbmFtZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NT U1BhcnNlckltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJJbXBs LmNwcAppbmRleCA4NDllYzEyNjMyYTQuLjgxMTM1OTJmZjAzYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9jc3MvcGFyc2VyL0NTU1BhcnNlckltcGwuY3BwCkBAIC00MjAsNiArNDIwLDggQEAgUmVmUHRy PFN0eWxlUnVsZUJhc2U+IENTU1BhcnNlckltcGw6OmNvbnN1bWVBdFJ1bGUoQ1NTUGFyc2VyVG9r ZW5SYW5nZSYgcmFuZ2UsIEEKICAgICAgICAgICAgIHJldHVybiBjb25zdW1lSW1wb3J0UnVsZShw cmVsdWRlKTsKICAgICAgICAgaWYgKGFsbG93ZWRSdWxlcyA8PSBBbGxvd05hbWVzcGFjZVJ1bGVz ICYmIGlkID09IENTU0F0UnVsZU5hbWVzcGFjZSkKICAgICAgICAgICAgIHJldHVybiBjb25zdW1l TmFtZXNwYWNlUnVsZShwcmVsdWRlKTsKKyAgICAgICAgaWYgKGFsbG93ZWRSdWxlcyA8PSBSZWd1 bGFyUnVsZXMgJiYgaWQgPT0gQ1NTQXRSdWxlTGF5ZXIpCisgICAgICAgICAgICByZXR1cm4gY29u c3VtZUxheWVyUnVsZShwcmVsdWRlLCB7IH0pOwogICAgICAgICAvLyBGSVhNRS1ORVdQQVJTRVI6 IFN1cHBvcnQgImFwcGx5IgogICAgICAgICAvKmlmIChhbGxvd2VkUnVsZXMgPT0gQXBwbHlSdWxl cyAmJiBpZCA9PSBDU1NBdFJ1bGVBcHBseSkgewogICAgICAgICAgICAgY29uc3VtZUFwcGx5UnVs ZShwcmVsdWRlKTsKQEAgLTQ1MSw2ICs0NTMsOCBAQCBSZWZQdHI8U3R5bGVSdWxlQmFzZT4gQ1NT UGFyc2VySW1wbDo6Y29uc3VtZUF0UnVsZShDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSwgQQog ICAgICAgICByZXR1cm4gY29uc3VtZVBhZ2VSdWxlKHByZWx1ZGUsIGJsb2NrKTsKICAgICBjYXNl IENTU0F0UnVsZUNvdW50ZXJTdHlsZToKICAgICAgICAgcmV0dXJuIGNvbnN1bWVDb3VudGVyU3R5 bGVSdWxlKHByZWx1ZGUsIGJsb2NrKTsKKyAgICBjYXNlIENTU0F0UnVsZUxheWVyOgorICAgICAg ICByZXR1cm4gY29uc3VtZUxheWVyUnVsZShwcmVsdWRlLCBibG9jayk7CiAgICAgZGVmYXVsdDoK ICAgICAgICAgcmV0dXJuIG51bGxwdHI7IC8vIFBhcnNlIGVycm9yLCB1bnJlY29nbmlzZWQgYXQt cnVsZSB3aXRoIGJsb2NrCiAgICAgfQpAQCAtNjc2LDYgKzY4MCw5MiBAQCBSZWZQdHI8U3R5bGVS dWxlQ291bnRlclN0eWxlPiBDU1NQYXJzZXJJbXBsOjpjb25zdW1lQ291bnRlclN0eWxlUnVsZShD U1NQYXJzZXJUbwogICAgIHJldHVybiBTdHlsZVJ1bGVDb3VudGVyU3R5bGU6OmNyZWF0ZShuYW1l LCBjcmVhdGVTdHlsZVByb3BlcnRpZXMobV9wYXJzZWRQcm9wZXJ0aWVzLCBtX2NvbnRleHQubW9k ZSkpOwogfQogCitSZWZQdHI8U3R5bGVSdWxlTGF5ZXI+IENTU1BhcnNlckltcGw6OmNvbnN1bWVM YXllclJ1bGUoQ1NTUGFyc2VyVG9rZW5SYW5nZSBwcmVsdWRlLCBzdGQ6Om9wdGlvbmFsPENTU1Bh cnNlclRva2VuUmFuZ2U+IGJsb2NrKQoreworLy8gICAgaWYgKCFtX2NvbnRleHQubGF5ZXJBdFJ1 bGVzRW5hYmxlZCkKKy8vICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIGF1dG8gcHJlbHVk ZUNvcHkgPSBwcmVsdWRlOworCisgICAgYXV0byBjb25zdW1lTmFtZSA9IFsmXSgpIC0+IHN0ZDo6 b3B0aW9uYWw8Q2FzY2FkZUxheWVyTmFtZT4geworICAgICAgICBDYXNjYWRlTGF5ZXJOYW1lIG5h bWU7CisgICAgICAgIC8vIEFub255bW91cyBjYXNlLgorICAgICAgICBpZiAocHJlbHVkZS5hdEVu ZCgpKQorICAgICAgICAgICAgcmV0dXJuIG5hbWU7CisKKyAgICAgICAgd2hpbGUgKHRydWUpIHsK KyAgICAgICAgICAgIGF1dG8gbmFtZVRva2VuID0gcHJlbHVkZS5jb25zdW1lKCk7CisgICAgICAg ICAgICBpZiAobmFtZVRva2VuLnR5cGUoKSAhPSBJZGVudFRva2VuKQorICAgICAgICAgICAgICAg IHJldHVybiB7IH07CisKKyAgICAgICAgICAgIG5hbWUuYXBwZW5kKG5hbWVUb2tlbi52YWx1ZSgp LnRvQXRvbVN0cmluZygpKTsKKworICAgICAgICAgICAgaWYgKHByZWx1ZGUucGVlaygpLnR5cGUo KSAhPSBEZWxpbWl0ZXJUb2tlbiB8fCBwcmVsdWRlLnBlZWsoKS5kZWxpbWl0ZXIoKSAhPSAnLicp CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBwcmVsdWRlLmNvbnN1bWUoKTsK KyAgICAgICAgfQorCisgICAgICAgIHByZWx1ZGUuY29uc3VtZVdoaXRlc3BhY2UoKTsKKyAgICAg ICAgcmV0dXJuIG5hbWU7CisgICAgfTsKKworICAgIGlmICghYmxvY2spIHsKKyAgICAgICAgLy8g TGlzdCBzeW50YXguCisgICAgICAgIFZlY3RvcjxDYXNjYWRlTGF5ZXJOYW1lPiBuYW1lTGlzdDsK KyAgICAgICAgd2hpbGUgKHRydWUpIHsKKyAgICAgICAgICAgIGF1dG8gbmFtZSA9IGNvbnN1bWVO YW1lKCk7CisgICAgICAgICAgICBpZiAoIW5hbWUpCisgICAgICAgICAgICAgICAgcmV0dXJuIG51 bGxwdHI7CisgICAgICAgICAgICBuYW1lTGlzdC5hcHBlbmQoKm5hbWUpOworCisgICAgICAgICAg ICBpZiAocHJlbHVkZS5hdEVuZCgpKQorICAgICAgICAgICAgICAgIGJyZWFrOworCisgICAgICAg ICAgICBhdXRvIGNvbW1hVG9rZW4gPSBwcmVsdWRlLmNvbnN1bWVJbmNsdWRpbmdXaGl0ZXNwYWNl KCk7CisgICAgICAgICAgICBpZiAoY29tbWFUb2tlbi50eXBlKCkgIT0gQ29tbWFUb2tlbikKKyAg ICAgICAgICAgICAgICByZXR1cm4geyB9OworICAgICAgICB9CisKKyAgICAgICAgaWYgKG1fb2Jz ZXJ2ZXJXcmFwcGVyKSB7CisgICAgICAgICAgICB1bnNpZ25lZCBlbmRPZmZzZXQgPSBtX29ic2Vy dmVyV3JhcHBlci0+ZW5kT2Zmc2V0KHByZWx1ZGVDb3B5KTsKKyAgICAgICAgICAgIG1fb2JzZXJ2 ZXJXcmFwcGVyLT5vYnNlcnZlcigpLnN0YXJ0UnVsZUhlYWRlcihTdHlsZVJ1bGVUeXBlOjpMYXll ciwgbV9vYnNlcnZlcldyYXBwZXItPnN0YXJ0T2Zmc2V0KHByZWx1ZGVDb3B5KSk7CisgICAgICAg ICAgICBtX29ic2VydmVyV3JhcHBlci0+b2JzZXJ2ZXIoKS5lbmRSdWxlSGVhZGVyKGVuZE9mZnNl dCk7CisgICAgICAgICAgICBtX29ic2VydmVyV3JhcHBlci0+b2JzZXJ2ZXIoKS5zdGFydFJ1bGVC b2R5KGVuZE9mZnNldCk7CisgICAgICAgICAgICBtX29ic2VydmVyV3JhcHBlci0+b2JzZXJ2ZXIo KS5lbmRSdWxlQm9keShlbmRPZmZzZXQpOworICAgICAgICB9CisKKyAgICAgICAgcmV0dXJuIFN0 eWxlUnVsZUxheWVyOjpjcmVhdGUoV1RGTW92ZShuYW1lTGlzdCkpOworICAgIH0KKworICAgIGF1 dG8gbmFtZSA9IGNvbnN1bWVOYW1lKCk7CisgICAgaWYgKCFuYW1lKQorICAgICAgICByZXR1cm4g bnVsbHB0cjsKKworICAgIC8vIE5vIGNvbW1hIHNlcGFyYXRlZCBsaXN0IHdoZW4gdXNpbmcgdGhl IGJsb2NrIHN5bnRheC4KKyAgICBpZiAoIXByZWx1ZGUuYXRFbmQoKSkKKyAgICAgICAgcmV0dXJu IG51bGxwdHI7CisKKyAgICBpZiAobV9kZWZlcnJlZFBhcnNlcikKKyAgICAgICAgcmV0dXJuIFN0 eWxlUnVsZUxheWVyOjpjcmVhdGUoV1RGTW92ZSgqbmFtZSksIG1ha2VVbmlxdWU8RGVmZXJyZWRT dHlsZUdyb3VwUnVsZUxpc3Q+KCpibG9jaywgKm1fZGVmZXJyZWRQYXJzZXIpKTsKKworICAgIGlm IChtX29ic2VydmVyV3JhcHBlcikgeworICAgICAgICBtX29ic2VydmVyV3JhcHBlci0+b2JzZXJ2 ZXIoKS5zdGFydFJ1bGVIZWFkZXIoU3R5bGVSdWxlVHlwZTo6TGF5ZXIsIG1fb2JzZXJ2ZXJXcmFw cGVyLT5zdGFydE9mZnNldChwcmVsdWRlQ29weSkpOworICAgICAgICBtX29ic2VydmVyV3JhcHBl ci0+b2JzZXJ2ZXIoKS5lbmRSdWxlSGVhZGVyKG1fb2JzZXJ2ZXJXcmFwcGVyLT5lbmRPZmZzZXQo cHJlbHVkZUNvcHkpKTsKKyAgICAgICAgbV9vYnNlcnZlcldyYXBwZXItPm9ic2VydmVyKCkuc3Rh cnRSdWxlQm9keShtX29ic2VydmVyV3JhcHBlci0+cHJldmlvdXNUb2tlblN0YXJ0T2Zmc2V0KCpi bG9jaykpOworICAgIH0KKworICAgIFZlY3RvcjxSZWZQdHI8U3R5bGVSdWxlQmFzZT4+IHJ1bGVz OworICAgIGNvbnN1bWVSdWxlTGlzdCgqYmxvY2ssIFJlZ3VsYXJSdWxlTGlzdCwgWyZdKFJlZlB0 cjxTdHlsZVJ1bGVCYXNlPiBydWxlKSB7CisgICAgICAgIHJ1bGVzLmFwcGVuZChydWxlKTsKKyAg ICB9KTsKKyAgICBydWxlcy5zaHJpbmtUb0ZpdCgpOworCisgICAgaWYgKG1fb2JzZXJ2ZXJXcmFw cGVyKQorICAgICAgICBtX29ic2VydmVyV3JhcHBlci0+b2JzZXJ2ZXIoKS5lbmRSdWxlQm9keSht X29ic2VydmVyV3JhcHBlci0+ZW5kT2Zmc2V0KCpibG9jaykpOworCisgICAgcmV0dXJuIFN0eWxl UnVsZUxheWVyOjpjcmVhdGUoV1RGTW92ZSgqbmFtZSksIFdURk1vdmUocnVsZXMpKTsKK30KKwog Ly8gRklYTUUtTkVXUEFSU0VSOiBTdXBwb3J0ICJhcHBseSIKIC8qdm9pZCBDU1NQYXJzZXJJbXBs Ojpjb25zdW1lQXBwbHlSdWxlKENTU1BhcnNlclRva2VuUmFuZ2UgcHJlbHVkZSkKIHsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VySW1wbC5oIGIvU291cmNl L1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJJbXBsLmgKaW5kZXggYTNkNWM1NDZkNzNiLi5j ZGU1MWNmNDE4ZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFy c2VySW1wbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VySW1wbC5o CkBAIC01Myw2ICs1Myw3IEBAIGNsYXNzIFN0eWxlUnVsZUNoYXJzZXQ7CiBjbGFzcyBTdHlsZVJ1 bGVGb250RmFjZTsKIGNsYXNzIFN0eWxlUnVsZUltcG9ydDsKIGNsYXNzIFN0eWxlUnVsZUtleWZy YW1lczsKK2NsYXNzIFN0eWxlUnVsZUxheWVyOwogY2xhc3MgU3R5bGVSdWxlTWVkaWE7CiBjbGFz cyBTdHlsZVJ1bGVOYW1lc3BhY2U7CiBjbGFzcyBTdHlsZVJ1bGVQYWdlOwpAQCAtMTM1LDcgKzEz Niw4IEBAIHByaXZhdGU6CiAgICAgUmVmUHRyPFN0eWxlUnVsZUtleWZyYW1lcz4gY29uc3VtZUtl eWZyYW1lc1J1bGUoYm9vbCB3ZWJraXRQcmVmaXhlZCwgQ1NTUGFyc2VyVG9rZW5SYW5nZSBwcmVs dWRlLCBDU1NQYXJzZXJUb2tlblJhbmdlIGJsb2NrKTsKICAgICBSZWZQdHI8U3R5bGVSdWxlUGFn ZT4gY29uc3VtZVBhZ2VSdWxlKENTU1BhcnNlclRva2VuUmFuZ2UgcHJlbHVkZSwgQ1NTUGFyc2Vy VG9rZW5SYW5nZSBibG9jayk7CiAgICAgUmVmUHRyPFN0eWxlUnVsZUNvdW50ZXJTdHlsZT4gY29u c3VtZUNvdW50ZXJTdHlsZVJ1bGUoQ1NTUGFyc2VyVG9rZW5SYW5nZSBwcmVsdWRlLCBDU1NQYXJz ZXJUb2tlblJhbmdlIGJsb2NrKTsKLSAgICAKKyAgICBSZWZQdHI8U3R5bGVSdWxlTGF5ZXI+IGNv bnN1bWVMYXllclJ1bGUoQ1NTUGFyc2VyVG9rZW5SYW5nZSBwcmVsdWRlLCBzdGQ6Om9wdGlvbmFs PENTU1BhcnNlclRva2VuUmFuZ2U+IGJsb2NrKTsKKwogICAgIC8vIEZJWE1FLU5FV1BBUlNFUjog U3VwcG9ydCAiYXBwbHkiCiAgICAgLy8gdm9pZCBjb25zdW1lQXBwbHlSdWxlKENTU1BhcnNlclRv a2VuUmFuZ2UgcHJlbHVkZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0Vs ZW1lbnRSdWxlQ29sbGVjdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0VsZW1lbnRSdWxl Q29sbGVjdG9yLmNwcAppbmRleCBhYjZjYWE5MTRhNTEuLmYyNDFmMjhiZWUyNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvRWxlbWVudFJ1bGVDb2xsZWN0b3IuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNwcApAQCAtNTQ0LDYgKzU0 NCw5IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBjb21wYXJlUnVsZXMoTWF0Y2hlZFJ1bGUgcjEsIE1h dGNoZWRSdWxlIHIyKQogICAgIGlmIChyMS5zdHlsZVNjb3BlT3JkaW5hbCAhPSByMi5zdHlsZVNj b3BlT3JkaW5hbCkKICAgICAgICAgcmV0dXJuIHIxLnN0eWxlU2NvcGVPcmRpbmFsID4gcjIuc3R5 bGVTY29wZU9yZGluYWw7CiAKKyAgICBpZiAocjEucnVsZURhdGEtPmNhc2NhZGVMYXllck9yZGVy KCkgIT0gcjIucnVsZURhdGEtPmNhc2NhZGVMYXllck9yZGVyKCkpCisgICAgICAgIHJldHVybiBy MS5ydWxlRGF0YS0+Y2FzY2FkZUxheWVyT3JkZXIoKSA8IHIyLnJ1bGVEYXRhLT5jYXNjYWRlTGF5 ZXJPcmRlcigpOworCiAgICAgaWYgKHIxLnNwZWNpZmljaXR5ICE9IHIyLnNwZWNpZmljaXR5KQog ICAgICAgICByZXR1cm4gcjEuc3BlY2lmaWNpdHkgPCByMi5zcGVjaWZpY2l0eTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZURhdGEuY3BwIGIvU291cmNlL1dlYkNvcmUv c3R5bGUvUnVsZURhdGEuY3BwCmluZGV4IDIxMjlhNjc3YjcxZC4uNDUxMDgyYWE3MWZhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9SdWxlRGF0YS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvc3R5bGUvUnVsZURhdGEuY3BwCkBAIC01Niw3ICs1Niw4IEBAIHN0cnVjdCBTYW1lU2l6 ZUFzUnVsZURhdGEgewogICAgIHZvaWQqIGE7CiAgICAgdW5zaWduZWQgYjsKICAgICB1bnNpZ25l ZCBjOwotICAgIHVuc2lnbmVkIGRbNF07CisgICAgdW5zaWduZWQgZDsKKyAgICB1bnNpZ25lZCBl WzRdOwogfTsKIAogQ09NUElMRV9BU1NFUlQoc2l6ZW9mKFJ1bGVEYXRhKSA9PSBzaXplb2YoU2Ft ZVNpemVBc1J1bGVEYXRhKSwgUnVsZURhdGFfc2hvdWxkX3N0YXlfc21hbGwpOwpAQCAtMTU4LDcg KzE1OSw3IEBAIHN0YXRpYyBpbmxpbmUgUHJvcGVydHlBbGxvd2xpc3RUeXBlIGRldGVybWluZVBy b3BlcnR5QWxsb3dsaXN0VHlwZShjb25zdCBDU1NTZWxlCiAgICAgcmV0dXJuIFByb3BlcnR5QWxs b3dsaXN0Tm9uZTsKIH0KIAotUnVsZURhdGE6OlJ1bGVEYXRhKGNvbnN0IFN0eWxlUnVsZSYgc3R5 bGVSdWxlLCB1bnNpZ25lZCBzZWxlY3RvckluZGV4LCB1bnNpZ25lZCBzZWxlY3Rvckxpc3RJbmRl eCwgdW5zaWduZWQgcG9zaXRpb24pCitSdWxlRGF0YTo6UnVsZURhdGEoY29uc3QgU3R5bGVSdWxl JiBzdHlsZVJ1bGUsIHVuc2lnbmVkIHNlbGVjdG9ySW5kZXgsIHVuc2lnbmVkIHNlbGVjdG9yTGlz dEluZGV4LCB1bnNpZ25lZCBwb3NpdGlvbiwgdW5zaWduZWQgY2FzY2FkZUxheWVyT3JkZXIpCiAg ICAgOiBtX3N0eWxlUnVsZSgmc3R5bGVSdWxlKQogICAgICwgbV9zZWxlY3RvckluZGV4KHNlbGVj dG9ySW5kZXgpCiAgICAgLCBtX3NlbGVjdG9yTGlzdEluZGV4KHNlbGVjdG9yTGlzdEluZGV4KQpA QCAtMTY5LDYgKzE3MCw3IEBAIFJ1bGVEYXRhOjpSdWxlRGF0YShjb25zdCBTdHlsZVJ1bGUmIHN0 eWxlUnVsZSwgdW5zaWduZWQgc2VsZWN0b3JJbmRleCwgdW5zaWduZWQKICAgICAsIG1fbGlua01h dGNoVHlwZShTZWxlY3RvckNoZWNrZXI6OmRldGVybWluZUxpbmtNYXRjaFR5cGUoc2VsZWN0b3Io KSkpCiAgICAgLCBtX3Byb3BlcnR5QWxsb3dsaXN0VHlwZShkZXRlcm1pbmVQcm9wZXJ0eUFsbG93 bGlzdFR5cGUoc2VsZWN0b3IoKSkpCiAgICAgLCBtX2lzRW5hYmxlZCh0cnVlKQorICAgICwgbV9j YXNjYWRlTGF5ZXJPcmRlcihjYXNjYWRlTGF5ZXJPcmRlcikKICAgICAsIG1fZGVzY2VuZGFudFNl bGVjdG9ySWRlbnRpZmllckhhc2hlcyhTZWxlY3RvckZpbHRlcjo6Y29sbGVjdEhhc2hlcygqc2Vs ZWN0b3IoKSkpCiB7CiAgICAgQVNTRVJUKG1fcG9zaXRpb24gPT0gcG9zaXRpb24pOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3N0 eWxlL1J1bGVEYXRhLmgKaW5kZXggODNhODAyODU5M2E1Li4xYTcxNzhkOWI1YjYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1J1bGVEYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUv c3R5bGUvUnVsZURhdGEuaApAQCAtNDcsOSArNDcsMTAgQEAgY2xhc3MgUnVsZURhdGEgewogcHVi bGljOgogICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBtYXhpbXVtU2VsZWN0b3JDb21wb25lbnRD b3VudCA9IDgxOTI7CiAKLSAgICBSdWxlRGF0YShjb25zdCBTdHlsZVJ1bGUmLCB1bnNpZ25lZCBz ZWxlY3RvckluZGV4LCB1bnNpZ25lZCBzZWxlY3Rvckxpc3RJbmRleCwgdW5zaWduZWQgcG9zaXRp b24pOworICAgIFJ1bGVEYXRhKGNvbnN0IFN0eWxlUnVsZSYsIHVuc2lnbmVkIHNlbGVjdG9ySW5k ZXgsIHVuc2lnbmVkIHNlbGVjdG9yTGlzdEluZGV4LCB1bnNpZ25lZCBwb3NpdGlvbiwgdW5zaWdu ZWQgY2FzY2FkZUxheWVyT3JkZXIpOwogCiAgICAgdW5zaWduZWQgcG9zaXRpb24oKSBjb25zdCB7 IHJldHVybiBtX3Bvc2l0aW9uOyB9CisgICAgdW5zaWduZWQgY2FzY2FkZUxheWVyT3JkZXIoKSBj b25zdCB7IHJldHVybiBtX2Nhc2NhZGVMYXllck9yZGVyOyB9CiAKICAgICBjb25zdCBTdHlsZVJ1 bGUmIHN0eWxlUnVsZSgpIGNvbnN0IHsgcmV0dXJuICptX3N0eWxlUnVsZTsgfQogCkBAIC04Niw2 ICs4Nyw3IEBAIHByaXZhdGU6CiAgICAgdW5zaWduZWQgbV9saW5rTWF0Y2hUeXBlIDogMjsgLy8g IFNlbGVjdG9yQ2hlY2tlcjo6TGlua01hdGNoTWFzawogICAgIHVuc2lnbmVkIG1fcHJvcGVydHlB bGxvd2xpc3RUeXBlIDogMjsKICAgICB1bnNpZ25lZCBtX2lzRW5hYmxlZCA6IDE7CisgICAgdW5z aWduZWQgbV9jYXNjYWRlTGF5ZXJPcmRlcjsKICAgICBTZWxlY3RvckZpbHRlcjo6SGFzaGVzIG1f ZGVzY2VuZGFudFNlbGVjdG9ySWRlbnRpZmllckhhc2hlczsKIH07CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1J1bGVTZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVs ZVNldC5jcHAKaW5kZXggNGRlNzNhNjI4MWRkLi5jYjg1YTdmZDQ4MmQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1J1bGVTZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxl L1J1bGVTZXQuY3BwCkBAIC00Miw2ICs0Miw3IEBACiAjaW5jbHVkZSAiU3R5bGVSdWxlLmgiCiAj aW5jbHVkZSAiU3R5bGVSdWxlSW1wb3J0LmgiCiAjaW5jbHVkZSAiU3R5bGVTaGVldENvbnRlbnRz LmgiCisjaW5jbHVkZSA8d3RmL0hleE51bWJlci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBu YW1lc3BhY2UgU3R5bGUgewpAQCAtODUsNyArODYsNyBAQCBzdGF0aWMgYm9vbCBpc0hvc3RTZWxl Y3Rvck1hdGNoaW5nSW5TaGFkb3dUcmVlKGNvbnN0IENTU1NlbGVjdG9yJiBzdGFydFNlbGVjdG9y KQogCiB2b2lkIFJ1bGVTZXQ6OmFkZFJ1bGUoY29uc3QgU3R5bGVSdWxlJiBydWxlLCB1bnNpZ25l ZCBzZWxlY3RvckluZGV4LCB1bnNpZ25lZCBzZWxlY3Rvckxpc3RJbmRleCwgTWVkaWFRdWVyeUNv bGxlY3RvciogbWVkaWFRdWVyeUNvbGxlY3RvcikKIHsKLSAgICBSdWxlRGF0YSBydWxlRGF0YShy dWxlLCBzZWxlY3RvckluZGV4LCBzZWxlY3Rvckxpc3RJbmRleCwgbV9ydWxlQ291bnQrKyk7Cisg ICAgUnVsZURhdGEgcnVsZURhdGEocnVsZSwgc2VsZWN0b3JJbmRleCwgc2VsZWN0b3JMaXN0SW5k ZXgsIG1fcnVsZUNvdW50KyssIG1fY2FzY2FkZUxheWVyUHJpb3JpdHkpOwogCiAgICAgbV9mZWF0 dXJlcy5jb2xsZWN0RmVhdHVyZXMocnVsZURhdGEpOwogCkBAIC0yODcsNiArMjg4LDIyIEBAIHZv aWQgUnVsZVNldDo6YWRkQ2hpbGRSdWxlcyhjb25zdCBWZWN0b3I8UmVmUHRyPFN0eWxlUnVsZUJh c2U+PiYgcnVsZXMsIE1lZGlhUXVlCiAgICAgICAgICAgICBtZWRpYVF1ZXJ5Q29sbGVjdG9yLnBv cCgmbWVkaWFSdWxlLm1lZGlhUXVlcmllcygpKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAg ICAgICB9CisgICAgICAgIGlmIChpczxTdHlsZVJ1bGVMYXllcj4oKnJ1bGUpKSB7CisgICAgICAg ICAgICBhdXRvJiBsYXllclJ1bGUgPSBkb3duY2FzdDxTdHlsZVJ1bGVMYXllcj4oKnJ1bGUpOwor ICAgICAgICAgICAgaWYgKGxheWVyUnVsZS5pc0xpc3QoKSkgeworICAgICAgICAgICAgICAgIC8v IExpc3Qgc3ludGF4IHRoYXQganVzdCByZWdpc3RlcnMgdGhlIGxheWVycy4KKyAgICAgICAgICAg ICAgICBmb3IgKGF1dG8mIG5hbWUgOiBsYXllclJ1bGUubmFtZUxpc3QoKSkgeworICAgICAgICAg ICAgICAgICAgICBwdXNoQ2FzY2FkZUxheWVyKG5hbWUpOworICAgICAgICAgICAgICAgICAgICBw b3BDYXNjYWRlTGF5ZXIobmFtZSk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAg IGNvbnRpbnVlOworICAgICAgICAgICAgfQorICAgICAgICAgICAgLy8gQmxvY2sgc3ludGF4Lgor ICAgICAgICAgICAgcHVzaENhc2NhZGVMYXllcihsYXllclJ1bGUubmFtZSgpKTsKKyAgICAgICAg ICAgIGFkZENoaWxkUnVsZXMobGF5ZXJSdWxlLmNoaWxkUnVsZXMoKSwgbWVkaWFRdWVyeUNvbGxl Y3RvciwgcmVzb2x2ZXIsIG1vZGUpOworICAgICAgICAgICAgcG9wQ2FzY2FkZUxheWVyKGxheWVy UnVsZS5uYW1lKCkpOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KICAgICAgICAg aWYgKGlzPFN0eWxlUnVsZUZvbnRGYWNlPigqcnVsZSkpIHsKICAgICAgICAgICAgIC8vIEFkZCB0 aGlzIGZvbnQgZmFjZSB0byBvdXIgc2V0LgogICAgICAgICAgICAgaWYgKHJlc29sdmVyKSB7CkBA IC00NjksNiArNDg2LDM1IEBAIFJ1bGVTZXQ6OkNvbGxlY3RlZE1lZGlhUXVlcnlDaGFuZ2VzIFJ1 bGVTZXQ6OmV2YWx1YXRlRHluYW1pY01lZGlhUXVlcnlSdWxlcyhjb25zCiAgICAgcmV0dXJuIGNv bGxlY3RlZENoYW5nZXM7CiB9CiAKK3ZvaWQgUnVsZVNldDo6cHVzaENhc2NhZGVMYXllcihjb25z dCBDYXNjYWRlTGF5ZXJOYW1lJiBuYW1lKQoreworICAgIGF1dG8gbmFtZVJlc29sdmluZ0Fub255 bW91cyA9IFsmXSB7CisgICAgICAgIGlmIChuYW1lLmlzRW1wdHkoKSkgeworICAgICAgICAgICAg Ly8gTWFrZSB1bmlxdWUgbmFtZSBmb3IgYW4gYW5vbnltb3VzIGxheWVyLgorICAgICAgICAgICAg dW5zaWduZWQgbG9uZyBsb25nIHJhbmRvbSA9IHJhbmRvbU51bWJlcigpICogc3RkOjpudW1lcmlj X2xpbWl0czx1bnNpZ25lZCBsb25nIGxvbmc+OjptYXgoKTsKKyAgICAgICAgICAgIHJldHVybiBD YXNjYWRlTGF5ZXJOYW1lIHsgImFub25fIl9zICsgU3RyaW5nOjpudW1iZXIocmFuZG9tKSB9Owor ICAgICAgICB9CisgICAgICAgIHJldHVybiBuYW1lOworICAgIH07CisKKyAgICAvLyBGb3IgaGll cmFyY2hpY2FsIG5hbWVzIHdlIHJlZ2lzdGVyIHRoZSBjb250YWluaW5nIGxheWVycyBpbmRpdmlk dWFsbHkgZmlyc3QuCisgICAgZm9yIChhdXRvJiBuYW1lU2VnbWVudCA6IG5hbWVSZXNvbHZpbmdB bm9ueW1vdXMoKSkgeworICAgICAgICBtX3Jlc29sdmVkQ2FzY2FkZUxheWVyTmFtZS5hcHBlbmQo bmFtZVNlZ21lbnQpOworICAgICAgICBtX2Nhc2NhZGVMYXllclByaW9yaXR5ID0gbV9jYXNjYWRl TGF5ZXJQcmlvcml0eU1hcC5lbnN1cmUobV9yZXNvbHZlZENhc2NhZGVMYXllck5hbWUsIFsmXSB7 CisgICAgICAgICAgICByZXR1cm4gbV9jYXNjYWRlTGF5ZXJQcmlvcml0eU1hcC5zaXplKCkgKyAx OworICAgICAgICB9KS5pdGVyYXRvci0+dmFsdWU7CisgICAgICAgIFdURkxvZ0Fsd2F5cygicHVz aCBsYXllciBuYW1lOiAlcyBjdXJyZW50ICVkIiwgbmFtZVNlZ21lbnQuc3RyaW5nKCkudXRmOCgp LmRhdGEoKSwgbV9jYXNjYWRlTGF5ZXJQcmlvcml0eSk7CisgICAgfQorfQorCit2b2lkIFJ1bGVT ZXQ6OnBvcENhc2NhZGVMYXllcihjb25zdCBDYXNjYWRlTGF5ZXJOYW1lJiBuYW1lKQoreworICAg IGF1dG8gc2l6ZSA9IG5hbWUuaXNFbXB0eSgpID8gMSA6IG5hbWUuc2l6ZSgpOworICAgIG1fcmVz b2x2ZWRDYXNjYWRlTGF5ZXJOYW1lLnNocmluayhtX3Jlc29sdmVkQ2FzY2FkZUxheWVyTmFtZS5z aXplKCkgLSBzaXplKTsKKyAgICBtX2Nhc2NhZGVMYXllclByaW9yaXR5ID0gbV9yZXNvbHZlZENh c2NhZGVMYXllck5hbWUuaXNFbXB0eSgpID8gMCA6IG1fY2FzY2FkZUxheWVyUHJpb3JpdHlNYXAu Z2V0KG1fcmVzb2x2ZWRDYXNjYWRlTGF5ZXJOYW1lKTsKKyAgICBXVEZMb2dBbHdheXMoInJlbW92 ZSAlenUgbGF5ZXJzIGN1cnJlbnQgJWQiLCBzaXplLCBtX2Nhc2NhZGVMYXllclByaW9yaXR5KTsK K30KKwogc3RhdGljIGlubGluZSB2b2lkIHNocmlua01hcFZlY3RvcnNUb0ZpdChSdWxlU2V0OjpB dG9tUnVsZU1hcCYgbWFwKQogewogICAgIGZvciAoYXV0byYgdmVjdG9yIDogbWFwLnZhbHVlcygp KQpAQCAtNTY5LDYgKzYxNSw1IEBAIHZvaWQgUnVsZVNldDo6TWVkaWFRdWVyeUNvbGxlY3Rvcjo6 YWRkUnVsZUlmTmVlZGVkKGNvbnN0IFJ1bGVEYXRhJiBydWxlRGF0YSkKICAgICBjb250ZXh0LnJ1 bGVGZWF0dXJlcy5hcHBlbmQoeyBydWxlRGF0YSB9KTsKIH0KIAotCiB9IC8vIG5hbWVzcGFjZSBT dHlsZQogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv c3R5bGUvUnVsZVNldC5oIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldC5oCmluZGV4IDdh YjVmN2I0MGM1My4uMzAyZTMyNjg5ZjA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHls ZS9SdWxlU2V0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldC5oCkBAIC0xNTgs NiArMTU4LDkgQEAgcHJpdmF0ZToKICAgICB9OwogICAgIENvbGxlY3RlZE1lZGlhUXVlcnlDaGFu Z2VzIGV2YWx1YXRlRHluYW1pY01lZGlhUXVlcnlSdWxlcyhjb25zdCBNZWRpYVF1ZXJ5RXZhbHVh dG9yJiwgc2l6ZV90IHN0YXJ0SW5kZXgpOwogCisgICAgdm9pZCBwdXNoQ2FzY2FkZUxheWVyKGNv bnN0IENhc2NhZGVMYXllck5hbWUmKTsKKyAgICB2b2lkIHBvcENhc2NhZGVMYXllcihjb25zdCBD YXNjYWRlTGF5ZXJOYW1lJik7CisKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBGdW5jdGlvbj4gdm9p ZCB0cmF2ZXJzZVJ1bGVEYXRhcyhGdW5jdGlvbiYmKTsKIAogICAgIEF0b21SdWxlTWFwIG1faWRS dWxlczsKQEAgLTE3OSw2ICsxODIsMTEgQEAgcHJpdmF0ZToKICAgICBWZWN0b3I8RHluYW1pY01l ZGlhUXVlcnlSdWxlcz4gbV9keW5hbWljTWVkaWFRdWVyeVJ1bGVzOwogICAgIEhhc2hNYXA8VmVj dG9yPHNpemVfdD4sIFJlZjxjb25zdCBSdWxlU2V0Pj4gbV9tZWRpYVF1ZXJ5SW52YWxpZGF0aW9u UnVsZVNldENhY2hlOwogICAgIHVuc2lnbmVkIG1fcnVsZUNvdW50IHsgMCB9OworCisgICAgQ2Fz Y2FkZUxheWVyTmFtZSBtX3Jlc29sdmVkQ2FzY2FkZUxheWVyTmFtZTsKKyAgICBIYXNoTWFwPENh c2NhZGVMYXllck5hbWUsIHVuc2lnbmVkPiBtX2Nhc2NhZGVMYXllclByaW9yaXR5TWFwOworICAg IHVuc2lnbmVkIG1fY2FzY2FkZUxheWVyUHJpb3JpdHkgeyAwIH07CisKICAgICBib29sIG1faGFz SG9zdFBzZXVkb0NsYXNzUnVsZXNNYXRjaGluZ0luU2hhZG93VHJlZSB7IGZhbHNlIH07CiAgICAg Ym9vbCBtX2F1dG9TaHJpbmtUb0ZpdEVuYWJsZWQgeyB0cnVlIH07CiAgICAgYm9vbCBtX2hhc1Zp ZXdwb3J0RGVwZW5kZW50TWVkaWFRdWVyaWVzIHsgZmFsc2UgfTsK