183200 2018-02-28 02:03:09 -0800 Filter attribute selectors with selector filter 2018-02-28 07:50:07 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned commit-queue webkit-bug-importer zalan oldest_to_newest 1402551 0 koivisto 2018-02-28 02:03:09 -0800 Currently selector filtering is done based on tags, classes and ids. We should include attributes too. 1402555 1 334732 koivisto 2018-02-28 02:15:51 -0800 Created attachment 334732 patch 1402596 2 webkit-bug-importer 2018-02-28 07:18:21 -0800 <rdar://problem/37983381> 1402606 3 334732 commit-queue 2018-02-28 07:50:05 -0800 Comment on attachment 334732 patch Clearing flags on attachment: 334732 Committed r229090: <https://trac.webkit.org/changeset/229090> 1402607 4 commit-queue 2018-02-28 07:50:07 -0800 All reviewed patches have been landed. Closing bug. 334732 2018-02-28 02:15:51 -0800 2018-02-28 07:50:05 -0800 patch selector-filter-attributes-4.patch text/plain 6734 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyOTA4OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE4LTAyLTI4ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBGaWx0ZXIgYXR0cmlidXRlIHNl bGVjdG9ycyB3aXRoIHNlbGVjdG9yIGZpbHRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzMjAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5IHNlbGVjdG9yIGZpbHRlcmluZyBpcyBkb25l IGJhc2VkIG9uIHRhZ3MsIGNsYXNzZXMgYW5kIGlkcy4gV2Ugc2hvdWxkIGluY2x1ZGUgYXR0cmli dXRlcyB0b28uCisKKyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIGZpbHRlcmluZyBiYXNlZCBvbiBh dHRyaWJ1dGUgbmFtZSAoYnV0IG5vdCBjb250ZW50KS4KKworICAgICAgICAqIGNzcy9TZWxlY3Rv ckZpbHRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjppc0V4Y2x1ZGVkQXR0cmlidXRlKToKKwor ICAgICAgICAgICAgSWdub3JlIGlkLCBjbGFzcyBhbmQgc3R5bGUgYXR0cmlidXRlcy4gRmlyc3Qg dHdvIGFyZSBhbHJlYWR5IGhhbmRsZWQgYW5kIHRoZSBsYXN0IGlzIGNvbW1vbiBidXQgaXMgcmFy ZWx5CisgICAgICAgICAgICB1c2VkIGluIHNlbGVjdG9ycy4KKworICAgICAgICAoV2ViQ29yZTo6 Y29sbGVjdEVsZW1lbnRJZGVudGlmaWVySGFzaGVzKToKKworICAgICAgICAgICAgQ29sbGVjdCBh dHRyaWJ1dGVzLgorICAgICAgICAgICAgUmVtb3ZlIHRoZSB1bm5lY2Vzc2FyeSBTdHlsZWRFbGVt ZW50IGNhc3RpbmcuCisKKyAgICAgICAgKFdlYkNvcmU6OmNvbGxlY3RTaW1wbGVTZWxlY3Rvckhh c2gpOgorCisgICAgICAgICAgICBDb2xsZWN0IGF0dHJpYnV0ZSBzZWxlY3RvcnMuCisKKyAgICAg ICAgKFdlYkNvcmU6OmNob29zZVNlbGVjdG9ySGFzaGVzRm9yRmlsdGVyKToKKworICAgICAgICAg ICAgUGljayBhdHRyaWJ1dGVzIHdpdGggaGlnaCBwcmlvcml0eSBmb3IgdGhlIGZpbHRlciBhcyBp dCBpcyBsaWtlbHkgYSBnb29kIHNpZ25hbC4KKwogMjAxOC0wMi0yNyAgU2VyZ2lvIFZpbGxhciBT ZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV2ViVlJdIENvbnZlcnQgVlJQ bGF0Zm9ybURpc3BsYXlJbmZvIGludG8gYSBjbGFzcwpJbmRleDogU291cmNlL1dlYkNvcmUvY3Nz L1NlbGVjdG9yRmlsdGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvU2Vs ZWN0b3JGaWx0ZXIuY3BwCShyZXZpc2lvbiAyMjg4OTEpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3Mv U2VsZWN0b3JGaWx0ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNiwyMiArMzYsMzYgQEAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogLy8gU2FsdCB0byBzZXBhcmF0ZSBvdGhlcndpc2UgaWRlbnRp Y2FsIHN0cmluZyBoYXNoZXMgc28gYSBjbGFzcy1zZWxlY3RvciBsaWtlIC5hcnRpY2xlIHdvbid0 IG1hdGNoIDxhcnRpY2xlPiBlbGVtZW50cy4KLWVudW0geyBUYWdOYW1lU2FsdCA9IDEzLCBJZEF0 dHJpYnV0ZVNhbHQgPSAxNywgQ2xhc3NBdHRyaWJ1dGVTYWx0ID0gMTkgfTsKK2VudW0geyBUYWdO YW1lU2FsdCA9IDEzLCBJZFNhbHQgPSAxNywgQ2xhc3NTYWx0ID0gMTksIEF0dHJpYnV0ZVNhbHQg PSAyMyB9OwogCi1zdGF0aWMgaW5saW5lIHZvaWQgY29sbGVjdEVsZW1lbnRJZGVudGlmaWVySGFz aGVzKGNvbnN0IEVsZW1lbnQqIGVsZW1lbnQsIFZlY3Rvcjx1bnNpZ25lZCwgND4mIGlkZW50aWZp ZXJIYXNoZXMpCitzdGF0aWMgYm9vbCBpc0V4Y2x1ZGVkQXR0cmlidXRlKGNvbnN0IEF0b21pY1N0 cmluZyYgbmFtZSkKIHsKLSAgICBBdG9taWNTdHJpbmcgdGFnTG93ZXJjYXNlTG9jYWxOYW1lID0g ZWxlbWVudC0+bG9jYWxOYW1lKCkuY29udmVydFRvQVNDSUlMb3dlcmNhc2UoKTsKKyAgICByZXR1 cm4gbmFtZSA9PSBIVE1MTmFtZXM6OmNsYXNzQXR0ci0+bG9jYWxOYW1lKCkgfHwgbmFtZSA9PSBI VE1MTmFtZXM6OmlkQXR0ci0+bG9jYWxOYW1lKCkgfHwgbmFtZSA9PSBIVE1MTmFtZXM6OnN0eWxl QXR0ci0+bG9jYWxOYW1lKCk7Cit9CisKK3N0YXRpYyBpbmxpbmUgdm9pZCBjb2xsZWN0RWxlbWVu dElkZW50aWZpZXJIYXNoZXMoY29uc3QgRWxlbWVudCYgZWxlbWVudCwgVmVjdG9yPHVuc2lnbmVk LCA0PiYgaWRlbnRpZmllckhhc2hlcykKK3sKKyAgICBBdG9taWNTdHJpbmcgdGFnTG93ZXJjYXNl TG9jYWxOYW1lID0gZWxlbWVudC5sb2NhbE5hbWUoKS5jb252ZXJ0VG9BU0NJSUxvd2VyY2FzZSgp OwogICAgIGlkZW50aWZpZXJIYXNoZXMuYXBwZW5kKHRhZ0xvd2VyY2FzZUxvY2FsTmFtZS5pbXBs KCktPmV4aXN0aW5nSGFzaCgpICogVGFnTmFtZVNhbHQpOwogCi0gICAgYXV0byYgaWQgPSBlbGVt ZW50LT5pZEZvclN0eWxlUmVzb2x1dGlvbigpOworICAgIGF1dG8mIGlkID0gZWxlbWVudC5pZEZv clN0eWxlUmVzb2x1dGlvbigpOwogICAgIGlmICghaWQuaXNOdWxsKCkpCi0gICAgICAgIGlkZW50 aWZpZXJIYXNoZXMuYXBwZW5kKGlkLmltcGwoKS0+ZXhpc3RpbmdIYXNoKCkgKiBJZEF0dHJpYnV0 ZVNhbHQpOwotICAgIGNvbnN0IFN0eWxlZEVsZW1lbnQqIHN0eWxlZEVsZW1lbnQgPSBlbGVtZW50 LT5pc1N0eWxlZEVsZW1lbnQoKSA/IHN0YXRpY19jYXN0PGNvbnN0IFN0eWxlZEVsZW1lbnQqPihl bGVtZW50KSA6IDA7Ci0gICAgaWYgKHN0eWxlZEVsZW1lbnQgJiYgc3R5bGVkRWxlbWVudC0+aGFz Q2xhc3MoKSkgewotICAgICAgICBjb25zdCBTcGFjZVNwbGl0U3RyaW5nJiBjbGFzc05hbWVzID0g c3R5bGVkRWxlbWVudC0+Y2xhc3NOYW1lcygpOworICAgICAgICBpZGVudGlmaWVySGFzaGVzLmFw cGVuZChpZC5pbXBsKCktPmV4aXN0aW5nSGFzaCgpICogSWRTYWx0KTsKKworICAgIGlmIChlbGVt ZW50Lmhhc0NsYXNzKCkpIHsKKyAgICAgICAgY29uc3QgU3BhY2VTcGxpdFN0cmluZyYgY2xhc3NO YW1lcyA9IGVsZW1lbnQuY2xhc3NOYW1lcygpOwogICAgICAgICBzaXplX3QgY291bnQgPSBjbGFz c05hbWVzLnNpemUoKTsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjb3VudDsgKytp KQotICAgICAgICAgICAgaWRlbnRpZmllckhhc2hlcy5hcHBlbmQoY2xhc3NOYW1lc1tpXS5pbXBs KCktPmV4aXN0aW5nSGFzaCgpICogQ2xhc3NBdHRyaWJ1dGVTYWx0KTsKKyAgICAgICAgICAgIGlk ZW50aWZpZXJIYXNoZXMuYXBwZW5kKGNsYXNzTmFtZXNbaV0uaW1wbCgpLT5leGlzdGluZ0hhc2go KSAqIENsYXNzU2FsdCk7CisgICAgfQorICAgIAorICAgIGlmIChlbGVtZW50Lmhhc0F0dHJpYnV0 ZXNXaXRob3V0VXBkYXRlKCkpIHsKKyAgICAgICAgZm9yIChhdXRvJiBhdHRyaWJ1dGUgOiBlbGVt ZW50LmF0dHJpYnV0ZXNJdGVyYXRvcigpKSB7CisgICAgICAgICAgICBhdXRvIGF0dHJpYnV0ZU5h bWUgPSBlbGVtZW50LmlzSFRNTEVsZW1lbnQoKSA/IGF0dHJpYnV0ZS5sb2NhbE5hbWUoKSA6IGF0 dHJpYnV0ZS5sb2NhbE5hbWUoKS5jb252ZXJ0VG9BU0NJSUxvd2VyY2FzZSgpOworICAgICAgICAg ICAgaWYgKGlzRXhjbHVkZWRBdHRyaWJ1dGUoYXR0cmlidXRlTmFtZSkpCisgICAgICAgICAgICAg ICAgY29udGludWU7CisgICAgICAgICAgICBpZGVudGlmaWVySGFzaGVzLmFwcGVuZChhdHRyaWJ1 dGVOYW1lLmltcGwoKS0+ZXhpc3RpbmdIYXNoKCkgKiBBdHRyaWJ1dGVTYWx0KTsKKyAgICAgICAg fQogICAgIH0KIH0KIApAQCAtODAsNyArOTQsNyBAQCB2b2lkIFNlbGVjdG9yRmlsdGVyOjpwdXNo UGFyZW50KEVsZW1lbnQqCiAgICAgUGFyZW50U3RhY2tGcmFtZSYgcGFyZW50RnJhbWUgPSBtX3Bh cmVudFN0YWNrLmxhc3QoKTsKICAgICAvLyBNaXggdGFncywgY2xhc3MgbmFtZXMgYW5kIGlkcyBp bnRvIHNvbWUgc29ydCBvZiB3ZWlyZCBib3VpbGxhYmFpc3NlLgogICAgIC8vIFRoZSBmaWx0ZXIg aXMgdXNlZCBmb3IgZmFzdCByZWplY3Rpb24gb2YgY2hpbGQgYW5kIGRlc2NlbmRhbnQgc2VsZWN0 b3JzLgotICAgIGNvbGxlY3RFbGVtZW50SWRlbnRpZmllckhhc2hlcyhwYXJlbnQsIHBhcmVudEZy YW1lLmlkZW50aWZpZXJIYXNoZXMpOworICAgIGNvbGxlY3RFbGVtZW50SWRlbnRpZmllckhhc2hl cygqcGFyZW50LCBwYXJlbnRGcmFtZS5pZGVudGlmaWVySGFzaGVzKTsKICAgICBzaXplX3QgY291 bnQgPSBwYXJlbnRGcmFtZS5pZGVudGlmaWVySGFzaGVzLnNpemUoKTsKICAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IGNvdW50OyArK2kpCiAgICAgICAgIG1fYW5jZXN0b3JJZGVudGlmaWVyRmls dGVyLmFkZChwYXJlbnRGcmFtZS5pZGVudGlmaWVySGFzaGVzW2ldKTsKQEAgLTEyMyw2ICsxMzcs NyBAQCBzdHJ1Y3QgQ29sbGVjdGVkU2VsZWN0b3JIYXNoZXMgewogICAgIEhhc2hWZWN0b3IgaWRz OwogICAgIEhhc2hWZWN0b3IgY2xhc3NlczsKICAgICBIYXNoVmVjdG9yIHRhZ3M7CisgICAgSGFz aFZlY3RvciBhdHRyaWJ1dGVzOwogfTsKIAogc3RhdGljIGlubGluZSB2b2lkIGNvbGxlY3RTaW1w bGVTZWxlY3Rvckhhc2goQ29sbGVjdGVkU2VsZWN0b3JIYXNoZXMmIGNvbGxlY3RlZEhhc2hlcywg Y29uc3QgQ1NTU2VsZWN0b3ImIHNlbGVjdG9yKQpAQCAtMTMwLDExICsxNDUsMTEgQEAgc3RhdGlj IGlubGluZSB2b2lkIGNvbGxlY3RTaW1wbGVTZWxlY3RvcgogICAgIHN3aXRjaCAoc2VsZWN0b3Iu bWF0Y2goKSkgewogICAgIGNhc2UgQ1NTU2VsZWN0b3I6OklkOgogICAgICAgICBpZiAoIXNlbGVj dG9yLnZhbHVlKCkuaXNFbXB0eSgpKQotICAgICAgICAgICAgY29sbGVjdGVkSGFzaGVzLmlkcy5h cHBlbmQoc2VsZWN0b3IudmFsdWUoKS5pbXBsKCktPmV4aXN0aW5nSGFzaCgpICogSWRBdHRyaWJ1 dGVTYWx0KTsKKyAgICAgICAgICAgIGNvbGxlY3RlZEhhc2hlcy5pZHMuYXBwZW5kKHNlbGVjdG9y LnZhbHVlKCkuaW1wbCgpLT5leGlzdGluZ0hhc2goKSAqIElkU2FsdCk7CiAgICAgICAgIGJyZWFr OwogICAgIGNhc2UgQ1NTU2VsZWN0b3I6OkNsYXNzOgogICAgICAgICBpZiAoIXNlbGVjdG9yLnZh bHVlKCkuaXNFbXB0eSgpKQotICAgICAgICAgICAgY29sbGVjdGVkSGFzaGVzLmNsYXNzZXMuYXBw ZW5kKHNlbGVjdG9yLnZhbHVlKCkuaW1wbCgpLT5leGlzdGluZ0hhc2goKSAqIENsYXNzQXR0cmli dXRlU2FsdCk7CisgICAgICAgICAgICBjb2xsZWN0ZWRIYXNoZXMuY2xhc3Nlcy5hcHBlbmQoc2Vs ZWN0b3IudmFsdWUoKS5pbXBsKCktPmV4aXN0aW5nSGFzaCgpICogQ2xhc3NTYWx0KTsKICAgICAg ICAgYnJlYWs7CiAgICAgY2FzZSBDU1NTZWxlY3Rvcjo6VGFnOiB7CiAgICAgICAgIGF1dG8mIHRh Z0xvd2VyY2FzZUxvY2FsTmFtZSA9IHNlbGVjdG9yLnRhZ0xvd2VyY2FzZUxvY2FsTmFtZSgpOwpA QCAtMTQyLDYgKzE1NywxOCBAQCBzdGF0aWMgaW5saW5lIHZvaWQgY29sbGVjdFNpbXBsZVNlbGVj dG9yCiAgICAgICAgICAgICBjb2xsZWN0ZWRIYXNoZXMudGFncy5hcHBlbmQodGFnTG93ZXJjYXNl TG9jYWxOYW1lLmltcGwoKS0+ZXhpc3RpbmdIYXNoKCkgKiBUYWdOYW1lU2FsdCk7CiAgICAgICAg IGJyZWFrOwogICAgIH0KKyAgICBjYXNlIENTU1NlbGVjdG9yOjpFeGFjdDoKKyAgICBjYXNlIENT U1NlbGVjdG9yOjpTZXQ6CisgICAgY2FzZSBDU1NTZWxlY3Rvcjo6TGlzdDoKKyAgICBjYXNlIENT U1NlbGVjdG9yOjpIeXBoZW46CisgICAgY2FzZSBDU1NTZWxlY3Rvcjo6Q29udGFpbjoKKyAgICBj YXNlIENTU1NlbGVjdG9yOjpCZWdpbjoKKyAgICBjYXNlIENTU1NlbGVjdG9yOjpFbmQ6IHsKKyAg ICAgICAgYXV0byBhdHRyaWJ1dGVOYW1lID0gc2VsZWN0b3IuYXR0cmlidXRlQ2Fub25pY2FsTG9j YWxOYW1lKCkuY29udmVydFRvQVNDSUlMb3dlcmNhc2UoKTsKKyAgICAgICAgaWYgKCFpc0V4Y2x1 ZGVkQXR0cmlidXRlKGF0dHJpYnV0ZU5hbWUpKQorICAgICAgICAgICAgY29sbGVjdGVkSGFzaGVz LmF0dHJpYnV0ZXMuYXBwZW5kKGF0dHJpYnV0ZU5hbWUuaW1wbCgpLT5leGlzdGluZ0hhc2goKSAq IEF0dHJpYnV0ZVNhbHQpOworICAgICAgICBicmVhazsKKyAgICB9CiAgICAgZGVmYXVsdDoKICAg ICAgICAgYnJlYWs7CiAgICAgfQpAQCAtMjA0LDYgKzIzMSw4IEBAIHN0YXRpYyBTZWxlY3RvckZp bHRlcjo6SGFzaGVzIGNob29zZVNlbGUKICAgICAvLyBUaGVyZSBpcyBhIGxpbWl0ZWQgbnVtYmVy IG9mIHNsb3RzLiBQcmVmZXIgbW9yZSBzcGVjaWZpYyBzZWxlY3RvciB0eXBlcy4KICAgICBpZiAo Y29weUhhc2hlcyhjb2xsZWN0ZWRTZWxlY3Rvckhhc2hlcy5pZHMpKQogICAgICAgICByZXR1cm4g cmVzdWx0SGFzaGVzOworICAgIGlmIChjb3B5SGFzaGVzKGNvbGxlY3RlZFNlbGVjdG9ySGFzaGVz LmF0dHJpYnV0ZXMpKQorICAgICAgICByZXR1cm4gcmVzdWx0SGFzaGVzOwogICAgIGlmIChjb3B5 SGFzaGVzKGNvbGxlY3RlZFNlbGVjdG9ySGFzaGVzLmNsYXNzZXMpKQogICAgICAgICByZXR1cm4g cmVzdWx0SGFzaGVzOwogICAgIGlmIChjb3B5SGFzaGVzKGNvbGxlY3RlZFNlbGVjdG9ySGFzaGVz LnRhZ3MpKQo=