210117 2020-04-07 09:11:14 -0700 Make StylePropertyShorthand iterable 2020-04-07 12:44:15 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned darin dino dstockwell esprehn+autocc ews-watchlist glenn gyuyoung.kim hi joepeck macpherson menard simon.fraser webkit-bug-importer oldest_to_newest 1638572 0 koivisto 2020-04-07 09:11:14 -0700 Enable modern for loops. 1638574 1 395688 koivisto 2020-04-07 09:13:50 -0700 Created attachment 395688 patch 1638731 2 ews-feeder 2020-04-07 12:43:35 -0700 Committed r259659: <https://trac.webkit.org/changeset/259659> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395688. 1638733 3 webkit-bug-importer 2020-04-07 12:44:15 -0700 <rdar://problem/61405631> 395688 2020-04-07 09:13:50 -0700 2020-04-07 12:43:36 -0700 patch shorthand-iteration.patch text/plain 9748 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5OGY3YjRkNGM3Ni4uZjAyYzBhMDViMDUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMCBAQAorMjAyMC0wNC0wNyAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+ CisKKyAgICAgICAgTWFrZSBTdHlsZVByb3BlcnR5U2hvcnRoYW5kIGl0ZXJhYmxlCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTAxMTcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbmFibGUgbW9kZXJuIGZv ci1sb29wcy4KKworICAgICAgICAqIGFuaW1hdGlvbi9BbmltYXRpb25UaW1lbGluZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjp0cmFuc2l0aW9uTWF0Y2hlc1Byb3BlcnR5KToKKyAgICAgICAgKFdl YkNvcmU6OmNvbXBpbGVUcmFuc2l0aW9uUHJvcGVydGllc0luU3R5bGUpOgorICAgICAgICAqIGNz cy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6dXBk YXRlU3R5bGVJZk5lZWRlZEZvclByb3BlcnR5KToKKyAgICAgICAgKiBjc3MvU3R5bGVQcm9wZXJ0 aWVzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUHJvcGVydGllczo6cHJvcGVydHlJc0lt cG9ydGFudCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpNdXRhYmxlU3R5bGVQcm9wZXJ0aWVz OjpzZXRQcm9wZXJ0eSk6CisgICAgICAgICogY3NzL1N0eWxlUHJvcGVydHlTaG9ydGhhbmQuaDoK KyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUHJvcGVydHlTaG9ydGhhbmQ6OmJlZ2luIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUHJvcGVydHlTaG9ydGhhbmQ6OmVuZCBjb25zdCk6Cisg ICAgICAgICogY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpDU1NQcm9wZXJ0eVBhcnNlcjo6YWRkRXhwYW5kZWRQcm9wZXJ0eUZvclZhbHVlKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckNTU0FnZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckNTU0FnZW50OjpnZXRTdXBwb3J0ZWRDU1NQcm9wZXJ0aWVzKToK KyAgICAgICAgKiBwYWdlL2FuaW1hdGlvbi9DU1NQcm9wZXJ0eUFuaW1hdGlvbi5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eUFuaW1hdGlvbldyYXBwZXJNYXA6OkNTU1Byb3BlcnR5 QW5pbWF0aW9uV3JhcHBlck1hcCk6CisKIDIwMjAtMDQtMDcgIEFuZHJlcyBHb256YWxleiAgPGFu ZHJlc2dfMjJAYXBwbGUuY29tPgogCiAgICAgICAgIEluaXRpYWxpemF0aW9uIG9mIG1vZGFsIG5v ZGVzIHNob3VsZCBoYXBwZW4gbGF6aWx5LCBub3QgaW4gdGhlIEFYT2JqZWN0Q2FjaGUgY29uc3Ry dWN0b3IuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQW5pbWF0aW9uVGlt ZWxpbmUuY3BwIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0FuaW1hdGlvblRpbWVsaW5lLmNw cAppbmRleCAzNmE3ODEzOTY0MS4uYWNiNjRjNDFlZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2FuaW1hdGlvbi9BbmltYXRpb25UaW1lbGluZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv YW5pbWF0aW9uL0FuaW1hdGlvblRpbWVsaW5lLmNwcApAQCAtMzM0LDkgKzMzNCw4IEBAIHN0YXRp YyBib29sIHRyYW5zaXRpb25NYXRjaGVzUHJvcGVydHkoY29uc3QgQW5pbWF0aW9uJiB0cmFuc2l0 aW9uLCBDU1NQcm9wZXJ0eUlECiAgICAgaWYgKG1vZGUgPT0gQW5pbWF0aW9uOjpBbmltYXRlU2lu Z2xlUHJvcGVydHkpIHsKICAgICAgICAgYXV0byB0cmFuc2l0aW9uUHJvcGVydHkgPSB0cmFuc2l0 aW9uLnByb3BlcnR5KCk7CiAgICAgICAgIGlmICh0cmFuc2l0aW9uUHJvcGVydHkgIT0gcHJvcGVy dHkpIHsKLSAgICAgICAgICAgIGF1dG8gc2hvcnRoYW5kID0gc2hvcnRoYW5kRm9yUHJvcGVydHko dHJhbnNpdGlvblByb3BlcnR5KTsKLSAgICAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwg c2hvcnRoYW5kLmxlbmd0aCgpOyArK2kpIHsKLSAgICAgICAgICAgICAgICBpZiAoc2hvcnRoYW5k LnByb3BlcnRpZXMoKVtpXSA9PSBwcm9wZXJ0eSkKKyAgICAgICAgICAgIGZvciAoYXV0byBsb25n aGFuZCA6IHNob3J0aGFuZEZvclByb3BlcnR5KHRyYW5zaXRpb25Qcm9wZXJ0eSkpIHsKKyAgICAg ICAgICAgICAgICBpZiAobG9uZ2hhbmQgPT0gcHJvcGVydHkpCiAgICAgICAgICAgICAgICAgICAg IHJldHVybiB0cnVlOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwpA QCAtMzYwLDkgKzM1OSw4IEBAIHN0YXRpYyB2b2lkIGNvbXBpbGVUcmFuc2l0aW9uUHJvcGVydGll c0luU3R5bGUoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBIYXNoU2V0CiAgICAgICAgIGlmICht b2RlID09IEFuaW1hdGlvbjo6QW5pbWF0ZVNpbmdsZVByb3BlcnR5KSB7CiAgICAgICAgICAgICBh dXRvIHByb3BlcnR5ID0gYW5pbWF0aW9uLnByb3BlcnR5KCk7CiAgICAgICAgICAgICBpZiAoaXNT aG9ydGhhbmRDU1NQcm9wZXJ0eShwcm9wZXJ0eSkpIHsKLSAgICAgICAgICAgICAgICBhdXRvIHNo b3J0aGFuZCA9IHNob3J0aGFuZEZvclByb3BlcnR5KHByb3BlcnR5KTsKLSAgICAgICAgICAgICAg ICBmb3IgKHNpemVfdCBqID0gMDsgaiA8IHNob3J0aGFuZC5sZW5ndGgoKTsgKytqKQotICAgICAg ICAgICAgICAgICAgICB0cmFuc2l0aW9uUHJvcGVydGllcy5hZGQoc2hvcnRoYW5kLnByb3BlcnRp ZXMoKVtqXSk7CisgICAgICAgICAgICAgICAgZm9yIChhdXRvIGxvbmdoYW5kIDogc2hvcnRoYW5k Rm9yUHJvcGVydHkocHJvcGVydHkpKQorICAgICAgICAgICAgICAgICAgICB0cmFuc2l0aW9uUHJv cGVydGllcy5hZGQobG9uZ2hhbmQpOwogICAgICAgICAgICAgfSBlbHNlIGlmIChwcm9wZXJ0eSAh PSBDU1NQcm9wZXJ0eUludmFsaWQpCiAgICAgICAgICAgICAgICAgdHJhbnNpdGlvblByb3BlcnRp ZXMuYWRkKHByb3BlcnR5KTsKICAgICAgICAgfSBlbHNlIGlmIChtb2RlID09IEFuaW1hdGlvbjo6 QW5pbWF0ZUFsbCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVk U3R5bGVEZWNsYXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHls ZURlY2xhcmF0aW9uLmNwcAppbmRleCBjZTc4MzY3NDcxYS4uYjFiZDU3NWVjOWUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCkBA IC0yMTk0LDggKzIxOTQsOCBAQCBzdGF0aWMgYm9vbCB1cGRhdGVTdHlsZUlmTmVlZGVkRm9yUHJv cGVydHkoRWxlbWVudCYgZWxlbWVudCwgQ1NTUHJvcGVydHlJRCBwcm9wZQogICAgIGF1dG8gaGFz VmFsaWRTdHlsZSA9IFsmXSB7CiAgICAgICAgIGF1dG8gc2hvcnRoYW5kID0gc2hvcnRoYW5kRm9y UHJvcGVydHkocHJvcGVydHlJRCk7CiAgICAgICAgIGlmIChzaG9ydGhhbmQubGVuZ3RoKCkpIHsK LSAgICAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc2hvcnRoYW5kLmxlbmd0aCgpOyAr K2kpIHsKLSAgICAgICAgICAgICAgICBpZiAoIWhhc1ZhbGlkU3R5bGVGb3JQcm9wZXJ0eShlbGVt ZW50LCBzaG9ydGhhbmQucHJvcGVydGllcygpW2ldKSkKKyAgICAgICAgICAgIGZvciAoYXV0byBs b25naGFuZCA6IHNob3J0aGFuZCkgeworICAgICAgICAgICAgICAgIGlmICghaGFzVmFsaWRTdHls ZUZvclByb3BlcnR5KGVsZW1lbnQsIGxvbmdoYW5kKSkKICAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0aWVzLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnRpZXMuY3BwCmluZGV4IDY0NDgxMjllNGMzLi40ZDFjZGZh YWY0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydGllcy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydGllcy5jcHAKQEAgLTgzMywxMiAr ODMzLDEyIEBAIGJvb2wgU3R5bGVQcm9wZXJ0aWVzOjpwcm9wZXJ0eUlzSW1wb3J0YW50KENTU1By b3BlcnR5SUQgcHJvcGVydHlJRCkgY29uc3QKICAgICBpZiAoZm91bmRQcm9wZXJ0eUluZGV4ICE9 IC0xKQogICAgICAgICByZXR1cm4gcHJvcGVydHlBdChmb3VuZFByb3BlcnR5SW5kZXgpLmlzSW1w b3J0YW50KCk7CiAKLSAgICBTdHlsZVByb3BlcnR5U2hvcnRoYW5kIHNob3J0aGFuZCA9IHNob3J0 aGFuZEZvclByb3BlcnR5KHByb3BlcnR5SUQpOworICAgIGF1dG8gc2hvcnRoYW5kID0gc2hvcnRo YW5kRm9yUHJvcGVydHkocHJvcGVydHlJRCk7CiAgICAgaWYgKCFzaG9ydGhhbmQubGVuZ3RoKCkp CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBz aG9ydGhhbmQubGVuZ3RoKCk7ICsraSkgewotICAgICAgICBpZiAoIXByb3BlcnR5SXNJbXBvcnRh bnQoc2hvcnRoYW5kLnByb3BlcnRpZXMoKVtpXSkpCisgICAgZm9yIChhdXRvIGxvbmdoYW5kIDog c2hvcnRoYW5kKSB7CisgICAgICAgIGlmICghcHJvcGVydHlJc0ltcG9ydGFudChsb25naGFuZCkp CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogICAgIHJldHVybiB0cnVlOwpAQCAt OTI1LDggKzkyNSw4IEBAIHZvaWQgTXV0YWJsZVN0eWxlUHJvcGVydGllczo6c2V0UHJvcGVydHko Q1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELCBSZWZQdHI8Q1NTVmFsCiAKICAgICByZW1vdmVQcm9w ZXJ0aWVzSW5TZXQoc2hvcnRoYW5kLnByb3BlcnRpZXMoKSwgc2hvcnRoYW5kLmxlbmd0aCgpKTsK IAotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBzaG9ydGhhbmQubGVuZ3RoKCk7ICsraSkK LSAgICAgICAgbV9wcm9wZXJ0eVZlY3Rvci5hcHBlbmQoQ1NTUHJvcGVydHkoc2hvcnRoYW5kLnBy b3BlcnRpZXMoKVtpXSwgdmFsdWUuY29weVJlZigpLCBpbXBvcnRhbnQpKTsKKyAgICBmb3IgKGF1 dG8gbG9uZ2hhbmQgOiBzaG9ydGhhbmQpCisgICAgICAgIG1fcHJvcGVydHlWZWN0b3IuYXBwZW5k KENTU1Byb3BlcnR5KGxvbmdoYW5kLCB2YWx1ZS5jb3B5UmVmKCksIGltcG9ydGFudCkpOwogfQog CiBib29sIE11dGFibGVTdHlsZVByb3BlcnRpZXM6OnNldFByb3BlcnR5KGNvbnN0IENTU1Byb3Bl cnR5JiBwcm9wZXJ0eSwgQ1NTUHJvcGVydHkqIHNsb3QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvU3R5bGVQcm9wZXJ0eVNob3J0aGFuZC5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlUHJvcGVydHlTaG9ydGhhbmQuaAppbmRleCBjZWY2NWMxMmNmNi4uODRlZTQ0NzNhNmUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnR5U2hvcnRoYW5kLmgKKysr IGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydHlTaG9ydGhhbmQuaApAQCAtMzksNiAr MzksOSBAQCBwdWJsaWM6CiAgICAgewogICAgIH0KIAorICAgIGNvbnN0IENTU1Byb3BlcnR5SUQq IGJlZ2luKCkgY29uc3QgeyByZXR1cm4gcHJvcGVydGllcygpOyB9CisgICAgY29uc3QgQ1NTUHJv cGVydHlJRCogZW5kKCkgY29uc3QgeyByZXR1cm4gcHJvcGVydGllcygpICsgbGVuZ3RoKCk7IH0K KwogICAgIGNvbnN0IENTU1Byb3BlcnR5SUQqIHByb3BlcnRpZXMoKSBjb25zdCB7IHJldHVybiBt X3Byb3BlcnRpZXM7IH0KICAgICBjb25zdCBTdHlsZVByb3BlcnR5U2hvcnRoYW5kKiBwcm9wZXJ0 aWVzRm9ySW5pdGlhbGl6YXRpb24oKSBjb25zdCB7IHJldHVybiBtX3Byb3BlcnRpZXNGb3JJbml0 aWFsaXphdGlvbjsgfQogICAgIHVuc2lnbmVkIGxlbmd0aCgpIGNvbnN0IHsgcmV0dXJuIG1fbGVu Z3RoOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5 UGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIu Y3BwCmluZGV4IDhmYWVjNTcxMjhmLi43YzEzNmIzMWQ3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKQEAgLTI1MSwxMiArMjUxLDggQEAg dm9pZCBDU1NQcm9wZXJ0eVBhcnNlcjo6YWRkUHJvcGVydHkoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0 eSwgQ1NTUHJvcGVydHlJRCBjdXJyZW4KIAogdm9pZCBDU1NQcm9wZXJ0eVBhcnNlcjo6YWRkRXhw YW5kZWRQcm9wZXJ0eUZvclZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcGVydHksIFJlZjxDU1NWYWx1 ZT4mJiB2YWx1ZSwgYm9vbCBpbXBvcnRhbnQpCiB7Ci0gICAgY29uc3QgU3R5bGVQcm9wZXJ0eVNo b3J0aGFuZCYgc2hvcnRoYW5kID0gc2hvcnRoYW5kRm9yUHJvcGVydHkocHJvcGVydHkpOwotICAg IHVuc2lnbmVkIHNob3J0aGFuZExlbmd0aCA9IHNob3J0aGFuZC5sZW5ndGgoKTsKLSAgICBBU1NF UlQoc2hvcnRoYW5kTGVuZ3RoKTsKLSAgICBjb25zdCBDU1NQcm9wZXJ0eUlEKiBsb25naGFuZHMg PSBzaG9ydGhhbmQucHJvcGVydGllcygpOwotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBz aG9ydGhhbmRMZW5ndGg7ICsraSkKLSAgICAgICAgYWRkUHJvcGVydHkobG9uZ2hhbmRzW2ldLCBw cm9wZXJ0eSwgdmFsdWUuY29weVJlZigpLCBpbXBvcnRhbnQpOworICAgIGZvciAoYXV0byBsb25n aGFuZCA6IHNob3J0aGFuZEZvclByb3BlcnR5KHByb3BlcnR5KSkKKyAgICAgICAgYWRkUHJvcGVy dHkobG9uZ2hhbmQsIHByb3BlcnR5LCB2YWx1ZS5jb3B5UmVmKCksIGltcG9ydGFudCk7CiB9CiAK IGJvb2wgQ1NTUHJvcGVydHlQYXJzZXI6OnBhcnNlVmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0 eUlELCBib29sIGltcG9ydGFudCwgY29uc3QgQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2UsIGNv bnN0IENTU1BhcnNlckNvbnRleHQmIGNvbnRleHQsIFBhcnNlZFByb3BlcnR5VmVjdG9yJiBwYXJz ZWRQcm9wZXJ0aWVzLCBTdHlsZVJ1bGVUeXBlIHJ1bGVUeXBlKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JDU1NBZ2VudC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckNTU0FnZW50LmNwcAppbmRleCAzY2Zm ZTdkMzc3NS4uNzliMTRjODEzYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9hZ2VudHMvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9hZ2VudHMvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCkBAIC03OTUsMTMgKzc5NSwxMiBAQCB2 b2lkIEluc3BlY3RvckNTU0FnZW50OjpnZXRTdXBwb3J0ZWRDU1NQcm9wZXJ0aWVzKEVycm9yU3Ry aW5nJiwgUmVmUHRyPEpTT046OkFycgogICAgICAgICAgICAgcHJvcGVydHktPnNldEFsaWFzZXMo V1RGTW92ZShhbGlhc2VzQXJyYXkpKTsKICAgICAgICAgfQogCi0gICAgICAgIGNvbnN0IFN0eWxl UHJvcGVydHlTaG9ydGhhbmQmIHNob3J0aGFuZCA9IHNob3J0aGFuZEZvclByb3BlcnR5KHByb3Bl cnR5SUQpOworICAgICAgICBhdXRvIHNob3J0aGFuZCA9IHNob3J0aGFuZEZvclByb3BlcnR5KHBy b3BlcnR5SUQpOwogICAgICAgICBpZiAoc2hvcnRoYW5kLmxlbmd0aCgpKSB7CiAgICAgICAgICAg ICBhdXRvIGxvbmdoYW5kcyA9IEpTT046OkFycmF5T2Y8U3RyaW5nPjo6Y3JlYXRlKCk7Ci0gICAg ICAgICAgICBmb3IgKHVuc2lnbmVkIGogPSAwOyBqIDwgc2hvcnRoYW5kLmxlbmd0aCgpOyArK2op IHsKLSAgICAgICAgICAgICAgICBDU1NQcm9wZXJ0eUlEIGxvbmdoYW5kSUQgPSBzaG9ydGhhbmQu cHJvcGVydGllcygpW2pdOwotICAgICAgICAgICAgICAgIGlmIChpc0VuYWJsZWRDU1NQcm9wZXJ0 eShsb25naGFuZElEKSkKLSAgICAgICAgICAgICAgICAgICAgbG9uZ2hhbmRzLT5hZGRJdGVtKGdl dFByb3BlcnR5TmFtZVN0cmluZyhsb25naGFuZElEKSk7CisgICAgICAgICAgICBmb3IgKGF1dG8g bG9uZ2hhbmQgOiBzaG9ydGhhbmQpIHsKKyAgICAgICAgICAgICAgICBpZiAoaXNFbmFibGVkQ1NT UHJvcGVydHkobG9uZ2hhbmQpKQorICAgICAgICAgICAgICAgICAgICBsb25naGFuZHMtPmFkZEl0 ZW0oZ2V0UHJvcGVydHlOYW1lU3RyaW5nKGxvbmdoYW5kKSk7CiAgICAgICAgICAgICB9CiAgICAg ICAgICAgICBwcm9wZXJ0eS0+c2V0TG9uZ2hhbmRzKFdURk1vdmUobG9uZ2hhbmRzKSk7CiAgICAg ICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NTU1Byb3Bl cnR5QW5pbWF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NTU1Byb3Bl cnR5QW5pbWF0aW9uLmNwcAppbmRleCBiNGZiYTI5M2UzYi4uOThjM2JiOWQxZGIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NTU1Byb3BlcnR5QW5pbWF0aW9uLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9DU1NQcm9wZXJ0eUFuaW1hdGlv bi5jcHAKQEAgLTE3NjEsMTUgKzE3NjEsMTQgQEAgQ1NTUHJvcGVydHlBbmltYXRpb25XcmFwcGVy TWFwOjpDU1NQcm9wZXJ0eUFuaW1hdGlvbldyYXBwZXJNYXAoKQogCiAgICAgZm9yIChzaXplX3Qg aSA9IDA7IGkgPCBhbmltYXRhYmxlU2hvcnRoYW5kUHJvcGVydGllc0NvdW50OyArK2kpIHsKICAg ICAgICAgQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlEID0gYW5pbWF0YWJsZVNob3J0aGFuZFByb3Bl cnRpZXNbaV07Ci0gICAgICAgIFN0eWxlUHJvcGVydHlTaG9ydGhhbmQgc2hvcnRoYW5kID0gc2hv cnRoYW5kRm9yUHJvcGVydHkocHJvcGVydHlJRCk7CisgICAgICAgIGF1dG8gc2hvcnRoYW5kID0g c2hvcnRoYW5kRm9yUHJvcGVydHkocHJvcGVydHlJRCk7CiAgICAgICAgIGlmICghc2hvcnRoYW5k Lmxlbmd0aCgpKQogICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgVmVjdG9yPEFuaW1h dGlvblByb3BlcnR5V3JhcHBlckJhc2UqPiBsb25naGFuZFdyYXBwZXJzOwogICAgICAgICBsb25n aGFuZFdyYXBwZXJzLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkoc2hvcnRoYW5kLmxlbmd0aCgpKTsK LSAgICAgICAgY29uc3QgQ1NTUHJvcGVydHlJRCogcHJvcGVydGllcyA9IHNob3J0aGFuZC5wcm9w ZXJ0aWVzKCk7Ci0gICAgICAgIGZvciAodW5zaWduZWQgaiA9IDA7IGogPCBzaG9ydGhhbmQubGVu Z3RoKCk7ICsraikgewotICAgICAgICAgICAgdW5zaWduZWQgd3JhcHBlckluZGV4ID0gaW5kZXhG cm9tUHJvcGVydHlJRChwcm9wZXJ0aWVzW2pdKTsKKyAgICAgICAgZm9yIChhdXRvIGxvbmdoYW5k IDogc2hvcnRoYW5kKSB7CisgICAgICAgICAgICB1bnNpZ25lZCB3cmFwcGVySW5kZXggPSBpbmRl eEZyb21Qcm9wZXJ0eUlEKGxvbmdoYW5kKTsKICAgICAgICAgICAgIGlmICh3cmFwcGVySW5kZXgg PT0gY0ludmFsaWRQcm9wZXJ0eVdyYXBwZXJJbmRleCkKICAgICAgICAgICAgICAgICBjb250aW51 ZTsKICAgICAgICAgICAgIEFTU0VSVChtX3Byb3BlcnR5V3JhcHBlcnNbd3JhcHBlckluZGV4XSk7 Cg==