121986 2013-09-26 15:11:57 -0700 Move CSS MatchRequest from StyleResolver to a private definition in ElementRuleCollector 2013-09-26 16:35:15 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin allan.jensen commit-queue esprehn+autocc glenn kling macpherson menard oldest_to_newest 933734 0 benjamin 2013-09-26 15:11:57 -0700 Move CSS MatchRequest from StyleResolver to a private definition in ElementRuleCollector 933735 1 212758 benjamin 2013-09-26 15:13:06 -0700 Created attachment 212758 Patch 933762 2 212758 kling 2013-09-26 15:59:30 -0700 Comment on attachment 212758 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=212758&action=review Coolio. > Source/WebCore/css/ElementRuleCollector.h:82 > + const RuleSet* ruleSet; Could we make this a RuleSet&? 933764 3 kling 2013-09-26 16:00:33 -0700 If you only need MatchRequest inside ElementRuleCollector.cpp, consider moving the class definition into ElementRuleCollector.cpp. You could forward declare it inside ElementRuleCollector to maintain the class nesting. 933778 4 benjamin 2013-09-26 16:35:15 -0700 Committed r156515: <http://trac.webkit.org/changeset/156515> 212758 2013-09-26 15:13:06 -0700 2013-09-26 15:59:30 -0700 Patch bug-121986-20130926151306.patch text/plain 3014 benjamin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NjUwMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEzLTA5LTI2ICBCZW5qYW1p biBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBNb3ZlIENTUyBNYXRj aFJlcXVlc3QgZnJvbSBTdHlsZVJlc29sdmVyIHRvIGEgcHJpdmF0ZSBkZWZpbml0aW9uIGluIEVs ZW1lbnRSdWxlQ29sbGVjdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjE5ODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBNYXRjaFJlcXVlc3QgaXMgYW4gaW50ZXJuYWwgdHlwZSBvZiBFbGVtZW50UnVs ZUNvbGxlY3RvciBub3csIG1vdmUgdGhlIGRlZmluaXRpb24KKyAgICAgICAgdG8gRWxlbWVudFJ1 bGVDb2xsZWN0b3IuCisKKyAgICAgICAgKiBjc3MvRG9jdW1lbnRSdWxlU2V0cy5oOgorICAgICAg ICAqIGNzcy9FbGVtZW50UnVsZUNvbGxlY3Rvci5oOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVu dFJ1bGVDb2xsZWN0b3I6Ok1hdGNoUmVxdWVzdDo6TWF0Y2hSZXF1ZXN0KToKKyAgICAgICAgKiBj c3MvU3R5bGVSZXNvbHZlci5oOgorCiAyMDEzLTA5LTI2ICBBbnR0aSBLb2l2aXN0byAgPGFudHRp QGFwcGxlLmNvbT4KIAogICAgICAgICBEb24ndCBtdXRhdGUgc3R5bGUgaW4gUmVuZGVyQ29tYmlu ZVRleHQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9Eb2N1bWVudFJ1bGVTZXRzLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0RvY3VtZW50UnVsZVNldHMuaAkocmV2aXNpb24g MTU2NDk1KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0RvY3VtZW50UnVsZVNldHMuaAkod29ya2lu ZyBjb3B5KQpAQCAtMzYsNyArMzYsNiBAQCBjbGFzcyBDU1NTdHlsZVJ1bGU7CiBjbGFzcyBDU1NT dHlsZVNoZWV0OwogY2xhc3MgRG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlvbjsKIGNsYXNzIElu c3BlY3RvckNTU09NV3JhcHBlcnM7Ci1jbGFzcyBNYXRjaFJlcXVlc3Q7CiBjbGFzcyBNZWRpYVF1 ZXJ5RXZhbHVhdG9yOwogY2xhc3MgUnVsZVNldDsKIGNsYXNzIFN0eWxlU2NvcGVSZXNvbHZlcjsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9FbGVtZW50UnVsZUNvbGxlY3Rvci5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9FbGVtZW50UnVsZUNvbGxlY3Rvci5oCShyZXZpc2lv biAxNTY0OTUpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvRWxlbWVudFJ1bGVDb2xsZWN0b3IuaAko d29ya2luZyBjb3B5KQpAQCAtNzEsNiArNzEsMTkgQEAgcHVibGljOgogICAgIGNvbnN0IFZlY3Rv cjxSZWZQdHI8U3R5bGVSdWxlQmFzZT4gPiYgbWF0Y2hlZFJ1bGVMaXN0KCkgY29uc3Q7CiAKIHBy aXZhdGU6CisgICAgY2xhc3MgTWF0Y2hSZXF1ZXN0IHsKKyAgICBwdWJsaWM6CisgICAgICAgIE1h dGNoUmVxdWVzdChSdWxlU2V0KiBydWxlU2V0LCBib29sIGluY2x1ZGVFbXB0eVJ1bGVzID0gZmFs c2UsIGNvbnN0IENvbnRhaW5lck5vZGUqIHNjb3BlID0gMCkKKyAgICAgICAgICAgIDogcnVsZVNl dChydWxlU2V0KQorICAgICAgICAgICAgLCBpbmNsdWRlRW1wdHlSdWxlcyhpbmNsdWRlRW1wdHlS dWxlcykKKyAgICAgICAgICAgICwgc2NvcGUoc2NvcGUpCisgICAgICAgIHsKKyAgICAgICAgfQor ICAgICAgICBjb25zdCBSdWxlU2V0KiBydWxlU2V0OworICAgICAgICBjb25zdCBib29sIGluY2x1 ZGVFbXB0eVJ1bGVzOworICAgICAgICBjb25zdCBDb250YWluZXJOb2RlKiBzY29wZTsKKyAgICB9 OworCiAgICAgRG9jdW1lbnQmIGRvY3VtZW50KCkgeyByZXR1cm4gbV9zdGF0ZS5kb2N1bWVudCgp OyB9CiAgICAgdm9pZCBhZGRFbGVtZW50U3R5bGVQcm9wZXJ0aWVzKGNvbnN0IFN0eWxlUHJvcGVy dHlTZXQqLCBib29sIGlzQ2FjaGVhYmxlID0gdHJ1ZSk7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2Nzcy9TdHlsZVJlc29sdmVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlUmVzb2x2ZXIuaAkocmV2aXNpb24gMTU2NDk1KQorKysgU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlUmVzb2x2ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTUxLDE3ICsxNTEsNiBAQCBwdWJsaWM6 CiAgICAgUmVuZGVyU2Nyb2xsYmFyKiBzY3JvbGxiYXI7CiB9OwogCi1jbGFzcyBNYXRjaFJlcXVl c3QgewotcHVibGljOgotICAgIE1hdGNoUmVxdWVzdChSdWxlU2V0KiBydWxlU2V0LCBib29sIGlu Y2x1ZGVFbXB0eVJ1bGVzID0gZmFsc2UsIGNvbnN0IENvbnRhaW5lck5vZGUqIHNjb3BlID0gMCkK LSAgICAgICAgOiBydWxlU2V0KHJ1bGVTZXQpCi0gICAgICAgICwgaW5jbHVkZUVtcHR5UnVsZXMo aW5jbHVkZUVtcHR5UnVsZXMpCi0gICAgICAgICwgc2NvcGUoc2NvcGUpIHsgfQotICAgIGNvbnN0 IFJ1bGVTZXQqIHJ1bGVTZXQ7Ci0gICAgY29uc3QgYm9vbCBpbmNsdWRlRW1wdHlSdWxlczsKLSAg ICBjb25zdCBDb250YWluZXJOb2RlKiBzY29wZTsKLX07Ci0KIC8vIFRoaXMgY2xhc3Mgc2VsZWN0 cyBhIFJlbmRlclN0eWxlIGZvciBhIGdpdmVuIGVsZW1lbnQgYmFzZWQgb24gYSBjb2xsZWN0aW9u IG9mIHN0eWxlc2hlZXRzLgogY2xhc3MgU3R5bGVSZXNvbHZlciB7CiAgICAgV1RGX01BS0VfTk9O Q09QWUFCTEUoU3R5bGVSZXNvbHZlcik7IFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwo=