224431 2021-04-12 05:58:31 -0700 Descendant style relations are sometimes reset when they shouldn't 2021-04-12 09:50:02 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned cdumez cmarcelo esprehn+autocc ews-watchlist kangil.han sam oldest_to_newest 1749195 0 koivisto 2021-04-12 05:58:31 -0700 Some style relations computed during resolution of descendants are set on a parent element. The parent element shouldn't reset them unless we are actually also computing the descendants. 1749196 1 koivisto 2021-04-12 05:58:39 -0700 rdar://76267783 1749205 2 425740 koivisto 2021-04-12 06:52:01 -0700 Created attachment 425740 patch 1749257 3 ews-feeder 2021-04-12 09:50:00 -0700 Committed r275825 (236395@main): <https://commits.webkit.org/236395@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425740. 425740 2021-04-12 06:52:01 -0700 2021-04-12 09:50:01 -0700 patch descendant-style-relation-clear.patch text/plain 19529 koivisto ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiZTg4YTJkMzRlNjYuLmQ4YWZlMGY1NmMzNCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDIxLTA0LTEyICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAg ICBEZXNjZW5kYW50IHN0eWxlIHJlbGF0aW9ucyBhcmUgc29tZXRpbWVzIHJlc2V0IHdoZW4gdGhl eSBzaG91bGRuJ3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIyNDQzMQorICAgICAgICByZGFyOi8vNzYyNjc3ODMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvY3NzL2ZpcnN0LWxldHRlci1zdHls ZS1yZWxhdGlvbi1jcmFzaC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvY3Nz L2ZpcnN0LWxldHRlci1zdHlsZS1yZWxhdGlvbi1jcmFzaC5odG1sOiBBZGRlZC4KKwogMjAyMS0w My0yNCAgTGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBS ZS1za2lwIG1vZGVybi1tZWRpYS1jb250cm9scyB0ZXN0cyBhZnRlciByMjc0ODEwCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9maXJzdC1sZXR0ZXItc3R5bGUtcmVsYXRpb24tY3Jh c2gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZmlyc3QtbGV0dGVyLXN0eWxl LXJlbGF0aW9uLWNyYXNoLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAuLjhiMTM3ODkxNzkxZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2Zhc3QvY3NzL2ZpcnN0LWxldHRlci1zdHlsZS1yZWxhdGlvbi1jcmFzaC1leHBlY3RlZC50eHQK QEAgLTAsMCArMSBAQAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9maXJzdC1s ZXR0ZXItc3R5bGUtcmVsYXRpb24tY3Jhc2guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2Zp cnN0LWxldHRlci1zdHlsZS1yZWxhdGlvbi1jcmFzaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMC4uZTQ4M2FiOWJhODA3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9jc3MvZmlyc3QtbGV0dGVyLXN0eWxlLXJlbGF0aW9uLWNyYXNoLmh0bWwK QEAgLTAsMCArMSwzMyBAQAorPHN0eWxlPgorICBodG1sIHsKKyAgICAtd2Via2l0LXVzZXItbW9k aWZ5OiByZWFkLXdyaXRlLXBsYWludGV4dC1vbmx5OworICB9CisgICogeworICAgIGZsb2F0OiBy aWdodDsKKyAgICBib3JkZXItaW1hZ2U6IHVybCgpOworICAgIG1heC1pbmxpbmUtc2l6ZTogMDsK KyAgfQorICA6Zmlyc3QtY2hpbGQgeworICAgIGNvbnRlbnQ6IHVybCgpOworICB9CisgIDpudGgt Y2hpbGQoMyk6OmZpcnN0LWxldHRlciB7CisgICAgYmFja2dyb3VuZDogZ3JleTsKKyAgfQorICBk aXYgeworICAgIG92ZXJmbG93LXg6IHNjcm9sbDsKKyAgfQorICBkaXY6Oi13ZWJraXQtc2Nyb2xs YmFyIHsKKyAgICBiYWNrZ3JvdW5kOiBncmV5OworICB9Cis8L3N0eWxlPgorPHNjcmlwdD4KK2lm ICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKK29ubG9h ZCA9ICgpID0+IHsKKyAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoJ2RpdicpKTsKKyAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoJ2RpdicpKTsKKyAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2RpdicpKTsKKyAgICBkb2N1bWVudC5leGVjQ29tbWFuZCgn U2VsZWN0QWxsJyk7CisgICAgZG9jdW1lbnQuZXhlY0NvbW1hbmQoJ0luc2VydFRleHQnLCBmYWxz ZSwgIlRoaXMgdGVzdCBwYXNzZXMgaWYgaXQgZG9lc24ndCBjcmFzaCIpOworfTsKKzwvc2NyaXB0 PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCmluZGV4IDFhMzlmMWQwZGIwZC4uOWNmZjJiOTA3MDZkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsNTYgQEAKKzIwMjEtMDQtMTIgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUu Y29tPgorCisgICAgICAgIERlc2NlbmRhbnQgc3R5bGUgcmVsYXRpb25zIGFyZSBzb21ldGltZXMg cmVzZXQgd2hlbiB0aGV5IHNob3VsZG4ndAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NDMxCisgICAgICAgIHJkYXI6Ly83NjI2Nzc4MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgU29tZSBz dHlsZSByZWxhdGlvbnMgY29tcHV0ZWQgZHVyaW5nIHJlc29sdXRpb24gb2YgZGVzY2VuZGFudHMg YXJlIHNldCBvbiBhIHBhcmVudCBlbGVtZW50LgorICAgICAgICBUaGUgcGFyZW50IGVsZW1lbnQg c2hvdWxkbid0IHJlc2V0IHRoZW0gdW5sZXNzIHdlIGFyZSBhY3R1YWxseSBhbHNvIGNvbXB1dGlu ZyB0aGUgZGVzY2VuZGFudHMuCisKKyAgICAgICAgVGVzdDogZmFzdC9jc3MvZmlyc3QtbGV0dGVy LXN0eWxlLXJlbGF0aW9uLWNyYXNoLmh0bWwKKworICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnJlc2V0U3R5bGVSZWxhdGlvbnMpOgorICAgICAg ICAoV2ViQ29yZTo6RWxlbWVudDo6cmVzZXRDaGlsZFN0eWxlUmVsYXRpb25zKToKKyAgICAgICAg KFdlYkNvcmU6OkVsZW1lbnQ6OnJlc2V0QWxsRGVzY2VuZGFudFN0eWxlUmVsYXRpb25zKToKKyAg ICAgICAgCisgICAgICAgIFNwbGl0IHJlc2V0U3R5bGVSZWxhdGlvbnMgaW50byBzZXBhcmF0ZSBw YXJ0cy4KKyAgICAgICAgCisgICAgICAgICogZG9tL0VsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNv cmU6OkVsZW1lbnQ6OnN0eWxlQWZmZWN0ZWRCeUVtcHR5IGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkVsZW1lbnQ6OmNoaWxkcmVuQWZmZWN0ZWRCeUZvcndhcmRQb3NpdGlvbmFsUnVsZXMgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6ZGVzY2VuZGFudHNBZmZlY3RlZEJ5Rm9y d2FyZFBvc2l0aW9uYWxSdWxlcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50Ojpj aGlsZHJlbkFmZmVjdGVkQnlCYWNrd2FyZFBvc2l0aW9uYWxSdWxlcyBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpFbGVtZW50OjpkZXNjZW5kYW50c0FmZmVjdGVkQnlCYWNrd2FyZFBvc2l0aW9u YWxSdWxlcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpjaGlsZHJlbkFmZmVj dGVkQnlQcm9wZXJ0eUJhc2VkQmFja3dhcmRQb3NpdGlvbmFsUnVsZXMgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6RWxlbWVudDo6c2V0U3R5bGVBZmZlY3RlZEJ5RW1wdHkpOgorICAgICAgICAo V2ViQ29yZTo6RWxlbWVudDo6c2V0Q2hpbGRyZW5BZmZlY3RlZEJ5Rm9yd2FyZFBvc2l0aW9uYWxS dWxlcyk6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpzZXREZXNjZW5kYW50c0FmZmVjdGVk QnlGb3J3YXJkUG9zaXRpb25hbFJ1bGVzKToKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnNl dENoaWxkcmVuQWZmZWN0ZWRCeUJhY2t3YXJkUG9zaXRpb25hbFJ1bGVzKToKKyAgICAgICAgKFdl YkNvcmU6OkVsZW1lbnQ6OnNldERlc2NlbmRhbnRzQWZmZWN0ZWRCeUJhY2t3YXJkUG9zaXRpb25h bFJ1bGVzKToKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnNldENoaWxkcmVuQWZmZWN0ZWRC eVByb3BlcnR5QmFzZWRCYWNrd2FyZFBvc2l0aW9uYWxSdWxlcyk6CisgICAgICAgICogZG9tL0Vs ZW1lbnRSYXJlRGF0YS5oOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudFJhcmVEYXRhOjpyZXNl dFN0eWxlUmVsYXRpb25zKTogRGVsZXRlZC4KKyAgICAgICAgKiBkb20vTm9kZS5oOgorICAgICAg ICAoV2ViQ29yZTo6Tm9kZTo6U3R5bGVCaXRmaWVsZHM6OmNsZWFyRmxhZ3MpOgorICAgICAgICAo V2ViQ29yZTo6Tm9kZTo6Y2xlYXJTdHlsZUZsYWdzKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6 OlN0eWxlQml0ZmllbGRzOjpkeW5hbWljU3R5bGVSZWxhdGlvbnMgY29uc3QpOiBEZWxldGVkLgor ICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6U3R5bGVCaXRmaWVsZHM6OnNldER5bmFtaWNTdHlsZVJl bGF0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OlN0eWxlQml0ZmllbGRz OjpjbGVhckR5bmFtaWNTdHlsZVJlbGF0aW9ucyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpOb2RlOjpoYXNEeW5hbWljU3R5bGVSZWxhdGlvbkZsYWcgY29uc3QpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6Tm9kZTo6c2V0RHluYW1pY1N0eWxlUmVsYXRpb25GbGFnKTogRGVsZXRl ZC4KKyAgICAgICAgCisgICAgICAgIFJlbW92ZSB0aGUgbWVhbmluZ2xlc3MgRHluYW1pY1N0eWxl UmVsYXRpb24gY29uY2VwdCBhbmQgbWVyZ2UgdGhlc2UgZmxhZ3Mgd2l0aCB0aGUgb3RoZXJzLgor ICAgICAgICAKKyAgICAgICAgKiBzdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTdHlsZTo6VHJlZVJlc29sdmVyOjpyZXNvbHZlRWxlbWVudCk6CisgICAgICAg IChXZWJDb3JlOjpTdHlsZTo6VHJlZVJlc29sdmVyOjpyZXNvbHZlQ29tcG9zZWRUcmVlKToKKyAg ICAgICAgCisgICAgICAgIE9ubHkgY2xlYXIgdGhlIGRlc2NlbmRhbnQgb3IgY2hpbGQgc3R5bGUg cmVsYXRpb24gYml0cyBpZiB3ZSBhcmUgYWN0dWFsbHkgcmUtcmVzb2x2aW5nCisgICAgICAgIGRl c2NlbmRhbnRzIG9yIGNoaWxkcmVuLgorCiAyMDIxLTAzLTI1ICBBbnRvaW5lIFF1aW50ICA8Z3Jh b3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIEltcHJvdmUgaW50ZXJwb2xhdGlvbiBvZiB0aGUg c2hhcGUtb3V0c2lkZSBDU1MgcHJvcGVydHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9FbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAppbmRleCA3ZTVh MGExZjQyY2YuLjk0YjNkNDM1NzZiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0Vs ZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcApAQCAtNDI2MCwx MyArNDI2MCwzMSBAQCB2b2lkIEVsZW1lbnQ6OnJlc2V0Q29tcHV0ZWRTdHlsZSgpCiAKIHZvaWQg RWxlbWVudDo6cmVzZXRTdHlsZVJlbGF0aW9ucygpCiB7Ci0gICAgLy8gRklYTUU6IE1ha2UgdGhp cyBjb2RlIG1vcmUgY29uc2lzdGVudC4KLSAgICBhdXRvIGJpdGZpZWxkcyA9IHN0eWxlQml0Zmll bGRzKCk7Ci0gICAgYml0ZmllbGRzLmNsZWFyRHluYW1pY1N0eWxlUmVsYXRpb25zKCk7Ci0gICAg c2V0U3R5bGVCaXRmaWVsZHMoYml0ZmllbGRzKTsKKyAgICBjbGVhclN0eWxlRmxhZ3MoTm9kZVN0 eWxlRmxhZzo6U3R5bGVBZmZlY3RlZEJ5RW1wdHkpOwogICAgIGlmICghaGFzUmFyZURhdGEoKSkK ICAgICAgICAgcmV0dXJuOwotICAgIGVsZW1lbnRSYXJlRGF0YSgpLT5yZXNldFN0eWxlUmVsYXRp b25zKCk7CisgICAgZWxlbWVudFJhcmVEYXRhKCktPnNldENoaWxkSW5kZXgoMCk7Cit9CisKK3Zv aWQgRWxlbWVudDo6cmVzZXRDaGlsZFN0eWxlUmVsYXRpb25zKCkKK3sKKyAgICBjbGVhclN0eWxl RmxhZ3MoeworICAgICAgICBOb2RlU3R5bGVGbGFnOjpDaGlsZHJlbkFmZmVjdGVkQnlGaXJzdENo aWxkUnVsZXMsCisgICAgICAgIE5vZGVTdHlsZUZsYWc6OkNoaWxkcmVuQWZmZWN0ZWRCeUxhc3RD aGlsZFJ1bGVzLAorICAgICAgICBOb2RlU3R5bGVGbGFnOjpDaGlsZHJlbkFmZmVjdGVkQnlGb3J3 YXJkUG9zaXRpb25hbFJ1bGVzLAorICAgICAgICBOb2RlU3R5bGVGbGFnOjpDaGlsZHJlbkFmZmVj dGVkQnlCYWNrd2FyZFBvc2l0aW9uYWxSdWxlcywKKyAgICAgICAgTm9kZVN0eWxlRmxhZzo6Q2hp bGRyZW5BZmZlY3RlZEJ5UHJvcGVydHlCYXNlZEJhY2t3YXJkUG9zaXRpb25hbFJ1bGVzCisgICAg fSk7Cit9CisKK3ZvaWQgRWxlbWVudDo6cmVzZXRBbGxEZXNjZW5kYW50U3R5bGVSZWxhdGlvbnMo KQoreworICAgIHJlc2V0Q2hpbGRTdHlsZVJlbGF0aW9ucygpOworICAgIAorICAgIGNsZWFyU3R5 bGVGbGFncyh7CisgICAgICAgIE5vZGVTdHlsZUZsYWc6OkRlc2NlbmRhbnRzQWZmZWN0ZWRCeUZv cndhcmRQb3NpdGlvbmFsUnVsZXMsCisgICAgICAgIE5vZGVTdHlsZUZsYWc6OkRlc2NlbmRhbnRz QWZmZWN0ZWRCeUJhY2t3YXJkUG9zaXRpb25hbFJ1bGVzCisgICAgfSk7CiB9CiAKIHZvaWQgRWxl bWVudDo6Y2xlYXJIb3ZlckFuZEFjdGl2ZVN0YXR1c0JlZm9yZURldGFjaGluZ1JlbmRlcmVyKCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29y ZS9kb20vRWxlbWVudC5oCmluZGV4IDA0YmQxOWVjZDI4MC4uNTc5ZjU2ZmMxZWMyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9FbGVtZW50LmgKQEAgLTM1OSwzMCArMzU5LDMwIEBAIHB1YmxpYzoKICAgICBib29sIGlzVmlz aWJsZVdpdGhvdXRSZXNvbHZpbmdGdWxsU3R5bGUoKSBjb25zdDsKIAogICAgIC8vIE1ldGhvZHMg Zm9yIGluZGljYXRpbmcgdGhlIHN0eWxlIGlzIGFmZmVjdGVkIGJ5IGR5bmFtaWMgdXBkYXRlcyAo ZS5nLiwgY2hpbGRyZW4gY2hhbmdpbmcsIG91ciBwb3NpdGlvbiBjaGFuZ2luZyBpbiBvdXIgc2li bGluZyBsaXN0LCBldGMuKQotICAgIGJvb2wgc3R5bGVBZmZlY3RlZEJ5RW1wdHkoKSBjb25zdCB7 IHJldHVybiBoYXNEeW5hbWljU3R5bGVSZWxhdGlvbkZsYWcoRHluYW1pY1N0eWxlUmVsYXRpb25G bGFnOjpTdHlsZUFmZmVjdGVkQnlFbXB0eSk7IH0KKyAgICBib29sIHN0eWxlQWZmZWN0ZWRCeUVt cHR5KCkgY29uc3QgeyByZXR1cm4gaGFzU3R5bGVGbGFnKE5vZGVTdHlsZUZsYWc6OlN0eWxlQWZm ZWN0ZWRCeUVtcHR5KTsgfQogICAgIGJvb2wgZGVzY2VuZGFudHNBZmZlY3RlZEJ5UHJldmlvdXNT aWJsaW5nKCkgY29uc3QgeyByZXR1cm4gaGFzU3R5bGVGbGFnKE5vZGVTdHlsZUZsYWc6OkRlc2Nl bmRhbnRzQWZmZWN0ZWRCeVByZXZpb3VzU2libGluZyk7IH0KICAgICBib29sIGNoaWxkcmVuQWZm ZWN0ZWRCeUZpcnN0Q2hpbGRSdWxlcygpIGNvbnN0IHsgcmV0dXJuIGhhc1N0eWxlRmxhZyhOb2Rl U3R5bGVGbGFnOjpDaGlsZHJlbkFmZmVjdGVkQnlGaXJzdENoaWxkUnVsZXMpOyB9CiAgICAgYm9v bCBjaGlsZHJlbkFmZmVjdGVkQnlMYXN0Q2hpbGRSdWxlcygpIGNvbnN0IHsgcmV0dXJuIGhhc1N0 eWxlRmxhZyhOb2RlU3R5bGVGbGFnOjpDaGlsZHJlbkFmZmVjdGVkQnlMYXN0Q2hpbGRSdWxlcyk7 IH0KLSAgICBib29sIGNoaWxkcmVuQWZmZWN0ZWRCeUZvcndhcmRQb3NpdGlvbmFsUnVsZXMoKSBj b25zdCB7IHJldHVybiBoYXNEeW5hbWljU3R5bGVSZWxhdGlvbkZsYWcoRHluYW1pY1N0eWxlUmVs YXRpb25GbGFnOjpDaGlsZHJlbkFmZmVjdGVkQnlGb3J3YXJkUG9zaXRpb25hbFJ1bGVzKTsgfQot ICAgIGJvb2wgZGVzY2VuZGFudHNBZmZlY3RlZEJ5Rm9yd2FyZFBvc2l0aW9uYWxSdWxlcygpIGNv bnN0IHsgcmV0dXJuIGhhc0R5bmFtaWNTdHlsZVJlbGF0aW9uRmxhZyhEeW5hbWljU3R5bGVSZWxh dGlvbkZsYWc6OkRlc2NlbmRhbnRzQWZmZWN0ZWRCeUZvcndhcmRQb3NpdGlvbmFsUnVsZXMpOyB9 Ci0gICAgYm9vbCBjaGlsZHJlbkFmZmVjdGVkQnlCYWNrd2FyZFBvc2l0aW9uYWxSdWxlcygpIGNv bnN0IHsgcmV0dXJuIGhhc0R5bmFtaWNTdHlsZVJlbGF0aW9uRmxhZyhEeW5hbWljU3R5bGVSZWxh dGlvbkZsYWc6OkNoaWxkcmVuQWZmZWN0ZWRCeUJhY2t3YXJkUG9zaXRpb25hbFJ1bGVzKTsgfQot ICAgIGJvb2wgZGVzY2VuZGFudHNBZmZlY3RlZEJ5QmFja3dhcmRQb3NpdGlvbmFsUnVsZXMoKSBj b25zdCB7IHJldHVybiBoYXNEeW5hbWljU3R5bGVSZWxhdGlvbkZsYWcoRHluYW1pY1N0eWxlUmVs YXRpb25GbGFnOjpEZXNjZW5kYW50c0FmZmVjdGVkQnlCYWNrd2FyZFBvc2l0aW9uYWxSdWxlcyk7 IH0KLSAgICBib29sIGNoaWxkcmVuQWZmZWN0ZWRCeVByb3BlcnR5QmFzZWRCYWNrd2FyZFBvc2l0 aW9uYWxSdWxlcygpIGNvbnN0IHsgcmV0dXJuIGhhc0R5bmFtaWNTdHlsZVJlbGF0aW9uRmxhZyhE eW5hbWljU3R5bGVSZWxhdGlvbkZsYWc6OkNoaWxkcmVuQWZmZWN0ZWRCeVByb3BlcnR5QmFzZWRC YWNrd2FyZFBvc2l0aW9uYWxSdWxlcyk7IH0KKyAgICBib29sIGNoaWxkcmVuQWZmZWN0ZWRCeUZv cndhcmRQb3NpdGlvbmFsUnVsZXMoKSBjb25zdCB7IHJldHVybiBoYXNTdHlsZUZsYWcoTm9kZVN0 eWxlRmxhZzo6Q2hpbGRyZW5BZmZlY3RlZEJ5Rm9yd2FyZFBvc2l0aW9uYWxSdWxlcyk7IH0KKyAg ICBib29sIGRlc2NlbmRhbnRzQWZmZWN0ZWRCeUZvcndhcmRQb3NpdGlvbmFsUnVsZXMoKSBjb25z dCB7IHJldHVybiBoYXNTdHlsZUZsYWcoTm9kZVN0eWxlRmxhZzo6RGVzY2VuZGFudHNBZmZlY3Rl ZEJ5Rm9yd2FyZFBvc2l0aW9uYWxSdWxlcyk7IH0KKyAgICBib29sIGNoaWxkcmVuQWZmZWN0ZWRC eUJhY2t3YXJkUG9zaXRpb25hbFJ1bGVzKCkgY29uc3QgeyByZXR1cm4gaGFzU3R5bGVGbGFnKE5v ZGVTdHlsZUZsYWc6OkNoaWxkcmVuQWZmZWN0ZWRCeUJhY2t3YXJkUG9zaXRpb25hbFJ1bGVzKTsg fQorICAgIGJvb2wgZGVzY2VuZGFudHNBZmZlY3RlZEJ5QmFja3dhcmRQb3NpdGlvbmFsUnVsZXMo KSBjb25zdCB7IHJldHVybiBoYXNTdHlsZUZsYWcoTm9kZVN0eWxlRmxhZzo6RGVzY2VuZGFudHNB ZmZlY3RlZEJ5QmFja3dhcmRQb3NpdGlvbmFsUnVsZXMpOyB9CisgICAgYm9vbCBjaGlsZHJlbkFm ZmVjdGVkQnlQcm9wZXJ0eUJhc2VkQmFja3dhcmRQb3NpdGlvbmFsUnVsZXMoKSBjb25zdCB7IHJl dHVybiBoYXNTdHlsZUZsYWcoTm9kZVN0eWxlRmxhZzo6Q2hpbGRyZW5BZmZlY3RlZEJ5UHJvcGVy dHlCYXNlZEJhY2t3YXJkUG9zaXRpb25hbFJ1bGVzKTsgfQogICAgIGJvb2wgYWZmZWN0c05leHRT aWJsaW5nRWxlbWVudFN0eWxlKCkgY29uc3QgeyByZXR1cm4gaGFzU3R5bGVGbGFnKE5vZGVTdHls ZUZsYWc6OkFmZmVjdHNOZXh0U2libGluZ0VsZW1lbnRTdHlsZSk7IH0KICAgICBib29sIHN0eWxl SXNBZmZlY3RlZEJ5UHJldmlvdXNTaWJsaW5nKCkgY29uc3QgeyByZXR1cm4gaGFzU3R5bGVGbGFn KE5vZGVTdHlsZUZsYWc6OlN0eWxlSXNBZmZlY3RlZEJ5UHJldmlvdXNTaWJsaW5nKTsgfQogICAg IHVuc2lnbmVkIGNoaWxkSW5kZXgoKSBjb25zdCB7IHJldHVybiBoYXNSYXJlRGF0YSgpID8gcmFy ZURhdGFDaGlsZEluZGV4KCkgOiAwOyB9CiAKICAgICBib29sIGhhc0ZsYWdzU2V0RHVyaW5nU3R5 bGluZ09mQ2hpbGRyZW4oKSBjb25zdDsKIAotICAgIHZvaWQgc2V0U3R5bGVBZmZlY3RlZEJ5RW1w dHkoKSB7IHNldER5bmFtaWNTdHlsZVJlbGF0aW9uRmxhZyhEeW5hbWljU3R5bGVSZWxhdGlvbkZs YWc6OlN0eWxlQWZmZWN0ZWRCeUVtcHR5KTsgfQorICAgIHZvaWQgc2V0U3R5bGVBZmZlY3RlZEJ5 RW1wdHkoKSB7IHNldFN0eWxlRmxhZyhOb2RlU3R5bGVGbGFnOjpTdHlsZUFmZmVjdGVkQnlFbXB0 eSk7IH0KICAgICB2b2lkIHNldERlc2NlbmRhbnRzQWZmZWN0ZWRCeVByZXZpb3VzU2libGluZygp IHsgc2V0U3R5bGVGbGFnKE5vZGVTdHlsZUZsYWc6OkRlc2NlbmRhbnRzQWZmZWN0ZWRCeVByZXZp b3VzU2libGluZyk7IH0KICAgICB2b2lkIHNldENoaWxkcmVuQWZmZWN0ZWRCeUZpcnN0Q2hpbGRS dWxlcygpIHsgc2V0U3R5bGVGbGFnKE5vZGVTdHlsZUZsYWc6OkNoaWxkcmVuQWZmZWN0ZWRCeUZp cnN0Q2hpbGRSdWxlcyk7IH0KICAgICB2b2lkIHNldENoaWxkcmVuQWZmZWN0ZWRCeUxhc3RDaGls ZFJ1bGVzKCkgeyBzZXRTdHlsZUZsYWcoTm9kZVN0eWxlRmxhZzo6Q2hpbGRyZW5BZmZlY3RlZEJ5 TGFzdENoaWxkUnVsZXMpOyB9Ci0gICAgdm9pZCBzZXRDaGlsZHJlbkFmZmVjdGVkQnlGb3J3YXJk UG9zaXRpb25hbFJ1bGVzKCkgeyBzZXREeW5hbWljU3R5bGVSZWxhdGlvbkZsYWcoRHluYW1pY1N0 eWxlUmVsYXRpb25GbGFnOjpDaGlsZHJlbkFmZmVjdGVkQnlGb3J3YXJkUG9zaXRpb25hbFJ1bGVz KTsgfQotICAgIHZvaWQgc2V0RGVzY2VuZGFudHNBZmZlY3RlZEJ5Rm9yd2FyZFBvc2l0aW9uYWxS dWxlcygpIHsgc2V0RHluYW1pY1N0eWxlUmVsYXRpb25GbGFnKER5bmFtaWNTdHlsZVJlbGF0aW9u RmxhZzo6RGVzY2VuZGFudHNBZmZlY3RlZEJ5Rm9yd2FyZFBvc2l0aW9uYWxSdWxlcyk7IH0KLSAg ICB2b2lkIHNldENoaWxkcmVuQWZmZWN0ZWRCeUJhY2t3YXJkUG9zaXRpb25hbFJ1bGVzKCkgeyBz ZXREeW5hbWljU3R5bGVSZWxhdGlvbkZsYWcoRHluYW1pY1N0eWxlUmVsYXRpb25GbGFnOjpDaGls ZHJlbkFmZmVjdGVkQnlCYWNrd2FyZFBvc2l0aW9uYWxSdWxlcyk7IH0KLSAgICB2b2lkIHNldERl c2NlbmRhbnRzQWZmZWN0ZWRCeUJhY2t3YXJkUG9zaXRpb25hbFJ1bGVzKCkgeyBzZXREeW5hbWlj U3R5bGVSZWxhdGlvbkZsYWcoRHluYW1pY1N0eWxlUmVsYXRpb25GbGFnOjpEZXNjZW5kYW50c0Fm ZmVjdGVkQnlCYWNrd2FyZFBvc2l0aW9uYWxSdWxlcyk7IH0KLSAgICB2b2lkIHNldENoaWxkcmVu QWZmZWN0ZWRCeVByb3BlcnR5QmFzZWRCYWNrd2FyZFBvc2l0aW9uYWxSdWxlcygpIHsgc2V0RHlu YW1pY1N0eWxlUmVsYXRpb25GbGFnKER5bmFtaWNTdHlsZVJlbGF0aW9uRmxhZzo6Q2hpbGRyZW5B ZmZlY3RlZEJ5UHJvcGVydHlCYXNlZEJhY2t3YXJkUG9zaXRpb25hbFJ1bGVzKTsgfQorICAgIHZv aWQgc2V0Q2hpbGRyZW5BZmZlY3RlZEJ5Rm9yd2FyZFBvc2l0aW9uYWxSdWxlcygpIHsgc2V0U3R5 bGVGbGFnKE5vZGVTdHlsZUZsYWc6OkNoaWxkcmVuQWZmZWN0ZWRCeUZvcndhcmRQb3NpdGlvbmFs UnVsZXMpOyB9CisgICAgdm9pZCBzZXREZXNjZW5kYW50c0FmZmVjdGVkQnlGb3J3YXJkUG9zaXRp b25hbFJ1bGVzKCkgeyBzZXRTdHlsZUZsYWcoTm9kZVN0eWxlRmxhZzo6RGVzY2VuZGFudHNBZmZl Y3RlZEJ5Rm9yd2FyZFBvc2l0aW9uYWxSdWxlcyk7IH0KKyAgICB2b2lkIHNldENoaWxkcmVuQWZm ZWN0ZWRCeUJhY2t3YXJkUG9zaXRpb25hbFJ1bGVzKCkgeyBzZXRTdHlsZUZsYWcoTm9kZVN0eWxl RmxhZzo6Q2hpbGRyZW5BZmZlY3RlZEJ5QmFja3dhcmRQb3NpdGlvbmFsUnVsZXMpOyB9CisgICAg dm9pZCBzZXREZXNjZW5kYW50c0FmZmVjdGVkQnlCYWNrd2FyZFBvc2l0aW9uYWxSdWxlcygpIHsg c2V0U3R5bGVGbGFnKE5vZGVTdHlsZUZsYWc6OkRlc2NlbmRhbnRzQWZmZWN0ZWRCeUJhY2t3YXJk UG9zaXRpb25hbFJ1bGVzKTsgfQorICAgIHZvaWQgc2V0Q2hpbGRyZW5BZmZlY3RlZEJ5UHJvcGVy dHlCYXNlZEJhY2t3YXJkUG9zaXRpb25hbFJ1bGVzKCkgeyBzZXRTdHlsZUZsYWcoTm9kZVN0eWxl RmxhZzo6Q2hpbGRyZW5BZmZlY3RlZEJ5UHJvcGVydHlCYXNlZEJhY2t3YXJkUG9zaXRpb25hbFJ1 bGVzKTsgfQogICAgIHZvaWQgc2V0QWZmZWN0c05leHRTaWJsaW5nRWxlbWVudFN0eWxlKCkgeyBz ZXRTdHlsZUZsYWcoTm9kZVN0eWxlRmxhZzo6QWZmZWN0c05leHRTaWJsaW5nRWxlbWVudFN0eWxl KTsgfQogICAgIHZvaWQgc2V0U3R5bGVJc0FmZmVjdGVkQnlQcmV2aW91c1NpYmxpbmcoKSB7IHNl dFN0eWxlRmxhZyhOb2RlU3R5bGVGbGFnOjpTdHlsZUlzQWZmZWN0ZWRCeVByZXZpb3VzU2libGlu Zyk7IH0KICAgICB2b2lkIHNldENoaWxkSW5kZXgodW5zaWduZWQpOwpAQCAtNTYzLDYgKzU2Myw4 IEBAIHB1YmxpYzoKICAgICB2b2lkIGNsZWFyQWZ0ZXJQc2V1ZG9FbGVtZW50KCk7CiAgICAgdm9p ZCByZXNldENvbXB1dGVkU3R5bGUoKTsKICAgICB2b2lkIHJlc2V0U3R5bGVSZWxhdGlvbnMoKTsK KyAgICB2b2lkIHJlc2V0Q2hpbGRTdHlsZVJlbGF0aW9ucygpOworICAgIHZvaWQgcmVzZXRBbGxE ZXNjZW5kYW50U3R5bGVSZWxhdGlvbnMoKTsKICAgICB2b2lkIGNsZWFySG92ZXJBbmRBY3RpdmVT dGF0dXNCZWZvcmVEZXRhY2hpbmdSZW5kZXJlcigpOwogCiAgICAgV0VCQ09SRV9FWFBPUlQgVVJM IGFic29sdXRlTGlua1VSTCgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnRSYXJlRGF0YS5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnRSYXJlRGF0YS5o CmluZGV4IDJjZDdlOWY3ODc1Ny4uOWNhOTg5MDViMDhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9kb20vRWxlbWVudFJhcmVEYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1l bnRSYXJlRGF0YS5oCkBAIC01NSw3ICs1NSw2IEBAIHB1YmxpYzoKICAgICBQc2V1ZG9FbGVtZW50 KiBhZnRlclBzZXVkb0VsZW1lbnQoKSBjb25zdCB7IHJldHVybiBtX2FmdGVyUHNldWRvRWxlbWVu dC5nZXQoKTsgfQogCiAgICAgdm9pZCByZXNldENvbXB1dGVkU3R5bGUoKTsKLSAgICB2b2lkIHJl c2V0U3R5bGVSZWxhdGlvbnMoKTsKIAogICAgIGludCB1bnVzdWFsVGFiSW5kZXgoKSBjb25zdDsK ICAgICB2b2lkIHNldFVudXN1YWxUYWJJbmRleChpbnQpOwpAQCAtMjIwLDExICsyMTksNiBAQCBp bmxpbmUgdm9pZCBFbGVtZW50UmFyZURhdGE6OnJlc2V0Q29tcHV0ZWRTdHlsZSgpCiAgICAgbV9j b21wdXRlZFN0eWxlID0gbnVsbHB0cjsKIH0KIAotaW5saW5lIHZvaWQgRWxlbWVudFJhcmVEYXRh OjpyZXNldFN0eWxlUmVsYXRpb25zKCkKLXsKLSAgICBzZXRDaGlsZEluZGV4KDApOwotfQotCiBp bmxpbmUgaW50IEVsZW1lbnRSYXJlRGF0YTo6dW51c3VhbFRhYkluZGV4KCkgY29uc3QKIHsKICAg ICBBU1NFUlQobV91bnVzdWFsVGFiSW5kZXgpOyAvLyBzZXRVbnVzdWFsVGFiSW5kZXggbXVzdCBo YXZlIGJlZW4gY2FsbGVkIGJlZm9yZSB0aGlzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv ZG9tL05vZGUuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmgKaW5kZXggMWViODkxNDVlYzRi Li44NzYyNzBkYjZiZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmgKKysr IGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuaApAQCAtNjEyLDI3ICs2MTIsMjQgQEAgcHJvdGVj dGVkOgogICAgIHN0YXRpYyBjb25zdGV4cHIgdWludDMyX3Qgc19yZWZDb3VudEluY3JlbWVudCA9 IDI7CiAgICAgc3RhdGljIGNvbnN0ZXhwciB1aW50MzJfdCBzX3JlZkNvdW50TWFzayA9IH5zdGF0 aWNfY2FzdDx1aW50MzJfdD4oMSk7CiAKLSAgICBlbnVtIGNsYXNzIE5vZGVTdHlsZUZsYWcgOiB1 aW50OF90IHsKLSAgICAgICAgRGVzY2VuZGFudE5lZWRzU3R5bGVSZXNvbHV0aW9uID0gMSA8PCAw LAotICAgICAgICBEaXJlY3RDaGlsZE5lZWRzU3R5bGVSZXNvbHV0aW9uID0gMSA8PCAxLAotICAg ICAgICBTdHlsZVJlc29sdXRpb25TaG91bGRSZWNvbXBvc2l0ZUxheWVyID0gMSA8PCAyLAotCi0g ICAgICAgIENoaWxkcmVuQWZmZWN0ZWRCeUZpcnN0Q2hpbGRSdWxlcyA9IDEgPDwgMywKLSAgICAg ICAgQ2hpbGRyZW5BZmZlY3RlZEJ5TGFzdENoaWxkUnVsZXMgPSAxIDw8IDQsCi0gICAgICAgIEFm ZmVjdHNOZXh0U2libGluZ0VsZW1lbnRTdHlsZSA9IDEgPDwgNSwKLSAgICAgICAgU3R5bGVJc0Fm ZmVjdGVkQnlQcmV2aW91c1NpYmxpbmcgPSAxIDw8IDYsCi0gICAgICAgIERlc2NlbmRhbnRzQWZm ZWN0ZWRCeVByZXZpb3VzU2libGluZyA9IDEgPDwgNywKLSAgICB9OwotCi0gICAgZW51bSBjbGFz cyBEeW5hbWljU3R5bGVSZWxhdGlvbkZsYWcgOiB1aW50OF90IHsKLSAgICAgICAgU3R5bGVBZmZl Y3RlZEJ5RW1wdHkgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA9IDEgPDwgMCwK KyAgICBlbnVtIGNsYXNzIE5vZGVTdHlsZUZsYWcgOiB1aW50MTZfdCB7CisgICAgICAgIERlc2Nl bmRhbnROZWVkc1N0eWxlUmVzb2x1dGlvbiAgICAgICAgICAgICAgICAgICAgICAgICAgPSAxIDw8 IDAsCisgICAgICAgIERpcmVjdENoaWxkTmVlZHNTdHlsZVJlc29sdXRpb24gICAgICAgICAgICAg ICAgICAgICAgICAgPSAxIDw8IDEsCisgICAgICAgIFN0eWxlUmVzb2x1dGlvblNob3VsZFJlY29t cG9zaXRlTGF5ZXIgICAgICAgICAgICAgICAgICAgPSAxIDw8IDIsCisKKyAgICAgICAgQ2hpbGRy ZW5BZmZlY3RlZEJ5Rmlyc3RDaGlsZFJ1bGVzICAgICAgICAgICAgICAgICAgICAgICA9IDEgPDwg MywKKyAgICAgICAgQ2hpbGRyZW5BZmZlY3RlZEJ5TGFzdENoaWxkUnVsZXMgICAgICAgICAgICAg ICAgICAgICAgICA9IDEgPDwgNCwKKyAgICAgICAgQWZmZWN0c05leHRTaWJsaW5nRWxlbWVudFN0 eWxlICAgICAgICAgICAgICAgICAgICAgICAgICA9IDEgPDwgNSwKKyAgICAgICAgU3R5bGVJc0Fm ZmVjdGVkQnlQcmV2aW91c1NpYmxpbmcgICAgICAgICAgICAgICAgICAgICAgICA9IDEgPDwgNiwK KyAgICAgICAgRGVzY2VuZGFudHNBZmZlY3RlZEJ5UHJldmlvdXNTaWJsaW5nICAgICAgICAgICAg ICAgICAgICA9IDEgPDwgNywKKyAgICAgICAgU3R5bGVBZmZlY3RlZEJ5RW1wdHkgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICA9IDEgPDwgOCwKICAgICAgICAgLy8gV2Ugb3B0aW1p emUgZm9yIDpmaXJzdC1jaGlsZCBhbmQgOmxhc3QtY2hpbGQuIFRoZSBvdGhlciBwb3NpdGlvbmFs IGNoaWxkIHNlbGVjdG9ycyBsaWtlIG50aC1jaGlsZCBvcgogICAgICAgICAvLyAqLWNoaWxkLW9m LXR5cGUsIHdlIHdpbGwganVzdCBnaXZlIHVwIGFuZCByZS1ldmFsdWF0ZSB3aGVuZXZlciBjaGls ZHJlbiBjaGFuZ2UgYXQgYWxsLgotICAgICAgICBDaGlsZHJlbkFmZmVjdGVkQnlGb3J3YXJkUG9z aXRpb25hbFJ1bGVzICAgICAgICAgICAgICAgID0gMSA8PCAxLAotICAgICAgICBEZXNjZW5kYW50 c0FmZmVjdGVkQnlGb3J3YXJkUG9zaXRpb25hbFJ1bGVzICAgICAgICAgICAgID0gMSA8PCAyLAot ICAgICAgICBDaGlsZHJlbkFmZmVjdGVkQnlCYWNrd2FyZFBvc2l0aW9uYWxSdWxlcyAgICAgICAg ICAgICAgID0gMSA8PCAzLAotICAgICAgICBEZXNjZW5kYW50c0FmZmVjdGVkQnlCYWNrd2FyZFBv c2l0aW9uYWxSdWxlcyAgICAgICAgICAgID0gMSA8PCA0LAotICAgICAgICBDaGlsZHJlbkFmZmVj dGVkQnlQcm9wZXJ0eUJhc2VkQmFja3dhcmRQb3NpdGlvbmFsUnVsZXMgID0gMSA8PCA1LAorICAg ICAgICBDaGlsZHJlbkFmZmVjdGVkQnlGb3J3YXJkUG9zaXRpb25hbFJ1bGVzICAgICAgICAgICAg ICAgID0gMSA8PCA5LAorICAgICAgICBEZXNjZW5kYW50c0FmZmVjdGVkQnlGb3J3YXJkUG9zaXRp b25hbFJ1bGVzICAgICAgICAgICAgID0gMSA8PCAxMCwKKyAgICAgICAgQ2hpbGRyZW5BZmZlY3Rl ZEJ5QmFja3dhcmRQb3NpdGlvbmFsUnVsZXMgICAgICAgICAgICAgICA9IDEgPDwgMTEsCisgICAg ICAgIERlc2NlbmRhbnRzQWZmZWN0ZWRCeUJhY2t3YXJkUG9zaXRpb25hbFJ1bGVzICAgICAgICAg ICAgPSAxIDw8IDEyLAorICAgICAgICBDaGlsZHJlbkFmZmVjdGVkQnlQcm9wZXJ0eUJhc2VkQmFj a3dhcmRQb3NpdGlvbmFsUnVsZXMgID0gMSA8PCAxMywKICAgICB9OwogCiAgICAgc3RydWN0IFN0 eWxlQml0ZmllbGRzIHsKQEAgLTY0MywyNyArNjQwLDIyIEBAIHByb3RlY3RlZDoKICAgICAgICAg U3R5bGU6OlZhbGlkaXR5IHN0eWxlVmFsaWRpdHkoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2Fz dDxTdHlsZTo6VmFsaWRpdHk+KG1fc3R5bGVWYWxpZGl0eSk7IH0KICAgICAgICAgdm9pZCBzZXRT dHlsZVZhbGlkaXR5KFN0eWxlOjpWYWxpZGl0eSB2YWxpZGl0eSkgeyBtX3N0eWxlVmFsaWRpdHkg PSBzdGF0aWNfY2FzdDx1aW50OF90Pih2YWxpZGl0eSk7IH0KIAotICAgICAgICBPcHRpb25TZXQ8 RHluYW1pY1N0eWxlUmVsYXRpb25GbGFnPiBkeW5hbWljU3R5bGVSZWxhdGlvbnMoKSBjb25zdCB7 IHJldHVybiBPcHRpb25TZXQ8RHluYW1pY1N0eWxlUmVsYXRpb25GbGFnPjo6ZnJvbVJhdyhtX2R5 bmFtaWNTdHlsZVJlbGF0aW9uKTsgfQotICAgICAgICB2b2lkIHNldER5bmFtaWNTdHlsZVJlbGF0 aW9uKER5bmFtaWNTdHlsZVJlbGF0aW9uRmxhZyBmbGFnKSB7IG1fZHluYW1pY1N0eWxlUmVsYXRp b24gPSAoZHluYW1pY1N0eWxlUmVsYXRpb25zKCkgfCBmbGFnKS50b1JhdygpOyB9Ci0gICAgICAg IHZvaWQgY2xlYXJEeW5hbWljU3R5bGVSZWxhdGlvbnMoKSB7IG1fZHluYW1pY1N0eWxlUmVsYXRp b24gPSAwOyB9Ci0KICAgICAgICAgT3B0aW9uU2V0PE5vZGVTdHlsZUZsYWc+IGZsYWdzKCkgY29u c3QgeyByZXR1cm4gT3B0aW9uU2V0PE5vZGVTdHlsZUZsYWc+Ojpmcm9tUmF3KG1fZmxhZ3MpOyB9 CiAgICAgICAgIHZvaWQgc2V0RmxhZyhOb2RlU3R5bGVGbGFnIGZsYWcpIHsgbV9mbGFncyA9IChm bGFncygpIHwgZmxhZykudG9SYXcoKTsgfQogICAgICAgICB2b2lkIGNsZWFyRmxhZyhOb2RlU3R5 bGVGbGFnIGZsYWcpIHsgbV9mbGFncyA9IChmbGFncygpIC0gZmxhZykudG9SYXcoKTsgfQorICAg ICAgICB2b2lkIGNsZWFyRmxhZ3MoT3B0aW9uU2V0PE5vZGVTdHlsZUZsYWc+IGZsYWdzVG9DbGVh cikgeyBtX2ZsYWdzID0gKGZsYWdzKCkgLSBmbGFnc1RvQ2xlYXIpLnRvUmF3KCk7IH0KICAgICAg ICAgdm9pZCBjbGVhckRlc2NlbmRhbnRzTmVlZFN0eWxlUmVzb2x1dGlvbigpIHsgbV9mbGFncyA9 IChmbGFncygpIC0gTm9kZVN0eWxlRmxhZzo6RGVzY2VuZGFudE5lZWRzU3R5bGVSZXNvbHV0aW9u IC0gTm9kZVN0eWxlRmxhZzo6RGlyZWN0Q2hpbGROZWVkc1N0eWxlUmVzb2x1dGlvbikudG9SYXco KTsgfQogCiAgICAgcHJpdmF0ZToKLSAgICAgICAgdWludDhfdCBtX3N0eWxlVmFsaWRpdHkgOiAy OwotICAgICAgICB1aW50OF90IG1fZHluYW1pY1N0eWxlUmVsYXRpb24gOiA2OwotICAgICAgICB1 aW50OF90IG1fZmxhZ3MgOiA4OworICAgICAgICB1aW50MTZfdCBtX3N0eWxlVmFsaWRpdHkgOiAy OworICAgICAgICB1aW50MTZfdCBtX2ZsYWdzIDogMTQ7CiAgICAgfTsKIAogICAgIFN0eWxlQml0 ZmllbGRzIHN0eWxlQml0ZmllbGRzKCkgY29uc3QgeyByZXR1cm4gU3R5bGVCaXRmaWVsZHM6OmZy b21SYXcobV9yZW5kZXJlcldpdGhTdHlsZUZsYWdzLnR5cGUoKSk7IH0KICAgICB2b2lkIHNldFN0 eWxlQml0ZmllbGRzKFN0eWxlQml0ZmllbGRzIGJpdGZpZWxkcykgeyBtX3JlbmRlcmVyV2l0aFN0 eWxlRmxhZ3Muc2V0VHlwZShiaXRmaWVsZHMudG9SYXcoKSk7IH0KICAgICBBTFdBWVNfSU5MSU5F IGJvb2wgaGFzU3R5bGVGbGFnKE5vZGVTdHlsZUZsYWcgZmxhZykgY29uc3QgeyByZXR1cm4gc3R5 bGVCaXRmaWVsZHMoKS5mbGFncygpLmNvbnRhaW5zKGZsYWcpOyB9CiAgICAgQUxXQVlTX0lOTElO RSB2b2lkIHNldFN0eWxlRmxhZyhOb2RlU3R5bGVGbGFnKTsKLSAgICBBTFdBWVNfSU5MSU5FIGJv b2wgaGFzRHluYW1pY1N0eWxlUmVsYXRpb25GbGFnKER5bmFtaWNTdHlsZVJlbGF0aW9uRmxhZyBm bGFnKSBjb25zdCB7IHJldHVybiBzdHlsZUJpdGZpZWxkcygpLmR5bmFtaWNTdHlsZVJlbGF0aW9u cygpLmNvbnRhaW5zKGZsYWcpOyB9Ci0gICAgQUxXQVlTX0lOTElORSB2b2lkIHNldER5bmFtaWNT dHlsZVJlbGF0aW9uRmxhZyhEeW5hbWljU3R5bGVSZWxhdGlvbkZsYWcpOworICAgIEFMV0FZU19J TkxJTkUgdm9pZCBjbGVhclN0eWxlRmxhZ3MoT3B0aW9uU2V0PE5vZGVTdHlsZUZsYWc+KTsKIAog ICAgIHZpcnR1YWwgdm9pZCBhZGRTdWJyZXNvdXJjZUF0dHJpYnV0ZVVSTHMoTGlzdEhhc2hTZXQ8 VVJMPiYpIGNvbnN0IHsgfQogCkBAIC04NTYsMTAgKzg0OCwxMCBAQCBBTFdBWVNfSU5MSU5FIHZv aWQgTm9kZTo6c2V0U3R5bGVGbGFnKE5vZGVTdHlsZUZsYWcgZmxhZykKICAgICBzZXRTdHlsZUJp dGZpZWxkcyhiaXRmaWVsZHMpOwogfQogCi1BTFdBWVNfSU5MSU5FIHZvaWQgTm9kZTo6c2V0RHlu YW1pY1N0eWxlUmVsYXRpb25GbGFnKER5bmFtaWNTdHlsZVJlbGF0aW9uRmxhZyBmbGFnKQorQUxX QVlTX0lOTElORSB2b2lkIE5vZGU6OmNsZWFyU3R5bGVGbGFncyhPcHRpb25TZXQ8Tm9kZVN0eWxl RmxhZz4gZmxhZ3MpCiB7CiAgICAgYXV0byBiaXRmaWVsZHMgPSBzdHlsZUJpdGZpZWxkcygpOwot ICAgIGJpdGZpZWxkcy5zZXREeW5hbWljU3R5bGVSZWxhdGlvbihmbGFnKTsKKyAgICBiaXRmaWVs ZHMuY2xlYXJGbGFncyhmbGFncyk7CiAgICAgc2V0U3R5bGVCaXRmaWVsZHMoYml0ZmllbGRzKTsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVzb2x2ZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVzb2x2ZXIuY3BwCmluZGV4IDA5 ODc4NjUzOWE5Ny4uZjg2NWVhMmIxNTJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHls ZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVU cmVlUmVzb2x2ZXIuY3BwCkBAIC00NzYsNiArNDc2LDIxIEBAIHN0YXRpYyBzdGQ6OnVuaXF1ZV9w dHI8UmVuZGVyU3R5bGU+IGNyZWF0ZUluaGVyaXRlZERpc3BsYXlDb250ZW50c1N0eWxlSWZOZWVk ZWQoCiAgICAgcmV0dXJuIHN0eWxlOwogfQogCitzdGF0aWMgdm9pZCByZXNldERlc2NlbmRhbnRT dHlsZVJlbGF0aW9ucyhFbGVtZW50JiBlbGVtZW50LCBEZXNjZW5kYW50c1RvUmVzb2x2ZSBkZXNj ZW5kYW50c1RvUmVzb2x2ZSkKK3sKKyAgICBzd2l0Y2ggKGRlc2NlbmRhbnRzVG9SZXNvbHZlKSB7 CisgICAgY2FzZSBEZXNjZW5kYW50c1RvUmVzb2x2ZTo6Tm9uZToKKyAgICBjYXNlIERlc2NlbmRh bnRzVG9SZXNvbHZlOjpDaGlsZHJlbldpdGhFeHBsaWNpdEluaGVyaXQ6CisgICAgICAgIGJyZWFr OworICAgIGNhc2UgRGVzY2VuZGFudHNUb1Jlc29sdmU6OkNoaWxkcmVuOgorICAgICAgICBlbGVt ZW50LnJlc2V0Q2hpbGRTdHlsZVJlbGF0aW9ucygpOworICAgICAgICBicmVhazsKKyAgICBjYXNl IERlc2NlbmRhbnRzVG9SZXNvbHZlOjpBbGw6CisgICAgICAgIGVsZW1lbnQucmVzZXRBbGxEZXNj ZW5kYW50U3R5bGVSZWxhdGlvbnMoKTsKKyAgICAgICAgYnJlYWs7CisgICAgfTsKK30KKwogdm9p ZCBUcmVlUmVzb2x2ZXI6OnJlc29sdmVDb21wb3NlZFRyZWUoKQogewogICAgIEFTU0VSVChtX3Bh cmVudFN0YWNrLnNpemUoKSA9PSAxKTsKQEAgLTU1OCw2ICs1NzMsOCBAQCB2b2lkIFRyZWVSZXNv bHZlcjo6cmVzb2x2ZUNvbXBvc2VkVHJlZSgpCiAgICAgICAgICAgICBpdC50cmF2ZXJzZU5leHRT a2lwcGluZ0NoaWxkcmVuKCk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQorICAg ICAgICAKKyAgICAgICAgcmVzZXREZXNjZW5kYW50U3R5bGVSZWxhdGlvbnMoZWxlbWVudCwgZGVz Y2VuZGFudHNUb1Jlc29sdmUpOwogCiAgICAgICAgIHB1c2hQYXJlbnQoZWxlbWVudCwgKnN0eWxl LCBjaGFuZ2UsIGRlc2NlbmRhbnRzVG9SZXNvbHZlKTsKIAo=