126714 2014-01-09 13:00:14 -0800 Replace ElementIteratorAdapter find() with beginAt() 2014-01-10 12:59:40 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned darin oldest_to_newest 966031 0 koivisto 2014-01-09 13:00:14 -0800 It makes more sense for what it does. 966033 1 220763 koivisto 2014-01-09 13:07:57 -0800 Created attachment 220763 patch 966036 2 220763 kling 2014-01-09 13:13:44 -0800 Comment on attachment 220763 patch View in context: https://bugs.webkit.org/attachment.cgi?id=220763&action=review Nice :) > Source/WebCore/html/HTMLFormElement.cpp:508 > + if (!associatedHTMLElement.isDescendantOf(this)) > + return currentAssociatedElementsAfterIndex; isDescendantOf signature is rather 2012 :| 966064 3 koivisto 2014-01-09 14:06:46 -0800 https://trac.webkit.org/r161583 966527 4 darin 2014-01-10 12:59:40 -0800 Thanks. Better than I had hoped for! 220763 2014-01-09 13:07:57 -0800 2014-01-09 13:13:44 -0800 patch iterator-beginat.patch text/plain 9360 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MTU3NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE0LTAxLTA5ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZXBsYWNlIEVsZW1lbnRJdGVy YXRvckFkYXB0ZXIgZmluZCgpIHdpdGggYmVnaW5BdCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjY3MTQKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbGVtZW50SXRlcmF0b3JBZGFwdGVyIGZpbmQoKSB3 b3VsZCByZXR1cm4gaXRlcmF0b3IgZm9yIHRoZSBhcmd1bWVudCBlbGVtZW50IGlmIGl0IHdhcwor ICAgICAgICBvZiBjb3JyZWN0IHR5cGUgYW5kIGluIHRoZSByaWdodCBzdWJ0cmVlLiBUaGlzIGlz IG5vdCByZWFsbHkgd2hhdCB5b3Ugd291bGQgZXhwZWN0IGZyb20gZmluZCgpCisgICAgICAgIHNv IHJlcGxhY2UgaXQgd2l0aCBhIHNpbXBsZSBiZWdpbkF0KCkgaXRlcmF0b3IgY29uc3RydWN0aW9u IGZ1bmN0aW9uLgorCisgICAgICAgICogZG9tL0RvY3VtZW50T3JkZXJlZE1hcC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpEb2N1bWVudE9yZGVyZWRNYXA6OmdldEFsbEVsZW1lbnRzQnlJZCk6Cisg ICAgICAgICogZG9tL0VsZW1lbnRDaGlsZEl0ZXJhdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpF bGVtZW50Q2hpbGRJdGVyYXRvckFkYXB0ZXI8RWxlbWVudFR5cGU+OjpiZWdpbkF0KToKKyAgICAg ICAgKFdlYkNvcmU6OkVsZW1lbnRDaGlsZENvbnN0SXRlcmF0b3JBZGFwdGVyPEVsZW1lbnRUeXBl Pjo6YmVnaW5BdCk6CisgICAgICAgICogZG9tL0VsZW1lbnREZXNjZW5kYW50SXRlcmF0b3IuaDoK KyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnREZXNjZW5kYW50SXRlcmF0b3JBZGFwdGVyPEVsZW1l bnRUeXBlPjo6YmVnaW5BdCk6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50RGVzY2VuZGFudENv bnN0SXRlcmF0b3JBZGFwdGVyPEVsZW1lbnRUeXBlPjo6YmVnaW5BdCk6CisgICAgICAgICogaHRt bC9IVE1MRm9ybUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEZvcm1FbGVtZW50 Ojpmb3JtRWxlbWVudEluZGV4KToKKyAgICAgICAgKiBodG1sL0hUTUxUYWJsZVJvd3NDb2xsZWN0 aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUYWJsZVJvd3NDb2xsZWN0aW9uOjpyb3dB ZnRlcik6CisKIDIwMTQtMDEtMDkgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxl LmNvbT4KIAogICAgICAgICBOYXJyb3cgdW5kZXJsaW5lcyBhcmUgdG9vIHRhbGwKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE9yZGVyZWRNYXAuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE9yZGVyZWRNYXAuY3BwCShyZXZpc2lvbiAxNjE1NzIp CisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRPcmRlcmVkTWFwLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjExLDcgKzIxMSw3IEBAIGNvbnN0IFZlY3RvcjxFbGVtZW50Kj4qIERvY3VtZW50 T3JkZXJlZE0KICAgICBpZiAoZW50cnkub3JkZXJlZExpc3QuaXNFbXB0eSgpKSB7CiAgICAgICAg IGVudHJ5Lm9yZGVyZWRMaXN0LnJlc2VydmVDYXBhY2l0eShlbnRyeS5jb3VudCk7CiAgICAgICAg IGF1dG8gZWxlbWVudERlc2NhbmRlbnRzID0gZGVzY2VuZGFudHNPZlR5cGU8RWxlbWVudD4oKnNj b3BlLnJvb3ROb2RlKCkpOwotICAgICAgICBhdXRvIGl0ID0gZW50cnkuZWxlbWVudCA/IGVsZW1l bnREZXNjYW5kZW50cy5maW5kKCplbnRyeS5lbGVtZW50KSA6IGVsZW1lbnREZXNjYW5kZW50cy5i ZWdpbigpOworICAgICAgICBhdXRvIGl0ID0gZW50cnkuZWxlbWVudCA/IGVsZW1lbnREZXNjYW5k ZW50cy5iZWdpbkF0KCplbnRyeS5lbGVtZW50KSA6IGVsZW1lbnREZXNjYW5kZW50cy5iZWdpbigp OwogICAgICAgICBhdXRvIGVuZCA9IGVsZW1lbnREZXNjYW5kZW50cy5lbmQoKTsKICAgICAgICAg Zm9yICg7IGl0ICE9IGVuZDsgKytpdCkgewogICAgICAgICAgICAgYXV0byYgZWxlbWVudCA9ICpp dDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50Q2hpbGRJdGVyYXRvci5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50Q2hpbGRJdGVyYXRvci5oCShyZXZp c2lvbiAxNjE1NTIpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudENoaWxkSXRlcmF0b3Iu aAkod29ya2luZyBjb3B5KQpAQCAtNTMsNyArNTMsNyBAQCBwdWJsaWM6CiAKICAgICBFbGVtZW50 Q2hpbGRJdGVyYXRvcjxFbGVtZW50VHlwZT4gYmVnaW4oKTsKICAgICBFbGVtZW50Q2hpbGRJdGVy YXRvcjxFbGVtZW50VHlwZT4gZW5kKCk7Ci0gICAgRWxlbWVudENoaWxkSXRlcmF0b3I8RWxlbWVu dFR5cGU+IGZpbmQoRWxlbWVudCYpOworICAgIEVsZW1lbnRDaGlsZEl0ZXJhdG9yPEVsZW1lbnRU eXBlPiBiZWdpbkF0KEVsZW1lbnRUeXBlJik7CiAKICAgICBFbGVtZW50VHlwZSogZmlyc3QoKTsK ICAgICBFbGVtZW50VHlwZSogbGFzdCgpOwpAQCAtNjksNyArNjksNyBAQCBwdWJsaWM6CiAKICAg ICBFbGVtZW50Q2hpbGRDb25zdEl0ZXJhdG9yPEVsZW1lbnRUeXBlPiBiZWdpbigpIGNvbnN0Owog ICAgIEVsZW1lbnRDaGlsZENvbnN0SXRlcmF0b3I8RWxlbWVudFR5cGU+IGVuZCgpIGNvbnN0Owot ICAgIEVsZW1lbnRDaGlsZENvbnN0SXRlcmF0b3I8RWxlbWVudFR5cGU+IGZpbmQoY29uc3QgRWxl bWVudCYpIGNvbnN0OworICAgIEVsZW1lbnRDaGlsZENvbnN0SXRlcmF0b3I8RWxlbWVudFR5cGU+ IGJlZ2luQXQoY29uc3QgRWxlbWVudFR5cGUmKSBjb25zdDsKIAogICAgIGNvbnN0IEVsZW1lbnRU eXBlKiBmaXJzdCgpIGNvbnN0OwogICAgIGNvbnN0IEVsZW1lbnRUeXBlKiBsYXN0KCkgY29uc3Q7 CkBAIC0xNTQsMTMgKzE1NCwxMCBAQCBpbmxpbmUgRWxlbWVudFR5cGUqIEVsZW1lbnRDaGlsZEl0 ZXJhdG9yCiB9CiAKIHRlbXBsYXRlIDx0eXBlbmFtZSBFbGVtZW50VHlwZT4KLWlubGluZSBFbGVt ZW50Q2hpbGRJdGVyYXRvcjxFbGVtZW50VHlwZT4gRWxlbWVudENoaWxkSXRlcmF0b3JBZGFwdGVy PEVsZW1lbnRUeXBlPjo6ZmluZChFbGVtZW50JiBjaGlsZCkKK2lubGluZSBFbGVtZW50Q2hpbGRJ dGVyYXRvcjxFbGVtZW50VHlwZT4gRWxlbWVudENoaWxkSXRlcmF0b3JBZGFwdGVyPEVsZW1lbnRU eXBlPjo6YmVnaW5BdChFbGVtZW50VHlwZSYgY2hpbGQpCiB7Ci0gICAgaWYgKCFpc0VsZW1lbnRP ZlR5cGU8Y29uc3QgRWxlbWVudFR5cGU+KGNoaWxkKSkKLSAgICAgICAgcmV0dXJuIGVuZCgpOwot ICAgIGlmIChjaGlsZC5wYXJlbnROb2RlKCkgIT0gJm1fcGFyZW50KQotICAgICAgICByZXR1cm4g ZW5kKCk7Ci0gICAgcmV0dXJuIEVsZW1lbnRDaGlsZEl0ZXJhdG9yPEVsZW1lbnRUeXBlPihtX3Bh cmVudCwgc3RhdGljX2Nhc3Q8RWxlbWVudFR5cGUqPigmY2hpbGQpKTsKKyAgICBBU1NFUlQoY2hp bGQucGFyZW50Tm9kZSgpID09ICZtX3BhcmVudCk7CisgICAgcmV0dXJuIEVsZW1lbnRDaGlsZEl0 ZXJhdG9yPEVsZW1lbnRUeXBlPihtX3BhcmVudCwgJmNoaWxkKTsKIH0KIAogLy8gRWxlbWVudENo aWxkQ29uc3RJdGVyYXRvckFkYXB0ZXIKQEAgLTE5NiwxMyArMTkzLDEwIEBAIGlubGluZSBjb25z dCBFbGVtZW50VHlwZSogRWxlbWVudENoaWxkQ28KIH0KIAogdGVtcGxhdGUgPHR5cGVuYW1lIEVs ZW1lbnRUeXBlPgotaW5saW5lIEVsZW1lbnRDaGlsZENvbnN0SXRlcmF0b3I8RWxlbWVudFR5cGU+ IEVsZW1lbnRDaGlsZENvbnN0SXRlcmF0b3JBZGFwdGVyPEVsZW1lbnRUeXBlPjo6ZmluZChjb25z dCBFbGVtZW50JiBjaGlsZCkgY29uc3QKK2lubGluZSBFbGVtZW50Q2hpbGRDb25zdEl0ZXJhdG9y PEVsZW1lbnRUeXBlPiBFbGVtZW50Q2hpbGRDb25zdEl0ZXJhdG9yQWRhcHRlcjxFbGVtZW50VHlw ZT46OmJlZ2luQXQoY29uc3QgRWxlbWVudFR5cGUmIGNoaWxkKSBjb25zdAogewotICAgIGlmICgh aXNFbGVtZW50T2ZUeXBlPGNvbnN0IEVsZW1lbnRUeXBlPihjaGlsZCkpCi0gICAgICAgIHJldHVy biBlbmQoKTsKLSAgICBpZiAoY2hpbGQucGFyZW50Tm9kZSgpICE9ICZtX3BhcmVudCkKLSAgICAg ICAgcmV0dXJuIGVuZCgpOwotICAgIHJldHVybiBFbGVtZW50Q2hpbGRDb25zdEl0ZXJhdG9yPEVs ZW1lbnRUeXBlPihtX3BhcmVudCwgc3RhdGljX2Nhc3Q8Y29uc3QgRWxlbWVudFR5cGUqPigmY2hp bGQpKTsKKyAgICBBU1NFUlQoY2hpbGQucGFyZW50Tm9kZSgpID09ICZtX3BhcmVudCk7CisgICAg cmV0dXJuIEVsZW1lbnRDaGlsZENvbnN0SXRlcmF0b3I8RWxlbWVudFR5cGU+KG1fcGFyZW50LCAm Y2hpbGQpOwogfQogCiAvLyBTdGFuZGFsb25lIGZ1bmN0aW9ucwpJbmRleDogU291cmNlL1dlYkNv cmUvZG9tL0VsZW1lbnREZXNjZW5kYW50SXRlcmF0b3IuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9kb20vRWxlbWVudERlc2NlbmRhbnRJdGVyYXRvci5oCShyZXZpc2lvbiAxNjE1NTIp CisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudERlc2NlbmRhbnRJdGVyYXRvci5oCSh3b3Jr aW5nIGNvcHkpCkBAIC01Miw3ICs1Miw3IEBAIHB1YmxpYzoKICAgICBFbGVtZW50RGVzY2VuZGFu dEl0ZXJhdG9yQWRhcHRlcihDb250YWluZXJOb2RlJiByb290KTsKICAgICBFbGVtZW50RGVzY2Vu ZGFudEl0ZXJhdG9yPEVsZW1lbnRUeXBlPiBiZWdpbigpOwogICAgIEVsZW1lbnREZXNjZW5kYW50 SXRlcmF0b3I8RWxlbWVudFR5cGU+IGVuZCgpOwotICAgIEVsZW1lbnREZXNjZW5kYW50SXRlcmF0 b3I8RWxlbWVudFR5cGU+IGZpbmQoRWxlbWVudCYpOworICAgIEVsZW1lbnREZXNjZW5kYW50SXRl cmF0b3I8RWxlbWVudFR5cGU+IGJlZ2luQXQoRWxlbWVudFR5cGUmKTsKICAgICBFbGVtZW50RGVz Y2VuZGFudEl0ZXJhdG9yPEVsZW1lbnRUeXBlPiBmcm9tKEVsZW1lbnQmKTsKIAogICAgIEVsZW1l bnRUeXBlKiBmaXJzdCgpOwpAQCAtNjgsNyArNjgsNyBAQCBwdWJsaWM6CiAgICAgRWxlbWVudERl c2NlbmRhbnRDb25zdEl0ZXJhdG9yQWRhcHRlcihjb25zdCBDb250YWluZXJOb2RlJiByb290KTsK ICAgICBFbGVtZW50RGVzY2VuZGFudENvbnN0SXRlcmF0b3I8RWxlbWVudFR5cGU+IGJlZ2luKCkg Y29uc3Q7CiAgICAgRWxlbWVudERlc2NlbmRhbnRDb25zdEl0ZXJhdG9yPEVsZW1lbnRUeXBlPiBl bmQoKSBjb25zdDsKLSAgICBFbGVtZW50RGVzY2VuZGFudENvbnN0SXRlcmF0b3I8RWxlbWVudFR5 cGU+IGZpbmQoY29uc3QgRWxlbWVudCYpIGNvbnN0OworICAgIEVsZW1lbnREZXNjZW5kYW50Q29u c3RJdGVyYXRvcjxFbGVtZW50VHlwZT4gYmVnaW5BdChjb25zdCBFbGVtZW50VHlwZSYpIGNvbnN0 OwogICAgIEVsZW1lbnREZXNjZW5kYW50Q29uc3RJdGVyYXRvcjxFbGVtZW50VHlwZT4gZnJvbShj b25zdCBFbGVtZW50JikgY29uc3Q7CiAKICAgICBjb25zdCBFbGVtZW50VHlwZSogZmlyc3QoKSBj b25zdDsKQEAgLTE0MywxMiArMTQzLDkgQEAgaW5saW5lIEVsZW1lbnREZXNjZW5kYW50SXRlcmF0 b3I8RWxlbWVudAogfQogICAgIAogdGVtcGxhdGUgPHR5cGVuYW1lIEVsZW1lbnRUeXBlPgotaW5s aW5lIEVsZW1lbnREZXNjZW5kYW50SXRlcmF0b3I8RWxlbWVudFR5cGU+IEVsZW1lbnREZXNjZW5k YW50SXRlcmF0b3JBZGFwdGVyPEVsZW1lbnRUeXBlPjo6ZmluZChFbGVtZW50JiBkZXNjZW5kYW50 KQoraW5saW5lIEVsZW1lbnREZXNjZW5kYW50SXRlcmF0b3I8RWxlbWVudFR5cGU+IEVsZW1lbnRE ZXNjZW5kYW50SXRlcmF0b3JBZGFwdGVyPEVsZW1lbnRUeXBlPjo6YmVnaW5BdChFbGVtZW50VHlw ZSYgZGVzY2VuZGFudCkKIHsKLSAgICBpZiAoIWlzRWxlbWVudE9mVHlwZTxjb25zdCBFbGVtZW50 VHlwZT4oZGVzY2VuZGFudCkpCi0gICAgICAgIHJldHVybiBlbmQoKTsKLSAgICBpZiAoIWRlc2Nl bmRhbnQuaXNEZXNjZW5kYW50T2YoJm1fcm9vdCkpCi0gICAgICAgIHJldHVybiBlbmQoKTsKKyAg ICBBU1NFUlQoZGVzY2VuZGFudC5pc0Rlc2NlbmRhbnRPZigmbV9yb290KSk7CiAgICAgcmV0dXJu IEVsZW1lbnREZXNjZW5kYW50SXRlcmF0b3I8RWxlbWVudFR5cGU+KG1fcm9vdCwgc3RhdGljX2Nh c3Q8RWxlbWVudFR5cGUqPigmZGVzY2VuZGFudCkpOwogfQogCkBAIC0xOTUsMTMgKzE5MiwxMCBA QCBpbmxpbmUgRWxlbWVudERlc2NlbmRhbnRDb25zdEl0ZXJhdG9yPEVsCiB9CiAKIHRlbXBsYXRl IDx0eXBlbmFtZSBFbGVtZW50VHlwZT4KLWlubGluZSBFbGVtZW50RGVzY2VuZGFudENvbnN0SXRl cmF0b3I8RWxlbWVudFR5cGU+IEVsZW1lbnREZXNjZW5kYW50Q29uc3RJdGVyYXRvckFkYXB0ZXI8 RWxlbWVudFR5cGU+OjpmaW5kKGNvbnN0IEVsZW1lbnQmIGRlc2NlbmRhbnQpIGNvbnN0Citpbmxp bmUgRWxlbWVudERlc2NlbmRhbnRDb25zdEl0ZXJhdG9yPEVsZW1lbnRUeXBlPiBFbGVtZW50RGVz Y2VuZGFudENvbnN0SXRlcmF0b3JBZGFwdGVyPEVsZW1lbnRUeXBlPjo6YmVnaW5BdChjb25zdCBF bGVtZW50VHlwZSYgZGVzY2VuZGFudCkgY29uc3QKIHsKLSAgICBpZiAoIWlzRWxlbWVudE9mVHlw ZTxjb25zdCBFbGVtZW50VHlwZT4oZGVzY2VuZGFudCkpCi0gICAgICAgIHJldHVybiBlbmQoKTsK LSAgICBpZiAoIWRlc2NlbmRhbnQuaXNEZXNjZW5kYW50T2YoJm1fcm9vdCkpCi0gICAgICAgIHJl dHVybiBlbmQoKTsKLSAgICByZXR1cm4gRWxlbWVudERlc2NlbmRhbnRDb25zdEl0ZXJhdG9yPEVs ZW1lbnRUeXBlPihtX3Jvb3QsIHN0YXRpY19jYXN0PGNvbnN0IEVsZW1lbnRUeXBlKj4oJmRlc2Nl bmRhbnQpKTsKKyAgICBBU1NFUlQoZGVzY2VuZGFudC5pc0Rlc2NlbmRhbnRPZigmbV9yb290KSk7 CisgICAgcmV0dXJuIEVsZW1lbnREZXNjZW5kYW50Q29uc3RJdGVyYXRvcjxFbGVtZW50VHlwZT4o bV9yb290LCAmZGVzY2VuZGFudCk7CiB9CiAKIHRlbXBsYXRlIDx0eXBlbmFtZSBFbGVtZW50VHlw ZT4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZvcm1FbGVtZW50LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGb3JtRWxlbWVudC5jcHAJKHJldmlzaW9u IDE2MTU1MikKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZvcm1FbGVtZW50LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNTA0LDE0ICs1MDQsMTcgQEAgdW5zaWduZWQgSFRNTEZvcm1FbGVtZW50 Ojpmb3JtRWxlbWVudEluZAogICAgIHVuc2lnbmVkIGN1cnJlbnRBc3NvY2lhdGVkRWxlbWVudHNB ZnRlckluZGV4ID0gbV9hc3NvY2lhdGVkRWxlbWVudHNBZnRlckluZGV4OwogICAgICsrbV9hc3Nv Y2lhdGVkRWxlbWVudHNBZnRlckluZGV4OwogCisgICAgaWYgKCFhc3NvY2lhdGVkSFRNTEVsZW1l bnQuaXNEZXNjZW5kYW50T2YodGhpcykpCisgICAgICAgIHJldHVybiBjdXJyZW50QXNzb2NpYXRl ZEVsZW1lbnRzQWZ0ZXJJbmRleDsKKwogICAgIC8vIENoZWNrIGZvciB0aGUgc3BlY2lhbCBjYXNl IHdoZXJlIHRoaXMgZWxlbWVudCBpcyB0aGUgdmVyeSBsYXN0IHRoaW5nIGluCiAgICAgLy8gdGhl IGZvcm0ncyB0cmVlIG9mIGNoaWxkcmVuOyB3ZSBkb24ndCB3YW50IHRvIHdhbGsgdGhlIGVudGly ZSB0cmVlIGluIHRoYXQKICAgICAvLyBjb21tb24gY2FzZSB0aGF0IG9jY3VycyBkdXJpbmcgcGFy c2luZzsgaW5zdGVhZCB3ZSdsbCBqdXN0IHJldHVybiBhIHZhbHVlCiAgICAgLy8gdGhhdCBzYXlz ICJhZGQgdGhpcyBmb3JtIGVsZW1lbnQgdG8gdGhlIGVuZCBvZiB0aGUgYXJyYXkiLgogICAgIGF1 dG8gZGVzY2VuZGFudHMgPSBkZXNjZW5kYW50c09mVHlwZTxIVE1MRWxlbWVudD4oKnRoaXMpOwot ICAgIGF1dG8gaXQgPSBkZXNjZW5kYW50cy5maW5kKGFzc29jaWF0ZWRIVE1MRWxlbWVudCk7Cisg ICAgYXV0byBpdCA9IGRlc2NlbmRhbnRzLmJlZ2luQXQoYXNzb2NpYXRlZEhUTUxFbGVtZW50KTsK ICAgICBhdXRvIGVuZCA9IGRlc2NlbmRhbnRzLmVuZCgpOwotICAgIGlmIChpdCA9PSBlbmQgfHwg KytpdCA9PSBlbmQpCisgICAgaWYgKCsraXQgPT0gZW5kKQogICAgICAgICByZXR1cm4gY3VycmVu dEFzc29jaWF0ZWRFbGVtZW50c0FmdGVySW5kZXg7CiAKICAgICB1bnNpZ25lZCBpID0gbV9hc3Nv Y2lhdGVkRWxlbWVudHNCZWZvcmVJbmRleDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TFRhYmxlUm93c0NvbGxlY3Rpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTFRhYmxlUm93c0NvbGxlY3Rpb24uY3BwCShyZXZpc2lvbiAxNjE1NTIpCisrKyBTb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxUYWJsZVJvd3NDb2xsZWN0aW9uLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNzAsOSArNzAsOSBAQCBIVE1MVGFibGVSb3dFbGVtZW50KiBIVE1MVGFibGVSb3dzQ29s bGVjCiAKICAgICAvLyBTdGFydCBieSBsb29raW5nIGZvciB0aGUgbmV4dCByb3cgaW4gdGhpcyBz ZWN0aW9uLiBDb250aW51ZSBvbmx5IGlmIHRoZXJlIGlzIG5vbmUuCiAgICAgaWYgKHByZXZpb3Vz ICYmIHByZXZpb3VzLT5wYXJlbnROb2RlKCkgIT0gdGFibGUpIHsKLSAgICAgICAgYXV0byByb3dz ID0gY2hpbGRyZW5PZlR5cGU8SFRNTFRhYmxlUm93RWxlbWVudD4oKnByZXZpb3VzLT5wYXJlbnRO b2RlKCkpOwotICAgICAgICBhdXRvIHJvdyA9IHJvd3MuZmluZCgqcHJldmlvdXMpOwotICAgICAg ICBpZiAoKytyb3cgIT0gcm93cy5lbmQoKSkKKyAgICAgICAgYXV0byBjaGlsZFJvd3MgPSBjaGls ZHJlbk9mVHlwZTxIVE1MVGFibGVSb3dFbGVtZW50PigqcHJldmlvdXMtPnBhcmVudE5vZGUoKSk7 CisgICAgICAgIGF1dG8gcm93ID0gY2hpbGRSb3dzLmJlZ2luQXQoKnByZXZpb3VzKTsKKyAgICAg ICAgaWYgKCsrcm93ICE9IGNoaWxkUm93cy5lbmQoKSkKICAgICAgICAgICAgIHJldHVybiAmKnJv dzsKICAgICB9CiAK