204301 2019-11-18 10:21:02 -0800 Rename DocumentRuleSets to Style::ScopeRuleSets 2019-11-18 11:14:21 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned commit-queue esprehn+autocc ews-watchlist glenn gyuyoung.kim macpherson menard webkit-bug-importer zalan oldest_to_newest 1591099 0 koivisto 2019-11-18 10:21:02 -0800 It is per style scope, not per document. Also move it to Style namespace. 1591102 1 383757 koivisto 2019-11-18 10:27:32 -0800 Created attachment 383757 patch 1591127 2 383757 commit-queue 2019-11-18 11:13:13 -0800 Comment on attachment 383757 patch Clearing flags on attachment: 383757 Committed r252553: <https://trac.webkit.org/changeset/252553> 1591128 3 commit-queue 2019-11-18 11:13:14 -0800 All reviewed patches have been landed. Closing bug. 1591129 4 webkit-bug-importer 2019-11-18 11:14:21 -0800 <rdar://problem/57290220> 383757 2019-11-18 10:27:32 -0800 2019-11-18 11:13:13 -0800 patch documentrulesets-namespace.patch text/plain 25917 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkZTU5YWJhNzUxOS4uNGJkZjI4NjM1YzUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0OCBAQAorMjAxOS0xMS0xOCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+ CisKKyAgICAgICAgUmVuYW1lIERvY3VtZW50UnVsZVNldHMgdG8gU3R5bGU6OlNjb3BlUnVsZVNl dHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDMw MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBj dXJyZW50IG5hbWUgaXMgbWlzbGVhZGluZywgdGhlc2Ugb2JqZWN0cyBhcmUgcGVyIHN0eWxlIHNj b3BlLCBub3QgcGVyIGRvY3VtZW50LgorICAgICAgICBBbHNvIHN3aXRjaCB0byBTdHlsZSBuYW1l c3BhY2UgYW5kIGRpcmVjdG9yeS4KKworICAgICAgICAqIFNvdXJjZXMudHh0OgorICAgICAgICAq IFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBjc3MvRWxlbWVu dFJ1bGVDb2xsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudFJ1bGVDb2xsZWN0 b3I6OkVsZW1lbnRSdWxlQ29sbGVjdG9yKToKKyAgICAgICAgKiBjc3MvRWxlbWVudFJ1bGVDb2xs ZWN0b3IuaDoKKyAgICAgICAgKiBjc3MvUGFnZVJ1bGVDb2xsZWN0b3IuaDoKKyAgICAgICAgKFdl YkNvcmU6OlBhZ2VSdWxlQ29sbGVjdG9yOjpQYWdlUnVsZUNvbGxlY3Rvcik6CisgICAgICAgICog c3R5bGUvQXR0cmlidXRlQ2hhbmdlSW52YWxpZGF0aW9uLmg6CisgICAgICAgICogc3R5bGUvQ2xh c3NDaGFuZ2VJbnZhbGlkYXRpb24uaDoKKyAgICAgICAgKiBzdHlsZS9TdHlsZUludmFsaWRhdGlv bkZ1bmN0aW9ucy5oOgorICAgICAgICAqIHN0eWxlL1N0eWxlUmVzb2x2ZXIuaDoKKyAgICAgICAg KFdlYkNvcmU6OlN0eWxlOjpSZXNvbHZlcjo6cnVsZVNldHMpOgorICAgICAgICAoV2ViQ29yZTo6 U3R5bGU6OlJlc29sdmVyOjpydWxlU2V0cyBjb25zdCk6CisgICAgICAgICogc3R5bGUvU3R5bGVT Y29wZVJ1bGVTZXRzLmNwcDogUmVuYW1lZCBmcm9tIFNvdXJjZS9XZWJDb3JlL2Nzcy9Eb2N1bWVu dFJ1bGVTZXRzLmNwcC4KKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTY29wZVJ1bGVTZXRzOjpT Y29wZVJ1bGVTZXRzKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTY29wZVJ1bGVTZXRzOjp+ U2NvcGVSdWxlU2V0cyk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2NvcGVSdWxlU2V0czo6 dXNlckFnZW50TWVkaWFRdWVyeVN0eWxlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxl OjpTY29wZVJ1bGVTZXRzOjp1cGRhdGVVc2VyQWdlbnRNZWRpYVF1ZXJ5U3R5bGVJZk5lZWRlZCBj b25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2NvcGVSdWxlU2V0czo6dXNlclN0eWxl IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTY29wZVJ1bGVTZXRzOjppbml0aWFs aXplVXNlclN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTY29wZVJ1bGVTZXRzOjpj b2xsZWN0UnVsZXNGcm9tVXNlclN0eWxlU2hlZXRzKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxl OjpTY29wZVJ1bGVTZXRzOjpyZXNldEF1dGhvclN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0 eWxlOjpTY29wZVJ1bGVTZXRzOjpyZXNldFVzZXJBZ2VudE1lZGlhUXVlcnlTdHlsZSk6CisgICAg ICAgIChXZWJDb3JlOjpTdHlsZTo6U2NvcGVSdWxlU2V0czo6YXBwZW5kQXV0aG9yU3R5bGVTaGVl dHMpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlNjb3BlUnVsZVNldHM6OmNvbGxlY3RGZWF0 dXJlcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2NvcGVSdWxlU2V0czo6Y2xh c3NJbnZhbGlkYXRpb25SdWxlU2V0cyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6 U2NvcGVSdWxlU2V0czo6YXR0cmlidXRlSW52YWxpZGF0aW9uUnVsZVNldHMgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6U3R5bGU6OlNjb3BlUnVsZVNldHM6Omhhc0NvbXBsZXhTZWxlY3RvcnNG b3JTdHlsZUF0dHJpYnV0ZSBjb25zdCk6CisgICAgICAgICogc3R5bGUvU3R5bGVTY29wZVJ1bGVT ZXRzLmg6IFJlbmFtZWQgZnJvbSBTb3VyY2UvV2ViQ29yZS9jc3MvRG9jdW1lbnRSdWxlU2V0cy5o LgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlNjb3BlUnVsZVNldHM6OmZlYXR1cmVzIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTY29wZVJ1bGVTZXRzOjptdXRhYmxlRmVhdHVy ZXMpOgorICAgICAgICAqIHN0eWxlL1N0eWxlU2hhcmluZ1Jlc29sdmVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlN0eWxlOjpTaGFyaW5nUmVzb2x2ZXI6OlNoYXJpbmdSZXNvbHZlcik6CisgICAg ICAgICogc3R5bGUvU3R5bGVTaGFyaW5nUmVzb2x2ZXIuaDoKKwogMjAxOS0xMS0xOCAgQW50dGkg S29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBTdHlsZVJlc29sdmVy IHRvIFN0eWxlIG5hbWVzcGFjZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvU291cmNlcy50 eHQgYi9Tb3VyY2UvV2ViQ29yZS9Tb3VyY2VzLnR4dAppbmRleCA0YzAwOTNiMTZjNy4uNmIxY2Uw OTVjZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1NvdXJjZXMudHh0CisrKyBiL1NvdXJj ZS9XZWJDb3JlL1NvdXJjZXMudHh0CkBAIC03NTUsNyArNzU1LDYgQEAgY3NzL0RPTU1hdHJpeFJl YWRPbmx5LmNwcAogY3NzL0RlcHJlY2F0ZWRDU1NPTVByaW1pdGl2ZVZhbHVlLmNwcAogY3NzL0Rl cHJlY2F0ZWRDU1NPTVZhbHVlLmNwcAogY3NzL0RlcHJlY2F0ZWRDU1NPTVZhbHVlTGlzdC5jcHAK LWNzcy9Eb2N1bWVudFJ1bGVTZXRzLmNwcAogY3NzL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNwcAog Y3NzL0ZvbnRWYXJpYW50QnVpbGRlci5jcHAKIGNzcy9JbnNwZWN0b3JDU1NPTVdyYXBwZXJzLmNw cApAQCAtMjM1OCw2ICsyMzU3LDcgQEAgc3R5bGUvU3R5bGVSZWxhdGlvbnMuY3BwCiBzdHlsZS9T dHlsZVJlc29sdmVyLmNwcAogc3R5bGUvU3R5bGVSZXNvbHZlRm9yRG9jdW1lbnQuY3BwCiBzdHls ZS9TdHlsZVNjb3BlLmNwcAorc3R5bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmNwcAogc3R5bGUvU3R5 bGVTaGFyaW5nUmVzb2x2ZXIuY3BwCiBzdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAKIHN0eWxl L1N0eWxlVXBkYXRlLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29k ZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ov cHJvamVjdC5wYnhwcm9qCmluZGV4IDJjZDc2MzI3NGRlLi4zMWE1NTQ1NDRjZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBi L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtMTMx NSw3ICsxMzE1LDcgQEAKIAkJNEEwRkZBOUUxQUFGNUU3RTAwNjI4MDNCIC8qIE1vY2tSZWFsdGlt ZU1lZGlhU291cmNlQ2VudGVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSA0QTBGRkE5QzFBQUY1RTZDMDA2MjgwM0IgLyogTW9ja1JlYWx0aW1lTWVkaWFT b3VyY2VDZW50ZXIuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9 OyB9OwogCQk0QTBGRkFBMjFBQUY1RUEyMDA2MjgwM0IgLyogUmVhbHRpbWVNZWRpYVNvdXJjZUNl bnRlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNEEw RkZBQTAxQUFGNUVBMjAwNjI4MDNCIC8qIFJlYWx0aW1lTWVkaWFTb3VyY2VDZW50ZXIuaCAqLzsg c2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQk0QTM4QkY1MTE0 RkUxQzA5MDA2MTI1MTIgLyogV2ViU29ja2V0RGVmbGF0ZUZyYW1lci5oIGluIEhlYWRlcnMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNEEzOEJGNEYxNEZFMUMwOTAwNjEyNTEy IC8qIFdlYlNvY2tldERlZmxhdGVGcmFtZXIuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9 IChQcml2YXRlLCApOyB9OyB9OwotCQk0QTRGNDhBQTE2QjBERkMwMDBFREJCMjkgLyogRG9jdW1l bnRSdWxlU2V0cy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gNEE0RjQ4QTgxNkIwREZDMDAwRURCQjI5IC8qIERvY3VtZW50UnVsZVNldHMuaCAqLzsgfTsK KwkJNEE0RjQ4QUExNkIwREZDMDAwRURCQjI5IC8qIFN0eWxlU2NvcGVSdWxlU2V0cy5oIGluIEhl YWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNEE0RjQ4QTgxNkIwREZD MDAwRURCQjI5IC8qIFN0eWxlU2NvcGVSdWxlU2V0cy5oICovOyB9OwogCQk0QTRGNjU3MTFBQTk5 N0YxMDBFMzhDREQgLyogUmVhbHRpbWVNZWRpYVNvdXJjZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNEE0RjY1NkMxQUE5OTdGMTAwRTM4Q0REIC8qIFJl YWx0aW1lTWVkaWFTb3VyY2UuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRl LCApOyB9OyB9OwogCQk0QTRGNjU3MjFBQTk5N0YxMDBFMzhDREQgLyogUmVhbHRpbWVNZWRpYVNv dXJjZUNhcGFiaWxpdGllcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gNEE0RjY1NkQxQUE5OTdGMTAwRTM4Q0REIC8qIFJlYWx0aW1lTWVkaWFTb3VyY2VD YXBhYmlsaXRpZXMuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9 OyB9OwogCQk0QTRGNjU3NDFBQTk5N0YxMDBFMzhDREQgLyogUmVhbHRpbWVNZWRpYVNvdXJjZVNl dHRpbmdzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0 QTRGNjU2RjFBQTk5N0YxMDBFMzhDREQgLyogUmVhbHRpbWVNZWRpYVNvdXJjZVNldHRpbmdzLmgg Ki87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKQEAgLTc4Nzks OCArNzg3OSw4IEBACiAJCTRBMEZGQUEzMUFBRjVFRjYwMDYyODAzQiAvKiBSZWFsdGltZU1lZGlh U291cmNlQ2VudGVyTWFjLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9 IFJlYWx0aW1lTWVkaWFTb3VyY2VDZW50ZXJNYWMuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwogCQk0QTM4QkY0RTE0RkUxQzA5MDA2MTI1MTIgLyogV2ViU29ja2V0RGVmbGF0ZUZyYW1l ci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBXZWJTb2NrZXREZWZs YXRlRnJhbWVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNEEzOEJGNEYxNEZF MUMwOTAwNjEyNTEyIC8qIFdlYlNvY2tldERlZmxhdGVGcmFtZXIuaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gV2ViU29ja2V0RGVmbGF0ZUZyYW1lci5oOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwotCQk0QTRGNDhBNzE2QjBERkMwMDBFREJCMjkgLyogRG9jdW1lbnRSdWxl U2V0cy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBEb2N1bWVudFJ1 bGVTZXRzLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJNEE0RjQ4QTgxNkIwREZD MDAwRURCQjI5IC8qIERvY3VtZW50UnVsZVNldHMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gRG9jdW1lbnRSdWxlU2V0cy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owor CQk0QTRGNDhBNzE2QjBERkMwMDBFREJCMjkgLyogU3R5bGVTY29wZVJ1bGVTZXRzLmNwcCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFN0eWxlU2NvcGVSdWxlU2V0cy5jcHA7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTRBNEY0OEE4MTZCMERGQzAwMEVEQkIyOSAv KiBTdHlsZVNjb3BlUnVsZVNldHMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0g U3R5bGVTY29wZVJ1bGVTZXRzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTRBNEY2 NTZCMUFBOTk3RjEwMEUzOENERCAvKiBSZWFsdGltZU1lZGlhU291cmNlLmNwcCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFJlYWx0aW1lTWVkaWFTb3VyY2UuY3BwOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0QTRGNjU2QzFBQTk5N0YxMDBFMzhDREQgLyogUmVh bHRpbWVNZWRpYVNvdXJjZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBSZWFs dGltZU1lZGlhU291cmNlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTRBNEY2NTZE MUFBOTk3RjEwMEUzOENERCAvKiBSZWFsdGltZU1lZGlhU291cmNlQ2FwYWJpbGl0aWVzLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFJlYWx0aW1lTWVkaWFTb3VyY2VDYXBhYmls aXRpZXMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTI3MDUzLDYgKzI3MDUzLDgg QEAKIAkJCQlFMTM5ODY2MjE1NDc4NDc0MDAxRTNGNjUgLyogU3R5bGVSZXNvbHZlci5oICovLAog CQkJCUU0NjFENjVDMUJCMEM3RjAwMENCNTY0NSAvKiBTdHlsZVNjb3BlLmNwcCAqLywKIAkJCQlF NDYxRDY1RTFCQjBDODBEMDBDQjU2NDUgLyogU3R5bGVTY29wZS5oICovLAorCQkJCTRBNEY0OEE3 MTZCMERGQzAwMEVEQkIyOSAvKiBTdHlsZVNjb3BlUnVsZVNldHMuY3BwICovLAorCQkJCTRBNEY0 OEE4MTZCMERGQzAwMEVEQkIyOSAvKiBTdHlsZVNjb3BlUnVsZVNldHMuaCAqLywKIAkJCQlFNDdB M0FDMjFDNUVBQkJFMDBDQ0JGQTcgLyogU3R5bGVTaGFyaW5nUmVzb2x2ZXIuY3BwICovLAogCQkJ CUU0N0EzQUM0MUM1RUFDNzkwMENDQkZBNyAvKiBTdHlsZVNoYXJpbmdSZXNvbHZlci5oICovLAog CQkJCUU0REVBQTE1MTdBOTNEQzMwMDBFMDQzMCAvKiBTdHlsZVRyZWVSZXNvbHZlci5jcHAgKi8s CkBAIC0yNzM2MCw4ICsyNzM2Miw2IEBACiAJCQkJOTQ3OTQ5MkQxRTA0NTc4RDAwMDE4RDg1IC8q IERlcHJlY2F0ZWRDU1NPTVZhbHVlTGlzdC5jcHAgKi8sCiAJCQkJOTQ3OTQ5MjcxRTAzMTMyMDAw MDE4RDg1IC8qIERlcHJlY2F0ZWRDU1NPTVZhbHVlTGlzdC5oICovLAogCQkJCUE4RDA2NTFDMEEy M0MxRkUwMDVFNzIwMyAvKiBEZXByZWNhdGVkQ1NTT01WYWx1ZUxpc3QuaWRsICovLAotCQkJCTRB NEY0OEE3MTZCMERGQzAwMEVEQkIyOSAvKiBEb2N1bWVudFJ1bGVTZXRzLmNwcCAqLywKLQkJCQk0 QTRGNDhBODE2QjBERkMwMDBFREJCMjkgLyogRG9jdW1lbnRSdWxlU2V0cy5oICovLAogCQkJCTRC REEzRkY4MjE1MUI2RjIwMEZENjYwNCAvKiBET01DU1NDdXN0b21Qcm9wZXJ0eURlc2NyaXB0b3Iu aCAqLywKIAkJCQk0QkRBM0ZGQTIxNTFCNkYzMDBGRDY2MDQgLyogRE9NQ1NTQ3VzdG9tUHJvcGVy dHlEZXNjcmlwdG9yLmlkbCAqLywKIAkJCQlGRDY3NzczNTE5NUNBQjIwMDA3MkUwRDMgLyogRE9N Q1NTTmFtZXNwYWNlLmNwcCAqLywKQEAgLTI5NTM0LDcgKzI5NTM0LDcgQEAKIAkJCQlDRTA1N0ZB NjEyMjA3MzExMDBBNDc2RDUgLyogRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmggaW4gSGVhZGVy cyAqLywKIAkJCQlCQ0NGQkFFODBCNTE1MkVEMDAwMUYxRDcgLyogRG9jdW1lbnRQYXJzZXIuaCBp biBIZWFkZXJzICovLAogCQkJCTFEMkY4RTAzMjM0NDc0RUYwMDk5M0I2OCAvKiBEb2N1bWVudFBp Y3R1cmVJblBpY3R1cmUuaCBpbiBIZWFkZXJzICovLAotCQkJCTRBNEY0OEFBMTZCMERGQzAwMEVE QkIyOSAvKiBEb2N1bWVudFJ1bGVTZXRzLmggaW4gSGVhZGVycyAqLywKKwkJCQk0QTRGNDhBQTE2 QjBERkMwMDBFREJCMjkgLyogU3R5bGVTY29wZVJ1bGVTZXRzLmggaW4gSGVhZGVycyAqLywKIAkJ CQlBRDZFNzFBRDE2Njg4OTlEMDAzMjBDMTMgLyogRG9jdW1lbnRTaGFyZWRPYmplY3RQb29sLmgg aW4gSGVhZGVycyAqLywKIAkJCQk2QkRCNURDMjIyN0JEM0I4MDA5MTk3NzAgLyogRG9jdW1lbnRT dG9yYWdlQWNjZXNzLmggaW4gSGVhZGVycyAqLywKIAkJCQkwQjkwNTYxQTBGMjU3OEJGMDA5NUZG NkEgLyogRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmggaW4gSGVhZGVycyAqLywKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvRWxlbWVudFJ1bGVDb2xsZWN0b3IuY3BwCmluZGV4IDQ1MDFkZWIwZTM1Li5m OGU1NmMyMzI0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0VsZW1lbnRSdWxlQ29s bGVjdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRWxlbWVudFJ1bGVDb2xsZWN0b3Iu Y3BwCkBAIC0zMyw3ICszMyw2IEBACiAjaW5jbHVkZSAiQ1NTUnVsZUxpc3QuaCIKICNpbmNsdWRl ICJDU1NTZWxlY3Rvci5oIgogI2luY2x1ZGUgIkNTU1ZhbHVlS2V5d29yZHMuaCIKLSNpbmNsdWRl ICJEb2N1bWVudFJ1bGVTZXRzLmgiCiAjaW5jbHVkZSAiSFRNTEVsZW1lbnQuaCIKICNpbmNsdWRl ICJIVE1MU2xvdEVsZW1lbnQuaCIKICNpbmNsdWRlICJTVkdFbGVtZW50LmgiCkBAIC00Myw2ICs0 Miw3IEBACiAjaW5jbHVkZSAiU3R5bGVQcm9wZXJ0aWVzLmgiCiAjaW5jbHVkZSAiU3R5bGVSZXNv bHZlci5oIgogI2luY2x1ZGUgIlN0eWxlU2NvcGUuaCIKKyNpbmNsdWRlICJTdHlsZVNjb3BlUnVs ZVNldHMuaCIKICNpbmNsdWRlICJTdHlsZWRFbGVtZW50LmgiCiAjaW5jbHVkZSA8d3RmL1NldEZv clNjb3BlLmg+CiAKQEAgLTc5LDcgKzc5LDcgQEAgcHVibGljOgogICAgIFN0eWxlOjpTY29wZU9y ZGluYWwgc3R5bGVTY29wZU9yZGluYWw7CiB9OwogCi1FbGVtZW50UnVsZUNvbGxlY3Rvcjo6RWxl bWVudFJ1bGVDb2xsZWN0b3IoY29uc3QgRWxlbWVudCYgZWxlbWVudCwgY29uc3QgRG9jdW1lbnRS dWxlU2V0cyYgcnVsZVNldHMsIGNvbnN0IFNlbGVjdG9yRmlsdGVyKiBzZWxlY3RvckZpbHRlcikK K0VsZW1lbnRSdWxlQ29sbGVjdG9yOjpFbGVtZW50UnVsZUNvbGxlY3Rvcihjb25zdCBFbGVtZW50 JiBlbGVtZW50LCBjb25zdCBTdHlsZTo6U2NvcGVSdWxlU2V0cyYgcnVsZVNldHMsIGNvbnN0IFNl bGVjdG9yRmlsdGVyKiBzZWxlY3RvckZpbHRlcikKICAgICA6IG1fZWxlbWVudChlbGVtZW50KQog ICAgICwgbV9hdXRob3JTdHlsZShydWxlU2V0cy5hdXRob3JTdHlsZSgpKQogICAgICwgbV91c2Vy U3R5bGUocnVsZVNldHMudXNlclN0eWxlKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9j c3MvRWxlbWVudFJ1bGVDb2xsZWN0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9FbGVtZW50UnVs ZUNvbGxlY3Rvci5oCmluZGV4IDViNjg0ODM2MjY0Li5iNjJhZDM2NWFhMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvY3NzL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmgKKysrIGIvU291cmNlL1dl YkNvcmUvY3NzL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmgKQEAgLTMxLDEwICszMSwxMyBAQAogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIERvY3VtZW50UnVsZVNldHM7CiBjbGFzcyBNYXRj aFJlcXVlc3Q7CiBjbGFzcyBTZWxlY3RvckZpbHRlcjsKIAorbmFtZXNwYWNlIFN0eWxlIHsKK2Ns YXNzIFNjb3BlUnVsZVNldHM7Cit9CisKIGNsYXNzIFBzZXVkb1N0eWxlUmVxdWVzdCB7CiBwdWJs aWM6CiAgICAgUHNldWRvU3R5bGVSZXF1ZXN0KFBzZXVkb0lkIHBzZXVkb0lkLCBPcHRpb25hbDxT dHlsZVNjcm9sbGJhclN0YXRlPiBzY3JvbGxiYXJTdGF0ZSA9IFdURjo6bnVsbG9wdCkKQEAgLTgw LDcgKzgzLDcgQEAgc3RydWN0IE1hdGNoUmVzdWx0IHsKIAogY2xhc3MgRWxlbWVudFJ1bGVDb2xs ZWN0b3IgewogcHVibGljOgotICAgIEVsZW1lbnRSdWxlQ29sbGVjdG9yKGNvbnN0IEVsZW1lbnQm LCBjb25zdCBEb2N1bWVudFJ1bGVTZXRzJiwgY29uc3QgU2VsZWN0b3JGaWx0ZXIqKTsKKyAgICBF bGVtZW50UnVsZUNvbGxlY3Rvcihjb25zdCBFbGVtZW50JiwgY29uc3QgU3R5bGU6OlNjb3BlUnVs ZVNldHMmLCBjb25zdCBTZWxlY3RvckZpbHRlciopOwogICAgIEVsZW1lbnRSdWxlQ29sbGVjdG9y KGNvbnN0IEVsZW1lbnQmLCBjb25zdCBSdWxlU2V0JiBhdXRob3JTdHlsZSwgY29uc3QgU2VsZWN0 b3JGaWx0ZXIqKTsKIAogICAgIHZvaWQgc2V0SW5jbHVkZUVtcHR5UnVsZXMoYm9vbCB2YWx1ZSkg eyBtX3Nob3VsZEluY2x1ZGVFbXB0eVJ1bGVzID0gdmFsdWU7IH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9QYWdlUnVsZUNvbGxlY3Rvci5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1Bh Z2VSdWxlQ29sbGVjdG9yLmgKaW5kZXggNjI3MmZkNzIwZjYuLjE1ZGNiNTRmODE3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvUGFnZVJ1bGVDb2xsZWN0b3IuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvUGFnZVJ1bGVDb2xsZWN0b3IuaApAQCAtMjEsOCArMjEsOCBAQAogCiAjcHJh Z21hIG9uY2UKIAotI2luY2x1ZGUgIkRvY3VtZW50UnVsZVNldHMuaCIKICNpbmNsdWRlICJTdHls ZVJlc29sdmVyLmgiCisjaW5jbHVkZSAiU3R5bGVTY29wZVJ1bGVTZXRzLmgiCiAjaW5jbHVkZSA8 d3RmL0ZvcndhcmQuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtMzEsNyArMzEsNyBAQCBj bGFzcyBTdHlsZVJ1bGVQYWdlOwogCiBjbGFzcyBQYWdlUnVsZUNvbGxlY3RvciB7CiBwdWJsaWM6 Ci0gICAgUGFnZVJ1bGVDb2xsZWN0b3IoU3R5bGU6OlJlc29sdmVyOjpTdGF0ZSYgc3RhdGUsIERv Y3VtZW50UnVsZVNldHMmIHJ1bGVTZXRzKQorICAgIFBhZ2VSdWxlQ29sbGVjdG9yKFN0eWxlOjpS ZXNvbHZlcjo6U3RhdGUmIHN0YXRlLCBTdHlsZTo6U2NvcGVSdWxlU2V0cyYgcnVsZVNldHMpCiAg ICAgICAgIDogbV9zdGF0ZShzdGF0ZSkKICAgICAgICAgLCBtX3J1bGVTZXRzKHJ1bGVTZXRzKSB7 IH0KIApAQCAtNDgsNyArNDgsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgbWF0Y2hQYWdlUnVsZXNG b3JMaXN0KFZlY3RvcjxTdHlsZVJ1bGVQYWdlKj4mIG1hdGNoZWRSdWxlcywgY29uc3QgVmVjdG9y PFN0eWxlUnVsZVBhZ2UqPiYgcnVsZXMsIGJvb2wgaXNMZWZ0UGFnZSwgYm9vbCBpc0ZpcnN0UGFn ZSwgY29uc3QgU3RyaW5nJiBwYWdlTmFtZSk7CiAKICAgICBjb25zdCBTdHlsZTo6UmVzb2x2ZXI6 OlN0YXRlJiBtX3N0YXRlOwotICAgIERvY3VtZW50UnVsZVNldHMmIG1fcnVsZVNldHM7CisgICAg U3R5bGU6OlNjb3BlUnVsZVNldHMmIG1fcnVsZVNldHM7CiAKICAgICBNYXRjaFJlc3VsdCBtX3Jl c3VsdDsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9BdHRyaWJ1dGVDaGFu Z2VJbnZhbGlkYXRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0F0dHJpYnV0ZUNoYW5nZUlu dmFsaWRhdGlvbi5oCmluZGV4IGNhYzcxNTlkZGNjLi5jNGRlYjczYzY5NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvc3R5bGUvQXR0cmlidXRlQ2hhbmdlSW52YWxpZGF0aW9uLmgKKysrIGIv U291cmNlL1dlYkNvcmUvc3R5bGUvQXR0cmlidXRlQ2hhbmdlSW52YWxpZGF0aW9uLmgKQEAgLTI4 LDExICsyOCwxMCBAQAogI2luY2x1ZGUgIkVsZW1lbnQuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUg eworbmFtZXNwYWNlIFN0eWxlIHsKIAogc3RydWN0IEludmFsaWRhdGlvblJ1bGVTZXQ7CiAKLW5h bWVzcGFjZSBTdHlsZSB7Ci0KIGNsYXNzIEF0dHJpYnV0ZUNoYW5nZUludmFsaWRhdGlvbiB7CiBw dWJsaWM6CiAgICAgQXR0cmlidXRlQ2hhbmdlSW52YWxpZGF0aW9uKEVsZW1lbnQmLCBjb25zdCBR dWFsaWZpZWROYW1lJiwgY29uc3QgQXRvbVN0cmluZyYgb2xkVmFsdWUsIGNvbnN0IEF0b21TdHJp bmcmIG5ld1ZhbHVlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0NsYXNzQ2hh bmdlSW52YWxpZGF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9DbGFzc0NoYW5nZUludmFs aWRhdGlvbi5oCmluZGV4IDkwNzg4MDg5MjBhLi43NmY5NDQ5YjNmYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvc3R5bGUvQ2xhc3NDaGFuZ2VJbnZhbGlkYXRpb24uaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9zdHlsZS9DbGFzc0NoYW5nZUludmFsaWRhdGlvbi5oCkBAIC0zMCwxMyArMzAsMTMg QEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1jbGFzcyBEb2N1bWVudFJ1bGVTZXRzOwogY2xh c3MgUnVsZVNldDsKIGNsYXNzIFNwYWNlU3BsaXRTdHJpbmc7Ci1zdHJ1Y3QgSW52YWxpZGF0aW9u UnVsZVNldDsKIAogbmFtZXNwYWNlIFN0eWxlIHsKIAorc3RydWN0IEludmFsaWRhdGlvblJ1bGVT ZXQ7CisKIGNsYXNzIENsYXNzQ2hhbmdlSW52YWxpZGF0aW9uIHsKIHB1YmxpYzoKICAgICBDbGFz c0NoYW5nZUludmFsaWRhdGlvbihFbGVtZW50JiwgY29uc3QgU3BhY2VTcGxpdFN0cmluZyYgb2xk Q2xhc3NlcywgY29uc3QgU3BhY2VTcGxpdFN0cmluZyYgbmV3Q2xhc3Nlcyk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUludmFsaWRhdGlvbkZ1bmN0aW9ucy5oIGIvU291 cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVJbnZhbGlkYXRpb25GdW5jdGlvbnMuaAppbmRleCBkNDFh MGQ4ODI3My4uZjBjODViZmUwMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0 eWxlSW52YWxpZGF0aW9uRnVuY3Rpb25zLmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5 bGVJbnZhbGlkYXRpb25GdW5jdGlvbnMuaApAQCAtMjUsMTEgKzI1LDExIEBACiAKICNwcmFnbWEg b25jZQogCi0jaW5jbHVkZSAiRG9jdW1lbnRSdWxlU2V0cy5oIgogI2luY2x1ZGUgIkhUTUxTbG90 RWxlbWVudC5oIgogI2luY2x1ZGUgIlNoYWRvd1Jvb3QuaCIKICNpbmNsdWRlICJTdHlsZVJlc29s dmVyLmgiCiAjaW5jbHVkZSAiU3R5bGVTY29wZS5oIgorI2luY2x1ZGUgIlN0eWxlU2NvcGVSdWxl U2V0cy5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgU3R5bGUgewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlci5oIGIvU291cmNlL1dlYkNv cmUvc3R5bGUvU3R5bGVSZXNvbHZlci5oCmluZGV4IGUyMjI0NTMzOGI0Li44ZTNmNmM2ODU0OCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlci5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZXIuaApAQCAtMjIsNyArMjIsNiBAQAogI3By YWdtYSBvbmNlCiAKICNpbmNsdWRlICJDU1NTZWxlY3Rvci5oIgotI2luY2x1ZGUgIkRvY3VtZW50 UnVsZVNldHMuaCIKICNpbmNsdWRlICJFbGVtZW50UnVsZUNvbGxlY3Rvci5oIgogI2luY2x1ZGUg Ikluc3BlY3RvckNTU09NV3JhcHBlcnMuaCIKICNpbmNsdWRlICJNYXRjaGVkRGVjbGFyYXRpb25z Q2FjaGUuaCIKQEAgLTMwLDYgKzI5LDcgQEAKICNpbmNsdWRlICJSZW5kZXJTdHlsZS5oIgogI2lu Y2x1ZGUgIlJ1bGVTZXQuaCIKICNpbmNsdWRlICJTdHlsZUJ1aWxkZXJTdGF0ZS5oIgorI2luY2x1 ZGUgIlN0eWxlU2NvcGVSdWxlU2V0cy5oIgogI2luY2x1ZGUgPG1lbW9yeT4KICNpbmNsdWRlIDx3 dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KQEAgLTEwMSw4ICsxMDEsOCBA QCBwdWJsaWM6CiAKICAgICB2b2lkIGFwcGVuZEF1dGhvclN0eWxlU2hlZXRzKGNvbnN0IFZlY3Rv cjxSZWZQdHI8Q1NTU3R5bGVTaGVldD4+Jik7CiAKLSAgICBEb2N1bWVudFJ1bGVTZXRzJiBydWxl U2V0cygpIHsgcmV0dXJuIG1fcnVsZVNldHM7IH0KLSAgICBjb25zdCBEb2N1bWVudFJ1bGVTZXRz JiBydWxlU2V0cygpIGNvbnN0IHsgcmV0dXJuIG1fcnVsZVNldHM7IH0KKyAgICBTY29wZVJ1bGVT ZXRzJiBydWxlU2V0cygpIHsgcmV0dXJuIG1fcnVsZVNldHM7IH0KKyAgICBjb25zdCBTY29wZVJ1 bGVTZXRzJiBydWxlU2V0cygpIGNvbnN0IHsgcmV0dXJuIG1fcnVsZVNldHM7IH0KIAogICAgIGNv bnN0IE1lZGlhUXVlcnlFdmFsdWF0b3ImIG1lZGlhUXVlcnlFdmFsdWF0b3IoKSBjb25zdCB7IHJl dHVybiBtX21lZGlhUXVlcnlFdmFsdWF0b3I7IH0KIApAQCAtMTkxLDcgKzE5MSw3IEBAIHByaXZh dGU6CiAgICAgZW51bSBjbGFzcyBVc2VNYXRjaGVkRGVjbGFyYXRpb25zQ2FjaGUgeyBZZXMsIE5v IH07CiAgICAgdm9pZCBhcHBseU1hdGNoZWRQcm9wZXJ0aWVzKFN0YXRlJiwgY29uc3QgTWF0Y2hS ZXN1bHQmLCBVc2VNYXRjaGVkRGVjbGFyYXRpb25zQ2FjaGUgPSBVc2VNYXRjaGVkRGVjbGFyYXRp b25zQ2FjaGU6Olllcyk7CiAKLSAgICBEb2N1bWVudFJ1bGVTZXRzIG1fcnVsZVNldHM7CisgICAg U2NvcGVSdWxlU2V0cyBtX3J1bGVTZXRzOwogCiAgICAgdHlwZWRlZiBIYXNoTWFwPEF0b21TdHJp bmdJbXBsKiwgUmVmUHRyPFN0eWxlUnVsZUtleWZyYW1lcz4+IEtleWZyYW1lc1J1bGVNYXA7CiAg ICAgS2V5ZnJhbWVzUnVsZU1hcCBtX2tleWZyYW1lc1J1bGVNYXA7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvRG9jdW1lbnRSdWxlU2V0cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHls ZS9TdHlsZVNjb3BlUnVsZVNldHMuY3BwCnNpbWlsYXJpdHkgaW5kZXggODglCnJlbmFtZSBmcm9t IFNvdXJjZS9XZWJDb3JlL2Nzcy9Eb2N1bWVudFJ1bGVTZXRzLmNwcApyZW5hbWUgdG8gU291cmNl L1dlYkNvcmUvc3R5bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmNwcAppbmRleCBhODRkN2U2NzQ4Zi4u N2EyMjg0YmE2ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Eb2N1bWVudFJ1bGVT ZXRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuY3Bw CkBAIC0yNyw3ICsyNyw3IEBACiAgKi8KIAogI2luY2x1ZGUgImNvbmZpZy5oIgotI2luY2x1ZGUg IkRvY3VtZW50UnVsZVNldHMuaCIKKyNpbmNsdWRlICJTdHlsZVNjb3BlUnVsZVNldHMuaCIKIAog I2luY2x1ZGUgIkNTU1N0eWxlU2hlZXQuaCIKICNpbmNsdWRlICJFeHRlbnNpb25TdHlsZVNoZWV0 cy5oIgpAQCAtMzYsMjAgKzM2LDIxIEBACiAjaW5jbHVkZSAiU3R5bGVTaGVldENvbnRlbnRzLmgi CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKK25hbWVzcGFjZSBTdHlsZSB7CiAKLURvY3VtZW50UnVs ZVNldHM6OkRvY3VtZW50UnVsZVNldHMoU3R5bGU6OlJlc29sdmVyJiBzdHlsZVJlc29sdmVyKQor U2NvcGVSdWxlU2V0czo6U2NvcGVSdWxlU2V0cyhSZXNvbHZlciYgc3R5bGVSZXNvbHZlcikKICAg ICA6IG1fc3R5bGVSZXNvbHZlcihzdHlsZVJlc29sdmVyKQogewogICAgIG1fYXV0aG9yU3R5bGUg PSBtYWtlVW5pcXVlPFJ1bGVTZXQ+KCk7CiAgICAgbV9hdXRob3JTdHlsZS0+ZGlzYWJsZUF1dG9T aHJpbmtUb0ZpdCgpOwogfQogCi1Eb2N1bWVudFJ1bGVTZXRzOjp+RG9jdW1lbnRSdWxlU2V0cygp CitTY29wZVJ1bGVTZXRzOjp+U2NvcGVSdWxlU2V0cygpCiB7CiAgICAgUkVMRUFTRV9BU1NFUlQo IW1faXNJbnZhbGlkYXRpbmdTdHlsZVdpdGhSdWxlU2V0cyk7CiB9CiAKLVJ1bGVTZXQqIERvY3Vt ZW50UnVsZVNldHM6OnVzZXJBZ2VudE1lZGlhUXVlcnlTdHlsZSgpIGNvbnN0CitSdWxlU2V0KiBT Y29wZVJ1bGVTZXRzOjp1c2VyQWdlbnRNZWRpYVF1ZXJ5U3R5bGUoKSBjb25zdAogewogICAgIC8v IEZJWE1FOiBXZSBzaG91bGQgaGF2ZSBhIHNlcGFyYXRlIHR5cGVzIGZvciBkb2N1bWVudCBydWxl IHNldHMgYW5kIHNoYWRvdyB0cmVlIHJ1bGUgc2V0cy4KICAgICBpZiAobV9pc0ZvclNoYWRvd1Nj b3BlKQpAQCAtNTksNyArNjAsNyBAQCBSdWxlU2V0KiBEb2N1bWVudFJ1bGVTZXRzOjp1c2VyQWdl bnRNZWRpYVF1ZXJ5U3R5bGUoKSBjb25zdAogICAgIHJldHVybiBtX3VzZXJBZ2VudE1lZGlhUXVl cnlTdHlsZS5nZXQoKTsKIH0KIAotdm9pZCBEb2N1bWVudFJ1bGVTZXRzOjp1cGRhdGVVc2VyQWdl bnRNZWRpYVF1ZXJ5U3R5bGVJZk5lZWRlZCgpIGNvbnN0Cit2b2lkIFNjb3BlUnVsZVNldHM6OnVw ZGF0ZVVzZXJBZ2VudE1lZGlhUXVlcnlTdHlsZUlmTmVlZGVkKCkgY29uc3QKIHsKICAgICBpZiAo IUNTU0RlZmF1bHRTdHlsZVNoZWV0czo6bWVkaWFRdWVyeVN0eWxlU2hlZXQpCiAgICAgICAgIHJl dHVybjsKQEAgLTgyLDE0ICs4MywxNCBAQCB2b2lkIERvY3VtZW50UnVsZVNldHM6OnVwZGF0ZVVz ZXJBZ2VudE1lZGlhUXVlcnlTdHlsZUlmTmVlZGVkKCkgY29uc3QKICAgICBBU1NFUlQoIW1fc3R5 bGVSZXNvbHZlci5oYXNWaWV3cG9ydERlcGVuZGVudE1lZGlhUXVlcmllcygpIHx8IGhhZFZpZXdw b3J0RGVwZW5kZW50TWVkaWFRdWVyaWVzKTsKIH0KIAotUnVsZVNldCogRG9jdW1lbnRSdWxlU2V0 czo6dXNlclN0eWxlKCkgY29uc3QKK1J1bGVTZXQqIFNjb3BlUnVsZVNldHM6OnVzZXJTdHlsZSgp IGNvbnN0CiB7CiAgICAgaWYgKG1fdXNlc1NoYXJlZFVzZXJTdHlsZSkKICAgICAgICAgcmV0dXJu IG1fc3R5bGVSZXNvbHZlci5kb2N1bWVudCgpLnN0eWxlU2NvcGUoKS5yZXNvbHZlcigpLnJ1bGVT ZXRzKCkudXNlclN0eWxlKCk7CiAgICAgcmV0dXJuIG1fdXNlclN0eWxlLmdldCgpOwogfQogCi12 b2lkIERvY3VtZW50UnVsZVNldHM6OmluaXRpYWxpemVVc2VyU3R5bGUoKQordm9pZCBTY29wZVJ1 bGVTZXRzOjppbml0aWFsaXplVXNlclN0eWxlKCkKIHsKICAgICBhdXRvJiBleHRlbnNpb25TdHls ZVNoZWV0cyA9IG1fc3R5bGVSZXNvbHZlci5kb2N1bWVudCgpLmV4dGVuc2lvblN0eWxlU2hlZXRz KCk7CiAgICAgYXV0byYgbWVkaWFRdWVyeUV2YWx1YXRvciA9IG1fc3R5bGVSZXNvbHZlci5tZWRp YVF1ZXJ5RXZhbHVhdG9yKCk7CkBAIC0xMDIsNyArMTAzLDcgQEAgdm9pZCBEb2N1bWVudFJ1bGVT ZXRzOjppbml0aWFsaXplVXNlclN0eWxlKCkKICAgICAgICAgbV91c2VyU3R5bGUgPSBXVEZNb3Zl KHRlbXBVc2VyU3R5bGUpOwogfQogCi12b2lkIERvY3VtZW50UnVsZVNldHM6OmNvbGxlY3RSdWxl c0Zyb21Vc2VyU3R5bGVTaGVldHMoY29uc3QgVmVjdG9yPFJlZlB0cjxDU1NTdHlsZVNoZWV0Pj4m IHVzZXJTaGVldHMsIFJ1bGVTZXQmIHVzZXJTdHlsZSwgY29uc3QgTWVkaWFRdWVyeUV2YWx1YXRv ciYgbWVkaXVtLCBTdHlsZTo6UmVzb2x2ZXImIHJlc29sdmVyKQordm9pZCBTY29wZVJ1bGVTZXRz Ojpjb2xsZWN0UnVsZXNGcm9tVXNlclN0eWxlU2hlZXRzKGNvbnN0IFZlY3RvcjxSZWZQdHI8Q1NT U3R5bGVTaGVldD4+JiB1c2VyU2hlZXRzLCBSdWxlU2V0JiB1c2VyU3R5bGUsIGNvbnN0IE1lZGlh UXVlcnlFdmFsdWF0b3ImIG1lZGl1bSwgUmVzb2x2ZXImIHJlc29sdmVyKQogewogICAgIGZvciAo dW5zaWduZWQgaSA9IDA7IGkgPCB1c2VyU2hlZXRzLnNpemUoKTsgKytpKSB7CiAgICAgICAgIEFT U0VSVCh1c2VyU2hlZXRzW2ldLT5jb250ZW50cygpLmlzVXNlclN0eWxlU2hlZXQoKSk7CkBAIC0x MjIsMTkgKzEyMywxOSBAQCBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPFJ1bGVTZXQ+IG1ha2VSdWxl U2V0KGNvbnN0IFZlY3RvcjxSdWxlRmVhdHVyZT4mIHJ1bGVzKQogICAgIHJldHVybiBydWxlU2V0 OwogfQogCi12b2lkIERvY3VtZW50UnVsZVNldHM6OnJlc2V0QXV0aG9yU3R5bGUoKQordm9pZCBT Y29wZVJ1bGVTZXRzOjpyZXNldEF1dGhvclN0eWxlKCkKIHsKICAgICBtX2lzQXV0aG9yU3R5bGVE ZWZpbmVkID0gdHJ1ZTsKICAgICBtX2F1dGhvclN0eWxlID0gbWFrZVVuaXF1ZTxSdWxlU2V0Pigp OwogICAgIG1fYXV0aG9yU3R5bGUtPmRpc2FibGVBdXRvU2hyaW5rVG9GaXQoKTsKIH0KIAotdm9p ZCBEb2N1bWVudFJ1bGVTZXRzOjpyZXNldFVzZXJBZ2VudE1lZGlhUXVlcnlTdHlsZSgpCit2b2lk IFNjb3BlUnVsZVNldHM6OnJlc2V0VXNlckFnZW50TWVkaWFRdWVyeVN0eWxlKCkKIHsKICAgICBt X3VzZXJBZ2VudE1lZGlhUXVlcnlTdHlsZSA9IG51bGxwdHI7CiB9CiAKLXZvaWQgRG9jdW1lbnRS dWxlU2V0czo6YXBwZW5kQXV0aG9yU3R5bGVTaGVldHMoY29uc3QgVmVjdG9yPFJlZlB0cjxDU1NT dHlsZVNoZWV0Pj4mIHN0eWxlU2hlZXRzLCBNZWRpYVF1ZXJ5RXZhbHVhdG9yKiBtZWRpdW0sIElu c3BlY3RvckNTU09NV3JhcHBlcnMmIGluc3BlY3RvckNTU09NV3JhcHBlcnMsIFN0eWxlOjpSZXNv bHZlciogcmVzb2x2ZXIpCit2b2lkIFNjb3BlUnVsZVNldHM6OmFwcGVuZEF1dGhvclN0eWxlU2hl ZXRzKGNvbnN0IFZlY3RvcjxSZWZQdHI8Q1NTU3R5bGVTaGVldD4+JiBzdHlsZVNoZWV0cywgTWVk aWFRdWVyeUV2YWx1YXRvciogbWVkaXVtLCBJbnNwZWN0b3JDU1NPTVdyYXBwZXJzJiBpbnNwZWN0 b3JDU1NPTVdyYXBwZXJzLCBSZXNvbHZlciogcmVzb2x2ZXIpCiB7CiAgICAgLy8gVGhpcyBoYW5k bGVzIHNoZWV0cyBhZGRlZCB0byB0aGUgZW5kIG9mIHRoZSBzdHlsZXNoZWV0IGxpc3Qgb25seS4g SW4gb3RoZXIgY2FzZXMgdGhlIHN0eWxlIHJlc29sdmVyCiAgICAgLy8gbmVlZHMgdG8gYmUgcmVj b25zdHJ1Y3RlZC4gVG8gaGFuZGxlIGluc2VydGlvbnMgdG9vIHRoZSBydWxlIG9yZGVyIG51bWJl cnMgd291bGQgbmVlZCB0byBiZSB1cGRhdGVkLgpAQCAtMTQ5LDcgKzE1MCw3IEBAIHZvaWQgRG9j dW1lbnRSdWxlU2V0czo6YXBwZW5kQXV0aG9yU3R5bGVTaGVldHMoY29uc3QgVmVjdG9yPFJlZlB0 cjxDU1NTdHlsZVNoZWV0CiAgICAgY29sbGVjdEZlYXR1cmVzKCk7CiB9CiAKLXZvaWQgRG9jdW1l bnRSdWxlU2V0czo6Y29sbGVjdEZlYXR1cmVzKCkgY29uc3QKK3ZvaWQgU2NvcGVSdWxlU2V0czo6 Y29sbGVjdEZlYXR1cmVzKCkgY29uc3QKIHsKICAgICBSRUxFQVNFX0FTU0VSVCghbV9pc0ludmFs aWRhdGluZ1N0eWxlV2l0aFJ1bGVTZXRzKTsKIApAQCAtMjA2LDE3ICsyMDcsMTcgQEAgc3RhdGlj IFZlY3RvcjxJbnZhbGlkYXRpb25SdWxlU2V0PiogZW5zdXJlSW52YWxpZGF0aW9uUnVsZVNldHMo Y29uc3QgQXRvbVN0cmluZyYKICAgICB9KS5pdGVyYXRvci0+dmFsdWUuZ2V0KCk7CiB9CiAKLWNv bnN0IFZlY3RvcjxJbnZhbGlkYXRpb25SdWxlU2V0PiogRG9jdW1lbnRSdWxlU2V0czo6Y2xhc3NJ bnZhbGlkYXRpb25SdWxlU2V0cyhjb25zdCBBdG9tU3RyaW5nJiBjbGFzc05hbWUpIGNvbnN0Citj b25zdCBWZWN0b3I8SW52YWxpZGF0aW9uUnVsZVNldD4qIFNjb3BlUnVsZVNldHM6OmNsYXNzSW52 YWxpZGF0aW9uUnVsZVNldHMoY29uc3QgQXRvbVN0cmluZyYgY2xhc3NOYW1lKSBjb25zdAogewog ICAgIHJldHVybiBlbnN1cmVJbnZhbGlkYXRpb25SdWxlU2V0cyhjbGFzc05hbWUsIG1fY2xhc3NJ bnZhbGlkYXRpb25SdWxlU2V0cywgbV9mZWF0dXJlcy5jbGFzc1J1bGVzKTsKIH0KIAotY29uc3Qg VmVjdG9yPEludmFsaWRhdGlvblJ1bGVTZXQ+KiBEb2N1bWVudFJ1bGVTZXRzOjphdHRyaWJ1dGVJ bnZhbGlkYXRpb25SdWxlU2V0cyhjb25zdCBBdG9tU3RyaW5nJiBhdHRyaWJ1dGVOYW1lKSBjb25z dAorY29uc3QgVmVjdG9yPEludmFsaWRhdGlvblJ1bGVTZXQ+KiBTY29wZVJ1bGVTZXRzOjphdHRy aWJ1dGVJbnZhbGlkYXRpb25SdWxlU2V0cyhjb25zdCBBdG9tU3RyaW5nJiBhdHRyaWJ1dGVOYW1l KSBjb25zdAogewogICAgIHJldHVybiBlbnN1cmVJbnZhbGlkYXRpb25SdWxlU2V0cyhhdHRyaWJ1 dGVOYW1lLCBtX2F0dHJpYnV0ZUludmFsaWRhdGlvblJ1bGVTZXRzLCBtX2ZlYXR1cmVzLmF0dHJp YnV0ZVJ1bGVzKTsKIH0KIAotYm9vbCBEb2N1bWVudFJ1bGVTZXRzOjpoYXNDb21wbGV4U2VsZWN0 b3JzRm9yU3R5bGVBdHRyaWJ1dGUoKSBjb25zdAorYm9vbCBTY29wZVJ1bGVTZXRzOjpoYXNDb21w bGV4U2VsZWN0b3JzRm9yU3R5bGVBdHRyaWJ1dGUoKSBjb25zdAogewogICAgIGF1dG8gY29tcHV0 ZSA9IFsmXSB7CiAgICAgICAgIGF1dG8qIHJ1bGVTZXRzID0gYXR0cmlidXRlSW52YWxpZGF0aW9u UnVsZVNldHMoSFRNTE5hbWVzOjpzdHlsZUF0dHItPmxvY2FsTmFtZSgpKTsKQEAgLTIzNSw0ICsy MzYsNSBAQCBib29sIERvY3VtZW50UnVsZVNldHM6Omhhc0NvbXBsZXhTZWxlY3RvcnNGb3JTdHls ZUF0dHJpYnV0ZSgpIGNvbnN0CiAgICAgcmV0dXJuICptX2NhY2hlZEhhc0NvbXBsZXhTZWxlY3Rv cnNGb3JTdHlsZUF0dHJpYnV0ZTsKIH0KIAorfSAvLyBuYW1lc3BhY2UgU3R5bGUKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Eb2N1bWVudFJ1 bGVTZXRzLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuaApzaW1p bGFyaXR5IGluZGV4IDkxJQpyZW5hbWUgZnJvbSBTb3VyY2UvV2ViQ29yZS9jc3MvRG9jdW1lbnRS dWxlU2V0cy5oCnJlbmFtZSB0byBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNl dHMuaAppbmRleCBlOWE3NTZhMDc4NC4uNWFkZTM4NGU2MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9Eb2N1bWVudFJ1bGVTZXRzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUv U3R5bGVTY29wZVJ1bGVTZXRzLmgKQEAgLTM5LDggKzM5LDggQEAgY2xhc3MgSW5zcGVjdG9yQ1NT T01XcmFwcGVyczsKIGNsYXNzIE1lZGlhUXVlcnlFdmFsdWF0b3I7CiAKIG5hbWVzcGFjZSBTdHls ZSB7CisKIGNsYXNzIFJlc29sdmVyOwotfQogCiBzdHJ1Y3QgSW52YWxpZGF0aW9uUnVsZVNldCB7 CiAgICAgTWF0Y2hFbGVtZW50IG1hdGNoRWxlbWVudDsKQEAgLTUwLDEwICs1MCwxMCBAQCBzdHJ1 Y3QgSW52YWxpZGF0aW9uUnVsZVNldCB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiB9 OwogCi1jbGFzcyBEb2N1bWVudFJ1bGVTZXRzIHsKK2NsYXNzIFNjb3BlUnVsZVNldHMgewogcHVi bGljOgotICAgIERvY3VtZW50UnVsZVNldHMoU3R5bGU6OlJlc29sdmVyJik7Ci0gICAgfkRvY3Vt ZW50UnVsZVNldHMoKTsKKyAgICBTY29wZVJ1bGVTZXRzKFJlc29sdmVyJik7CisgICAgflNjb3Bl UnVsZVNldHMoKTsKIAogICAgIGJvb2wgaXNBdXRob3JTdHlsZURlZmluZWQoKSBjb25zdCB7IHJl dHVybiBtX2lzQXV0aG9yU3R5bGVEZWZpbmVkOyB9CiAgICAgUnVsZVNldCogdXNlckFnZW50TWVk aWFRdWVyeVN0eWxlKCkgY29uc3Q7CkBAIC03NCw3ICs3NCw3IEBAIHB1YmxpYzoKICAgICB2b2lk IGluaXRpYWxpemVVc2VyU3R5bGUoKTsKIAogICAgIHZvaWQgcmVzZXRBdXRob3JTdHlsZSgpOwot ICAgIHZvaWQgYXBwZW5kQXV0aG9yU3R5bGVTaGVldHMoY29uc3QgVmVjdG9yPFJlZlB0cjxDU1NT dHlsZVNoZWV0Pj4mLCBNZWRpYVF1ZXJ5RXZhbHVhdG9yKiwgSW5zcGVjdG9yQ1NTT01XcmFwcGVy cyYsIFN0eWxlOjpSZXNvbHZlciopOworICAgIHZvaWQgYXBwZW5kQXV0aG9yU3R5bGVTaGVldHMo Y29uc3QgVmVjdG9yPFJlZlB0cjxDU1NTdHlsZVNoZWV0Pj4mLCBNZWRpYVF1ZXJ5RXZhbHVhdG9y KiwgSW5zcGVjdG9yQ1NTT01XcmFwcGVycyYsIFJlc29sdmVyKik7CiAKICAgICB2b2lkIHJlc2V0 VXNlckFnZW50TWVkaWFRdWVyeVN0eWxlKCk7CiAKQEAgLTg0LDE0ICs4NCwxNCBAQCBwdWJsaWM6 CiAKIHByaXZhdGU6CiAgICAgdm9pZCBjb2xsZWN0RmVhdHVyZXMoKSBjb25zdDsKLSAgICB2b2lk IGNvbGxlY3RSdWxlc0Zyb21Vc2VyU3R5bGVTaGVldHMoY29uc3QgVmVjdG9yPFJlZlB0cjxDU1NT dHlsZVNoZWV0Pj4mLCBSdWxlU2V0JiB1c2VyU3R5bGUsIGNvbnN0IE1lZGlhUXVlcnlFdmFsdWF0 b3ImLCBTdHlsZTo6UmVzb2x2ZXImKTsKKyAgICB2b2lkIGNvbGxlY3RSdWxlc0Zyb21Vc2VyU3R5 bGVTaGVldHMoY29uc3QgVmVjdG9yPFJlZlB0cjxDU1NTdHlsZVNoZWV0Pj4mLCBSdWxlU2V0JiB1 c2VyU3R5bGUsIGNvbnN0IE1lZGlhUXVlcnlFdmFsdWF0b3ImLCBSZXNvbHZlciYpOwogICAgIHZv aWQgdXBkYXRlVXNlckFnZW50TWVkaWFRdWVyeVN0eWxlSWZOZWVkZWQoKSBjb25zdDsKIAogICAg IHN0ZDo6dW5pcXVlX3B0cjxSdWxlU2V0PiBtX2F1dGhvclN0eWxlOwogICAgIG11dGFibGUgc3Rk Ojp1bmlxdWVfcHRyPFJ1bGVTZXQ+IG1fdXNlckFnZW50TWVkaWFRdWVyeVN0eWxlOwogICAgIHN0 ZDo6dW5pcXVlX3B0cjxSdWxlU2V0PiBtX3VzZXJTdHlsZTsKIAotICAgIFN0eWxlOjpSZXNvbHZl ciYgbV9zdHlsZVJlc29sdmVyOworICAgIFJlc29sdmVyJiBtX3N0eWxlUmVzb2x2ZXI7CiAgICAg bXV0YWJsZSBSdWxlRmVhdHVyZVNldCBtX2ZlYXR1cmVzOwogICAgIG11dGFibGUgc3RkOjp1bmlx dWVfcHRyPFJ1bGVTZXQ+IG1fc2libGluZ1J1bGVTZXQ7CiAgICAgbXV0YWJsZSBzdGQ6OnVuaXF1 ZV9wdHI8UnVsZVNldD4gbV91bmNvbW1vbkF0dHJpYnV0ZVJ1bGVTZXQ7CkBAIC0xMTEsNyArMTEx LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1faXNJbnZhbGlkYXRpbmdTdHlsZVdpdGhSdWxlU2V0 cyB7IGZhbHNlIH07CiB9OwogCi1pbmxpbmUgY29uc3QgUnVsZUZlYXR1cmVTZXQmIERvY3VtZW50 UnVsZVNldHM6OmZlYXR1cmVzKCkgY29uc3QKK2lubGluZSBjb25zdCBSdWxlRmVhdHVyZVNldCYg U2NvcGVSdWxlU2V0czo6ZmVhdHVyZXMoKSBjb25zdAogewogICAgIGlmIChtX2RlZmF1bHRTdHls ZVZlcnNpb25PbkZlYXR1cmVDb2xsZWN0aW9uIDwgQ1NTRGVmYXVsdFN0eWxlU2hlZXRzOjpkZWZh dWx0U3R5bGVWZXJzaW9uKQogICAgICAgICBjb2xsZWN0RmVhdHVyZXMoKTsKQEAgLTExOSwxMSAr MTE5LDEyIEBAIGlubGluZSBjb25zdCBSdWxlRmVhdHVyZVNldCYgRG9jdW1lbnRSdWxlU2V0czo6 ZmVhdHVyZXMoKSBjb25zdAogfQogCiAvLyBGSVhNRTogVGhlcmUgc2hvdWxkIGJlIGp1c3QgdGhl IGNvbnN0IHZlcnNpb24uCi1pbmxpbmUgUnVsZUZlYXR1cmVTZXQmIERvY3VtZW50UnVsZVNldHM6 Om11dGFibGVGZWF0dXJlcygpCitpbmxpbmUgUnVsZUZlYXR1cmVTZXQmIFNjb3BlUnVsZVNldHM6 Om11dGFibGVGZWF0dXJlcygpCiB7CiAgICAgaWYgKG1fZGVmYXVsdFN0eWxlVmVyc2lvbk9uRmVh dHVyZUNvbGxlY3Rpb24gPCBDU1NEZWZhdWx0U3R5bGVTaGVldHM6OmRlZmF1bHRTdHlsZVZlcnNp b24pCiAgICAgICAgIGNvbGxlY3RGZWF0dXJlcygpOwogICAgIHJldHVybiBtX2ZlYXR1cmVzOwog fQogCit9IC8vIG5hbWVzcGFjZSBTdHlsZQogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTaGFyaW5nUmVzb2x2ZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTaGFyaW5nUmVzb2x2ZXIuY3BwCmluZGV4IDYyMmM1NTkz NTAxLi40ZTQyNmY5MjUzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVT aGFyaW5nUmVzb2x2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2hhcmlu Z1Jlc29sdmVyLmNwcApAQCAtMjYsNyArMjYsNiBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2lu Y2x1ZGUgIlN0eWxlU2hhcmluZ1Jlc29sdmVyLmgiCiAKLSNpbmNsdWRlICJEb2N1bWVudFJ1bGVT ZXRzLmgiCiAjaW5jbHVkZSAiRWxlbWVudFJ1bGVDb2xsZWN0b3IuaCIKICNpbmNsdWRlICJGdWxs c2NyZWVuTWFuYWdlci5oIgogI2luY2x1ZGUgIkhUTUxJbnB1dEVsZW1lbnQuaCIKQEAgLTM3LDYg KzM2LDcgQEAKICNpbmNsdWRlICJTaGFkb3dSb290LmgiCiAjaW5jbHVkZSAiU3R5bGVSZXNvbHZl ci5oIgogI2luY2x1ZGUgIlN0eWxlU2NvcGUuaCIKKyNpbmNsdWRlICJTdHlsZVNjb3BlUnVsZVNl dHMuaCIKICNpbmNsdWRlICJTdHlsZVVwZGF0ZS5oIgogI2luY2x1ZGUgIlN0eWxlZEVsZW1lbnQu aCIKICNpbmNsdWRlICJWaXNpdGVkTGlua1N0YXRlLmgiCkBAIC01NSw3ICs1NSw3IEBAIHN0cnVj dCBTaGFyaW5nUmVzb2x2ZXI6OkNvbnRleHQgewogICAgIEluc2lkZUxpbmsgZWxlbWVudExpbmtT dGF0ZTsKIH07CiAKLVNoYXJpbmdSZXNvbHZlcjo6U2hhcmluZ1Jlc29sdmVyKGNvbnN0IERvY3Vt ZW50JiBkb2N1bWVudCwgY29uc3QgRG9jdW1lbnRSdWxlU2V0cyYgcnVsZVNldHMsIGNvbnN0IFNl bGVjdG9yRmlsdGVyJiBzZWxlY3RvckZpbHRlcikKK1NoYXJpbmdSZXNvbHZlcjo6U2hhcmluZ1Jl c29sdmVyKGNvbnN0IERvY3VtZW50JiBkb2N1bWVudCwgY29uc3QgU2NvcGVSdWxlU2V0cyYgcnVs ZVNldHMsIGNvbnN0IFNlbGVjdG9yRmlsdGVyJiBzZWxlY3RvckZpbHRlcikKICAgICA6IG1fZG9j dW1lbnQoZG9jdW1lbnQpCiAgICAgLCBtX3J1bGVTZXRzKHJ1bGVTZXRzKQogICAgICwgbV9zZWxl Y3RvckZpbHRlcihzZWxlY3RvckZpbHRlcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0 eWxlL1N0eWxlU2hhcmluZ1Jlc29sdmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNo YXJpbmdSZXNvbHZlci5oCmluZGV4IGUzM2UzNzI1MDMyLi43YWYzNTliNTI0YiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTaGFyaW5nUmVzb2x2ZXIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNoYXJpbmdSZXNvbHZlci5oCkBAIC0zMCw3ICszMCw2IEBA CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIERvY3VtZW50OwotY2xhc3MgRG9jdW1lbnRS dWxlU2V0czsKIGNsYXNzIEVsZW1lbnQ7CiBjbGFzcyBOb2RlOwogY2xhc3MgUmVuZGVyU3R5bGU7 CkBAIC00MSwxMSArNDAsMTIgQEAgY2xhc3MgU3R5bGVkRWxlbWVudDsKIAogbmFtZXNwYWNlIFN0 eWxlIHsKIAorY2xhc3MgU2NvcGVSdWxlU2V0czsKIGNsYXNzIFVwZGF0ZTsKIAogY2xhc3MgU2hh cmluZ1Jlc29sdmVyIHsKIHB1YmxpYzoKLSAgICBTaGFyaW5nUmVzb2x2ZXIoY29uc3QgRG9jdW1l bnQmLCBjb25zdCBEb2N1bWVudFJ1bGVTZXRzJiwgY29uc3QgU2VsZWN0b3JGaWx0ZXImKTsKKyAg ICBTaGFyaW5nUmVzb2x2ZXIoY29uc3QgRG9jdW1lbnQmLCBjb25zdCBTY29wZVJ1bGVTZXRzJiwg Y29uc3QgU2VsZWN0b3JGaWx0ZXImKTsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHls ZT4gcmVzb2x2ZShjb25zdCBFbGVtZW50JiwgY29uc3QgVXBkYXRlJik7CiAKQEAgLTYwLDcgKzYw LDcgQEAgcHJpdmF0ZToKICAgICBib29sIGNsYXNzTmFtZXNBZmZlY3RlZEJ5UnVsZXMoY29uc3Qg U3BhY2VTcGxpdFN0cmluZyYgY2xhc3NOYW1lcykgY29uc3Q7CiAKICAgICBjb25zdCBEb2N1bWVu dCYgbV9kb2N1bWVudDsKLSAgICBjb25zdCBEb2N1bWVudFJ1bGVTZXRzJiBtX3J1bGVTZXRzOwor ICAgIGNvbnN0IFNjb3BlUnVsZVNldHMmIG1fcnVsZVNldHM7CiAgICAgY29uc3QgU2VsZWN0b3JG aWx0ZXImIG1fc2VsZWN0b3JGaWx0ZXI7CiAKICAgICBIYXNoTWFwPGNvbnN0IEVsZW1lbnQqLCBj b25zdCBFbGVtZW50Kj4gbV9lbGVtZW50c1NoYXJpbmdTdHlsZTsK