209009 2020-03-12 12:30:38 -0700 Remove unused affectedBy style flags 2020-03-13 01:34:13 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=208859 InRadar P2 Normal --- 1 koivisto webkit-unassigned allan.jensen cdumez cmarcelo commit-queue esprehn+autocc ews-watchlist glenn graouts gyuyoung.kim kangil.han kondapallykalyan macpherson menard pdr simon.fraser webkit-bug-importer oldest_to_newest 1629305 0 koivisto 2020-03-12 12:30:38 -0700 Remove some dead code. 1629307 1 393395 koivisto 2020-03-12 12:36:22 -0700 Created attachment 393395 patch 1629526 2 393395 commit-queue 2020-03-13 01:33:59 -0700 Comment on attachment 393395 patch Clearing flags on attachment: 393395 Committed r258388: <https://trac.webkit.org/changeset/258388> 1629527 3 commit-queue 2020-03-13 01:34:01 -0700 All reviewed patches have been landed. Closing bug. 1629528 4 webkit-bug-importer 2020-03-13 01:34:13 -0700 <rdar://problem/60409417> 393395 2020-03-12 12:36:22 -0700 2020-03-13 01:33:59 -0700 patch remove-affected-by-flags.patch text/plain 20003 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3YTQzM2RiZjljMi4uYzNiNjEzMzQ3NDcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw1MiBAQAorMjAyMC0wMy0xMiAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+ CisKKyAgICAgICAgUmVtb3ZlIHVudXNlZCBhZmZlY3RlZEJ5IHN0eWxlIGZsYWdzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDkwMDkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVzZSBmbGFncyBhcmUg dW51c2VkIGFmdGVyIHIyNTgzMjEuIFJlbW92ZSB0aGUgZmxhZ3MgYW5kIHRoZSBjb2RlIHRoYXQg Z2VuZXJhdGVzIHRoZW0uCisKKyAgICAgICAgKiBjc3MvU2VsZWN0b3JDaGVja2VyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yQ2hlY2tlcjo6Y2hlY2tPbmUgY29uc3QpOgorICAgICAg ICAqIGNzc2ppdC9TZWxlY3RvckNvbXBpbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVj dG9yQ29tcGlsZXI6OmFkZFN0eWxlUmVsYXRpb25GdW5jdGlvbik6CisgICAgICAgIChXZWJDb3Jl OjpTZWxlY3RvckNvbXBpbGVyOjpTZWxlY3RvckNvZGVHZW5lcmF0b3I6OmdlbmVyYXRlRWxlbWVu dElzQWN0aXZlKToKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yQ29tcGlsZXI6OlNlbGVjdG9y Q29kZUdlbmVyYXRvcjo6Z2VuZXJhdGVFbGVtZW50SXNIb3ZlcmVkKToKKyAgICAgICAgKFdlYkNv cmU6OlNlbGVjdG9yQ29tcGlsZXI6OlNlbGVjdG9yQ29kZUdlbmVyYXRvcjo6Z2VuZXJhdGVFbGVt ZW50SGFzRm9jdXNXaXRoaW4pOgorICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkVsZW1lbnQ6Omhhc0ZsYWdzU2V0RHVyaW5nU3R5bGluZ09mQ2hpbGRyZW4gY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6cmVzZXRTdHlsZVJlbGF0aW9ucyk6Cisg ICAgICAgICogZG9tL0VsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnN0eWxl QWZmZWN0ZWRCeUVtcHR5IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OmRlc2Nl bmRhbnRzQWZmZWN0ZWRCeVByZXZpb3VzU2libGluZyBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpFbGVtZW50OjpzZXRTdHlsZUFmZmVjdGVkQnlFbXB0eSk6CisgICAgICAgIChXZWJDb3JlOjpF bGVtZW50OjpzZXREZXNjZW5kYW50c0FmZmVjdGVkQnlQcmV2aW91c1NpYmxpbmcpOgorICAgICAg ICAoV2ViQ29yZTo6RWxlbWVudDo6c3R5bGVBZmZlY3RlZEJ5QWN0aXZlIGNvbnN0KTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnN0eWxlQWZmZWN0ZWRCeUZvY3VzV2l0aGlu IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OmNoaWxkcmVuQWZm ZWN0ZWRCeUhvdmVyIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6 OnNldFN0eWxlQWZmZWN0ZWRCeUZvY3VzV2l0aGluKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OkVsZW1lbnQ6OnNldENoaWxkcmVuQWZmZWN0ZWRCeUhvdmVyKTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnNldFN0eWxlQWZmZWN0ZWRCeUFjdGl2ZSk6IERlbGV0ZWQu CisgICAgICAgICogZG9tL05vZGUuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVy U3R5bGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OlJlbmRlclN0eWxlKToK KyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclN0eWxlOjphZmZlY3RlZEJ5RHJhZyBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJTdHlsZTo6Tm9uSW5oZXJpdGVkRmxhZ3M6Om9wZXJhdG9yPT0gY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OmFmZmVjdGVkQnlIb3ZlciBjb25zdCk6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6YWZmZWN0ZWRCeUFjdGl2ZSBjb25z dCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6c2V0QWZmZWN0ZWRC eUhvdmVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpzZXRBZmZl Y3RlZEJ5QWN0aXZlKTogRGVsZXRlZC4KKyAgICAgICAgKiBzdHlsZS9TdHlsZVJlbGF0aW9ucy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6Y29tbWl0UmVsYXRpb25zVG9SZW5kZXJTdHls ZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6Y29tbWl0UmVsYXRpb25zKToKKyAgICAgICAg KiBzdHlsZS9TdHlsZVJlbGF0aW9ucy5oOgorICAgICAgICAqIHN0eWxlL1N0eWxlU2hhcmluZ1Jl c29sdmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTaGFyaW5nUmVzb2x2ZXI6OmNh blNoYXJlU3R5bGVXaXRoRWxlbWVudCBjb25zdCk6CisKKyAgICAgICAgQ29tcGFyZSB0aGUgaGFz Rm9jdXNXaXRoaW4gYml0IGluc3RlYWQuCisKIDIwMjAtMDMtMTIgIHlvdWVubiBmYWJsZXQgIDx5 b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUgQXVkaW9TZXNzaW9uIGludGVycnVwdGlv biBsaXN0ZW5lciBjb2RlIHRvIEF1ZGlvU2Vzc2lvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvY3NzL1NlbGVjdG9yQ2hlY2tlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JD aGVja2VyLmNwcAppbmRleCBlMjY2MGM4OWQwNS4uNjQ4ZGZiZTI1MDUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCkBAIC0xMDA3LDEyICsxMDA3LDkgQEAgYm9vbCBTZWxl Y3RvckNoZWNrZXI6OmNoZWNrT25lKENoZWNraW5nQ29udGV4dCYgY2hlY2tpbmdDb250ZXh0LCBj b25zdCBMb2NhbENvbnQKICAgICAgICAgY2FzZSBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3NGb2N1 czoKICAgICAgICAgICAgIHJldHVybiBtYXRjaGVzRm9jdXNQc2V1ZG9DbGFzcyhlbGVtZW50KTsK ICAgICAgICAgY2FzZSBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3NGb2N1c1dpdGhpbjoKLSAgICAg ICAgICAgIGFkZFN0eWxlUmVsYXRpb24oY2hlY2tpbmdDb250ZXh0LCBlbGVtZW50LCBTdHlsZTo6 UmVsYXRpb246OkFmZmVjdGVkQnlGb2N1c1dpdGhpbik7CiAgICAgICAgICAgICByZXR1cm4gZWxl bWVudC5oYXNGb2N1c1dpdGhpbigpOwogICAgICAgICBjYXNlIENTU1NlbGVjdG9yOjpQc2V1ZG9D bGFzc0hvdmVyOgogICAgICAgICAgICAgaWYgKG1fc3RyaWN0UGFyc2luZyB8fCBlbGVtZW50Lmlz TGluaygpIHx8IGNhbk1hdGNoSG92ZXJPckFjdGl2ZUluUXVpcmtzTW9kZShjb250ZXh0KSkgewot ICAgICAgICAgICAgICAgIGFkZFN0eWxlUmVsYXRpb24oY2hlY2tpbmdDb250ZXh0LCBlbGVtZW50 LCBTdHlsZTo6UmVsYXRpb246OkFmZmVjdGVkQnlIb3Zlcik7Ci0KICAgICAgICAgICAgICAgICAv LyBTZWUgdGhlIGNvbW1lbnQgaW4gZ2VuZXJhdGVFbGVtZW50SXNIb3ZlcmVkKCkgaW4gU2VsZWN0 b3JDb21waWxlci4KICAgICAgICAgICAgICAgICBpZiAoY2hlY2tpbmdDb250ZXh0LnJlc29sdmlu Z01vZGUgPT0gU2VsZWN0b3JDaGVja2VyOjpNb2RlOjpDb2xsZWN0aW5nUnVsZXNJZ25vcmluZ1Zp cnR1YWxQc2V1ZG9FbGVtZW50cyAmJiAhY29udGV4dC5pc01hdGNoRWxlbWVudCkKICAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC0xMDIzLDggKzEwMjAsNiBAQCBib29sIFNlbGVj dG9yQ2hlY2tlcjo6Y2hlY2tPbmUoQ2hlY2tpbmdDb250ZXh0JiBjaGVja2luZ0NvbnRleHQsIGNv bnN0IExvY2FsQ29udAogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQ1NTU2VsZWN0 b3I6OlBzZXVkb0NsYXNzQWN0aXZlOgogICAgICAgICAgICAgaWYgKG1fc3RyaWN0UGFyc2luZyB8 fCBlbGVtZW50LmlzTGluaygpIHx8IGNhbk1hdGNoSG92ZXJPckFjdGl2ZUluUXVpcmtzTW9kZShj b250ZXh0KSkgewotICAgICAgICAgICAgICAgIGFkZFN0eWxlUmVsYXRpb24oY2hlY2tpbmdDb250 ZXh0LCBlbGVtZW50LCBTdHlsZTo6UmVsYXRpb246OkFmZmVjdGVkQnlBY3RpdmUpOwotCiAgICAg ICAgICAgICAgICAgaWYgKGVsZW1lbnQuYWN0aXZlKCkgfHwgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjpmb3JjZVBzZXVkb1N0YXRlKGVsZW1lbnQsIENTU1NlbGVjdG9yOjpQc2V1ZG9DbGFzc0Fj dGl2ZSkpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICAgICAgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3Nzaml0L1NlbGVjdG9yQ29tcGlsZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvY3Nzaml0L1NlbGVjdG9yQ29tcGlsZXIuY3BwCmluZGV4IDk3NWQ5YTdl MDc1Li44YjY1MzdlNWVhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3Nzaml0L1NlbGVj dG9yQ29tcGlsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzc2ppdC9TZWxlY3RvckNvbXBp bGVyLmNwcApAQCAtMjI0NCw3ICsyMjQ0LDcgQEAgdm9pZCBTZWxlY3RvckNvZGVHZW5lcmF0b3I6 OmdlbmVyYXRlQWRkU3R5bGVSZWxhdGlvbklmUmVzb2x2aW5nU3R5bGUoQXNzZW1ibGVyOjoKIAog c3RhdGljIHZvaWQgYWRkU3R5bGVSZWxhdGlvbkZ1bmN0aW9uKFNlbGVjdG9yQ2hlY2tlcjo6Q2hl Y2tpbmdDb250ZXh0KiBjaGVja2luZ0NvbnRleHQsIGNvbnN0IEVsZW1lbnQqIGVsZW1lbnQpCiB7 Ci0gICAgY2hlY2tpbmdDb250ZXh0LT5zdHlsZVJlbGF0aW9ucy5hcHBlbmQoeyAqZWxlbWVudCwg U3R5bGU6OlJlbGF0aW9uOjpBZmZlY3RlZEJ5QWN0aXZlLCAxIH0pOworICAgIGNoZWNraW5nQ29u dGV4dC0+c3R5bGVSZWxhdGlvbnMuYXBwZW5kKHsgKmVsZW1lbnQsIHsgfSwgMSB9KTsKIH0KIAog dm9pZCBTZWxlY3RvckNvZGVHZW5lcmF0b3I6OmdlbmVyYXRlQWRkU3R5bGVSZWxhdGlvbihBc3Nl bWJsZXI6OlJlZ2lzdGVySUQgY2hlY2tpbmdDb250ZXh0LCBBc3NlbWJsZXI6OlJlZ2lzdGVySUQg ZWxlbWVudCwgU3R5bGU6OlJlbGF0aW9uOjpUeXBlIHJlbGF0aW9uVHlwZSwgT3B0aW9uYWw8QXNz ZW1ibGVyOjpSZWdpc3RlcklEPiB2YWx1ZSkKQEAgLTMxNTcsOCArMzE1Nyw2IEBAIHZvaWQgU2Vs ZWN0b3JDb2RlR2VuZXJhdG9yOjpnZW5lcmF0ZUVsZW1lbnRJc0FjdGl2ZShBc3NlbWJsZXI6Okp1 bXBMaXN0JiBmYWlsdXJlCiB7CiAgICAgZ2VuZXJhdGVTcGVjaWFsRmFpbHVyZUluUXVpcmtzTW9k ZUZvckFjdGl2ZUFuZEhvdmVySWZOZWVkZWQoZmFpbHVyZUNhc2VzLCBmcmFnbWVudCk7CiAKLSAg ICBnZW5lcmF0ZUFkZFN0eWxlUmVsYXRpb25JZlJlc29sdmluZ1N0eWxlKGVsZW1lbnRBZGRyZXNz UmVnaXN0ZXIsIFN0eWxlOjpSZWxhdGlvbjo6QWZmZWN0ZWRCeUFjdGl2ZSk7Ci0KICAgICBGdW5j dGlvbkNhbGwgZnVuY3Rpb25DYWxsKG1fYXNzZW1ibGVyLCBtX3JlZ2lzdGVyQWxsb2NhdG9yLCBt X3N0YWNrQWxsb2NhdG9yLCBtX2Z1bmN0aW9uQ2FsbHMpOwogICAgIGZ1bmN0aW9uQ2FsbC5zZXRG dW5jdGlvbkFkZHJlc3MoZWxlbWVudElzQWN0aXZlKTsKICAgICBmdW5jdGlvbkNhbGwuc2V0T25l QXJndW1lbnQoZWxlbWVudEFkZHJlc3NSZWdpc3Rlcik7CkBAIC0zMjcwLDI0ICszMjY4LDEwIEBA IHZvaWQgU2VsZWN0b3JDb2RlR2VuZXJhdG9yOjpnZW5lcmF0ZUVsZW1lbnRJc0hvdmVyZWQoQXNz ZW1ibGVyOjpKdW1wTGlzdCYgZmFpbHVyCiB7CiAgICAgZ2VuZXJhdGVTcGVjaWFsRmFpbHVyZUlu UXVpcmtzTW9kZUZvckFjdGl2ZUFuZEhvdmVySWZOZWVkZWQoZmFpbHVyZUNhc2VzLCBmcmFnbWVu dCk7CiAKLSAgICBnZW5lcmF0ZUFkZFN0eWxlUmVsYXRpb25JZlJlc29sdmluZ1N0eWxlKGVsZW1l bnRBZGRyZXNzUmVnaXN0ZXIsIFN0eWxlOjpSZWxhdGlvbjo6QWZmZWN0ZWRCeUhvdmVyKTsKLQot ICAgIEFzc2VtYmxlcjo6SnVtcExpc3Qgc3VjY2Vzc0Nhc2VzOwotICAgIGlmIChtX3NlbGVjdG9y Q29udGV4dCAhPSBTZWxlY3RvckNvbnRleHQ6OlF1ZXJ5U2VsZWN0b3IgJiYgZnJhZ21lbnQucmVs YXRpb25Ub1JpZ2h0RnJhZ21lbnQgIT0gRnJhZ21lbnRSZWxhdGlvbjo6UmlnaHRtb3N0KSB7Ci0g ICAgICAgIC8vIDpob3ZlciBhbHdheXMgbWF0Y2hlcyB3aGVuIG5vdCBpbiByaWdodG1vc3QgcG9z aXRpb24gd2hlbiBjb2xsZWN0aW5nIHJ1bGVzIGZvciBkZXNjZW5kYW50IHN0eWxlIGludmFsaWRh dGlvbiBvcHRpbWl6YXRpb24uCi0gICAgICAgIC8vIFJlc29sdmluZyBzdHlsZSBmb3IgYSBtYXRj aGluZyBkZXNjZW5kYW50IHdpbGwgc2V0IHBhcmVudCBjaGlsZHJlbkFmZmVjdGVkQnlIb3ZlciBi aXQgZXZlbiB3aGVuIHRoZSBlbGVtZW50IGlzIG5vdCBjdXJyZW50bHkgaG92ZXJlZC4KLSAgICAg ICAgLy8gVGhpcyBiaXQgaGFzIHRvIGJlIHNldCBmb3IgdGhlIGV2ZW50IGJhc2VkIDpob3ZlciBp bnZhbGlkYXRpb24gdG8gd29yay4KLSAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBqdXN0IGNv bGxlY3Qgc3R5bGUgcmVsYXRpb24gYml0cyBhbmQgYXBwbHkgdGhlbSBhcyBuZWVkZWQgd2hlbiBj b21wdXRpbmcgc3R5bGUgaW52YWxpZGF0aW9uIG9wdGltaXphdGlvbi4KLSAgICAgICAgTG9jYWxS ZWdpc3RlciBjaGVja2luZ0NvbnRleHQobV9yZWdpc3RlckFsbG9jYXRvcik7Ci0gICAgICAgIHN1 Y2Nlc3NDYXNlcy5hcHBlbmQoYnJhbmNoT25SZXNvbHZpbmdNb2RlKEFzc2VtYmxlcjo6RXF1YWws IFNlbGVjdG9yQ2hlY2tlcjo6TW9kZTo6Q29sbGVjdGluZ1J1bGVzSWdub3JpbmdWaXJ0dWFsUHNl dWRvRWxlbWVudHMsIGNoZWNraW5nQ29udGV4dCkpOwotICAgIH0KLQogICAgIEZ1bmN0aW9uQ2Fs bCBmdW5jdGlvbkNhbGwobV9hc3NlbWJsZXIsIG1fcmVnaXN0ZXJBbGxvY2F0b3IsIG1fc3RhY2tB bGxvY2F0b3IsIG1fZnVuY3Rpb25DYWxscyk7CiAgICAgZnVuY3Rpb25DYWxsLnNldEZ1bmN0aW9u QWRkcmVzcyhlbGVtZW50SXNIb3ZlcmVkKTsKICAgICBmdW5jdGlvbkNhbGwuc2V0T25lQXJndW1l bnQoZWxlbWVudEFkZHJlc3NSZWdpc3Rlcik7CiAgICAgZmFpbHVyZUNhc2VzLmFwcGVuZChmdW5j dGlvbkNhbGwuY2FsbEFuZEJyYW5jaE9uQm9vbGVhblJldHVyblZhbHVlKEFzc2VtYmxlcjo6WmVy bykpOwotCi0gICAgc3VjY2Vzc0Nhc2VzLmxpbmsoJm1fYXNzZW1ibGVyKTsKIH0KIAogdm9pZCBT ZWxlY3RvckNvZGVHZW5lcmF0b3I6OmdlbmVyYXRlRWxlbWVudElzSW5MYW5ndWFnZShBc3NlbWJs ZXI6Okp1bXBMaXN0JiBmYWlsdXJlQ2FzZXMsIGNvbnN0IFNlbGVjdG9yRnJhZ21lbnQmIGZyYWdt ZW50KQpAQCAtMzg5NSw3ICszODc5LDYgQEAgdm9pZCBTZWxlY3RvckNvZGVHZW5lcmF0b3I6Omdl bmVyYXRlRWxlbWVudElzVGFyZ2V0KEFzc2VtYmxlcjo6SnVtcExpc3QmIGZhaWx1cmUKIAogdm9p ZCBTZWxlY3RvckNvZGVHZW5lcmF0b3I6OmdlbmVyYXRlRWxlbWVudEhhc0ZvY3VzV2l0aGluKEFz c2VtYmxlcjo6SnVtcExpc3QmIGZhaWx1cmVDYXNlcykKIHsKLSAgICBnZW5lcmF0ZUFkZFN0eWxl UmVsYXRpb25JZlJlc29sdmluZ1N0eWxlKGVsZW1lbnRBZGRyZXNzUmVnaXN0ZXIsIFN0eWxlOjpS ZWxhdGlvbjo6QWZmZWN0ZWRCeUZvY3VzV2l0aGluKTsKICAgICBmYWlsdXJlQ2FzZXMuYXBwZW5k KG1fYXNzZW1ibGVyLmJyYW5jaFRlc3QzMihBc3NlbWJsZXI6Olplcm8sIEFzc2VtYmxlcjo6QWRk cmVzcyhlbGVtZW50QWRkcmVzc1JlZ2lzdGVyLCBOb2RlOjpub2RlRmxhZ3NNZW1vcnlPZmZzZXQo KSksIEFzc2VtYmxlcjo6VHJ1c3RlZEltbTMyKE5vZGU6OmZsYWdIYXNGb2N1c1dpdGhpbigpKSkp OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKaW5kZXggYjY3MGJmYjBhYjAuLjZkYTQ1MjY4MWY5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCkBAIC0zNDAxLDkgKzM0MDEsNyBAQCB2b2lkIEVsZW1l bnQ6OnNldENoaWxkSW5kZXgodW5zaWduZWQgaW5kZXgpCiAKIGJvb2wgRWxlbWVudDo6aGFzRmxh Z3NTZXREdXJpbmdTdHlsaW5nT2ZDaGlsZHJlbigpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIHN0eWxl QWZmZWN0ZWRCeUFjdGl2ZSgpCi0gICAgICAgIHx8IGNoaWxkcmVuQWZmZWN0ZWRCeUhvdmVyKCkK LSAgICAgICAgfHwgY2hpbGRyZW5BZmZlY3RlZEJ5Rmlyc3RDaGlsZFJ1bGVzKCkKKyAgICByZXR1 cm4gY2hpbGRyZW5BZmZlY3RlZEJ5Rmlyc3RDaGlsZFJ1bGVzKCkKICAgICAgICAgfHwgY2hpbGRy ZW5BZmZlY3RlZEJ5TGFzdENoaWxkUnVsZXMoKQogICAgICAgICB8fCBjaGlsZHJlbkFmZmVjdGVk QnlEcmFnKCkKICAgICAgICAgfHwgY2hpbGRyZW5BZmZlY3RlZEJ5Rm9yd2FyZFBvc2l0aW9uYWxS dWxlcygpCkBAIC00MTI1LDcgKzQxMjMsNiBAQCB2b2lkIEVsZW1lbnQ6OnJlc2V0Q29tcHV0ZWRT dHlsZSgpCiB2b2lkIEVsZW1lbnQ6OnJlc2V0U3R5bGVSZWxhdGlvbnMoKQogewogICAgIC8vIEZJ WE1FOiBNYWtlIHRoaXMgY29kZSBtb3JlIGNvbnNpc3RlbnQuCi0gICAgY2xlYXJGbGFnKFN0eWxl QWZmZWN0ZWRCeUZvY3VzV2l0aGluRmxhZyk7CiAgICAgY2xlYXJTdHlsZUZsYWdzKCk7CiAgICAg aWYgKCFoYXNSYXJlRGF0YSgpKQogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9kb20vRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaAppbmRl eCBiYTQ5ZjA5ZDNmYi4uM2U3OWUxNTk3MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9FbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaApAQCAtMzQ5LDEx ICszNDksOCBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc1Zpc2libGVXaXRob3V0UmVzb2x2aW5nRnVs bFN0eWxlKCkgY29uc3Q7CiAKICAgICAvLyBNZXRob2RzIGZvciBpbmRpY2F0aW5nIHRoZSBzdHls ZSBpcyBhZmZlY3RlZCBieSBkeW5hbWljIHVwZGF0ZXMgKGUuZy4sIGNoaWxkcmVuIGNoYW5naW5n LCBvdXIgcG9zaXRpb24gY2hhbmdpbmcgaW4gb3VyIHNpYmxpbmcgbGlzdCwgZXRjLikKLSAgICBi b29sIHN0eWxlQWZmZWN0ZWRCeUFjdGl2ZSgpIGNvbnN0IHsgcmV0dXJuIGhhc1N0eWxlRmxhZyhF bGVtZW50U3R5bGVGbGFnOjpTdHlsZUFmZmVjdGVkQnlBY3RpdmUpOyB9CiAgICAgYm9vbCBzdHls ZUFmZmVjdGVkQnlFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIGhhc1N0eWxlRmxhZyhFbGVtZW50U3R5 bGVGbGFnOjpTdHlsZUFmZmVjdGVkQnlFbXB0eSk7IH0KLSAgICBib29sIHN0eWxlQWZmZWN0ZWRC eUZvY3VzV2l0aGluKCkgY29uc3QgeyByZXR1cm4gZ2V0RmxhZyhTdHlsZUFmZmVjdGVkQnlGb2N1 c1dpdGhpbkZsYWcpOyB9CiAgICAgYm9vbCBkZXNjZW5kYW50c0FmZmVjdGVkQnlQcmV2aW91c1Np YmxpbmcoKSBjb25zdCB7IHJldHVybiBnZXRGbGFnKERlc2NlbmRhbnRzQWZmZWN0ZWRCeVByZXZp b3VzU2libGluZ0ZsYWcpOyB9Ci0gICAgYm9vbCBjaGlsZHJlbkFmZmVjdGVkQnlIb3ZlcigpIGNv bnN0IHsgcmV0dXJuIGdldEZsYWcoQ2hpbGRyZW5BZmZlY3RlZEJ5SG92ZXJSdWxlc0ZsYWcpOyB9 CiAgICAgYm9vbCBjaGlsZHJlbkFmZmVjdGVkQnlEcmFnKCkgY29uc3QgeyByZXR1cm4gaGFzU3R5 bGVGbGFnKEVsZW1lbnRTdHlsZUZsYWc6OkNoaWxkcmVuQWZmZWN0ZWRCeURyYWcpOyB9CiAgICAg Ym9vbCBjaGlsZHJlbkFmZmVjdGVkQnlGaXJzdENoaWxkUnVsZXMoKSBjb25zdCB7IHJldHVybiBn ZXRGbGFnKENoaWxkcmVuQWZmZWN0ZWRCeUZpcnN0Q2hpbGRSdWxlc0ZsYWcpOyB9CiAgICAgYm9v bCBjaGlsZHJlbkFmZmVjdGVkQnlMYXN0Q2hpbGRSdWxlcygpIGNvbnN0IHsgcmV0dXJuIGdldEZs YWcoQ2hpbGRyZW5BZmZlY3RlZEJ5TGFzdENoaWxkUnVsZXNGbGFnKTsgfQpAQCAtMzY4LDEwICsz NjUsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYXNGbGFnc1NldER1cmluZ1N0eWxpbmdPZkNoaWxk cmVuKCkgY29uc3Q7CiAKICAgICB2b2lkIHNldFN0eWxlQWZmZWN0ZWRCeUVtcHR5KCkgeyBzZXRT dHlsZUZsYWcoRWxlbWVudFN0eWxlRmxhZzo6U3R5bGVBZmZlY3RlZEJ5RW1wdHkpOyB9Ci0gICAg dm9pZCBzZXRTdHlsZUFmZmVjdGVkQnlGb2N1c1dpdGhpbigpIHsgc2V0RmxhZyhTdHlsZUFmZmVj dGVkQnlGb2N1c1dpdGhpbkZsYWcpOyB9CiAgICAgdm9pZCBzZXREZXNjZW5kYW50c0FmZmVjdGVk QnlQcmV2aW91c1NpYmxpbmcoKSB7IHNldEZsYWcoRGVzY2VuZGFudHNBZmZlY3RlZEJ5UHJldmlv dXNTaWJsaW5nRmxhZyk7IH0KLSAgICB2b2lkIHNldENoaWxkcmVuQWZmZWN0ZWRCeUhvdmVyKCkg eyBzZXRGbGFnKENoaWxkcmVuQWZmZWN0ZWRCeUhvdmVyUnVsZXNGbGFnKTsgfQotICAgIHZvaWQg c2V0U3R5bGVBZmZlY3RlZEJ5QWN0aXZlKCkgeyBzZXRTdHlsZUZsYWcoRWxlbWVudFN0eWxlRmxh Zzo6U3R5bGVBZmZlY3RlZEJ5QWN0aXZlKTsgfQogICAgIHZvaWQgc2V0Q2hpbGRyZW5BZmZlY3Rl ZEJ5RHJhZygpIHsgc2V0U3R5bGVGbGFnKEVsZW1lbnRTdHlsZUZsYWc6OkNoaWxkcmVuQWZmZWN0 ZWRCeURyYWcpOyB9CiAgICAgdm9pZCBzZXRDaGlsZHJlbkFmZmVjdGVkQnlGaXJzdENoaWxkUnVs ZXMoKSB7IHNldEZsYWcoQ2hpbGRyZW5BZmZlY3RlZEJ5Rmlyc3RDaGlsZFJ1bGVzRmxhZyk7IH0K ICAgICB2b2lkIHNldENoaWxkcmVuQWZmZWN0ZWRCeUxhc3RDaGlsZFJ1bGVzKCkgeyBzZXRGbGFn KENoaWxkcmVuQWZmZWN0ZWRCeUxhc3RDaGlsZFJ1bGVzRmxhZyk7IH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5oCmluZGV4 IDlmZTNhZmE0N2ZlLi42MmUxZDIwODc1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9t L05vZGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5oCkBAIC01MzcsNyArNTM3LDcg QEAgcHJvdGVjdGVkOgogICAgICAgICBJc1NoYWRvd1Jvb3RGbGFnID0gMSA8PCA3LAogICAgICAg ICBJc0Nvbm5lY3RlZEZsYWcgPSAxIDw8IDgsCiAgICAgICAgIElzSW5TaGFkb3dUcmVlRmxhZyA9 IDEgPDwgOSwKLSAgICAgICAgU3R5bGVBZmZlY3RlZEJ5Rm9jdXNXaXRoaW5GbGFnID0gMSA8PCAx MCwKKyAgICAgICAgLy8gVW51c2VkRmxhZyA9IDEgPDwgMTAsCiAgICAgICAgIEhhc0V2ZW50VGFy Z2V0RGF0YUZsYWcgPSAxIDw8IDExLAogCiAgICAgICAgIC8vIFRoZXNlIGJpdHMgYXJlIHVzZWQg YnkgZGVyaXZlZCBjbGFzc2VzLCBwdWxsZWQgdXAgaGVyZSBzbyB0aGV5IGNhbgpAQCAtNTYxLDcg KzU2MSw3IEBAIHByb3RlY3RlZDoKIAogICAgICAgICBDaGlsZHJlbkFmZmVjdGVkQnlGaXJzdENo aWxkUnVsZXNGbGFnID0gMSA8PCAyNSwKICAgICAgICAgQ2hpbGRyZW5BZmZlY3RlZEJ5TGFzdENo aWxkUnVsZXNGbGFnID0gMSA8PCAyNiwKLSAgICAgICAgQ2hpbGRyZW5BZmZlY3RlZEJ5SG92ZXJS dWxlc0ZsYWcgPSAxIDw8IDI3LAorICAgICAgICAvLyBVbnVzZWRGbGFnID0gMSA8PCAyNywKIAog ICAgICAgICBBZmZlY3RzTmV4dFNpYmxpbmdFbGVtZW50U3R5bGUgPSAxIDw8IDI4LAogICAgICAg ICBTdHlsZUlzQWZmZWN0ZWRCeVByZXZpb3VzU2libGluZyA9IDEgPDwgMjksCkBAIC02MDEsMTgg KzYwMSwxNyBAQCBwcm90ZWN0ZWQ6CiAgICAgc3RhdGljIGNvbnN0ZXhwciB1aW50MzJfdCBzX3Jl ZkNvdW50TWFzayA9IH5zdGF0aWNfY2FzdDx1aW50MzJfdD4oMSk7CiAKICAgICBlbnVtIGNsYXNz IEVsZW1lbnRTdHlsZUZsYWcgOiB1aW50OF90IHsKLSAgICAgICAgU3R5bGVBZmZlY3RlZEJ5QWN0 aXZlID0gMSA8PCAwLAotICAgICAgICBTdHlsZUFmZmVjdGVkQnlFbXB0eSA9IDEgPDwgMSwKLSAg ICAgICAgQ2hpbGRyZW5BZmZlY3RlZEJ5RHJhZyA9IDEgPDwgMiwKKyAgICAgICAgU3R5bGVBZmZl Y3RlZEJ5RW1wdHkgPSAxIDw8IDAsCisgICAgICAgIENoaWxkcmVuQWZmZWN0ZWRCeURyYWcgPSAx IDw8IDEsCiAKICAgICAgICAgLy8gQml0cyBmb3IgZHluYW1pYyBjaGlsZCBtYXRjaGluZy4KICAg ICAgICAgLy8gV2Ugb3B0aW1pemUgZm9yIDpmaXJzdC1jaGlsZCBhbmQgOmxhc3QtY2hpbGQuIFRo ZSBvdGhlciBwb3NpdGlvbmFsIGNoaWxkIHNlbGVjdG9ycyBsaWtlIG50aC1jaGlsZCBvcgogICAg ICAgICAvLyAqLWNoaWxkLW9mLXR5cGUsIHdlIHdpbGwganVzdCBnaXZlIHVwIGFuZCByZS1ldmFs dWF0ZSB3aGVuZXZlciBjaGlsZHJlbiBjaGFuZ2UgYXQgYWxsLgotICAgICAgICBDaGlsZHJlbkFm ZmVjdGVkQnlGb3J3YXJkUG9zaXRpb25hbFJ1bGVzID0gMSA8PCAzLAotICAgICAgICBEZXNjZW5k YW50c0FmZmVjdGVkQnlGb3J3YXJkUG9zaXRpb25hbFJ1bGVzID0gMSA8PCA0LAotICAgICAgICBD aGlsZHJlbkFmZmVjdGVkQnlCYWNrd2FyZFBvc2l0aW9uYWxSdWxlcyA9IDEgPDwgNSwKLSAgICAg ICAgRGVzY2VuZGFudHNBZmZlY3RlZEJ5QmFja3dhcmRQb3NpdGlvbmFsUnVsZXMgPSAxIDw8IDYs Ci0gICAgICAgIENoaWxkcmVuQWZmZWN0ZWRCeVByb3BlcnR5QmFzZWRCYWNrd2FyZFBvc2l0aW9u YWxSdWxlcyA9IDEgPDwgNywKKyAgICAgICAgQ2hpbGRyZW5BZmZlY3RlZEJ5Rm9yd2FyZFBvc2l0 aW9uYWxSdWxlcyA9IDEgPDwgMiwKKyAgICAgICAgRGVzY2VuZGFudHNBZmZlY3RlZEJ5Rm9yd2Fy ZFBvc2l0aW9uYWxSdWxlcyA9IDEgPDwgMywKKyAgICAgICAgQ2hpbGRyZW5BZmZlY3RlZEJ5QmFj a3dhcmRQb3NpdGlvbmFsUnVsZXMgPSAxIDw8IDQsCisgICAgICAgIERlc2NlbmRhbnRzQWZmZWN0 ZWRCeUJhY2t3YXJkUG9zaXRpb25hbFJ1bGVzID0gMSA8PCA1LAorICAgICAgICBDaGlsZHJlbkFm ZmVjdGVkQnlQcm9wZXJ0eUJhc2VkQmFja3dhcmRQb3NpdGlvbmFsUnVsZXMgPSAxIDw8IDYsCiAg ICAgfTsKIAogICAgIGJvb2wgaGFzU3R5bGVGbGFnKEVsZW1lbnRTdHlsZUZsYWcgc3RhdGUpIGNv bnN0IHsgcmV0dXJuIG1fcmVuZGVyZXJXaXRoU3R5bGVGbGFncy50eXBlKCkgJiBzdGF0aWNfY2Fz dDx1aW50OF90PihzdGF0ZSk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuY3BwCmluZGV4IDk1ZWM4OWU0ZWU2Li5jOGM2ZWI4MzNkNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCkBAIC0xODksOCAr MTg5LDYgQEAgUmVuZGVyU3R5bGU6OlJlbmRlclN0eWxlKENyZWF0ZURlZmF1bHRTdHlsZVRhZykK ICAgICBtX25vbkluaGVyaXRlZEZsYWdzLmVtcHR5U3RhdGUgPSBmYWxzZTsKICAgICBtX25vbklu aGVyaXRlZEZsYWdzLmZpcnN0Q2hpbGRTdGF0ZSA9IGZhbHNlOwogICAgIG1fbm9uSW5oZXJpdGVk RmxhZ3MubGFzdENoaWxkU3RhdGUgPSBmYWxzZTsKLSAgICBtX25vbkluaGVyaXRlZEZsYWdzLmFm ZmVjdGVkQnlIb3ZlciA9IGZhbHNlOwotICAgIG1fbm9uSW5oZXJpdGVkRmxhZ3MuYWZmZWN0ZWRC eUFjdGl2ZSA9IGZhbHNlOwogICAgIG1fbm9uSW5oZXJpdGVkRmxhZ3MuYWZmZWN0ZWRCeURyYWcg PSBmYWxzZTsKICAgICBtX25vbkluaGVyaXRlZEZsYWdzLmlzTGluayA9IGZhbHNlOwogICAgIG1f bm9uSW5oZXJpdGVkRmxhZ3Muc3R5bGVUeXBlID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KFBzZXVk b0lkOjpOb25lKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9S ZW5kZXJTdHlsZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxl LmgKaW5kZXggM2Y0OGE4MmY4MGMuLmM4M2YwY2QwMmU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaApAQCAtMTkyLDEyICsxOTIsNyBAQCBwdWJsaWM6 CiAgICAgdm9pZCBzZXRIYXNWaWV3cG9ydFVuaXRzKGJvb2wgdiA9IHRydWUpIHsgbV9ub25Jbmhl cml0ZWRGbGFncy5oYXNWaWV3cG9ydFVuaXRzID0gdjsgfQogICAgIGJvb2wgaGFzVmlld3BvcnRV bml0cygpIGNvbnN0IHsgcmV0dXJuIG1fbm9uSW5oZXJpdGVkRmxhZ3MuaGFzVmlld3BvcnRVbml0 czsgfQogCi0gICAgYm9vbCBhZmZlY3RlZEJ5SG92ZXIoKSBjb25zdCB7IHJldHVybiBtX25vbklu aGVyaXRlZEZsYWdzLmFmZmVjdGVkQnlIb3ZlcjsgfQotICAgIGJvb2wgYWZmZWN0ZWRCeUFjdGl2 ZSgpIGNvbnN0IHsgcmV0dXJuIG1fbm9uSW5oZXJpdGVkRmxhZ3MuYWZmZWN0ZWRCeUFjdGl2ZTsg fQogICAgIGJvb2wgYWZmZWN0ZWRCeURyYWcoKSBjb25zdCB7IHJldHVybiBtX25vbkluaGVyaXRl ZEZsYWdzLmFmZmVjdGVkQnlEcmFnOyB9Ci0KLSAgICB2b2lkIHNldEFmZmVjdGVkQnlIb3Zlcigp IHsgbV9ub25Jbmhlcml0ZWRGbGFncy5hZmZlY3RlZEJ5SG92ZXIgPSB0cnVlOyB9Ci0gICAgdm9p ZCBzZXRBZmZlY3RlZEJ5QWN0aXZlKCkgeyBtX25vbkluaGVyaXRlZEZsYWdzLmFmZmVjdGVkQnlB Y3RpdmUgPSB0cnVlOyB9CiAgICAgdm9pZCBzZXRBZmZlY3RlZEJ5RHJhZygpIHsgbV9ub25Jbmhl cml0ZWRGbGFncy5hZmZlY3RlZEJ5RHJhZyA9IHRydWU7IH0KIAogICAgIHZvaWQgc2V0Q29sdW1u U3R5bGVzRnJvbVBhZ2luYXRpb25Nb2RlKGNvbnN0IFBhZ2luYXRpb246Ok1vZGUmKTsKQEAgLTE4 MDYsOCArMTgwMSw2IEBAIHByaXZhdGU6CiAgICAgICAgIHVuc2lnbmVkIGVtcHR5U3RhdGUgOiAx OwogICAgICAgICB1bnNpZ25lZCBmaXJzdENoaWxkU3RhdGUgOiAxOwogICAgICAgICB1bnNpZ25l ZCBsYXN0Q2hpbGRTdGF0ZSA6IDE7Ci0gICAgICAgIHVuc2lnbmVkIGFmZmVjdGVkQnlIb3ZlciA6 IDE7Ci0gICAgICAgIHVuc2lnbmVkIGFmZmVjdGVkQnlBY3RpdmUgOiAxOwogICAgICAgICB1bnNp Z25lZCBhZmZlY3RlZEJ5RHJhZyA6IDE7CiAgICAgICAgIHVuc2lnbmVkIGlzTGluayA6IDE7CiAK QEAgLTE5NDAsOCArMTkzMyw2IEBAIGlubGluZSBib29sIFJlbmRlclN0eWxlOjpOb25Jbmhlcml0 ZWRGbGFnczo6b3BlcmF0b3I9PShjb25zdCBOb25Jbmhlcml0ZWRGbGFncyYKICAgICAgICAgJiYg ZW1wdHlTdGF0ZSA9PSBvdGhlci5lbXB0eVN0YXRlCiAgICAgICAgICYmIGZpcnN0Q2hpbGRTdGF0 ZSA9PSBvdGhlci5maXJzdENoaWxkU3RhdGUKICAgICAgICAgJiYgbGFzdENoaWxkU3RhdGUgPT0g b3RoZXIubGFzdENoaWxkU3RhdGUKLSAgICAgICAgJiYgYWZmZWN0ZWRCeUhvdmVyID09IG90aGVy LmFmZmVjdGVkQnlIb3ZlcgotICAgICAgICAmJiBhZmZlY3RlZEJ5QWN0aXZlID09IG90aGVyLmFm ZmVjdGVkQnlBY3RpdmUKICAgICAgICAgJiYgYWZmZWN0ZWRCeURyYWcgPT0gb3RoZXIuYWZmZWN0 ZWRCeURyYWcKICAgICAgICAgJiYgaXNMaW5rID09IG90aGVyLmlzTGluawogICAgICAgICAmJiBz dHlsZVR5cGUgPT0gb3RoZXIuc3R5bGVUeXBlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9z dHlsZS9TdHlsZVJlbGF0aW9ucy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlbGF0 aW9ucy5jcHAKaW5kZXggMDYyZDU5NjRkNzcuLmQ3NDc3NDEzM2NiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlbGF0aW9ucy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv c3R5bGUvU3R5bGVSZWxhdGlvbnMuY3BwCkBAIC01MCwxMCArNTAsNiBAQCBzdGQ6OnVuaXF1ZV9w dHI8UmVsYXRpb25zPiBjb21taXRSZWxhdGlvbnNUb1JlbmRlclN0eWxlKFJlbmRlclN0eWxlJiBz dHlsZSwgY29ucwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KICAgICAgICAgc3dp dGNoIChyZWxhdGlvbi50eXBlKSB7Ci0gICAgICAgIGNhc2UgUmVsYXRpb246OkFmZmVjdGVkQnlB Y3RpdmU6Ci0gICAgICAgICAgICBzdHlsZS5zZXRBZmZlY3RlZEJ5QWN0aXZlKCk7Ci0gICAgICAg ICAgICBhcHBlbmRTdHlsZVJlbGF0aW9uKHJlbGF0aW9uKTsKLSAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICBjYXNlIFJlbGF0aW9uOjpBZmZlY3RlZEJ5RHJhZzoKICAgICAgICAgICAgIHN0eWxl LnNldEFmZmVjdGVkQnlEcmFnKCk7CiAgICAgICAgICAgICBicmVhazsKQEAgLTYxLDkgKzU3LDYg QEAgc3RkOjp1bmlxdWVfcHRyPFJlbGF0aW9ucz4gY29tbWl0UmVsYXRpb25zVG9SZW5kZXJTdHls ZShSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnMKICAgICAgICAgICAgIHN0eWxlLnNldEVtcHR5U3Rh dGUocmVsYXRpb24udmFsdWUpOwogICAgICAgICAgICAgYXBwZW5kU3R5bGVSZWxhdGlvbihyZWxh dGlvbik7CiAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBSZWxhdGlvbjo6QWZmZWN0 ZWRCeUhvdmVyOgotICAgICAgICAgICAgc3R5bGUuc2V0QWZmZWN0ZWRCeUhvdmVyKCk7Ci0gICAg ICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBSZWxhdGlvbjo6Rmlyc3RDaGlsZDoKICAgICAg ICAgICAgIHN0eWxlLnNldEZpcnN0Q2hpbGRTdGF0ZSgpOwogICAgICAgICAgICAgYnJlYWs7CkBA IC03Myw3ICs2Niw2IEBAIHN0ZDo6dW5pcXVlX3B0cjxSZWxhdGlvbnM+IGNvbW1pdFJlbGF0aW9u c1RvUmVuZGVyU3R5bGUoUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zCiAgICAgICAgIGNhc2UgUmVs YXRpb246OlVuaXF1ZToKICAgICAgICAgICAgIHN0eWxlLnNldFVuaXF1ZSgpOwogICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgUmVsYXRpb246OkFmZmVjdGVkQnlGb2N1c1dpdGhpbjoK ICAgICAgICAgY2FzZSBSZWxhdGlvbjo6QWZmZWN0ZWRCeVByZXZpb3VzU2libGluZzoKICAgICAg ICAgY2FzZSBSZWxhdGlvbjo6RGVzY2VuZGFudHNBZmZlY3RlZEJ5UHJldmlvdXNTaWJsaW5nOgog ICAgICAgICBjYXNlIFJlbGF0aW9uOjpBZmZlY3RzTmV4dFNpYmxpbmc6CkBAIC05OSwyMSArOTEs MTIgQEAgdm9pZCBjb21taXRSZWxhdGlvbnMoc3RkOjp1bmlxdWVfcHRyPFJlbGF0aW9ucz4gcmVs YXRpb25zLCBVcGRhdGUmIHVwZGF0ZSkKICAgICBmb3IgKGF1dG8mIHJlbGF0aW9uIDogKnJlbGF0 aW9ucykgewogICAgICAgICBhdXRvJiBlbGVtZW50ID0gY29uc3RfY2FzdDxFbGVtZW50Jj4oKnJl bGF0aW9uLmVsZW1lbnQpOwogICAgICAgICBzd2l0Y2ggKHJlbGF0aW9uLnR5cGUpIHsKLSAgICAg ICAgY2FzZSBSZWxhdGlvbjo6QWZmZWN0ZWRCeUFjdGl2ZToKLSAgICAgICAgICAgIGVsZW1lbnQu c2V0U3R5bGVBZmZlY3RlZEJ5QWN0aXZlKCk7Ci0gICAgICAgICAgICBicmVhazsKICAgICAgICAg Y2FzZSBSZWxhdGlvbjo6QWZmZWN0ZWRCeURyYWc6CiAgICAgICAgICAgICBlbGVtZW50LnNldENo aWxkcmVuQWZmZWN0ZWRCeURyYWcoKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNl IFJlbGF0aW9uOjpBZmZlY3RlZEJ5RW1wdHk6CiAgICAgICAgICAgICBlbGVtZW50LnNldFN0eWxl QWZmZWN0ZWRCeUVtcHR5KCk7CiAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBSZWxh dGlvbjo6QWZmZWN0ZWRCeUZvY3VzV2l0aGluOgotICAgICAgICAgICAgZWxlbWVudC5zZXRTdHls ZUFmZmVjdGVkQnlGb2N1c1dpdGhpbigpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNh c2UgUmVsYXRpb246OkFmZmVjdGVkQnlIb3ZlcjoKLSAgICAgICAgICAgIGVsZW1lbnQuc2V0Q2hp bGRyZW5BZmZlY3RlZEJ5SG92ZXIoKTsKLSAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNl IFJlbGF0aW9uOjpBZmZlY3RlZEJ5UHJldmlvdXNTaWJsaW5nOgogICAgICAgICAgICAgZWxlbWVu dC5zZXRTdHlsZUlzQWZmZWN0ZWRCeVByZXZpb3VzU2libGluZygpOwogICAgICAgICAgICAgYnJl YWs7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlbGF0aW9ucy5oIGIv U291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZWxhdGlvbnMuaAppbmRleCAwYzliNzZiOThlMi4u NjVjNTU0ZjQ0MjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVsYXRp b25zLmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZWxhdGlvbnMuaApAQCAtMzgs MTEgKzM4LDggQEAgY2xhc3MgVXBkYXRlOwogCiBzdHJ1Y3QgUmVsYXRpb24gewogICAgIGVudW0g VHlwZSB7Ci0gICAgICAgIEFmZmVjdGVkQnlBY3RpdmUsCiAgICAgICAgIEFmZmVjdGVkQnlEcmFn LAogICAgICAgICBBZmZlY3RlZEJ5RW1wdHksCi0gICAgICAgIEFmZmVjdGVkQnlGb2N1c1dpdGhp biwKLSAgICAgICAgQWZmZWN0ZWRCeUhvdmVyLAogICAgICAgICBBZmZlY3RlZEJ5UHJldmlvdXNT aWJsaW5nLAogICAgICAgICBEZXNjZW5kYW50c0FmZmVjdGVkQnlQcmV2aW91c1NpYmxpbmcsCiAg ICAgICAgIC8vIEZvciBBZmZlY3RzTmV4dFNpYmxpbmcgJ3ZhbHVlJyB0ZWxscyBob3cgbWFueSBl bGVtZW50IHNpYmxpbmdzIHRvIG1hcmsgc3RhcnRpbmcgd2l0aCAnZWxlbWVudCcuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNoYXJpbmdSZXNvbHZlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNoYXJpbmdSZXNvbHZlci5jcHAKaW5kZXggNGU0MjZmOTI1 MzcuLmIxMWJjZjM2YWUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNo YXJpbmdSZXNvbHZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTaGFyaW5n UmVzb2x2ZXIuY3BwCkBAIC0yMjMsNiArMjIzLDggQEAgYm9vbCBTaGFyaW5nUmVzb2x2ZXI6OmNh blNoYXJlU3R5bGVXaXRoRWxlbWVudChjb25zdCBDb250ZXh0JiBjb250ZXh0LCBjb25zdCBTdHkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmIChjYW5kaWRhdGVFbGVtZW50LmZvY3VzZWQo KSAhPSBlbGVtZW50LmZvY3VzZWQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmIChj YW5kaWRhdGVFbGVtZW50Lmhhc0ZvY3VzV2l0aGluKCkgIT0gZWxlbWVudC5oYXNGb2N1c1dpdGhp bigpKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKGNhbmRpZGF0ZUVsZW1lbnQuc2hh ZG93UHNldWRvSWQoKSAhPSBlbGVtZW50LnNoYWRvd1BzZXVkb0lkKCkpCiAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICBpZiAoJmNhbmRpZGF0ZUVsZW1lbnQgPT0gbV9kb2N1bWVudC5jc3NUYXJn ZXQoKSkKQEAgLTIzMyw4ICsyMzUsNiBAQCBib29sIFNoYXJpbmdSZXNvbHZlcjo6Y2FuU2hhcmVT dHlsZVdpdGhFbGVtZW50KGNvbnN0IENvbnRleHQmIGNvbnRleHQsIGNvbnN0IFN0eQogICAgICAg ICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKGNhbmRpZGF0ZUVsZW1lbnQuYWZmZWN0c05leHRTaWJs aW5nRWxlbWVudFN0eWxlKCkgfHwgY2FuZGlkYXRlRWxlbWVudC5zdHlsZUlzQWZmZWN0ZWRCeVBy ZXZpb3VzU2libGluZygpKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaWYgKGNhbmRpZGF0 ZUVsZW1lbnQuc3R5bGVBZmZlY3RlZEJ5Rm9jdXNXaXRoaW4oKSB8fCBlbGVtZW50LnN0eWxlQWZm ZWN0ZWRCeUZvY3VzV2l0aGluKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGF1dG8m IGNhbmRpZGF0ZUVsZW1lbnRJZCA9IGNhbmRpZGF0ZUVsZW1lbnQuaWRGb3JTdHlsZVJlc29sdXRp b24oKTsKICAgICBpZiAoIWNhbmRpZGF0ZUVsZW1lbnRJZC5pc051bGwoKSAmJiBtX3J1bGVTZXRz LmZlYXR1cmVzKCkuaWRzSW5SdWxlcy5jb250YWlucyhjYW5kaWRhdGVFbGVtZW50SWQpKQo=