72480 2011-11-16 00:58:24 -0800 CSSStyleSelector: refactor sorting of matched rules 2011-11-21 17:47:33 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All All RESOLVED INVALID P2 Normal --- 49142 67720 1 rolandsteiner rolandsteiner dglazkov dominicc koivisto macpherson morrita webkit.review.bot oldest_to_newest 503697 0 rolandsteiner 2011-11-16 00:58:24 -0800 In CSSStyleSelector, after rules are matched they are sorted according to specificity. This currently happens in 2 different places and thus should be refactored. This will also help in the implementation of <style scoped> (see bug 67720). 503704 1 rolandsteiner 2011-11-16 01:14:33 -0800 :P Turns out, that code has changed since I worked on it (in unsavory ways, IMHO), so marking this as invalid. 503718 2 rolandsteiner 2011-11-16 02:03:15 -0800 Upon further thought, a refactoring may still make sense, esp. in view of <style scoped> later on. It just won't be quite as elegant anymore. :p 503720 3 115349 rolandsteiner 2011-11-16 02:04:26 -0800 Created attachment 115349 Patch 503775 4 115349 koivisto 2011-11-16 05:02:40 -0800 Comment on attachment 115349 Patch This seems like a bad way to factor this. You are adding a function to share code but very little is actually used in the other case. 504463 5 rolandsteiner 2011-11-16 17:46:20 -0800 FWIW, I completely agree! :P Originally the function only took a collectRulesOnly parameter that was set to false for page rules. See the patch for 67720 for the original version. FWIW, no CSS test breaks with this, even with the link style twiddling added, but since matchPageRules bypasses the twiddling it felt dangerous to re-use that branch in the refactoring. 507333 6 rolandsteiner 2011-11-21 17:47:33 -0800 Given the code changes, this refactoring is probably meaningless without the context of the larger patch after all. Marking INVALID. 115349 2011-11-16 02:04:26 -0800 2011-11-16 05:02:39 -0800 Patch bug-72480-20111116190424.patch text/plain 7072 rolandsteiner U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2QzMWQ5YWM3YjYzYzZl NjA5YzNlMmJlY2FlM2M2M2QzN2MxMzQ3OC4uNWM2MDFjZDU5YTc5M2M5MTk5ZTExNDkwODQ1YmQ4 ZGE5ZTAxZDFmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDExLTExLTE2ICBSb2xh bmQgU3RlaW5lciAgPHJvbGFuZHN0ZWluZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENTU1N0 eWxlU2VsZWN0b3I6IHJlZmFjdG9yIHNvcnRpbmcgb2YgbWF0Y2hlZCBydWxlcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzI0ODAKKworICAgICAgICBN b3ZlZCBjb2RlIGZvciBzb3J0aW5nIGFuZCB0cmFuc2ZlcnJpbmcgb2YgbWF0Y2hlZCBydWxlcyBp bnRvIHNvcnRBbmRUcmFuc2Zlck1hdGNoZWRSdWxlcygpLgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKHJlZmFjdG9yaW5nKQor CisgICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Q1NTU3R5bGVTZWxlY3Rvcjo6bWF0Y2hSdWxlcyk6IHVzZXMgc29ydEFuZFRyYW5zZmVyTWF0Y2hl ZFJ1bGVzCisgICAgICAgIChXZWJDb3JlOjpsZXNzU3BlY2lmaWMpOgorICAgICAgICAoV2ViQ29y ZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6c29ydEFuZFRyYW5zZmVyTWF0Y2hlZFJ1bGVzKToKKyAgICAg ICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6Om1hdGNoUGFnZVJ1bGVzKTogdXNlcyBzb3J0 QW5kVHJhbnNmZXJNYXRjaGVkUnVsZXMKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5o OgorCiAyMDExLTExLTE2ICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNv bT4KIAogICAgICAgICBbR1RLXSBVc2UgR1F1YXJrJ3MgaW4gdGhlIEFUSyB3cmFwcGVyIHRvIGdl dCBhbmQgc2V0IGFyYml0cmFyeSBkYXRhCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTU3R5bGVTZWxlY3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rv ci5jcHAKaW5kZXggNzUyN2Q3M2VmNDJmYThiMGIzZDJhMDAyODAxNTlhMGU2OWRkMTkxZi4uZmNj YTMxODFlZjFiNDFhNGJmOGE3NGNjOWNiYmFlZmZkY2E0NmVlNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NTdHlsZVNlbGVjdG9yLmNwcApAQCAtNjQ4LDMyICs2NDgsNyBAQCB2b2lkIENTU1N0eWxl U2VsZWN0b3I6Om1hdGNoUnVsZXMoUnVsZVNldCogcnVsZXMsIGludCYgZmlyc3RSdWxlSW5kZXgs IGludCYgbGFzdAogICAgIG1hdGNoUnVsZXNGb3JMaXN0KHJ1bGVzLT50YWdSdWxlcyhtX2VsZW1l bnQtPmxvY2FsTmFtZSgpLmltcGwoKSksIGZpcnN0UnVsZUluZGV4LCBsYXN0UnVsZUluZGV4LCBp bmNsdWRlRW1wdHlSdWxlcyk7CiAgICAgbWF0Y2hSdWxlc0Zvckxpc3QocnVsZXMtPnVuaXZlcnNh bFJ1bGVzKCksIGZpcnN0UnVsZUluZGV4LCBsYXN0UnVsZUluZGV4LCBpbmNsdWRlRW1wdHlSdWxl cyk7CiAKLSAgICAvLyBJZiB3ZSBkaWRuJ3QgbWF0Y2ggYW55IHJ1bGVzLCB3ZSdyZSBkb25lLgot ICAgIGlmIChtX21hdGNoZWRSdWxlcy5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybjsKLQotICAg IC8vIFNvcnQgdGhlIHNldCBvZiBtYXRjaGVkIHJ1bGVzLgotICAgIHNvcnRNYXRjaGVkUnVsZXMo KTsKLQotICAgIC8vIE5vdyB0cmFuc2ZlciB0aGUgc2V0IG9mIG1hdGNoZWQgcnVsZXMgb3ZlciB0 byBvdXIgbGlzdCBvZiBkZWNscy4KLSAgICBpZiAoIW1fY2hlY2tlci5pc0NvbGxlY3RpbmdSdWxl c09ubHkoKSkgewotICAgICAgICAvLyBGSVhNRTogVGhpcyBzdWNrcywgdGhlIGluc3BlY3RvciBz aG91bGQgZ2V0IHRoZSBzdHlsZSBmcm9tIHRoZSB2aXNpdGVkIHN0eWxlIGl0c2VsZi4KLSAgICAg ICAgYm9vbCBzd2FwVmlzaXRlZFVudmlzaXRlZCA9IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6 Zm9yY2VQc2V1ZG9TdGF0ZShtX2VsZW1lbnQsIENTU1NlbGVjdG9yOjpQc2V1ZG9WaXNpdGVkKTsK LSAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fbWF0Y2hlZFJ1bGVzLnNpemUoKTsg aSsrKSB7Ci0gICAgICAgICAgICBpZiAobV9zdHlsZSAmJiBtX21hdGNoZWRSdWxlc1tpXS0+Y29u dGFpbnNVbmNvbW1vbkF0dHJpYnV0ZVNlbGVjdG9yKCkpCi0gICAgICAgICAgICAgICAgbV9zdHls ZS0+c2V0QWZmZWN0ZWRCeVVuY29tbW9uQXR0cmlidXRlU2VsZWN0b3JzKCk7Ci0gICAgICAgICAg ICB1bnNpZ25lZCBsaW5rTWF0Y2hUeXBlID0gbV9tYXRjaGVkUnVsZXNbaV0tPmxpbmtNYXRjaFR5 cGUoKTsKLSAgICAgICAgICAgIGlmIChzd2FwVmlzaXRlZFVudmlzaXRlZCAmJiBsaW5rTWF0Y2hU eXBlICYmIGxpbmtNYXRjaFR5cGUgIT0gU2VsZWN0b3JDaGVja2VyOjpNYXRjaEFsbCkKLSAgICAg ICAgICAgICAgICBsaW5rTWF0Y2hUeXBlID0gKGxpbmtNYXRjaFR5cGUgPT0gU2VsZWN0b3JDaGVj a2VyOjpNYXRjaFZpc2l0ZWQpID8gU2VsZWN0b3JDaGVja2VyOjpNYXRjaExpbmsgOiBTZWxlY3Rv ckNoZWNrZXI6Ok1hdGNoVmlzaXRlZDsKLSAgICAgICAgICAgIGFkZE1hdGNoZWREZWNsYXJhdGlv bihtX21hdGNoZWRSdWxlc1tpXS0+cnVsZSgpLT5kZWNsYXJhdGlvbigpLCBsaW5rTWF0Y2hUeXBl KTsKLSAgICAgICAgfQotICAgIH0gZWxzZSB7Ci0gICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7 IGkgPCBtX21hdGNoZWRSdWxlcy5zaXplKCk7IGkrKykgewotICAgICAgICAgICAgaWYgKCFtX3J1 bGVMaXN0KQotICAgICAgICAgICAgICAgIG1fcnVsZUxpc3QgPSBDU1NSdWxlTGlzdDo6Y3JlYXRl KCk7Ci0gICAgICAgICAgICBtX3J1bGVMaXN0LT5hcHBlbmQobV9tYXRjaGVkUnVsZXNbaV0tPnJ1 bGUoKSk7Ci0gICAgICAgIH0KLSAgICB9CisgICAgc29ydEFuZFRyYW5zZmVyTWF0Y2hlZFJ1bGVz KG1fY2hlY2tlci5pc0NvbGxlY3RpbmdSdWxlc09ubHkoKSwgdHJ1ZSk7CiB9CiAKIGNsYXNzIE1h dGNoaW5nVUFSdWxlc1Njb3BlIHsKQEAgLTc1MywxNiArNzI4LDQ0IEBAIHZvaWQgQ1NTU3R5bGVT ZWxlY3Rvcjo6bWF0Y2hSdWxlc0Zvckxpc3QoY29uc3QgVmVjdG9yPFJ1bGVEYXRhPiogcnVsZXMs IGludCYgZmlyCiAgICAgfQogfQogCi1zdGF0aWMgaW5saW5lIGJvb2wgY29tcGFyZVJ1bGVzKGNv bnN0IFJ1bGVEYXRhKiByMSwgY29uc3QgUnVsZURhdGEqIHIyKQorc3RhdGljIGlubGluZSBib29s IGxlc3NTcGVjaWZpYyhjb25zdCBSdWxlRGF0YSogcjEsIGNvbnN0IFJ1bGVEYXRhKiByMikKIHsK ICAgICB1bnNpZ25lZCBzcGVjaWZpY2l0eTEgPSByMS0+c3BlY2lmaWNpdHkoKTsKICAgICB1bnNp Z25lZCBzcGVjaWZpY2l0eTIgPSByMi0+c3BlY2lmaWNpdHkoKTsKICAgICByZXR1cm4gKHNwZWNp ZmljaXR5MSA9PSBzcGVjaWZpY2l0eTIpID8gcjEtPnBvc2l0aW9uKCkgPCByMi0+cG9zaXRpb24o KSA6IHNwZWNpZmljaXR5MSA8IHNwZWNpZmljaXR5MjsKIH0KIAotdm9pZCBDU1NTdHlsZVNlbGVj dG9yOjpzb3J0TWF0Y2hlZFJ1bGVzKCkKK3ZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6c29ydEFuZFRy YW5zZmVyTWF0Y2hlZFJ1bGVzKGJvb2wgY29sbGVjdFJ1bGVzT25seSwgYm9vbCB0d2lkZGxlTGlu a1N0eWxlKQogewotICAgIHN0ZDo6c29ydChtX21hdGNoZWRSdWxlcy5iZWdpbigpLCBtX21hdGNo ZWRSdWxlcy5lbmQoKSwgY29tcGFyZVJ1bGVzKTsKKyAgICAvLyBJZiB3ZSBkaWRuJ3QgbWF0Y2gg YW55IHJ1bGVzLCB3ZSdyZSBkb25lLgorICAgIGlmIChtX21hdGNoZWRSdWxlcy5pc0VtcHR5KCkp CisgICAgICAgIHJldHVybjsKKworICAgIC8vIFNvcnQgdGhlIHNldCBvZiBtYXRjaGVkIHJ1bGVz LgorICAgIHN0ZDo6c29ydChtX21hdGNoZWRSdWxlcy5iZWdpbigpLCBtX21hdGNoZWRSdWxlcy5l bmQoKSwgbGVzc1NwZWNpZmljKTsKKworICAgIC8vIE5vdyB0cmFuc2ZlciB0aGUgc2V0IG9mIG1h dGNoZWQgcnVsZXMgb3ZlciB0byBvdXIgbGlzdCBvZiBkZWNscy4KKyAgICBpZiAoY29sbGVjdFJ1 bGVzT25seSkgeworICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9tYXRjaGVkUnVs ZXMuc2l6ZSgpOyBpKyspIHsKKyAgICAgICAgICAgIGlmICghbV9ydWxlTGlzdCkKKyAgICAgICAg ICAgICAgICBtX3J1bGVMaXN0ID0gQ1NTUnVsZUxpc3Q6OmNyZWF0ZSgpOworICAgICAgICAgICAg bV9ydWxlTGlzdC0+YXBwZW5kKG1fbWF0Y2hlZFJ1bGVzW2ldLT5ydWxlKCkpOworICAgICAgICB9 CisgICAgfSBlbHNlIGlmICh0d2lkZGxlTGlua1N0eWxlKSB7CisgICAgICAgIC8vIEZJWE1FOiBU aGlzIHN1Y2tzLCB0aGUgaW5zcGVjdG9yIHNob3VsZCBnZXQgdGhlIHN0eWxlIGZyb20gdGhlIHZp c2l0ZWQgc3R5bGUgaXRzZWxmLgorICAgICAgICBib29sIHN3YXBWaXNpdGVkVW52aXNpdGVkID0g SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpmb3JjZVBzZXVkb1N0YXRlKG1fZWxlbWVudCwgQ1NT U2VsZWN0b3I6OlBzZXVkb1Zpc2l0ZWQpOworICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBp IDwgbV9tYXRjaGVkUnVsZXMuc2l6ZSgpOyBpKyspIHsKKyAgICAgICAgICAgIGlmIChtX3N0eWxl ICYmIG1fbWF0Y2hlZFJ1bGVzW2ldLT5jb250YWluc1VuY29tbW9uQXR0cmlidXRlU2VsZWN0b3Io KSkKKyAgICAgICAgICAgICAgICBtX3N0eWxlLT5zZXRBZmZlY3RlZEJ5VW5jb21tb25BdHRyaWJ1 dGVTZWxlY3RvcnMoKTsKKyAgICAgICAgICAgIHVuc2lnbmVkIGxpbmtNYXRjaFR5cGUgPSBtX21h dGNoZWRSdWxlc1tpXS0+bGlua01hdGNoVHlwZSgpOworICAgICAgICAgICAgaWYgKHN3YXBWaXNp dGVkVW52aXNpdGVkICYmIGxpbmtNYXRjaFR5cGUgJiYgbGlua01hdGNoVHlwZSAhPSBTZWxlY3Rv ckNoZWNrZXI6Ok1hdGNoQWxsKQorICAgICAgICAgICAgICAgIGxpbmtNYXRjaFR5cGUgPSAobGlu a01hdGNoVHlwZSA9PSBTZWxlY3RvckNoZWNrZXI6Ok1hdGNoVmlzaXRlZCkgPyBTZWxlY3RvckNo ZWNrZXI6Ok1hdGNoTGluayA6IFNlbGVjdG9yQ2hlY2tlcjo6TWF0Y2hWaXNpdGVkOworICAgICAg ICAgICAgYWRkTWF0Y2hlZERlY2xhcmF0aW9uKG1fbWF0Y2hlZFJ1bGVzW2ldLT5ydWxlKCktPmRl Y2xhcmF0aW9uKCksIGxpbmtNYXRjaFR5cGUpOworICAgICAgICB9CisgICAgfSBlbHNlIHsKKyAg ICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fbWF0Y2hlZFJ1bGVzLnNpemUoKTsgaSsr KQorICAgICAgICAgICAgYWRkTWF0Y2hlZERlY2xhcmF0aW9uKG1fbWF0Y2hlZFJ1bGVzW2ldLT5y dWxlKCktPmRlY2xhcmF0aW9uKCkpOworICAgIH0KIH0KIAogdm9pZCBDU1NTdHlsZVNlbGVjdG9y OjptYXRjaEFsbFJ1bGVzKE1hdGNoUmVzdWx0JiByZXN1bHQpCkBAIC0yMzUzLDE3ICsyMzU2LDcg QEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjptYXRjaFBhZ2VSdWxlcyhSdWxlU2V0KiBydWxlcywg Ym9vbCBpc0xlZnRQYWdlLCBib29sIGlzRmkKICAgICAgICAgcmV0dXJuOwogCiAgICAgbWF0Y2hQ YWdlUnVsZXNGb3JMaXN0KHJ1bGVzLT5wYWdlUnVsZXMoKSwgaXNMZWZ0UGFnZSwgaXNGaXJzdFBh Z2UsIHBhZ2VOYW1lKTsKLQotICAgIC8vIElmIHdlIGRpZG4ndCBtYXRjaCBhbnkgcnVsZXMsIHdl J3JlIGRvbmUuCi0gICAgaWYgKG1fbWF0Y2hlZFJ1bGVzLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0 dXJuOwotCi0gICAgLy8gU29ydCB0aGUgc2V0IG9mIG1hdGNoZWQgcnVsZXMuCi0gICAgc29ydE1h dGNoZWRSdWxlcygpOwotCi0gICAgLy8gTm93IHRyYW5zZmVyIHRoZSBzZXQgb2YgbWF0Y2hlZCBy dWxlcyBvdmVyIHRvIG91ciBsaXN0IG9mIGRlY2xzLgotICAgIGZvciAodW5zaWduZWQgaSA9IDA7 IGkgPCBtX21hdGNoZWRSdWxlcy5zaXplKCk7IGkrKykKLSAgICAgICAgYWRkTWF0Y2hlZERlY2xh cmF0aW9uKG1fbWF0Y2hlZFJ1bGVzW2ldLT5ydWxlKCktPmRlY2xhcmF0aW9uKCkpOworICAgIHNv cnRBbmRUcmFuc2Zlck1hdGNoZWRSdWxlcyhmYWxzZSwgZmFsc2UpOwogfQogCiB2b2lkIENTU1N0 eWxlU2VsZWN0b3I6Om1hdGNoUGFnZVJ1bGVzRm9yTGlzdChjb25zdCBWZWN0b3I8UnVsZURhdGE+ KiBydWxlcywgYm9vbCBpc0xlZnRQYWdlLCBib29sIGlzRmlyc3RQYWdlLCBjb25zdCBTdHJpbmcm IHBhZ2VOYW1lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0 b3IuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmgKaW5kZXggOTc5ZmM5 OTNmOTliZjdlOGJlODdmNDI3YTE5ZjExNzg1OWNhZTQ3MS4uMWJiZDMyMzcxNmYzNzQ1NmNkOTM2 NTcxODJhZThiOGQ1MDY2NWM1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0 eWxlU2VsZWN0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5o CkBAIC0yNTYsNyArMjU2LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIG1hdGNoUnVsZXMoUnVsZVNl dCosIGludCYgZmlyc3RSdWxlSW5kZXgsIGludCYgbGFzdFJ1bGVJbmRleCwgYm9vbCBpbmNsdWRl RW1wdHlSdWxlcyk7CiAgICAgdm9pZCBtYXRjaFJ1bGVzRm9yTGlzdChjb25zdCBWZWN0b3I8UnVs ZURhdGE+KiwgaW50JiBmaXJzdFJ1bGVJbmRleCwgaW50JiBsYXN0UnVsZUluZGV4LCBib29sIGlu Y2x1ZGVFbXB0eVJ1bGVzKTsKICAgICBib29sIGZhc3RSZWplY3RTZWxlY3Rvcihjb25zdCBSdWxl RGF0YSYpIGNvbnN0OwotICAgIHZvaWQgc29ydE1hdGNoZWRSdWxlcygpOworICAgIHZvaWQgc29y dEFuZFRyYW5zZmVyTWF0Y2hlZFJ1bGVzKGJvb2wgY29sbGVjdFJ1bGVzT25seSwgYm9vbCB0d2lk ZGxlTGlua1N0eWxlKTsKIAogICAgIGJvb2wgY2hlY2tTZWxlY3Rvcihjb25zdCBSdWxlRGF0YSYp OwogCg==