180433 2017-12-05 10:54:25 -0800 Prefer ids and classes over tag names in selector filter 2017-12-06 14:24:11 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned commit-queue dbates ggaren rniwa simon.fraser webkit-bug-importer zalan oldest_to_newest 1378225 0 koivisto 2017-12-05 10:54:25 -0800 There are only four slots in the filter and currently we just pick whatever identifiers we find traversing the selector from right to left. More specific selector types are on average more valuable (id > class > tag) so we should prefer them. 1378227 1 webkit-bug-importer 2017-12-05 10:57:41 -0800 <rdar://problem/35859103> 1378230 2 328471 koivisto 2017-12-05 11:00:16 -0800 Created attachment 328471 patch 1378813 3 328471 commit-queue 2017-12-06 14:24:09 -0800 Comment on attachment 328471 patch Clearing flags on attachment: 328471 Committed r225596: <https://trac.webkit.org/changeset/225596> 1378814 4 commit-queue 2017-12-06 14:24:11 -0800 All reviewed patches have been landed. Closing bug. 328471 2017-12-05 11:00:16 -0800 2017-12-06 14:24:09 -0800 patch selectorfilter-collection-order-6.patch text/plain 8359 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNTUyNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBACisyMDE3LTEyLTA1ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBQcmVmZXIgaWRzIGFuZCBjbGFz c2VzIG92ZXIgdGFnIG5hbWVzIGluIHNlbGVjdG9yIGZpbHRlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgwNDMzCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8zNTg1OTEwMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGVyZSBhcmUgb25seSBmb3VyIHNsb3RzIGluIHRoZSBmaWx0ZXIgYW5kIGN1cnJl bnRseSB3ZSBqdXN0IHBpY2sgd2hhdGV2ZXIgaWRlbnRpZmllcnMgd2UgZmluZCB0cmF2ZXJzaW5n IHRoZSBzZWxlY3RvcgorICAgICAgICBmcm9tIHJpZ2h0IHRvIGxlZnQuIE1vcmUgc3BlY2lmaWMg c2VsZWN0b3IgdHlwZXMgYXJlIG9uIGF2ZXJhZ2UgbW9yZSB2YWx1YWJsZSAoaWQgPiBjbGFzcyA+ IHRhZykgc28gd2Ugc2hvdWxkIHByZWZlciB0aGVtLgorCisgICAgICAgIFRoaXMgYXBwZWFycyB0 byBiZSA0LTUlIFN0eWxlQmVuY2ggcHJvZ3Jlc3Npb24uCisKKyAgICAgICAgKiBjc3MvUnVsZVNl dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSdWxlRGF0YTo6UnVsZURhdGEpOgorICAgICAgICAq IGNzcy9TZWxlY3RvckZpbHRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb2xsZWN0U2ltcGxl U2VsZWN0b3JIYXNoKToKKyAgICAgICAgKFdlYkNvcmU6OmNvbGxlY3RTZWxlY3Rvckhhc2hlcyk6 CisKKyAgICAgICAgICAgIFRoaXMgZnVuY3Rpb24gY29sbGVjdHMgYWxsIGhhc2hlcyBmcm9tIHRo ZSBzZWxlY3Rvci4KKworICAgICAgICAoV2ViQ29yZTo6Y2hvb3NlU2VsZWN0b3JIYXNoZXNGb3JG aWx0ZXIpOgorCisgICAgICAgICAgICBUaGlzIGZ1bmN0aW9uIGNob29zZXMgdGhlIG1vc3QgdmFs dWFibGUgaGFzaGVzIHRvIHVzZSB3aXRoIHRoZSBmaWx0ZXIuCisKKyAgICAgICAgKFdlYkNvcmU6 OlNlbGVjdG9yRmlsdGVyOjpjb2xsZWN0SGFzaGVzKToKKworICAgICAgICAgICAgRmFjdG9yIGlu dG8gdHdvIHNlcGFyYXRlIHN0ZXBzLgorCisgICAgICAgIChXZWJDb3JlOjpjb2xsZWN0RGVzY2Vu ZGFudFNlbGVjdG9ySWRlbnRpZmllckhhc2hlcyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpTZWxlY3RvckZpbHRlcjo6Y29sbGVjdElkZW50aWZpZXJIYXNoZXMpOiBEZWxldGVkLgorICAg ICAgICAqIGNzcy9TZWxlY3RvckZpbHRlci5oOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JG aWx0ZXI6OmZhc3RSZWplY3RTZWxlY3RvciBjb25zdCk6CisKIDIwMTctMTItMDUgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHdlYmtpdEdl dEltYWdlRGF0YUhEIGFuZCB3ZWJraXRQdXRJbWFnZURhdGFIRCBmcm9tIGNhbnZhcyBBUEkKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9SdWxlU2V0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9jc3MvUnVsZVNldC5jcHAJKHJldmlzaW9uIDIyNTUyMSkKKysrIFNvdXJjZS9XZWJD b3JlL2Nzcy9SdWxlU2V0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU4LDEzICsxNTgsMTMgQEAg UnVsZURhdGE6OlJ1bGVEYXRhKFN0eWxlUnVsZSogcnVsZSwgdW5zaQogICAgICwgbV9jb250YWlu c1VuY29tbW9uQXR0cmlidXRlU2VsZWN0b3IoV2ViQ29yZTo6Y29udGFpbnNVbmNvbW1vbkF0dHJp YnV0ZVNlbGVjdG9yKCpzZWxlY3RvcigpKSkKICAgICAsIG1fbGlua01hdGNoVHlwZShTZWxlY3Rv ckNoZWNrZXI6OmRldGVybWluZUxpbmtNYXRjaFR5cGUoc2VsZWN0b3IoKSkpCiAgICAgLCBtX3By b3BlcnR5V2hpdGVsaXN0VHlwZShkZXRlcm1pbmVQcm9wZXJ0eVdoaXRlbGlzdFR5cGUoc2VsZWN0 b3IoKSkpCisgICAgLCBtX2Rlc2NlbmRhbnRTZWxlY3RvcklkZW50aWZpZXJIYXNoZXMoU2VsZWN0 b3JGaWx0ZXI6OmNvbGxlY3RIYXNoZXMoKnNlbGVjdG9yKCkpKQogI2lmIEVOQUJMRShDU1NfU0VM RUNUT1JfSklUKSAmJiBDU1NfU0VMRUNUT1JfSklUX1BST0ZJTElORwogICAgICwgbV9jb21waWxl ZFNlbGVjdG9yVXNlQ291bnQoMCkKICNlbmRpZgogewogICAgIEFTU0VSVChtX3Bvc2l0aW9uID09 IHBvc2l0aW9uKTsKICAgICBBU1NFUlQobV9zZWxlY3RvckluZGV4ID09IHNlbGVjdG9ySW5kZXgp OwotICAgIFNlbGVjdG9yRmlsdGVyOjpjb2xsZWN0SWRlbnRpZmllckhhc2hlcygqc2VsZWN0b3Io KSwgbV9kZXNjZW5kYW50U2VsZWN0b3JJZGVudGlmaWVySGFzaGVzKTsKIH0KIAogUnVsZVNldDo6 UnVsZVNldCgpID0gZGVmYXVsdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckZp bHRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL1NlbGVjdG9yRmlsdGVy LmNwcAkocmV2aXNpb24gMjI1NTIxKQorKysgU291cmNlL1dlYkNvcmUvY3NzL1NlbGVjdG9yRmls dGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTYsMzAgKzk2LDI4IEBAIHZvaWQgU2VsZWN0b3JG aWx0ZXI6OnB1c2hQYXJlbnQoRWxlbWVudCoKICAgICBwdXNoUGFyZW50U3RhY2tGcmFtZShwYXJl bnQpOwogfQogCi1zdGF0aWMgaW5saW5lIHZvaWQgY29sbGVjdERlc2NlbmRhbnRTZWxlY3Rvcklk ZW50aWZpZXJIYXNoZXMoY29uc3QgQ1NTU2VsZWN0b3ImIHNlbGVjdG9yLCBjb25zdCBTZWxlY3Rv ckZpbHRlcjo6SGFzaGVzJiBoYXNoZXMsIFNlbGVjdG9yRmlsdGVyOjpIYXNoZXM6Oml0ZXJhdG9y JiBoYXNoSXQpCi17Ci0gICAgYXV0byBhZGRJZk5ldyA9IFsmXSAodW5zaWduZWQgaGFzaCkgewot ICAgICAgICBmb3IgKGF1dG8gaXQgPSBoYXNoZXMuYmVnaW4oKTsgaXQgIT0gaGFzaEl0OyArK2l0 KSB7Ci0gICAgICAgICAgICBpZiAoKml0ID09IGhhc2gpCi0gICAgICAgICAgICAgICAgcmV0dXJu OwotICAgICAgICB9Ci0gICAgICAgICpoYXNoSXQgPSBoYXNoOwotICAgICAgICBoYXNoSXQrKzsK LSAgICB9Oworc3RydWN0IENvbGxlY3RlZFNlbGVjdG9ySGFzaGVzIHsKKyAgICB1c2luZyBIYXNo VmVjdG9yID0gVmVjdG9yPHVuc2lnbmVkLCA4PjsKKyAgICBIYXNoVmVjdG9yIGlkczsKKyAgICBI YXNoVmVjdG9yIGNsYXNzZXM7CisgICAgSGFzaFZlY3RvciB0YWdzOworfTsKIAorc3RhdGljIGlu bGluZSB2b2lkIGNvbGxlY3RTaW1wbGVTZWxlY3Rvckhhc2goQ29sbGVjdGVkU2VsZWN0b3JIYXNo ZXMmIGNvbGxlY3RlZEhhc2hlcywgY29uc3QgQ1NTU2VsZWN0b3ImIHNlbGVjdG9yKQorewogICAg IHN3aXRjaCAoc2VsZWN0b3IubWF0Y2goKSkgewogICAgIGNhc2UgQ1NTU2VsZWN0b3I6OklkOgog ICAgICAgICBpZiAoIXNlbGVjdG9yLnZhbHVlKCkuaXNFbXB0eSgpKQotICAgICAgICAgICAgYWRk SWZOZXcoc2VsZWN0b3IudmFsdWUoKS5pbXBsKCktPmV4aXN0aW5nSGFzaCgpICogSWRBdHRyaWJ1 dGVTYWx0KTsKKyAgICAgICAgICAgIGNvbGxlY3RlZEhhc2hlcy5pZHMuYXBwZW5kKHNlbGVjdG9y LnZhbHVlKCkuaW1wbCgpLT5leGlzdGluZ0hhc2goKSAqIElkQXR0cmlidXRlU2FsdCk7CiAgICAg ICAgIGJyZWFrOwogICAgIGNhc2UgQ1NTU2VsZWN0b3I6OkNsYXNzOgogICAgICAgICBpZiAoIXNl bGVjdG9yLnZhbHVlKCkuaXNFbXB0eSgpKQotICAgICAgICAgICAgYWRkSWZOZXcoc2VsZWN0b3Iu dmFsdWUoKS5pbXBsKCktPmV4aXN0aW5nSGFzaCgpICogQ2xhc3NBdHRyaWJ1dGVTYWx0KTsKKyAg ICAgICAgICAgIGNvbGxlY3RlZEhhc2hlcy5jbGFzc2VzLmFwcGVuZChzZWxlY3Rvci52YWx1ZSgp LmltcGwoKS0+ZXhpc3RpbmdIYXNoKCkgKiBDbGFzc0F0dHJpYnV0ZVNhbHQpOwogICAgICAgICBi cmVhazsKICAgICBjYXNlIENTU1NlbGVjdG9yOjpUYWc6IHsKICAgICAgICAgYXV0byYgdGFnTG93 ZXJjYXNlTG9jYWxOYW1lID0gc2VsZWN0b3IudGFnTG93ZXJjYXNlTG9jYWxOYW1lKCk7CiAgICAg ICAgIGlmICh0YWdMb3dlcmNhc2VMb2NhbE5hbWUgIT0gc3RhckF0b20oKSkKLSAgICAgICAgICAg IGFkZElmTmV3KHRhZ0xvd2VyY2FzZUxvY2FsTmFtZS5pbXBsKCktPmV4aXN0aW5nSGFzaCgpICog VGFnTmFtZVNhbHQpOworICAgICAgICAgICAgY29sbGVjdGVkSGFzaGVzLnRhZ3MuYXBwZW5kKHRh Z0xvd2VyY2FzZUxvY2FsTmFtZS5pbXBsKCktPmV4aXN0aW5nSGFzaCgpICogVGFnTmFtZVNhbHQp OwogICAgICAgICBicmVhazsKICAgICB9CiAgICAgZGVmYXVsdDoKQEAgLTEyNywxMyArMTI1LDEz IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBjb2xsZWN0RGVzY2VuZGFudFNlbGUKICAgICB9CiB9CiAK LXZvaWQgU2VsZWN0b3JGaWx0ZXI6OmNvbGxlY3RJZGVudGlmaWVySGFzaGVzKGNvbnN0IENTU1Nl bGVjdG9yJiByaWdodG1vc3RTZWxlY3RvciwgSGFzaGVzJiBoYXNoZXMpCitzdGF0aWMgQ29sbGVj dGVkU2VsZWN0b3JIYXNoZXMgY29sbGVjdFNlbGVjdG9ySGFzaGVzKGNvbnN0IENTU1NlbGVjdG9y JiByaWdodG1vc3RTZWxlY3RvcikKIHsKKyAgICBDb2xsZWN0ZWRTZWxlY3Rvckhhc2hlcyBjb2xs ZWN0ZWRIYXNoZXM7CisKICAgICBhdXRvKiBzZWxlY3RvciA9ICZyaWdodG1vc3RTZWxlY3RvcjsK ICAgICBhdXRvIHJlbGF0aW9uID0gc2VsZWN0b3ItPnJlbGF0aW9uKCk7CiAKLSAgICBhdXRvIGhh c2hJdCA9IGhhc2hlcy5iZWdpbigpOwotCiAgICAgLy8gU2tpcCB0aGUgdG9wbW9zdCBzZWxlY3Rv ci4gSXQgaXMgaGFuZGxlZCBxdWlja2x5IGJ5IHRoZSBydWxlIGhhc2hlcy4KICAgICBib29sIHNr aXBPdmVyU3Vic2VsZWN0b3JzID0gdHJ1ZTsKICAgICBmb3IgKHNlbGVjdG9yID0gc2VsZWN0b3It PnRhZ0hpc3RvcnkoKTsgc2VsZWN0b3I7IHNlbGVjdG9yID0gc2VsZWN0b3ItPnRhZ0hpc3Rvcnko KSkgewpAQCAtMTQxLDcgKzEzOSw3IEBAIHZvaWQgU2VsZWN0b3JGaWx0ZXI6OmNvbGxlY3RJZGVu dGlmaWVySGEKICAgICAgICAgc3dpdGNoIChyZWxhdGlvbikgewogICAgICAgICBjYXNlIENTU1Nl bGVjdG9yOjpTdWJzZWxlY3RvcjoKICAgICAgICAgICAgIGlmICghc2tpcE92ZXJTdWJzZWxlY3Rv cnMpCi0gICAgICAgICAgICAgICAgY29sbGVjdERlc2NlbmRhbnRTZWxlY3RvcklkZW50aWZpZXJI YXNoZXMoKnNlbGVjdG9yLCBoYXNoZXMsIGhhc2hJdCk7CisgICAgICAgICAgICAgICAgY29sbGVj dFNpbXBsZVNlbGVjdG9ySGFzaChjb2xsZWN0ZWRIYXNoZXMsICpzZWxlY3Rvcik7CiAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgY2FzZSBDU1NTZWxlY3Rvcjo6RGlyZWN0QWRqYWNlbnQ6CiAg ICAgICAgIGNhc2UgQ1NTU2VsZWN0b3I6OkluZGlyZWN0QWRqYWNlbnQ6CkBAIC0xNTEsMTUgKzE0 OSw1MyBAQCB2b2lkIFNlbGVjdG9yRmlsdGVyOjpjb2xsZWN0SWRlbnRpZmllckhhCiAgICAgICAg IGNhc2UgQ1NTU2VsZWN0b3I6OkRlc2NlbmRhbnRTcGFjZToKICAgICAgICAgY2FzZSBDU1NTZWxl Y3Rvcjo6Q2hpbGQ6CiAgICAgICAgICAgICBza2lwT3ZlclN1YnNlbGVjdG9ycyA9IGZhbHNlOwot ICAgICAgICAgICAgY29sbGVjdERlc2NlbmRhbnRTZWxlY3RvcklkZW50aWZpZXJIYXNoZXMoKnNl bGVjdG9yLCBoYXNoZXMsIGhhc2hJdCk7CisgICAgICAgICAgICBjb2xsZWN0U2ltcGxlU2VsZWN0 b3JIYXNoKGNvbGxlY3RlZEhhc2hlcywgKnNlbGVjdG9yKTsKICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICB9Ci0gICAgICAgIGlmIChoYXNoSXQgPT0gaGFzaGVzLmVuZCgpKQotICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICByZWxhdGlvbiA9IHNlbGVjdG9yLT5yZWxhdGlvbigpOwogICAg IH0KKyAgICByZXR1cm4gY29sbGVjdGVkSGFzaGVzOworfQorCitzdGF0aWMgU2VsZWN0b3JGaWx0 ZXI6Okhhc2hlcyBjaG9vc2VTZWxlY3Rvckhhc2hlc0ZvckZpbHRlcihjb25zdCBDb2xsZWN0ZWRT ZWxlY3Rvckhhc2hlcyYgY29sbGVjdGVkU2VsZWN0b3JIYXNoZXMpCit7CisgICAgU2VsZWN0b3JG aWx0ZXI6Okhhc2hlcyByZXN1bHRIYXNoZXM7CisgICAgdW5zaWduZWQgaW5kZXggPSAwOwogCi0g ICAgKmhhc2hJdCA9IDA7CisgICAgYXV0byBhZGRJZk5ldyA9IFsmXSAodW5zaWduZWQgaGFzaCkg eworICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgaW5kZXg7ICsraSkgeworICAgICAg ICAgICAgaWYgKHJlc3VsdEhhc2hlc1tpXSA9PSBoYXNoKQorICAgICAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgfQorICAgICAgICByZXN1bHRIYXNoZXNbaW5kZXgrK10gPSBoYXNoOworICAg IH07CisKKyAgICBhdXRvIGNvcHlIYXNoZXMgPSBbJl0gKGF1dG8mIGhhc2hlcykgeworICAgICAg ICBmb3IgKGF1dG8mIGhhc2ggOiBoYXNoZXMpIHsKKyAgICAgICAgICAgIGFkZElmTmV3KGhhc2gp OworICAgICAgICAgICAgaWYgKGluZGV4ID09IHJlc3VsdEhhc2hlcy5zaXplKCkpCisgICAgICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgIH07CisKKyAgICAvLyBUaGVyZSBpcyBhIGxpbWl0ZWQgbnVtYmVyIG9mIHNsb3RzLiBQcmVm ZXIgbW9yZSBzcGVjaWZpYyBzZWxlY3RvciB0eXBlcy4KKyAgICBpZiAoY29weUhhc2hlcyhjb2xs ZWN0ZWRTZWxlY3Rvckhhc2hlcy5pZHMpKQorICAgICAgICByZXR1cm4gcmVzdWx0SGFzaGVzOwor ICAgIGlmIChjb3B5SGFzaGVzKGNvbGxlY3RlZFNlbGVjdG9ySGFzaGVzLmNsYXNzZXMpKQorICAg ICAgICByZXR1cm4gcmVzdWx0SGFzaGVzOworICAgIGlmIChjb3B5SGFzaGVzKGNvbGxlY3RlZFNl bGVjdG9ySGFzaGVzLnRhZ3MpKQorICAgICAgICByZXR1cm4gcmVzdWx0SGFzaGVzOworCisgICAg Ly8gTnVsbC10ZXJtaW5hdGUgaWYgbm90IGZ1bGwuCisgICAgcmVzdWx0SGFzaGVzW2luZGV4XSA9 IDA7CisgICAgcmV0dXJuIHJlc3VsdEhhc2hlczsKK30KKworU2VsZWN0b3JGaWx0ZXI6Okhhc2hl cyBTZWxlY3RvckZpbHRlcjo6Y29sbGVjdEhhc2hlcyhjb25zdCBDU1NTZWxlY3RvciYgc2VsZWN0 b3IpCit7CisgICAgYXV0byBoYXNoZXMgPSBjb2xsZWN0U2VsZWN0b3JIYXNoZXMoc2VsZWN0b3Ip OworICAgIHJldHVybiBjaG9vc2VTZWxlY3Rvckhhc2hlc0ZvckZpbHRlcihoYXNoZXMpOwogfQog CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JGaWx0ZXIuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JGaWx0ZXIuaAkocmV2aXNpb24gMjI1NTIx KQorKysgU291cmNlL1dlYkNvcmUvY3NzL1NlbGVjdG9yRmlsdGVyLmgJKHdvcmtpbmcgY29weSkK QEAgLTQ5LDcgKzQ5LDcgQEAgcHVibGljOgogCiAgICAgdXNpbmcgSGFzaGVzID0gc3RkOjphcnJh eTx1bnNpZ25lZCwgND47CiAgICAgYm9vbCBmYXN0UmVqZWN0U2VsZWN0b3IoY29uc3QgSGFzaGVz JikgY29uc3Q7Ci0gICAgc3RhdGljIHZvaWQgY29sbGVjdElkZW50aWZpZXJIYXNoZXMoY29uc3Qg Q1NTU2VsZWN0b3ImLCBIYXNoZXMmKTsKKyAgICBzdGF0aWMgSGFzaGVzIGNvbGxlY3RIYXNoZXMo Y29uc3QgQ1NTU2VsZWN0b3ImKTsKIAogcHJpdmF0ZToKICAgICBzdHJ1Y3QgUGFyZW50U3RhY2tG cmFtZSB7CkBAIC02Nyw4ICs2NywxMCBAQCBwcml2YXRlOgogCiBpbmxpbmUgYm9vbCBTZWxlY3Rv ckZpbHRlcjo6ZmFzdFJlamVjdFNlbGVjdG9yKGNvbnN0IEhhc2hlcyYgaGFzaGVzKSBjb25zdAog ewotICAgIGZvciAodW5zaWduZWQgbiA9IDA7IG4gPCBoYXNoZXMuc2l6ZSgpICYmIGhhc2hlc1tu XTsgKytuKSB7Ci0gICAgICAgIGlmICghbV9hbmNlc3RvcklkZW50aWZpZXJGaWx0ZXIubWF5Q29u dGFpbihoYXNoZXNbbl0pKQorICAgIGZvciAoYXV0byYgaGFzaCA6IGhhc2hlcykgeworICAgICAg ICBpZiAoIWhhc2gpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlmICghbV9h bmNlc3RvcklkZW50aWZpZXJGaWx0ZXIubWF5Q29udGFpbihoYXNoKSkKICAgICAgICAgICAgIHJl dHVybiB0cnVlOwogICAgIH0KICAgICByZXR1cm4gZmFsc2U7Cg==