237152 2022-02-24 12:44:46 -0800 [css-cascade] Support 'revert-layer' in @keyframes 2022-03-02 07:25:21 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=237073 InRadar P2 Normal --- 1 obrufau obrufau darin graouts koivisto webkit-bug-importer oldest_to_newest 1845715 0 453128 obrufau 2022-02-24 12:44:46 -0800 Created attachment 453128 testcase Analogous to bug 237073, 'revert-layer' doesn't work in @keyframes, it just behaves as 'unset'. Note that unlike 'revert', it should roll back to author origin, not to user origin. https://drafts.csswg.org/css-cascade-5/#revert-layer 1845779 1 453142 obrufau 2022-02-24 14:51:52 -0800 Created attachment 453142 Patch 1845990 2 obrufau 2022-02-25 05:41:38 -0800 PTAL. Not sure if BuilderState is the right class to store the flag, or if it would be better in Builder or PropertyCascade. 1847351 3 453142 koivisto 2022-03-02 05:52:28 -0800 Comment on attachment 453142 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453142&action=review > Source/WebCore/style/StyleBuilderState.h:110 > + void setIgnoreRevertLayer() { m_ignoreRevertLayer = true; } Maybe this should be more specific like m_isBuildingKeyframeStyle as I don't think it has any other uses. 1847354 4 453595 obrufau 2022-03-02 06:04:38 -0800 Created attachment 453595 Patch 1847357 5 obrufau 2022-03-02 06:06:32 -0800 (In reply to Antti Koivisto from comment #3) > Maybe this should be more specific like m_isBuildingKeyframeStyle as I don't > think it has any other uses. Done. Also moved the comment since with the new name the explanation seemed more needed in Builder::applyProperty. 1847380 6 ews-feeder 2022-03-02 07:24:51 -0800 Committed r290729 (247976@main): <https://commits.webkit.org/247976@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453595. 1847382 7 webkit-bug-importer 2022-03-02 07:25:21 -0800 <rdar://problem/89686640> 453128 2022-02-24 12:44:46 -0800 2022-02-24 12:44:46 -0800 testcase revert-layer-keyframes.html text/html 597 obrufau PCFET0NUWVBFIGh0bWw+CjxzdHlsZT4KZGl2IHsKICB3aWR0aDogMTAwcHg7CiAgaGVpZ2h0OiAx MDBweDsKICBiYWNrZ3JvdW5kLWNvbG9yOiByZWQ7CiAgYmFja2dyb3VuZC1jbGlwOiBjb250ZW50 LWJveDsKfQoKdWwgewogIG1hcmdpbjogMHB4OwogIHBhZGRpbmc6IDBweDsKICBwYWRkaW5nLWlu bGluZS1zdGFydDogNTBweDsKICB3aWR0aDogMHB4OwogIGhlaWdodDogMTAwcHg7CiAgYmFja2dy b3VuZC1jb2xvcjogZ3JlZW47CiAgYW5pbWF0aW9uOiBhbmltLXJldmVydCBsaW5lYXIgMnMgLTFz IHBhdXNlZDsKfQoKQGtleWZyYW1lcyBhbmltLXJldmVydCB7CiAgZnJvbSB7IHBhZGRpbmctaW5s aW5lLXN0YXJ0OiAxNTBweDsgfQogIHRvIHsgcGFkZGluZy1pbmxpbmUtc3RhcnQ6IHJldmVydC1s YXllciAvKiA1MHB4ICovOyB9CiAgLyogQXQgNTAlIGl0J3MgKDE1MHB4ICsgNTBweCkgLyAyID0g MTAwcHggKi8KfQo8L3N0eWxlPgoKPHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQg Z3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJlZDwvc3Ryb25nPi48L3A+CjxkaXY+CiAgPHVs IGlkPSJyZXZlcnQiPjwvdWw+IAo8L2Rpdj4K 453142 2022-02-24 14:51:52 -0800 2022-03-02 06:04:34 -0800 Patch bug-237152-20220224235151.patch text/plain 5316 obrufau U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNDU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjUzYzlkMWE2YjY0MWJk ZGRmNzM1YTFkM2ZmNWE3NTczZTMzMjUzOC4uNzczNDE5MmU2YmRkYzViN2IzZTlmMzY5MTU2MTYx MmU1MGU4Y2NhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIyLTAyLTI0ICBPcmlv bCBCcnVmYXUgIDxvYnJ1ZmF1QGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1jYXNjYWRlXSBT dXBwb3J0ICdyZXZlcnQtbGF5ZXInIGluIEBrZXlmcmFtZXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzE1MgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIEBrZXlmcmFtZXMsICdyZXZlcnQtbGF5ZXIn IHNob3VsZCByb2xsIGJhY2sgdGhlIGNhc2NhZGVkIHZhbHVlIHRvCisgICAgICAgIGF1dGhvciBv cmlnaW4uIFJlc29sdmVyOjpzdHlsZUZvcktleWZyYW1lIGFscmVhZHkgaGFzIHRoZSBiYXNlIHN0 eWxlIG9mCisgICAgICAgIHRoZSBlbGVtZW50LCBzbyB3ZSBvbmx5IG5lZWQgdG8gYXZvaWQgYXBw bHlpbmcgcHJvcGVydGllcyB3aXRoIHRoZQorICAgICAgICAncmV2ZXJ0LWxheWVyJyB2YWx1ZS4K KworICAgICAgICBUZXN0OiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt Y2FzY2FkZS9yZXZlcnQtbGF5ZXItMDEwLmh0bWwuaHRtbAorCisgICAgICAgICogc3R5bGUvU3R5 bGVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpCdWlsZGVyOjphcHBseVBy b3BlcnR5KToKKyAgICAgICAgKiBzdHlsZS9TdHlsZUJ1aWxkZXJTdGF0ZS5oOgorICAgICAgICAo V2ViQ29yZTo6U3R5bGU6OkJ1aWxkZXJTdGF0ZTo6c2V0SWdub3JlUmV2ZXJ0TGF5ZXIpOgorICAg ICAgICAqIHN0eWxlL1N0eWxlUmVzb2x2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6 OlJlc29sdmVyOjpzdHlsZUZvcktleWZyYW1lKToKKwogMjAyMi0wMi0yNCAgT3Jpb2wgQnJ1ZmF1 ICA8b2JydWZhdUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3MtY2FzY2FkZV0gU3VwcG9ydCAn cmV2ZXJ0JyBpbiBAa2V5ZnJhbWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9T dHlsZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVCdWlsZGVyLmNwcApp bmRleCBjY2JiNDliNDY3Njc2ZGU3Y2IzY2Y5YzEyYzdkMDkzMGQ3ZjhjOTA0Li5kZTc5OGEyNjU0 YmU3M2NkY2RiOTEyMDJjODRkZjBjOTEzNTBmOTNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9zdHlsZS9TdHlsZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxl QnVpbGRlci5jcHAKQEAgLTMwMCw2ICszMDAsOSBAQCB2b2lkIEJ1aWxkZXI6OmFwcGx5UHJvcGVy dHkoQ1NTUHJvcGVydHlJRCBpZCwgQ1NTVmFsdWUmIHZhbHVlLCBTZWxlY3RvckNoZWNrZXI6Ogog ICAgIGJvb2wgaXNSZXZlcnRMYXllciA9IHZhbHVlVG9BcHBseS0+aXNSZXZlcnRMYXllclZhbHVl KCkgfHwgY3VzdG9tUHJvcGVydHlWYWx1ZUlEID09IENTU1ZhbHVlUmV2ZXJ0TGF5ZXI7CiAKICAg ICBpZiAoaXNSZXZlcnQgfHwgaXNSZXZlcnRMYXllcikgeworICAgICAgICBpZiAoaXNSZXZlcnRM YXllciAmJiBtX3N0YXRlLm1faWdub3JlUmV2ZXJ0TGF5ZXIpCisgICAgICAgICAgICByZXR1cm47 CisKICAgICAgICAgYXV0byogcm9sbGJhY2tDYXNjYWRlID0gaXNSZXZlcnQgPyBlbnN1cmVSb2xs YmFja0Nhc2NhZGVGb3JSZXZlcnQoKSA6IGVuc3VyZVJvbGxiYWNrQ2FzY2FkZUZvclJldmVydExh eWVyKCk7CiAKICAgICAgICAgaWYgKHJvbGxiYWNrQ2FzY2FkZSkgewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVCdWlsZGVyU3RhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL3N0 eWxlL1N0eWxlQnVpbGRlclN0YXRlLmgKaW5kZXggY2MxNDYzMWExMzU1NTkzMzc5MmJjOGYwMWU4 NTNjZDMxNDhhYjllNC4uMDY3OTA4MDIyNzkzMTMwZjEzZDgyY2M1ZmI2ZDczZmZiNTQxNGZmMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVCdWlsZGVyU3RhdGUuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUJ1aWxkZXJTdGF0ZS5oCkBAIC0xMDcsNiArMTA3 LDggQEAgcHVibGljOgogICAgIGNvbnN0IENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmIGNzc1Rv TGVuZ3RoQ29udmVyc2lvbkRhdGEoKSBjb25zdCB7IHJldHVybiBtX2Nzc1RvTGVuZ3RoQ29udmVy c2lvbkRhdGE7IH0KICAgICBDU1NUb1N0eWxlTWFwJiBzdHlsZU1hcCgpIHsgcmV0dXJuIG1fc3R5 bGVNYXA7IH0KIAorICAgIHZvaWQgc2V0SWdub3JlUmV2ZXJ0TGF5ZXIoKSB7IG1faWdub3JlUmV2 ZXJ0TGF5ZXIgPSB0cnVlOyB9CisKIHByaXZhdGU6CiAgICAgLy8gU2VlIHRoZSBjb21tZW50IGlu IG1heWJlVXBkYXRlRm9udEZvckxldHRlclNwYWNpbmcoKSBhYm91dCB3aHkgdGhpcyBuZWVkcyB0 byBiZSBhIGZyaWVuZC4KICAgICBmcmllbmQgdm9pZCBtYXliZVVwZGF0ZUZvbnRGb3JMZXR0ZXJT cGFjaW5nKEJ1aWxkZXJTdGF0ZSYsIENTU1ZhbHVlJik7CkBAIC0xNDEsNiArMTQzLDggQEAgcHJp dmF0ZToKIAogICAgIGJvb2wgbV9mb250RGlydHkgeyBmYWxzZSB9OwogICAgIFZlY3RvcjxBdG9t U3RyaW5nPiBtX3JlZ2lzdGVyZWRDb250ZW50QXR0cmlidXRlczsKKworICAgIGJvb2wgbV9pZ25v cmVSZXZlcnRMYXllciB7IGZhbHNlIH07CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9zdHlsZS9TdHlsZVJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxl UmVzb2x2ZXIuY3BwCmluZGV4IGU0YmUwNzQyZmRmYTBmZDRiZTAyZjlkNjY4NmU2MWRiYjU0MDZk YjcuLjIwOTU4N2MyMWYwOTFhMGQxOWM3NjAyNjhhY2Y3YzNjMWM4MWU4MjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3N0eWxlL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC0zMDgsNiArMzA4LDkgQEAgc3RkOjp1bmlx dWVfcHRyPFJlbmRlclN0eWxlPiBSZXNvbHZlcjo6c3R5bGVGb3JLZXlmcmFtZShjb25zdCBFbGVt ZW50JiBlbGVtZW50LAogICAgIH0KICAgICBjb2xsZWN0b3IuYWRkQXV0aG9yS2V5ZnJhbWVSdWxl cyhrZXlmcmFtZSk7CiAgICAgQnVpbGRlciBidWlsZGVyKCpzdGF0ZS5zdHlsZSgpLCBidWlsZGVy Q29udGV4dChzdGF0ZSksIGNvbGxlY3Rvci5tYXRjaFJlc3VsdCgpLCBDYXNjYWRlTGV2ZWw6OkF1 dGhvcik7CisgICAgLy8gVW5saWtlICdyZXZlcnQnLCAncmV2ZXJ0LWxheWVyJyByb2xscyBiYWNr IHRoZSBjYXNjYWRlZCB2YWx1ZSB0byB0aGUgYXV0aG9yIGxldmVsLgorICAgIC8vIFdlIGNhbiBq dXN0IG5vdCBhcHBseSB0aGUgcHJvcGVydHkgaW4gb3JkZXIgdG8ga2VlcCB0aGUgdmFsdWUgZnJv bSBlbGVtZW50U3R5bGUuCisgICAgYnVpbGRlci5zdGF0ZSgpLnNldElnbm9yZVJldmVydExheWVy KCk7CiAgICAgYnVpbGRlci5hcHBseUFsbFByb3BlcnRpZXMoKTsKIAogICAgIEFkanVzdGVyIGFk anVzdGVyKGRvY3VtZW50KCksICpzdGF0ZS5wYXJlbnRTdHlsZSgpLCBudWxscHRyLCBudWxscHRy KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwppbmRleCAzNWE4MzZmMmMwMDA3ZTdhNThlZDFmYjgzOGRlYTBlOWUzOGY5MWFkLi42ZTIx ODViODczMGEwMjVhM2U0OGU2ZjY4YjBmYWZmNWNjZWRjMTY4IDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMjItMDItMjQgIE9yaW9sIEJydWZhdSAgPG9icnVmYXVAaWdhbGlhLmNvbT4KKworICAg ICAgICBbY3NzLWNhc2NhZGVdIFN1cHBvcnQgJ3JldmVydC1sYXllcicgaW4gQGtleWZyYW1lcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3MTUyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXhwZWN0IHRl c3QgdG8gcGFzcy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjItMDItMjQg IE1lZ2FuIEdhcmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQg cGVyY2VudCBkZWNvZGluZyB0byBTY3JvbGwgdG8gVGV4dCBGcmFnbWVudCBwYXJzaW5nLgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RF eHBlY3RhdGlvbnMKaW5kZXggYmY2ZGQ4NTkwY2M0NDc0ZGIzN2ZiMDIwMzVkMTYyMDdhZDhlMDA4 NC4uZDk4ZTkxMDFhZWI2ZWQyOTc3MzhkYzkxY2Y0OTUwYzRlM2I1NWJiNiAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0 YXRpb25zCkBAIC0yMTI2LDggKzIxMjYsNyBAQCB3ZWJraXQub3JnL2IvMTQ4NjUwIGZhc3QvcmVw YWludC9hZGQtdGFibGUtb3ZlcnBhaW50Lmh0bWwgWyBQYXNzIEZhaWx1cmUgXQogCiBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9pbXBvcnRhbnQtcHJvcC5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTg3MDkzIFsgRGVidWcgXSBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9hbGwtcHJvcC1p bml0aWFsLXhtbC5odG1sIFsgU2tpcCBdCi13ZWJraXQub3JnL2IvMjMzOTM3IGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jYXNjYWRlL3JldmVydC1sYXllci0wMTAuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIzMzkzNyBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9yZXZlcnQtbGF5ZXItMDExLmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KK3dlYmtpdC5vcmcvYi8xOTIzMzQgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUvcmV2ZXJ0LWxheWVyLTAxMS5odG1sIFsg SW1hZ2VPbmx5RmFpbHVyZSBdCiAKICMgSW5pdGlhbCBmYWlsdXJlcyBvbiB0aGUgaW1wb3J0IG9m IGNzcy1jb250ZW50CiAK 453595 2022-03-02 06:04:38 -0800 2022-03-02 07:24:57 -0800 Patch bug-237152-20220302150437.patch text/plain 5361 obrufau U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNDU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjUzYzlkMWE2YjY0MWJk ZGRmNzM1YTFkM2ZmNWE3NTczZTMzMjUzOC4uNGIzNzkzZTJkZDUyYzgwYzdmMWQzNTcwYjA3Yjk1 MTc2MjA2ZTcyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIyLTAzLTAyICBPcmlv bCBCcnVmYXUgIDxvYnJ1ZmF1QGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1jYXNjYWRlXSBT dXBwb3J0ICdyZXZlcnQtbGF5ZXInIGluIEBrZXlmcmFtZXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzE1MgorCisgICAgICAgIFJldmlld2VkIGJ5 IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIEluIEBrZXlmcmFtZXMsICdyZXZlcnQtbGF5ZXIn IHNob3VsZCByb2xsIGJhY2sgdGhlIGNhc2NhZGVkIHZhbHVlIHRvCisgICAgICAgIGF1dGhvciBv cmlnaW4uIFJlc29sdmVyOjpzdHlsZUZvcktleWZyYW1lIGFscmVhZHkgaGFzIHRoZSBiYXNlIHN0 eWxlIG9mCisgICAgICAgIHRoZSBlbGVtZW50LCBzbyB3ZSBvbmx5IG5lZWQgdG8gYXZvaWQgYXBw bHlpbmcgcHJvcGVydGllcyB3aXRoIHRoZQorICAgICAgICAncmV2ZXJ0LWxheWVyJyB2YWx1ZS4K KworICAgICAgICBUZXN0OiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt Y2FzY2FkZS9yZXZlcnQtbGF5ZXItMDEwLmh0bWwuaHRtbAorCisgICAgICAgICogc3R5bGUvU3R5 bGVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpCdWlsZGVyOjphcHBseVBy b3BlcnR5KToKKyAgICAgICAgKiBzdHlsZS9TdHlsZUJ1aWxkZXJTdGF0ZS5oOgorICAgICAgICAo V2ViQ29yZTo6U3R5bGU6OkJ1aWxkZXJTdGF0ZTo6c2V0SXNCdWlsZGluZ0tleWZyYW1lU3R5bGUp OgorICAgICAgICAqIHN0eWxlL1N0eWxlUmVzb2x2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U3R5bGU6OlJlc29sdmVyOjpzdHlsZUZvcktleWZyYW1lKToKKwogMjAyMi0wMi0yNCAgT3Jpb2wg QnJ1ZmF1ICA8b2JydWZhdUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3MtY2FzY2FkZV0gU3Vw cG9ydCAncmV2ZXJ0JyBpbiBAa2V5ZnJhbWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9z dHlsZS9TdHlsZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVCdWlsZGVy LmNwcAppbmRleCBjY2JiNDliNDY3Njc2ZGU3Y2IzY2Y5YzEyYzdkMDkzMGQ3ZjhjOTA0Li4zZTA1 NjM3YTM4YzA0ZDkzN2UzZDY2ZTcyMGE2ZjZiZTNlNDU1ZWRlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9zdHlsZS9TdHlsZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxl L1N0eWxlQnVpbGRlci5jcHAKQEAgLTMwMCw2ICszMDAsMTEgQEAgdm9pZCBCdWlsZGVyOjphcHBs eVByb3BlcnR5KENTU1Byb3BlcnR5SUQgaWQsIENTU1ZhbHVlJiB2YWx1ZSwgU2VsZWN0b3JDaGVj a2VyOjoKICAgICBib29sIGlzUmV2ZXJ0TGF5ZXIgPSB2YWx1ZVRvQXBwbHktPmlzUmV2ZXJ0TGF5 ZXJWYWx1ZSgpIHx8IGN1c3RvbVByb3BlcnR5VmFsdWVJRCA9PSBDU1NWYWx1ZVJldmVydExheWVy OwogCiAgICAgaWYgKGlzUmV2ZXJ0IHx8IGlzUmV2ZXJ0TGF5ZXIpIHsKKyAgICAgICAgLy8gSW4g QGtleWZyYW1lcywgJ3JldmVydC1sYXllcicgcm9sbHMgYmFjayB0aGUgY2FzY2FkZWQgdmFsdWUg dG8gdGhlIGF1dGhvciBsZXZlbC4KKyAgICAgICAgLy8gV2UgY2FuIGp1c3Qgbm90IGFwcGx5IHRo ZSBwcm9wZXJ0eSBpbiBvcmRlciB0byBrZWVwIHRoZSB2YWx1ZSBmcm9tIHRoZSBiYXNlIHN0eWxl LgorICAgICAgICBpZiAoaXNSZXZlcnRMYXllciAmJiBtX3N0YXRlLm1faXNCdWlsZGluZ0tleWZy YW1lU3R5bGUpCisgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgYXV0byogcm9sbGJhY2tD YXNjYWRlID0gaXNSZXZlcnQgPyBlbnN1cmVSb2xsYmFja0Nhc2NhZGVGb3JSZXZlcnQoKSA6IGVu c3VyZVJvbGxiYWNrQ2FzY2FkZUZvclJldmVydExheWVyKCk7CiAKICAgICAgICAgaWYgKHJvbGxi YWNrQ2FzY2FkZSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVCdWls ZGVyU3RhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQnVpbGRlclN0YXRlLmgKaW5k ZXggY2MxNDYzMWExMzU1NTkzMzc5MmJjOGYwMWU4NTNjZDMxNDhhYjllNC4uMjE3NTdjMDcwMTJh NjEyYTAxODQyOWY3NjkwNjAwNGI2OTZiZTdhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv c3R5bGUvU3R5bGVCdWlsZGVyU3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHls ZUJ1aWxkZXJTdGF0ZS5oCkBAIC0xMDcsNiArMTA3LDggQEAgcHVibGljOgogICAgIGNvbnN0IENT U1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmIGNzc1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEoKSBjb25z dCB7IHJldHVybiBtX2Nzc1RvTGVuZ3RoQ29udmVyc2lvbkRhdGE7IH0KICAgICBDU1NUb1N0eWxl TWFwJiBzdHlsZU1hcCgpIHsgcmV0dXJuIG1fc3R5bGVNYXA7IH0KIAorICAgIHZvaWQgc2V0SXNC dWlsZGluZ0tleWZyYW1lU3R5bGUoKSB7IG1faXNCdWlsZGluZ0tleWZyYW1lU3R5bGUgPSB0cnVl OyB9CisKIHByaXZhdGU6CiAgICAgLy8gU2VlIHRoZSBjb21tZW50IGluIG1heWJlVXBkYXRlRm9u dEZvckxldHRlclNwYWNpbmcoKSBhYm91dCB3aHkgdGhpcyBuZWVkcyB0byBiZSBhIGZyaWVuZC4K ICAgICBmcmllbmQgdm9pZCBtYXliZVVwZGF0ZUZvbnRGb3JMZXR0ZXJTcGFjaW5nKEJ1aWxkZXJT dGF0ZSYsIENTU1ZhbHVlJik7CkBAIC0xNDEsNiArMTQzLDggQEAgcHJpdmF0ZToKIAogICAgIGJv b2wgbV9mb250RGlydHkgeyBmYWxzZSB9OwogICAgIFZlY3RvcjxBdG9tU3RyaW5nPiBtX3JlZ2lz dGVyZWRDb250ZW50QXR0cmlidXRlczsKKworICAgIGJvb2wgbV9pc0J1aWxkaW5nS2V5ZnJhbWVT dHlsZSB7IGZhbHNlIH07CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHls ZS9TdHlsZVJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZXIu Y3BwCmluZGV4IGU0YmUwNzQyZmRmYTBmZDRiZTAyZjlkNjY4NmU2MWRiYjU0MDZkYjcuLmM2M2Qw ZTU5MzQyMjY4Nzc4MjhlNmYwZjFjMmFlMTdjY2U0OGRmYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxl L1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC0zMDgsNiArMzA4LDcgQEAgc3RkOjp1bmlxdWVfcHRyPFJl bmRlclN0eWxlPiBSZXNvbHZlcjo6c3R5bGVGb3JLZXlmcmFtZShjb25zdCBFbGVtZW50JiBlbGVt ZW50LAogICAgIH0KICAgICBjb2xsZWN0b3IuYWRkQXV0aG9yS2V5ZnJhbWVSdWxlcyhrZXlmcmFt ZSk7CiAgICAgQnVpbGRlciBidWlsZGVyKCpzdGF0ZS5zdHlsZSgpLCBidWlsZGVyQ29udGV4dChz dGF0ZSksIGNvbGxlY3Rvci5tYXRjaFJlc3VsdCgpLCBDYXNjYWRlTGV2ZWw6OkF1dGhvcik7Cisg ICAgYnVpbGRlci5zdGF0ZSgpLnNldElzQnVpbGRpbmdLZXlmcmFtZVN0eWxlKCk7CiAgICAgYnVp bGRlci5hcHBseUFsbFByb3BlcnRpZXMoKTsKIAogICAgIEFkanVzdGVyIGFkanVzdGVyKGRvY3Vt ZW50KCksICpzdGF0ZS5wYXJlbnRTdHlsZSgpLCBudWxscHRyLCBudWxscHRyKTsKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAz NWE4MzZmMmMwMDA3ZTdhNThlZDFmYjgzOGRlYTBlOWUzOGY5MWFkLi5kMDQ0NTY4Y2M3ODM5NjA4 Mjc1YWE3MDcxMWQ2M2EyMzRiZTVjNjMzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjItMDMt MDIgIE9yaW9sIEJydWZhdSAgPG9icnVmYXVAaWdhbGlhLmNvbT4KKworICAgICAgICBbY3NzLWNh c2NhZGVdIFN1cHBvcnQgJ3JldmVydC1sYXllcicgaW4gQGtleWZyYW1lcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3MTUyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgRXhwZWN0IHRlc3QgdG8gcGFzcy4K KworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjItMDItMjQgIE1lZ2FuIEdhcmRu ZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgcGVyY2VudCBkZWNv ZGluZyB0byBTY3JvbGwgdG8gVGV4dCBGcmFnbWVudCBwYXJzaW5nLgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMK aW5kZXggYmY2ZGQ4NTkwY2M0NDc0ZGIzN2ZiMDIwMzVkMTYyMDdhZDhlMDA4NC4uZDk4ZTkxMDFh ZWI2ZWQyOTc3MzhkYzkxY2Y0OTUwYzRlM2I1NWJiNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv VGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC0y MTI2LDggKzIxMjYsNyBAQCB3ZWJraXQub3JnL2IvMTQ4NjUwIGZhc3QvcmVwYWludC9hZGQtdGFi bGUtb3ZlcnBhaW50Lmh0bWwgWyBQYXNzIEZhaWx1cmUgXQogCiBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9pbXBvcnRhbnQtcHJvcC5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTg3MDkzIFsgRGVidWcgXSBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9hbGwtcHJvcC1pbml0aWFsLXhtbC5o dG1sIFsgU2tpcCBdCi13ZWJraXQub3JnL2IvMjMzOTM3IGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1jYXNjYWRlL3JldmVydC1sYXllci0wMTAuaHRtbCBbIEltYWdlT25s eUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIzMzkzNyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9yZXZlcnQtbGF5ZXItMDExLmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KK3dlYmtpdC5vcmcvYi8xOTIzMzQgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLWNhc2NhZGUvcmV2ZXJ0LWxheWVyLTAxMS5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCiAKICMgSW5pdGlhbCBmYWlsdXJlcyBvbiB0aGUgaW1wb3J0IG9mIGNzcy1jb250ZW50 CiAK