155061 2016-03-05 00:02:12 -0800 Move QualifiedName from CustomElementInfo to JSCustomElementInterface 2016-03-05 17:23:45 -0800 1 1 1 Unclassified WebKit DOM WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 154907 1 rniwa rniwa ap cdumez commit-queue esprehn+autocc kangil.han oldest_to_newest 1171169 0 rniwa 2016-03-05 00:02:12 -0800 Now that each custom element interface can be associated with exactly one custom element, there is no need to separate the interface object from the qualified name. Just store the associated qualified name in JSCustomElementInterface itself for simplicity. 1171170 1 273069 rniwa 2016-03-05 00:13:03 -0800 Created attachment 273069 Cleanup 1171173 2 273069 rniwa 2016-03-05 00:29:15 -0800 Comment on attachment 273069 Cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=273069&action=review > Source/WebCore/dom/CustomElementDefinitions.cpp:-74 > - ASSERT(!m_nameMap.contains(fullName.localName())); Putting this assertion back per IRC discussion with kling & anttik. 1171174 3 rniwa 2016-03-05 00:31:27 -0800 Committed r197612: <http://trac.webkit.org/changeset/197612> 1171271 4 ap 2016-03-05 14:37:00 -0800 Either this or r197611 has caused memory corruption crashes on ASan and GuardMalloc bots. Ryosuke, are you around to take a look now? 1171305 5 rniwa 2016-03-05 16:24:50 -0800 (In reply to comment #4) > Either this or r197611 has caused memory corruption crashes on ASan and > GuardMalloc bots. > > Ryosuke, are you around to take a look now? Do you know a link or the name of a test on which the crash happens? 1171324 6 rniwa 2016-03-05 17:23:45 -0800 (In reply to comment #4) > Either this or r197611 has caused memory corruption crashes on ASan and > GuardMalloc bots. > > Ryosuke, are you around to take a look now? Fixed in http://trac.webkit.org/changeset/197624. 273069 2016-03-05 00:13:03 -0800 2016-03-05 00:14:28 -0800 Cleanup bug-155061-20160305001248.patch text/plain 10991 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NzYxMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDE2LTAzLTA1ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIE1vdmUgUXVhbGlmaWVkTmFtZSBm cm9tIEN1c3RvbUVsZW1lbnRJbmZvIHRvIEpTQ3VzdG9tRWxlbWVudEludGVyZmFjZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1MDYxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcmUgUXVhbGlmaWVk TmFtZSBvZiBjdXN0b20gZWxlbWVudHMgaW4gSlNDdXN0b21FbGVtZW50SW50ZXJmYWNlIGluc3Rl YWQgb2YgQ3VzdG9tRWxlbWVudEluZm8KKyAgICAgICAgbm93IHRoYXQgZWFjaCBpbnRlcmZhY2Ug aXMgYXNzb2NpYXRlZCB3aXRoIGV4YWN0bHkgb25lIGN1c3RvbSBlbGVtZW50IGFzIG9mIHIxOTc2 MDIuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIHNpbmNlIHRoaXMgaXMgYSByZWZhY3RvcmluZy4K KworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTQ3VzdG9tRWxlbWVudEludGVyZmFjZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpKU0N1c3RvbUVsZW1lbnRJbnRlcmZhY2U6OkpTQ3VzdG9tRWxlbWVu dEludGVyZmFjZSk6IE5vdyB0YWtlcyBRdWFsaWZpZWROYW1lIGFzIHRoZQorICAgICAgICBmaXJz dCBhcmd1bWVudC4KKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0N1c3RvbUVsZW1lbnRJbnRlcmZh Y2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OkpTQ3VzdG9tRWxlbWVudEludGVyZmFjZTo6Y3JlYXRl KToKKyAgICAgICAgKFdlYkNvcmU6OkpTQ3VzdG9tRWxlbWVudEludGVyZmFjZTo6bmFtZSk6IEFk ZGVkLgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRG9jdW1lbnRDdXN0b20uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SlNEb2N1bWVudDo6ZGVmaW5lRWxlbWVudCk6CisgICAgICAgICogYmluZGlu Z3MvanMvSlNIVE1MRWxlbWVudEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb25zdHJ1 Y3RKU0hUTUxFbGVtZW50KTogVXNlIGZpbmRJbnRlcmZhY2UgaW5zdGVhZCBvZiB0aGUgZGVsZXRl ZCBmaW5kTmFtZS4KKyAgICAgICAgKiBkb20vQ3VzdG9tRWxlbWVudERlZmluaXRpb25zLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkN1c3RvbUVsZW1lbnREZWZpbml0aW9uczo6Y2hlY2tOYW1lKToK KyAgICAgICAgKFdlYkNvcmU6OkN1c3RvbUVsZW1lbnREZWZpbml0aW9uczo6YWRkRWxlbWVudERl ZmluaXRpb24pOiBSZW5hbWVkIGZyb20gZGVmaW5lRWxlbWVudC4KKyAgICAgICAgKFdlYkNvcmU6 OkN1c3RvbUVsZW1lbnREZWZpbml0aW9uczo6ZmluZEludGVyZmFjZSk6IEFkZCBhIHZhcmlhbnQg dGhhdCBmaW5kcyB0aGUgaW50ZXJmYWNlIG9iamVjdAorICAgICAgICBieSBhIEpTIGNvbnN0cnVj dG9yLgorICAgICAgICAoV2ViQ29yZTo6Q3VzdG9tRWxlbWVudERlZmluaXRpb25zOjpjb250YWlu c0NvbnN0cnVjdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkN1c3RvbUVsZW1lbnREZWZpbml0aW9u czo6ZmluZE5hbWUpOiBEZWxldGVkLgorICAgICAgICAqIGRvbS9DdXN0b21FbGVtZW50RGVmaW5p dGlvbnMuaDoKKyAgICAgICAgKFdlYkNvcmU6OkN1c3RvbUVsZW1lbnREZWZpbml0aW9uczo6Q3Vz dG9tRWxlbWVudEluZm86OkN1c3RvbUVsZW1lbnRJbmZvKTogRGVsZXRlZC4KKwogMjAxNi0wMy0w NCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgYmFzaWMg c3VwcG9ydCBmb3IgYXR0cmlidXRlQ2hhbmdlZCBsaWZlY3ljbGUgY2FsbGJhY2sKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ3VzdG9tRWxlbWVudEludGVyZmFjZS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDdXN0b21FbGVtZW50SW50 ZXJmYWNlLmNwcAkocmV2aXNpb24gMTk3NjExKQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNDdXN0b21FbGVtZW50SW50ZXJmYWNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQsOCAr NDQsOSBAQCB1c2luZyBuYW1lc3BhY2UgSlNDOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLUpT Q3VzdG9tRWxlbWVudEludGVyZmFjZTo6SlNDdXN0b21FbGVtZW50SW50ZXJmYWNlKEpTT2JqZWN0 KiBjb25zdHJ1Y3RvciwgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCkKK0pTQ3VzdG9t RWxlbWVudEludGVyZmFjZTo6SlNDdXN0b21FbGVtZW50SW50ZXJmYWNlKGNvbnN0IFF1YWxpZmll ZE5hbWUmIG5hbWUsIEpTT2JqZWN0KiBjb25zdHJ1Y3RvciwgSlNET01HbG9iYWxPYmplY3QqIGds b2JhbE9iamVjdCkKICAgICA6IEFjdGl2ZURPTUNhbGxiYWNrKGdsb2JhbE9iamVjdC0+c2NyaXB0 RXhlY3V0aW9uQ29udGV4dCgpKQorICAgICwgbV9uYW1lKG5hbWUpCiAgICAgLCBtX2NvbnN0cnVj dG9yKGNvbnN0cnVjdG9yKQogICAgICwgbV9pc29sYXRlZFdvcmxkKCZnbG9iYWxPYmplY3QtPndv cmxkKCkpCiB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0N1c3RvbUVsZW1l bnRJbnRlcmZhY2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9K U0N1c3RvbUVsZW1lbnRJbnRlcmZhY2UuaAkocmV2aXNpb24gMTk3NjExKQorKysgU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvSlNDdXN0b21FbGVtZW50SW50ZXJmYWNlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTMwLDYgKzMwLDcgQEAKICNpZiBFTkFCTEUoQ1VTVE9NX0VMRU1FTlRTKQogCiAjaW5j bHVkZSAiQWN0aXZlRE9NQ2FsbGJhY2suaCIKKyNpbmNsdWRlICJRdWFsaWZpZWROYW1lLmgiCiAj aW5jbHVkZSA8aGVhcC9XZWFrLmg+CiAjaW5jbHVkZSA8aGVhcC9XZWFrSW5saW5lcy5oPgogI2lu Y2x1ZGUgPHJ1bnRpbWUvSlNPYmplY3QuaD4KQEAgLTUwLDE0ICs1MSwxMyBAQCBjbGFzcyBET01X cmFwcGVyV29ybGQ7CiBjbGFzcyBFbGVtZW50OwogY2xhc3MgSlNET01HbG9iYWxPYmplY3Q7CiBj bGFzcyBNYXRoTUxFbGVtZW50OwotY2xhc3MgUXVhbGlmaWVkTmFtZTsKIGNsYXNzIFNWR0VsZW1l bnQ7CiAKIGNsYXNzIEpTQ3VzdG9tRWxlbWVudEludGVyZmFjZSA6IHB1YmxpYyBSZWZDb3VudGVk PEpTQ3VzdG9tRWxlbWVudEludGVyZmFjZT4sIHB1YmxpYyBBY3RpdmVET01DYWxsYmFjayB7CiBw dWJsaWM6Ci0gICAgc3RhdGljIFJlZjxKU0N1c3RvbUVsZW1lbnRJbnRlcmZhY2U+IGNyZWF0ZShK U0M6OkpTT2JqZWN0KiBjYWxsYmFjaywgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCkK KyAgICBzdGF0aWMgUmVmPEpTQ3VzdG9tRWxlbWVudEludGVyZmFjZT4gY3JlYXRlKGNvbnN0IFF1 YWxpZmllZE5hbWUmIG5hbWUsIEpTQzo6SlNPYmplY3QqIGNhbGxiYWNrLCBKU0RPTUdsb2JhbE9i amVjdCogZ2xvYmFsT2JqZWN0KQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcg SlNDdXN0b21FbGVtZW50SW50ZXJmYWNlKGNhbGxiYWNrLCBnbG9iYWxPYmplY3QpKTsKKyAgICAg ICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgSlNDdXN0b21FbGVtZW50SW50ZXJmYWNlKG5hbWUsIGNh bGxiYWNrLCBnbG9iYWxPYmplY3QpKTsKICAgICB9CiAKICAgICBlbnVtIGNsYXNzIFNob3VsZENs ZWFyRXhjZXB0aW9uIHsgQ2xlYXIsIERvTm90Q2xlYXIgfTsKQEAgLTY4LDExICs2OCwxNCBAQCBw dWJsaWM6CiAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4 dCgpIGNvbnN0IHsgcmV0dXJuIENvbnRleHREZXN0cnVjdGlvbk9ic2VydmVyOjpzY3JpcHRFeGVj dXRpb25Db250ZXh0KCk7IH0KICAgICBKU0M6OkpTT2JqZWN0KiBjb25zdHJ1Y3RvcigpIHsgcmV0 dXJuIG1fY29uc3RydWN0b3IuZ2V0KCk7IH0KIAorICAgIGNvbnN0IFF1YWxpZmllZE5hbWUmIG5h bWUoKSBjb25zdCB7IHJldHVybiBtX25hbWU7IH0KKwogICAgIHZpcnR1YWwgfkpTQ3VzdG9tRWxl bWVudEludGVyZmFjZSgpOwogCiBwcml2YXRlOgotICAgIEpTQ3VzdG9tRWxlbWVudEludGVyZmFj ZShKU0M6OkpTT2JqZWN0KiBjYWxsYmFjaywgSlNET01HbG9iYWxPYmplY3QqKTsKKyAgICBKU0N1 c3RvbUVsZW1lbnRJbnRlcmZhY2UoY29uc3QgUXVhbGlmaWVkTmFtZSYsIEpTQzo6SlNPYmplY3Qq IGNhbGxiYWNrLCBKU0RPTUdsb2JhbE9iamVjdCopOwogCisgICAgUXVhbGlmaWVkTmFtZSBtX25h bWU7CiAgICAgbXV0YWJsZSBKU0M6OldlYWs8SlNDOjpKU09iamVjdD4gbV9jb25zdHJ1Y3RvcjsK ICAgICBSZWZQdHI8RE9NV3JhcHBlcldvcmxkPiBtX2lzb2xhdGVkV29ybGQ7CiB9OwpJbmRleDog U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNEb2N1bWVudEN1c3RvbS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNEb2N1bWVudEN1c3RvbS5jcHAJKHJl dmlzaW9uIDE5NzYxMCkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRG9jdW1lbnRD dXN0b20uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xODEsNyArMTgxLDcgQEAgSlNWYWx1ZSBKU0Rv Y3VtZW50OjpkZWZpbmVFbGVtZW50KEV4ZWNTdAogICAgIC8vIEZJWE1FOiAxNC4gTGV0IGF0dHJp YnV0ZUNoYW5nZWRDYWxsYmFjayBiZSBHZXQocHJvdG90eXBlLCAiYXR0cmlidXRlQ2hhbmdlZENh bGxiYWNrIikuIFJldGhyb3cgYW55IGV4Y2VwdGlvbnMuCiAKICAgICBRdWFsaWZpZWROYW1lIG5h bWUobnVsbEF0b20sIHRhZ05hbWUsIEhUTUxOYW1lczo6eGh0bWxOYW1lc3BhY2VVUkkpOwotICAg IGRlZmluaXRpb25zLmRlZmluZUVsZW1lbnQobmFtZSwgSlNDdXN0b21FbGVtZW50SW50ZXJmYWNl OjpjcmVhdGUob2JqZWN0LCBnbG9iYWxPYmplY3QoKSkpOworICAgIGRlZmluaXRpb25zLmFkZEVs ZW1lbnREZWZpbml0aW9uKEpTQ3VzdG9tRWxlbWVudEludGVyZmFjZTo6Y3JlYXRlKG5hbWUsIG9i amVjdCwgZ2xvYmFsT2JqZWN0KCkpKTsKICAgICBQcml2YXRlTmFtZSB1bmlxdWVQcml2YXRlTmFt ZTsKICAgICBnbG9iYWxPYmplY3QoKS0+cHV0RGlyZWN0KGdsb2JhbE9iamVjdCgpLT52bSgpLCB1 bmlxdWVQcml2YXRlTmFtZSwgb2JqZWN0KTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvSlNIVE1MRWxlbWVudEN1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvYmluZGluZ3MvanMvSlNIVE1MRWxlbWVudEN1c3RvbS5jcHAJKHJldmlzaW9uIDE5NzYxMCkK KysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSFRNTEVsZW1lbnRDdXN0b20uY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC01Myw4ICs1Myw4IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NB TEwgY29uc3RydWN0SlMKICAgICBWTSYgdm0gPSBzdGF0ZS0+dm0oKTsKICAgICBKU1ZhbHVlIG5l d1RhcmdldFZhbHVlID0gc3RhdGUtPnRoaXNWYWx1ZSgpOwogICAgIEpTT2JqZWN0KiBuZXdUYXJn ZXQgPSBuZXdUYXJnZXRWYWx1ZS5nZXRPYmplY3QoKTsKLSAgICBRdWFsaWZpZWROYW1lIGZ1bGxO YW1lID0gZGVmaW5pdGlvbnMtPmZpbmROYW1lKG5ld1RhcmdldCk7Ci0gICAgaWYgKGZ1bGxOYW1l ID09IG51bGxRTmFtZSgpKQorICAgIGF1dG8qIGludGVyZmFjZSA9IGRlZmluaXRpb25zLT5maW5k SW50ZXJmYWNlKG5ld1RhcmdldCk7CisgICAgaWYgKCFpbnRlcmZhY2UpCiAgICAgICAgIHJldHVy biB0aHJvd1ZNVHlwZUVycm9yKHN0YXRlLCAibmV3LnRhcmdldCBkb2VzIG5vdCBkZWZpbmUgYSBj dXN0b20gZWxlbWVudCIpOwogCiAgICAgYXV0byogZ2xvYmFsT2JqZWN0ID0ganNDb25zdHJ1Y3Rv ci0+Z2xvYmFsT2JqZWN0KCk7CkBAIC02Myw3ICs2Myw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19I T1NUX0NBTEwgY29uc3RydWN0SlMKICAgICBpZiAoVU5MSUtFTFkoc3RhdGUtPmhhZEV4Y2VwdGlv bigpKSkKICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKIAot ICAgIFJlZjxIVE1MRWxlbWVudD4gZWxlbWVudCA9IEhUTUxFbGVtZW50OjpjcmVhdGUoZnVsbE5h bWUsIGRvY3VtZW50KTsKKyAgICBSZWY8SFRNTEVsZW1lbnQ+IGVsZW1lbnQgPSBIVE1MRWxlbWVu dDo6Y3JlYXRlKGludGVyZmFjZS0+bmFtZSgpLCBkb2N1bWVudCk7CiAgICAgYXV0byoganNFbGVt ZW50ID0gSlNIVE1MRWxlbWVudDo6Y3JlYXRlKG5ld0VsZW1lbnRTdHJ1Y3R1cmUsIGdsb2JhbE9i amVjdCwgZWxlbWVudC5nZXQoKSk7CiAgICAgY2FjaGVXcmFwcGVyKGdsb2JhbE9iamVjdC0+d29y bGQoKSwgZWxlbWVudC5wdHIoKSwganNFbGVtZW50KTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5j b2RlKGpzRWxlbWVudCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vQ3VzdG9tRWxlbWVudERl ZmluaXRpb25zLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vQ3VzdG9tRWxl bWVudERlZmluaXRpb25zLmNwcAkocmV2aXNpb24gMTk3NjEwKQorKysgU291cmNlL1dlYkNvcmUv ZG9tL0N1c3RvbUVsZW1lbnREZWZpbml0aW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY5LDQw ICs2OSwzMyBAQCBDdXN0b21FbGVtZW50RGVmaW5pdGlvbnM6Ok5hbWVTdGF0dXMgQ3VzCiAgICAg cmV0dXJuIE5hbWVTdGF0dXM6OlZhbGlkOwogfQogCi1ib29sIEN1c3RvbUVsZW1lbnREZWZpbml0 aW9uczo6ZGVmaW5lRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiBmdWxsTmFtZSwgUmVmPEpT Q3VzdG9tRWxlbWVudEludGVyZmFjZT4mJiBpbnRlcmZhY2UpCit2b2lkIEN1c3RvbUVsZW1lbnRE ZWZpbml0aW9uczo6YWRkRWxlbWVudERlZmluaXRpb24oUmVmPEpTQ3VzdG9tRWxlbWVudEludGVy ZmFjZT4mJiBpbnRlcmZhY2UpCiB7Ci0gICAgQVNTRVJUKCFtX25hbWVNYXAuY29udGFpbnMoZnVs bE5hbWUubG9jYWxOYW1lKCkpKTsKLSAgICBhdXRvKiBjb25zdHJ1Y3RvciA9IGludGVyZmFjZS0+ Y29uc3RydWN0b3IoKTsKLSAgICBtX25hbWVNYXAuYWRkKGZ1bGxOYW1lLmxvY2FsTmFtZSgpLCBD dXN0b21FbGVtZW50SW5mbyhmdWxsTmFtZSwgV1RGTW92ZShpbnRlcmZhY2UpKSk7Ci0KLSAgICBh dXRvIGFkZFJlc3VsdCA9IG1fY29uc3RydWN0b3JNYXAuYWRkKGNvbnN0cnVjdG9yLCBmdWxsTmFt ZSk7Ci0gICAgaWYgKCFhZGRSZXN1bHQuaXNOZXdFbnRyeSkKLSAgICAgICAgYWRkUmVzdWx0Lml0 ZXJhdG9yLT52YWx1ZSA9IG51bGxRTmFtZSgpOyAvLyBUaGUgaW50ZXJmYWNlIGhhcyBtdWx0aXBs ZSB0YWcgbmFtZXMgYXNzb2NpYXRlZCB3aXRoIGl0LgotCi0gICAgcmV0dXJuIHRydWU7CisgICAg bV9jb25zdHJ1Y3Rvck1hcC5hZGQoaW50ZXJmYWNlLT5jb25zdHJ1Y3RvcigpLCBpbnRlcmZhY2Uu cHRyKCkpOworICAgIG1fbmFtZU1hcC5hZGQoaW50ZXJmYWNlLT5uYW1lKCkubG9jYWxOYW1lKCks IFdURk1vdmUoaW50ZXJmYWNlKSk7CiB9CiAKIEpTQ3VzdG9tRWxlbWVudEludGVyZmFjZSogQ3Vz dG9tRWxlbWVudERlZmluaXRpb25zOjpmaW5kSW50ZXJmYWNlKGNvbnN0IFF1YWxpZmllZE5hbWUm IG5hbWUpIGNvbnN0CiB7CiAgICAgYXV0byBpdCA9IG1fbmFtZU1hcC5maW5kKG5hbWUubG9jYWxO YW1lKCkpOwotICAgIHJldHVybiBpdCA9PSBtX25hbWVNYXAuZW5kKCkgfHwgaXQtPnZhbHVlLmZ1 bGxOYW1lICE9IG5hbWUgPyBudWxscHRyIDogaXQtPnZhbHVlLmludGVyZmFjZS5nZXQoKTsKKyAg ICByZXR1cm4gaXQgPT0gbV9uYW1lTWFwLmVuZCgpIHx8IGl0LT52YWx1ZS0+bmFtZSgpICE9IG5h bWUgPyBudWxscHRyIDogaXQtPnZhbHVlLmdldCgpOwogfQogCiBKU0N1c3RvbUVsZW1lbnRJbnRl cmZhY2UqIEN1c3RvbUVsZW1lbnREZWZpbml0aW9uczo6ZmluZEludGVyZmFjZShjb25zdCBBdG9t aWNTdHJpbmcmIG5hbWUpIGNvbnN0CiB7CiAgICAgYXV0byBpdCA9IG1fbmFtZU1hcC5maW5kKG5h bWUpOwotICAgIHJldHVybiBpdCA9PSBtX25hbWVNYXAuZW5kKCkgPyBudWxscHRyIDogaXQtPnZh bHVlLmludGVyZmFjZS5nZXQoKTsKKyAgICByZXR1cm4gaXQgPT0gbV9uYW1lTWFwLmVuZCgpID8g bnVsbHB0ciA6IGl0LT52YWx1ZS5nZXQoKTsKIH0KIAotYm9vbCBDdXN0b21FbGVtZW50RGVmaW5p dGlvbnM6OmNvbnRhaW5zQ29uc3RydWN0b3IoY29uc3QgSlNDOjpKU09iamVjdCogY29uc3RydWN0 b3IpIGNvbnN0CitKU0N1c3RvbUVsZW1lbnRJbnRlcmZhY2UqIEN1c3RvbUVsZW1lbnREZWZpbml0 aW9uczo6ZmluZEludGVyZmFjZShjb25zdCBKU0M6OkpTT2JqZWN0KiBjb25zdHJ1Y3RvcikgY29u c3QKIHsKLSAgICByZXR1cm4gbV9jb25zdHJ1Y3Rvck1hcC5jb250YWlucyhjb25zdHJ1Y3Rvcik7 CisgICAgYXV0byBpdCA9IG1fY29uc3RydWN0b3JNYXAuZmluZChjb25zdHJ1Y3Rvcik7CisgICAg cmV0dXJuIGl0LT52YWx1ZTsKIH0KIAotY29uc3QgUXVhbGlmaWVkTmFtZSYgQ3VzdG9tRWxlbWVu dERlZmluaXRpb25zOjpmaW5kTmFtZShjb25zdCBKU0M6OkpTT2JqZWN0KiBjb25zdHJ1Y3Rvcikg Y29uc3QKK2Jvb2wgQ3VzdG9tRWxlbWVudERlZmluaXRpb25zOjpjb250YWluc0NvbnN0cnVjdG9y KGNvbnN0IEpTQzo6SlNPYmplY3QqIGNvbnN0cnVjdG9yKSBjb25zdAogewotICAgIGF1dG8gaXQg PSBtX2NvbnN0cnVjdG9yTWFwLmZpbmQoY29uc3RydWN0b3IpOwotICAgIHJldHVybiBpdCA9PSBt X2NvbnN0cnVjdG9yTWFwLmVuZCgpID8gbnVsbFFOYW1lKCkgOiBpdC0+dmFsdWU7CisgICAgcmV0 dXJuIG1fY29uc3RydWN0b3JNYXAuY29udGFpbnMoY29uc3RydWN0b3IpOwogfQogCiB9CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9kb20vQ3VzdG9tRWxlbWVudERlZmluaXRpb25zLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0N1c3RvbUVsZW1lbnREZWZpbml0aW9ucy5oCShyZXZp c2lvbiAxOTc2MTApCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vQ3VzdG9tRWxlbWVudERlZmluaXRp b25zLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ4LDM1ICs0OCwxOSBAQCBjbGFzcyBRdWFsaWZpZWRO YW1lOwogY2xhc3MgQ3VzdG9tRWxlbWVudERlZmluaXRpb25zIHsKICAgICBXVEZfTUFLRV9GQVNU X0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAgICBib29sIGRlZmluZUVsZW1lbnQoY29uc3QgUXVhbGlm aWVkTmFtZSYsIFJlZjxKU0N1c3RvbUVsZW1lbnRJbnRlcmZhY2U+JiYpOworICAgIHZvaWQgYWRk RWxlbWVudERlZmluaXRpb24oUmVmPEpTQ3VzdG9tRWxlbWVudEludGVyZmFjZT4mJik7CiAKICAg ICBKU0N1c3RvbUVsZW1lbnRJbnRlcmZhY2UqIGZpbmRJbnRlcmZhY2UoY29uc3QgUXVhbGlmaWVk TmFtZSYpIGNvbnN0OwogICAgIEpTQ3VzdG9tRWxlbWVudEludGVyZmFjZSogZmluZEludGVyZmFj ZShjb25zdCBBdG9taWNTdHJpbmcmKSBjb25zdDsKKyAgICBKU0N1c3RvbUVsZW1lbnRJbnRlcmZh Y2UqIGZpbmRJbnRlcmZhY2UoY29uc3QgSlNDOjpKU09iamVjdCopIGNvbnN0OwogICAgIGJvb2wg Y29udGFpbnNDb25zdHJ1Y3Rvcihjb25zdCBKU0M6OkpTT2JqZWN0KikgY29uc3Q7Ci0gICAgY29u c3QgUXVhbGlmaWVkTmFtZSYgZmluZE5hbWUoY29uc3QgSlNDOjpKU09iamVjdCopIGNvbnN0Owog CiAgICAgZW51bSBjbGFzcyBOYW1lU3RhdHVzIHsgVmFsaWQsIENvbmZsaWN0c1dpdGhCdWlsdGlu TmFtZXMsIE5vSHlwaGVuLCBDb250YWluc1VwcGVyQ2FzZSB9OwogICAgIHN0YXRpYyBOYW1lU3Rh dHVzIGNoZWNrTmFtZShjb25zdCBBdG9taWNTdHJpbmcmIHRhZ05hbWUpOwogCiBwcml2YXRlOgot ICAgIGNsYXNzIEN1c3RvbUVsZW1lbnRJbmZvIHsKLSAgICAgICAgV1RGX01BS0VfRkFTVF9BTExP Q0FURUQ7Ci0gICAgcHVibGljOgotICAgICAgICBRdWFsaWZpZWROYW1lIGZ1bGxOYW1lOwotICAg ICAgICBSZWZQdHI8SlNDdXN0b21FbGVtZW50SW50ZXJmYWNlPiBpbnRlcmZhY2U7Ci0KLSAgICAg ICAgQ3VzdG9tRWxlbWVudEluZm8oKQotICAgICAgICAgICAgOiBmdWxsTmFtZShudWxsUU5hbWUo KSkKLSAgICAgICAgeyB9Ci0KLSAgICAgICAgQ3VzdG9tRWxlbWVudEluZm8oY29uc3QgUXVhbGlm aWVkTmFtZSYgbmFtZSwgUmVmPEpTQ3VzdG9tRWxlbWVudEludGVyZmFjZT4mJiBpbnRlcmZhY2Up Ci0gICAgICAgICAgICA6IGZ1bGxOYW1lKG5hbWUpCi0gICAgICAgICAgICAsIGludGVyZmFjZShX VEZNb3ZlKGludGVyZmFjZSkpCi0gICAgICAgIHsgfQotICAgIH07Ci0KLSAgICBIYXNoTWFwPEF0 b21pY1N0cmluZywgQ3VzdG9tRWxlbWVudEluZm8+IG1fbmFtZU1hcDsKLSAgICBIYXNoTWFwPGNv bnN0IEpTQzo6SlNPYmplY3QqLCBRdWFsaWZpZWROYW1lPiBtX2NvbnN0cnVjdG9yTWFwOworICAg IEhhc2hNYXA8QXRvbWljU3RyaW5nLCBSZWZQdHI8SlNDdXN0b21FbGVtZW50SW50ZXJmYWNlPj4g bV9uYW1lTWFwOworICAgIEhhc2hNYXA8Y29uc3QgSlNDOjpKU09iamVjdCosIEpTQ3VzdG9tRWxl bWVudEludGVyZmFjZSo+IG1fY29uc3RydWN0b3JNYXA7CiB9OwogICAgIAogfQo=