163274 2016-10-11 05:04:07 -0700 Use modern for loops for iterating supplement maps 2016-10-11 09:38:40 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 annulen annulen achristensen andersca commit-queue sam oldest_to_newest 1238814 0 annulen 2016-10-11 05:04:07 -0700 Use modern for loops for iterating supplement maps 1238815 1 291247 annulen 2016-10-11 05:08:42 -0700 Created attachment 291247 Patch 1238844 2 291247 achristensen 2016-10-11 08:08:05 -0700 Comment on attachment 291247 Patch Cool! Even better would be to iterate m_supplements.values() 1238848 3 annulen 2016-10-11 08:11:25 -0700 I wasn't sure if it's really better, now I know 1238856 4 291260 annulen 2016-10-11 08:27:07 -0700 Created attachment 291260 Patch 1238891 5 291260 commit-queue 2016-10-11 09:38:36 -0700 Comment on attachment 291260 Patch Clearing flags on attachment: 291260 Committed r207145: <http://trac.webkit.org/changeset/207145> 1238892 6 commit-queue 2016-10-11 09:38:40 -0700 All reviewed patches have been landed. Closing bug. 291247 2016-10-11 05:08:42 -0700 2016-10-11 08:27:01 -0700 Patch bug-163274-20161011150519.patch text/plain 3742 annulen U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3MDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWY3YzAzODlkZTY5ZDYw ZGY2ZWQxZDQzMzlhMDZjMWIzZTc4MmQ2ZS4uMjhiY2FhNjcyZWRiZTAyNjE3NzY4MTk0YmI2MDgy Njc1OWQ1OThjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE2LTEwLTExICBLb25z dGFudGluIFRva2FyZXYgIDxhbm51bGVuQHlhbmRleC5ydT4KKworICAgICAgICBVc2UgbW9kZXJu IGZvciBsb29wcyBmb3IgaXRlcmF0aW5nIHN1cHBsZW1lbnQgbWFwcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYzMjc0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr UHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjppbml0aWFsaXpl TmV0d29ya1Byb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6aW5pdGlh bGl6ZUNvbm5lY3Rpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjp+V2ViUHJvY2Vzc1Bvb2wpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6bmV0d29ya1Byb2Nlc3NDcmFzaGVkKToKKwog MjAxNi0xMC0xMCAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAg ICAgQWRkIEVOQUJMRV9FTkNSWVBURURfTUVESUEgY29uZmlndXJhdGlvbiBvcHRpb24KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcCBi L1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAppbmRleCAy NzAzNGQ3ODRmMzgxZDM1ZDUzODZlZjI0NzZjODI2NGMxMDJmMjYxLi42ZWFhNWY4OWQ4NDVlMzI2 MDJiM2RkYWY3ZmMyMzFmOTU5MjdlYWVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCkBAIC0yMzAsMjAgKzIzMCwxNiBAQCB2b2lkIE5l dHdvcmtQcm9jZXNzOjppbml0aWFsaXplTmV0d29ya1Byb2Nlc3MoTmV0d29ya1Byb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnMmJgogICAgIGlmIChwYXJhbWV0ZXJzLnNob3VsZFVzZVRlc3RpbmdOZXR3 b3JrU2Vzc2lvbikKICAgICAgICAgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpzd2l0Y2hUb05ld1Rl c3RpbmdTZXNzaW9uKCk7CiAKLSAgICBOZXR3b3JrUHJvY2Vzc1N1cHBsZW1lbnRNYXA6OmNvbnN0 X2l0ZXJhdG9yIGl0ID0gbV9zdXBwbGVtZW50cy5iZWdpbigpOwotICAgIE5ldHdvcmtQcm9jZXNz U3VwcGxlbWVudE1hcDo6Y29uc3RfaXRlcmF0b3IgZW5kID0gbV9zdXBwbGVtZW50cy5lbmQoKTsK LSAgICBmb3IgKDsgaXQgIT0gZW5kOyArK2l0KQotICAgICAgICBpdC0+dmFsdWUtPmluaXRpYWxp emUocGFyYW1ldGVycyk7CisgICAgZm9yIChhdXRvJiBzdXBwbGVtZW50IDogbV9zdXBwbGVtZW50 cykKKyAgICAgICAgc3VwcGxlbWVudC52YWx1ZS0+aW5pdGlhbGl6ZShwYXJhbWV0ZXJzKTsKIH0K IAogdm9pZCBOZXR3b3JrUHJvY2Vzczo6aW5pdGlhbGl6ZUNvbm5lY3Rpb24oSVBDOjpDb25uZWN0 aW9uKiBjb25uZWN0aW9uKQogewogICAgIENoaWxkUHJvY2Vzczo6aW5pdGlhbGl6ZUNvbm5lY3Rp b24oY29ubmVjdGlvbik7CiAKLSAgICBOZXR3b3JrUHJvY2Vzc1N1cHBsZW1lbnRNYXA6OmNvbnN0 X2l0ZXJhdG9yIGl0ID0gbV9zdXBwbGVtZW50cy5iZWdpbigpOwotICAgIE5ldHdvcmtQcm9jZXNz U3VwcGxlbWVudE1hcDo6Y29uc3RfaXRlcmF0b3IgZW5kID0gbV9zdXBwbGVtZW50cy5lbmQoKTsK LSAgICBmb3IgKDsgaXQgIT0gZW5kOyArK2l0KQotICAgICAgICBpdC0+dmFsdWUtPmluaXRpYWxp emVDb25uZWN0aW9uKGNvbm5lY3Rpb24pOworICAgIGZvciAoYXV0byYgc3VwcGxlbWVudCA6IG1f c3VwcGxlbWVudHMpCisgICAgICAgIHN1cHBsZW1lbnQudmFsdWUtPmluaXRpYWxpemVDb25uZWN0 aW9uKGNvbm5lY3Rpb24pOwogfQogCiB2b2lkIE5ldHdvcmtQcm9jZXNzOjpjcmVhdGVOZXR3b3Jr Q29ubmVjdGlvblRvV2ViUHJvY2VzcygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBy b2Nlc3NQb29sLmNwcAppbmRleCA0YjIzN2Y3NGY5MmVlNzdmNTQyMmM1NGYzYzJkMmFkZWYzYmE5 NWJkLi42YWNhYjRlZjVhNzVkNjljNzkxNjZjNGMxZjk2OTJhOWM5ZGI2YjgwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKQEAgLTIzOSwxMSArMjM5LDkg QEAgV2ViUHJvY2Vzc1Bvb2w6On5XZWJQcm9jZXNzUG9vbCgpCiAKICAgICBtX21lc3NhZ2VSZWNl aXZlck1hcC5pbnZhbGlkYXRlKCk7CiAKLSAgICBXZWJDb250ZXh0U3VwcGxlbWVudE1hcDo6Y29u c3RfaXRlcmF0b3IgaXQgPSBtX3N1cHBsZW1lbnRzLmJlZ2luKCk7Ci0gICAgV2ViQ29udGV4dFN1 cHBsZW1lbnRNYXA6OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IG1fc3VwcGxlbWVudHMuZW5kKCk7Ci0g ICAgZm9yICg7IGl0ICE9IGVuZDsgKytpdCkgewotICAgICAgICBpdC0+dmFsdWUtPnByb2Nlc3NQ b29sRGVzdHJveWVkKCk7Ci0gICAgICAgIGl0LT52YWx1ZS0+Y2xlYXJQcm9jZXNzUG9vbCgpOwor ICAgIGZvciAoYXV0byYgc3VwcGxlbWVudCA6IG1fc3VwcGxlbWVudHMpIHsKKyAgICAgICAgc3Vw cGxlbWVudC52YWx1ZS0+cHJvY2Vzc1Bvb2xEZXN0cm95ZWQoKTsKKyAgICAgICAgc3VwcGxlbWVu dC52YWx1ZS0+Y2xlYXJQcm9jZXNzUG9vbCgpOwogICAgIH0KIAogICAgIG1faWNvbkRhdGFiYXNl LT5pbnZhbGlkYXRlKCk7CkBAIC00MTUsMTAgKzQxMyw4IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6 Om5ldHdvcmtQcm9jZXNzQ3Jhc2hlZChOZXR3b3JrUHJvY2Vzc1Byb3h5KiBuZXR3b3JrUHJvY2Vz c1ByCiAgICAgQVNTRVJUKG5ldHdvcmtQcm9jZXNzUHJveHkgPT0gbV9uZXR3b3JrUHJvY2Vzcy5n ZXQoKSk7CiAgICAgbV9kaWROZXR3b3JrUHJvY2Vzc0NyYXNoID0gdHJ1ZTsKIAotICAgIFdlYkNv bnRleHRTdXBwbGVtZW50TWFwOjpjb25zdF9pdGVyYXRvciBpdCA9IG1fc3VwcGxlbWVudHMuYmVn aW4oKTsKLSAgICBXZWJDb250ZXh0U3VwcGxlbWVudE1hcDo6Y29uc3RfaXRlcmF0b3IgZW5kID0g bV9zdXBwbGVtZW50cy5lbmQoKTsKLSAgICBmb3IgKDsgaXQgIT0gZW5kOyArK2l0KQotICAgICAg ICBpdC0+dmFsdWUtPnByb2Nlc3NEaWRDbG9zZShuZXR3b3JrUHJvY2Vzc1Byb3h5KTsKKyAgICBm b3IgKGF1dG8mIHN1cHBsZW1lbnQgOiBtX3N1cHBsZW1lbnRzKQorICAgICAgICBzdXBwbGVtZW50 LnZhbHVlLT5wcm9jZXNzRGlkQ2xvc2UobmV0d29ya1Byb2Nlc3NQcm94eSk7CiAKICAgICBtX2Ns aWVudC5uZXR3b3JrUHJvY2Vzc0RpZENyYXNoKHRoaXMpOwogCg== 291260 2016-10-11 08:27:07 -0700 2016-10-11 09:38:36 -0700 Patch bug-163274-20161011182344.patch text/plain 4359 annulen U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3MDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWY3YzAzODlkZTY5ZDYw ZGY2ZWQxZDQzMzlhMDZjMWIzZTc4MmQ2ZS4uMjA4YzE4MmUwMDJlZjJiZjg1OTI1ZGYzYjU0ZjAw MzNmMjIwYjIzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE2LTEwLTExICBLb25z dGFudGluIFRva2FyZXYgIDxhbm51bGVuQHlhbmRleC5ydT4KKworICAgICAgICBVc2UgbW9kZXJu IGZvciBsb29wcyBmb3IgaXRlcmF0aW5nIHN1cHBsZW1lbnQgbWFwcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYzMjc0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr UHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjppbml0aWFsaXpl TmV0d29ya1Byb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6aW5pdGlh bGl6ZUNvbm5lY3Rpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjp+V2ViUHJvY2Vzc1Bvb2wpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6bmV0d29ya1Byb2Nlc3NDcmFzaGVkKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmRhdGFiYXNlUHJvY2Vzc0NyYXNoZWQpOiBJ dGVyYXRlIGJ5IHZhbHVlcygpCisgICAgICAgIGxpa2UgaW4gb3RoZXIgcGxhY2VzLgorCiAyMDE2 LTEwLTEwICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBB ZGQgRU5BQkxFX0VOQ1JZUFRFRF9NRURJQSBjb25maWd1cmF0aW9uIG9wdGlvbgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwIGIvU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCmluZGV4IDI3MDM0 ZDc4NGYzODFkMzVkNTM4NmVmMjQ3NmM4MjY0YzEwMmYyNjEuLjAyNDg1OTQwYWQwMWIzYTQ2MDc3 ZDRhMDc5ODM5OWMwOTMxYTg1MzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQ cm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKQEAgLTIzMCwyMCArMjMwLDE2IEBAIHZvaWQgTmV0d29y a1Byb2Nlc3M6OmluaXRpYWxpemVOZXR3b3JrUHJvY2VzcyhOZXR3b3JrUHJvY2Vzc0NyZWF0aW9u UGFyYW1ldGVycyYmCiAgICAgaWYgKHBhcmFtZXRlcnMuc2hvdWxkVXNlVGVzdGluZ05ldHdvcmtT ZXNzaW9uKQogICAgICAgICBOZXR3b3JrU3RvcmFnZVNlc3Npb246OnN3aXRjaFRvTmV3VGVzdGlu Z1Nlc3Npb24oKTsKIAotICAgIE5ldHdvcmtQcm9jZXNzU3VwcGxlbWVudE1hcDo6Y29uc3RfaXRl cmF0b3IgaXQgPSBtX3N1cHBsZW1lbnRzLmJlZ2luKCk7Ci0gICAgTmV0d29ya1Byb2Nlc3NTdXBw bGVtZW50TWFwOjpjb25zdF9pdGVyYXRvciBlbmQgPSBtX3N1cHBsZW1lbnRzLmVuZCgpOwotICAg IGZvciAoOyBpdCAhPSBlbmQ7ICsraXQpCi0gICAgICAgIGl0LT52YWx1ZS0+aW5pdGlhbGl6ZShw YXJhbWV0ZXJzKTsKKyAgICBmb3IgKGF1dG8mIHN1cHBsZW1lbnQgOiBtX3N1cHBsZW1lbnRzLnZh bHVlcygpKQorICAgICAgICBzdXBwbGVtZW50LT5pbml0aWFsaXplKHBhcmFtZXRlcnMpOwogfQog CiB2b2lkIE5ldHdvcmtQcm9jZXNzOjppbml0aWFsaXplQ29ubmVjdGlvbihJUEM6OkNvbm5lY3Rp b24qIGNvbm5lY3Rpb24pCiB7CiAgICAgQ2hpbGRQcm9jZXNzOjppbml0aWFsaXplQ29ubmVjdGlv bihjb25uZWN0aW9uKTsKIAotICAgIE5ldHdvcmtQcm9jZXNzU3VwcGxlbWVudE1hcDo6Y29uc3Rf aXRlcmF0b3IgaXQgPSBtX3N1cHBsZW1lbnRzLmJlZ2luKCk7Ci0gICAgTmV0d29ya1Byb2Nlc3NT dXBwbGVtZW50TWFwOjpjb25zdF9pdGVyYXRvciBlbmQgPSBtX3N1cHBsZW1lbnRzLmVuZCgpOwot ICAgIGZvciAoOyBpdCAhPSBlbmQ7ICsraXQpCi0gICAgICAgIGl0LT52YWx1ZS0+aW5pdGlhbGl6 ZUNvbm5lY3Rpb24oY29ubmVjdGlvbik7CisgICAgZm9yIChhdXRvJiBzdXBwbGVtZW50IDogbV9z dXBwbGVtZW50cy52YWx1ZXMoKSkKKyAgICAgICAgc3VwcGxlbWVudC0+aW5pdGlhbGl6ZUNvbm5l Y3Rpb24oY29ubmVjdGlvbik7CiB9CiAKIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmNyZWF0ZU5ldHdv cmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Bvb2wuY3BwCmluZGV4IDRiMjM3Zjc0ZjkyZWU3N2Y1NDIyYzU0ZjNjMmQyYWRlZjNi YTk1YmQuLjg1YjRkZjdlZDhiMTRmZjhjNGUyMzYwNTgxZDk5ZWQwMjU2ZjRhNzIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcApAQCAtMjM5LDExICsyMzks OSBAQCBXZWJQcm9jZXNzUG9vbDo6fldlYlByb2Nlc3NQb29sKCkKIAogICAgIG1fbWVzc2FnZVJl Y2VpdmVyTWFwLmludmFsaWRhdGUoKTsKIAotICAgIFdlYkNvbnRleHRTdXBwbGVtZW50TWFwOjpj b25zdF9pdGVyYXRvciBpdCA9IG1fc3VwcGxlbWVudHMuYmVnaW4oKTsKLSAgICBXZWJDb250ZXh0 U3VwcGxlbWVudE1hcDo6Y29uc3RfaXRlcmF0b3IgZW5kID0gbV9zdXBwbGVtZW50cy5lbmQoKTsK LSAgICBmb3IgKDsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIGl0LT52YWx1ZS0+cHJvY2Vz c1Bvb2xEZXN0cm95ZWQoKTsKLSAgICAgICAgaXQtPnZhbHVlLT5jbGVhclByb2Nlc3NQb29sKCk7 CisgICAgZm9yIChhdXRvJiBzdXBwbGVtZW50IDogbV9zdXBwbGVtZW50cy52YWx1ZXMoKSkgewor ICAgICAgICBzdXBwbGVtZW50LT5wcm9jZXNzUG9vbERlc3Ryb3llZCgpOworICAgICAgICBzdXBw bGVtZW50LT5jbGVhclByb2Nlc3NQb29sKCk7CiAgICAgfQogCiAgICAgbV9pY29uRGF0YWJhc2Ut PmludmFsaWRhdGUoKTsKQEAgLTQxNSwxMCArNDEzLDggQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6 bmV0d29ya1Byb2Nlc3NDcmFzaGVkKE5ldHdvcmtQcm9jZXNzUHJveHkqIG5ldHdvcmtQcm9jZXNz UHIKICAgICBBU1NFUlQobmV0d29ya1Byb2Nlc3NQcm94eSA9PSBtX25ldHdvcmtQcm9jZXNzLmdl dCgpKTsKICAgICBtX2RpZE5ldHdvcmtQcm9jZXNzQ3Jhc2ggPSB0cnVlOwogCi0gICAgV2ViQ29u dGV4dFN1cHBsZW1lbnRNYXA6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9zdXBwbGVtZW50cy5iZWdp bigpOwotICAgIFdlYkNvbnRleHRTdXBwbGVtZW50TWFwOjpjb25zdF9pdGVyYXRvciBlbmQgPSBt X3N1cHBsZW1lbnRzLmVuZCgpOwotICAgIGZvciAoOyBpdCAhPSBlbmQ7ICsraXQpCi0gICAgICAg IGl0LT52YWx1ZS0+cHJvY2Vzc0RpZENsb3NlKG5ldHdvcmtQcm9jZXNzUHJveHkpOworICAgIGZv ciAoYXV0byYgc3VwcGxlbWVudCA6IG1fc3VwcGxlbWVudHMudmFsdWVzKCkpCisgICAgICAgIHN1 cHBsZW1lbnQtPnByb2Nlc3NEaWRDbG9zZShuZXR3b3JrUHJvY2Vzc1Byb3h5KTsKIAogICAgIG1f Y2xpZW50Lm5ldHdvcmtQcm9jZXNzRGlkQ3Jhc2godGhpcyk7CiAKQEAgLTQ3Miw4ICs0NjgsOCBA QCB2b2lkIFdlYlByb2Nlc3NQb29sOjpkYXRhYmFzZVByb2Nlc3NDcmFzaGVkKERhdGFiYXNlUHJv Y2Vzc1Byb3h5KiBkYXRhYmFzZVByb2NlcwogICAgIEFTU0VSVChtX2RhdGFiYXNlUHJvY2Vzcyk7 CiAgICAgQVNTRVJUKGRhdGFiYXNlUHJvY2Vzc1Byb3h5ID09IG1fZGF0YWJhc2VQcm9jZXNzLmdl dCgpKTsKIAotICAgIGZvciAoYXV0byYgc3VwcGxlbWVudCA6IG1fc3VwcGxlbWVudHMpCi0gICAg ICAgIHN1cHBsZW1lbnQudmFsdWUtPnByb2Nlc3NEaWRDbG9zZShkYXRhYmFzZVByb2Nlc3NQcm94 eSk7CisgICAgZm9yIChhdXRvJiBzdXBwbGVtZW50IDogbV9zdXBwbGVtZW50cy52YWx1ZXMoKSkK KyAgICAgICAgc3VwcGxlbWVudC0+cHJvY2Vzc0RpZENsb3NlKGRhdGFiYXNlUHJvY2Vzc1Byb3h5 KTsKIAogICAgIG1fY2xpZW50LmRhdGFiYXNlUHJvY2Vzc0RpZENyYXNoKHRoaXMpOwogICAgIG1f ZGF0YWJhc2VQcm9jZXNzID0gbnVsbHB0cjsK