188527 2018-08-13 12:33:13 -0700 Modernize CSSSelectorList a little 2018-08-13 13:18:21 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen koivisto simon.fraser webkit-bug-importer oldest_to_newest 1449726 0 achristensen 2018-08-13 12:33:13 -0700 Modernize CSSSelectorList a little 1449729 1 347026 achristensen 2018-08-13 12:35:54 -0700 Created attachment 347026 Patch 1449746 2 347026 simon.fraser 2018-08-13 13:14:09 -0700 Comment on attachment 347026 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=347026&action=review > Source/WebCore/css/CSSSelectorList.cpp:56 > for (size_t i = 0; i < selectorVector.size(); ++i) { Modern loop. 1449748 3 achristensen 2018-08-13 13:17:22 -0700 http://trac.webkit.org/r234814 1449751 4 webkit-bug-importer 2018-08-13 13:18:21 -0700 <rdar://problem/43248740> 347026 2018-08-13 12:35:54 -0700 2018-08-13 13:14:09 -0700 Patch bug-188527-20180813123553.patch text/plain 8746 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNDgxMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE4LTA4LTEzICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW9kZXJuaXpl IENTU1NlbGVjdG9yTGlzdCBhIGxpdHRsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTg4NTI3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGJlaGF2aW9yLiAgSnVzdCB1c2UgbWFrZV91 bmlxdWUgYW5kIG1vdmUgc2VtYW50aWNzIGEgbGl0dGxlIG1vcmUuCisKKyAgICAgICAgKiBjc3Mv Q1NTU2VsZWN0b3JMaXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1NlbGVjdG9yTGlzdDo6 Q1NTU2VsZWN0b3JMaXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1NlbGVjdG9yTGlzdDo6YWRv cHRTZWxlY3RvclZlY3Rvcik6IERlbGV0ZWQuCisgICAgICAgICogY3NzL0NTU1NlbGVjdG9yTGlz dC5oOgorICAgICAgICAqIGNzcy9TdHlsZVJ1bGUuaDoKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NT U1BhcnNlckltcGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VySW1wbDo6cGFyc2VQ YWdlU2VsZWN0b3IpOgorICAgICAgICAqIGNzcy9wYXJzZXIvQ1NTUGFyc2VyU2VsZWN0b3IuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VyU2VsZWN0b3I6OmFkb3B0U2VsZWN0b3JWZWN0 b3IpOgorICAgICAgICAqIGNzcy9wYXJzZXIvQ1NTUGFyc2VyU2VsZWN0b3IuaDoKKyAgICAgICAg KiBjc3MvcGFyc2VyL0NTU1NlbGVjdG9yUGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNT U1NlbGVjdG9yUGFyc2VyOjpjb25zdW1lQ29tcGxleFNlbGVjdG9yTGlzdCk6CisgICAgICAgIChX ZWJDb3JlOjpDU1NTZWxlY3RvclBhcnNlcjo6Y29uc3VtZUNvbXBvdW5kU2VsZWN0b3JMaXN0KToK KyAgICAgICAgKFdlYkNvcmU6OkNTU1NlbGVjdG9yUGFyc2VyOjpjb25zdW1lUHNldWRvKToKKwog MjAxOC0wOC0xMyAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAg TWVhbmluZyBvZiBPcHRpb25TZXQ6OmNvbnRhaW5zIGlzIHVuY2xlYXIgd2hlbiB1c2VkIHdpdGgg T3B0aW9uU2V0IGFyZ3VtZW50CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU2VsZWN0b3JM aXN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU2VsZWN0b3JMaXN0 LmNwcAkocmV2aXNpb24gMjM0NjYzKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1NlbGVjdG9y TGlzdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ4LDExICs0OCwxMCBAQCBDU1NTZWxlY3Rvckxp c3Q6OkNTU1NlbGVjdG9yTGlzdChDU1NTZWxlCiAgICAgb3RoZXIubV9zZWxlY3RvckFycmF5ID0g bnVsbHB0cjsKIH0KIAotdm9pZCBDU1NTZWxlY3Rvckxpc3Q6OmFkb3B0U2VsZWN0b3JWZWN0b3Io VmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxDU1NQYXJzZXJTZWxlY3Rvcj4+JiBzZWxlY3RvclZlY3Rv cikKK0NTU1NlbGVjdG9yTGlzdDo6Q1NTU2VsZWN0b3JMaXN0KFZlY3RvcjxzdGQ6OnVuaXF1ZV9w dHI8Q1NTUGFyc2VyU2VsZWN0b3I+PiYmIHNlbGVjdG9yVmVjdG9yKQogewogICAgIEFTU0VSVF9X SVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCFzZWxlY3RvclZlY3Rvci5pc0VtcHR5KCkpOwogCi0g ICAgZGVsZXRlU2VsZWN0b3JzKCk7CiAgICAgc2l6ZV90IGZsYXR0ZW5lZFNpemUgPSAwOwogICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc2VsZWN0b3JWZWN0b3Iuc2l6ZSgpOyArK2kpIHsKICAg ICAgICAgZm9yIChDU1NQYXJzZXJTZWxlY3Rvciogc2VsZWN0b3IgPSBzZWxlY3RvclZlY3Rvcltp XS5nZXQoKTsgc2VsZWN0b3I7IHNlbGVjdG9yID0gc2VsZWN0b3ItPnRhZ0hpc3RvcnkoKSkKQEAg LTgyLDcgKzgxLDYgQEAgdm9pZCBDU1NTZWxlY3Rvckxpc3Q6OmFkb3B0U2VsZWN0b3JWZWN0bwog ICAgIH0KICAgICBBU1NFUlQoZmxhdHRlbmVkU2l6ZSA9PSBhcnJheUluZGV4KTsKICAgICBtX3Nl bGVjdG9yQXJyYXlbYXJyYXlJbmRleCAtIDFdLnNldExhc3RJblNlbGVjdG9yTGlzdCgpOwotICAg IHNlbGVjdG9yVmVjdG9yLmNsZWFyKCk7CiB9CiAKIHVuc2lnbmVkIENTU1NlbGVjdG9yTGlzdDo6 Y29tcG9uZW50Q291bnQoKSBjb25zdApJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1NlbGVj dG9yTGlzdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTZWxlY3Rvckxp c3QuaAkocmV2aXNpb24gMjM0NjYzKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1NlbGVjdG9y TGlzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zOCwxMCArMzgsMTAgQEAgcHVibGljOgogICAgIENT U1NlbGVjdG9yTGlzdCgpIDogbV9zZWxlY3RvckFycmF5KDApIHsgfQogICAgIENTU1NlbGVjdG9y TGlzdChjb25zdCBDU1NTZWxlY3Rvckxpc3QmKTsKICAgICBDU1NTZWxlY3Rvckxpc3QoQ1NTU2Vs ZWN0b3JMaXN0JiYpOworICAgIENTU1NlbGVjdG9yTGlzdChWZWN0b3I8c3RkOjp1bmlxdWVfcHRy PENTU1BhcnNlclNlbGVjdG9yPj4mJik7CiAKICAgICB+Q1NTU2VsZWN0b3JMaXN0KCkgeyBkZWxl dGVTZWxlY3RvcnMoKTsgfQogCi0gICAgdm9pZCBhZG9wdFNlbGVjdG9yVmVjdG9yKFZlY3Rvcjxz dGQ6OnVuaXF1ZV9wdHI8Q1NTUGFyc2VyU2VsZWN0b3I+PiYgc2VsZWN0b3JWZWN0b3IpOwogICAg IHZvaWQgYWRvcHRTZWxlY3RvckFycmF5KENTU1NlbGVjdG9yKiBzZWxlY3RvcnMpIHsgQVNTRVJU KCFtX3NlbGVjdG9yQXJyYXkpOyBtX3NlbGVjdG9yQXJyYXkgPSBzZWxlY3RvcnM7IH0KIAogICAg IGJvb2wgaXNWYWxpZCgpIGNvbnN0IHsgcmV0dXJuICEhbV9zZWxlY3RvckFycmF5OyB9CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSdWxlLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvY3NzL1N0eWxlUnVsZS5oCShyZXZpc2lvbiAyMzQ2NjMpCisrKyBTb3VyY2UvV2ViQ29y ZS9jc3MvU3R5bGVSdWxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTIwOCw3ICsyMDgsNiBAQCBwdWJs aWM6CiAgICAgY29uc3QgU3R5bGVQcm9wZXJ0aWVzJiBwcm9wZXJ0aWVzKCkgY29uc3QgeyByZXR1 cm4gbV9wcm9wZXJ0aWVzOyB9CiAgICAgTXV0YWJsZVN0eWxlUHJvcGVydGllcyYgbXV0YWJsZVBy b3BlcnRpZXMoKTsKIAotICAgIHZvaWQgcGFyc2VyQWRvcHRTZWxlY3RvclZlY3RvcihWZWN0b3I8 c3RkOjp1bmlxdWVfcHRyPENTU1BhcnNlclNlbGVjdG9yPj4mIHNlbGVjdG9ycykgeyBtX3NlbGVj dG9yTGlzdC5hZG9wdFNlbGVjdG9yVmVjdG9yKHNlbGVjdG9ycyk7IH0KICAgICB2b2lkIHdyYXBw ZXJBZG9wdFNlbGVjdG9yTGlzdChDU1NTZWxlY3Rvckxpc3QmIHNlbGVjdG9ycykgeyBtX3NlbGVj dG9yTGlzdCA9IFdURk1vdmUoc2VsZWN0b3JzKTsgfQogCiAgICAgUmVmPFN0eWxlUnVsZVBhZ2U+ IGNvcHkoKSBjb25zdCB7IHJldHVybiBhZG9wdFJlZigqbmV3IFN0eWxlUnVsZVBhZ2UoKnRoaXMp KTsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJJbXBsLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckltcGwuY3Bw CShyZXZpc2lvbiAyMzQ2NjMpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNl ckltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yODIsOSArMjgyLDkgQEAgQ1NTU2VsZWN0b3JM aXN0IENTU1BhcnNlckltcGw6OnBhcnNlUGFnZQogCiAgICAgc3RkOjp1bmlxdWVfcHRyPENTU1Bh cnNlclNlbGVjdG9yPiBzZWxlY3RvcjsKICAgICBpZiAoIXR5cGVTZWxlY3Rvci5pc051bGwoKSAm JiBwc2V1ZG8uaXNOdWxsKCkpCi0gICAgICAgIHNlbGVjdG9yID0gc3RkOjp1bmlxdWVfcHRyPENT U1BhcnNlclNlbGVjdG9yPihuZXcgQ1NTUGFyc2VyU2VsZWN0b3IoUXVhbGlmaWVkTmFtZShudWxs QXRvbSgpLCB0eXBlU2VsZWN0b3IsIHN0eWxlU2hlZXQtPmRlZmF1bHROYW1lc3BhY2UoKSkpKTsK KyAgICAgICAgc2VsZWN0b3IgPSBzdGQ6Om1ha2VfdW5pcXVlPENTU1BhcnNlclNlbGVjdG9yPihR dWFsaWZpZWROYW1lKG51bGxBdG9tKCksIHR5cGVTZWxlY3Rvciwgc3R5bGVTaGVldC0+ZGVmYXVs dE5hbWVzcGFjZSgpKSk7CiAgICAgZWxzZSB7Ci0gICAgICAgIHNlbGVjdG9yID0gc3RkOjp1bmlx dWVfcHRyPENTU1BhcnNlclNlbGVjdG9yPihuZXcgQ1NTUGFyc2VyU2VsZWN0b3IpOworICAgICAg ICBzZWxlY3RvciA9IHN0ZDo6bWFrZV91bmlxdWU8Q1NTUGFyc2VyU2VsZWN0b3I+KCk7CiAgICAg ICAgIGlmICghcHNldWRvLmlzTnVsbCgpKSB7CiAgICAgICAgICAgICBzZWxlY3RvciA9IHN0ZDo6 dW5pcXVlX3B0cjxDU1NQYXJzZXJTZWxlY3Rvcj4oQ1NTUGFyc2VyU2VsZWN0b3I6OnBhcnNlUGFn ZVBzZXVkb1NlbGVjdG9yKHBzZXVkbykpOwogICAgICAgICAgICAgaWYgKCFzZWxlY3RvciB8fCBz ZWxlY3Rvci0+bWF0Y2goKSAhPSBDU1NTZWxlY3Rvcjo6UGFnZVBzZXVkb0NsYXNzKQpAQCAtMjk1 LDExICsyOTUsNyBAQCBDU1NTZWxlY3Rvckxpc3QgQ1NTUGFyc2VySW1wbDo6cGFyc2VQYWdlCiAg ICAgfQogCiAgICAgc2VsZWN0b3ItPnNldEZvclBhZ2UoKTsKLSAgICBWZWN0b3I8c3RkOjp1bmlx dWVfcHRyPENTU1BhcnNlclNlbGVjdG9yPj4gc2VsZWN0b3JWZWN0b3I7Ci0gICAgc2VsZWN0b3JW ZWN0b3IuYXBwZW5kKFdURk1vdmUoc2VsZWN0b3IpKTsKLSAgICBDU1NTZWxlY3Rvckxpc3Qgc2Vs ZWN0b3JMaXN0OwotICAgIHNlbGVjdG9yTGlzdC5hZG9wdFNlbGVjdG9yVmVjdG9yKHNlbGVjdG9y VmVjdG9yKTsKLSAgICByZXR1cm4gc2VsZWN0b3JMaXN0OworICAgIHJldHVybiB7IFZlY3Rvcjxz dGQ6OnVuaXF1ZV9wdHI8Q1NTUGFyc2VyU2VsZWN0b3I+Pjo6ZnJvbShXVEZNb3ZlKHNlbGVjdG9y KSkgfTsKIH0KIAogc3RkOjp1bmlxdWVfcHRyPFZlY3Rvcjxkb3VibGU+PiBDU1NQYXJzZXJJbXBs OjpwYXJzZUtleWZyYW1lS2V5TGlzdChjb25zdCBTdHJpbmcmIGtleUxpc3QpCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlclNlbGVjdG9yLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlclNlbGVjdG9yLmNwcAkocmV2aXNp b24gMjM0NjYzKQorKysgU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJTZWxlY3Rv ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyNCwxMSArMTI0LDkgQEAgQ1NTUGFyc2VyU2VsZWN0 b3I6On5DU1NQYXJzZXJTZWxlY3RvcigpCiAgICAgfQogfQogCi12b2lkIENTU1BhcnNlclNlbGVj dG9yOjphZG9wdFNlbGVjdG9yVmVjdG9yKFZlY3RvcjxzdGQ6OnVuaXF1ZV9wdHI8Q1NTUGFyc2Vy U2VsZWN0b3I+PiYgc2VsZWN0b3JWZWN0b3IpCit2b2lkIENTU1BhcnNlclNlbGVjdG9yOjphZG9w dFNlbGVjdG9yVmVjdG9yKFZlY3RvcjxzdGQ6OnVuaXF1ZV9wdHI8Q1NTUGFyc2VyU2VsZWN0b3I+ PiYmIHNlbGVjdG9yVmVjdG9yKQogewotICAgIGF1dG8gc2VsZWN0b3JMaXN0ID0gc3RkOjptYWtl X3VuaXF1ZTxDU1NTZWxlY3Rvckxpc3Q+KCk7Ci0gICAgc2VsZWN0b3JMaXN0LT5hZG9wdFNlbGVj dG9yVmVjdG9yKHNlbGVjdG9yVmVjdG9yKTsKLSAgICBtX3NlbGVjdG9yLT5zZXRTZWxlY3Rvckxp c3QoV1RGTW92ZShzZWxlY3Rvckxpc3QpKTsKKyAgICBtX3NlbGVjdG9yLT5zZXRTZWxlY3Rvckxp c3Qoc3RkOjptYWtlX3VuaXF1ZTxDU1NTZWxlY3Rvckxpc3Q+KFdURk1vdmUoc2VsZWN0b3JWZWN0 b3IpKSk7CiB9CiAKIHZvaWQgQ1NTUGFyc2VyU2VsZWN0b3I6OnNldExhbmdBcmd1bWVudExpc3Qo c3RkOjp1bmlxdWVfcHRyPFZlY3RvcjxBdG9taWNTdHJpbmc+PiBhcmd1bWVudExpc3QpCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlclNlbGVjdG9yLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJTZWxlY3Rvci5oCShyZXZp c2lvbiAyMzQ2NjMpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlclNlbGVj dG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTcxLDcgKzcxLDcgQEAgcHVibGljOgogICAgIAogICAg IHZvaWQgc2V0UHNldWRvRWxlbWVudFR5cGUoQ1NTU2VsZWN0b3I6OlBzZXVkb0VsZW1lbnRUeXBl IHR5cGUpIHsgbV9zZWxlY3Rvci0+c2V0UHNldWRvRWxlbWVudFR5cGUodHlwZSk7IH0KIAotICAg IHZvaWQgYWRvcHRTZWxlY3RvclZlY3RvcihWZWN0b3I8c3RkOjp1bmlxdWVfcHRyPENTU1BhcnNl clNlbGVjdG9yPj4mIHNlbGVjdG9yVmVjdG9yKTsKKyAgICB2b2lkIGFkb3B0U2VsZWN0b3JWZWN0 b3IoVmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxDU1NQYXJzZXJTZWxlY3Rvcj4+JiYpOwogICAgIHZv aWQgc2V0TGFuZ0FyZ3VtZW50TGlzdChzdGQ6OnVuaXF1ZV9wdHI8VmVjdG9yPEF0b21pY1N0cmlu Zz4+KTsKICAgICB2b2lkIHNldFNlbGVjdG9yTGlzdChzdGQ6OnVuaXF1ZV9wdHI8Q1NTU2VsZWN0 b3JMaXN0Pik7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTU2VsZWN0b3JQ YXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTU2Vs ZWN0b3JQYXJzZXIuY3BwCShyZXZpc2lvbiAyMzQ2NjMpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3Mv cGFyc2VyL0NTU1NlbGVjdG9yUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjgsMTEgKzY4 LDkgQEAgQ1NTU2VsZWN0b3JMaXN0IENTU1NlbGVjdG9yUGFyc2VyOjpjb25zdQogICAgICAgICBz ZWxlY3Rvckxpc3QuYXBwZW5kKFdURk1vdmUoc2VsZWN0b3IpKTsKICAgICB9CiAKLSAgICBDU1NT ZWxlY3Rvckxpc3QgbGlzdDsKICAgICBpZiAobV9mYWlsZWRQYXJzaW5nKQotICAgICAgICByZXR1 cm4gbGlzdDsKLSAgICBsaXN0LmFkb3B0U2VsZWN0b3JWZWN0b3Ioc2VsZWN0b3JMaXN0KTsKLSAg ICByZXR1cm4gbGlzdDsKKyAgICAgICAgcmV0dXJuIHsgfTsKKyAgICByZXR1cm4geyBXVEZNb3Zl KHNlbGVjdG9yTGlzdCkgfTsKIH0KIAogQ1NTU2VsZWN0b3JMaXN0IENTU1NlbGVjdG9yUGFyc2Vy Ojpjb25zdW1lQ29tcG91bmRTZWxlY3Rvckxpc3QoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2Up CkBAIC05MiwxMSArOTAsOSBAQCBDU1NTZWxlY3Rvckxpc3QgQ1NTU2VsZWN0b3JQYXJzZXI6OmNv bnN1CiAgICAgICAgIHNlbGVjdG9yTGlzdC5hcHBlbmQoV1RGTW92ZShzZWxlY3RvcikpOwogICAg IH0KIAotICAgIENTU1NlbGVjdG9yTGlzdCBsaXN0OwogICAgIGlmIChtX2ZhaWxlZFBhcnNpbmcp Ci0gICAgICAgIHJldHVybiBsaXN0OwotICAgIGxpc3QuYWRvcHRTZWxlY3RvclZlY3RvcihzZWxl Y3Rvckxpc3QpOwotICAgIHJldHVybiBsaXN0OworICAgICAgICByZXR1cm4geyB9OworICAgIHJl dHVybiB7IFdURk1vdmUoc2VsZWN0b3JMaXN0KSB9OwogfQogCiBzdGF0aWMgYm9vbCBjb25zdW1l TGFuZ0FyZ3VtZW50TGlzdChzdGQ6OnVuaXF1ZV9wdHI8VmVjdG9yPEF0b21pY1N0cmluZz4+JiBh cmd1bWVudExpc3QsIENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQpAQCAtNjMxLDkgKzYyNyw3 IEBAIHN0ZDo6dW5pcXVlX3B0cjxDU1NQYXJzZXJTZWxlY3Rvcj4gQ1NTU2UKICAgICAgICAgICAg IGJsb2NrLmNvbnN1bWVXaGl0ZXNwYWNlKCk7CiAgICAgICAgICAgICBpZiAoIWlubmVyU2VsZWN0 b3IgfHwgIWJsb2NrLmF0RW5kKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0g ICAgICAgICAgICBWZWN0b3I8c3RkOjp1bmlxdWVfcHRyPENTU1BhcnNlclNlbGVjdG9yPj4gc2Vs ZWN0b3JWZWN0b3I7Ci0gICAgICAgICAgICBzZWxlY3RvclZlY3Rvci5hcHBlbmQoV1RGTW92ZShp bm5lclNlbGVjdG9yKSk7Ci0gICAgICAgICAgICBzZWxlY3Rvci0+YWRvcHRTZWxlY3RvclZlY3Rv cihzZWxlY3RvclZlY3Rvcik7CisgICAgICAgICAgICBzZWxlY3Rvci0+YWRvcHRTZWxlY3RvclZl Y3RvcihWZWN0b3I8c3RkOjp1bmlxdWVfcHRyPENTU1BhcnNlclNlbGVjdG9yPj46OmZyb20oV1RG TW92ZShpbm5lclNlbGVjdG9yKSkpOwogICAgICAgICAgICAgcmV0dXJuIHNlbGVjdG9yOwogICAg ICAgICB9CiAgICAgICAgIGRlZmF1bHQ6Cg==