74794 2011-12-17 15:35:24 -0800 CSSStyleSelector: Clean up matchRules(). 2011-12-17 19:17:46 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling macpherson webkit.review.bot oldest_to_newest 523358 0 kling 2011-12-17 15:35:24 -0800 This function could use a little love. 523359 1 119739 kling 2011-12-17 15:39:53 -0800 Created attachment 119739 Patch 523383 2 119739 kling 2011-12-17 19:17:35 -0800 Comment on attachment 119739 Patch Clearing flags on attachment: 119739 Committed r103160: <http://trac.webkit.org/changeset/103160> 523384 3 kling 2011-12-17 19:17:46 -0800 All reviewed patches have been landed. Closing bug. 119739 2011-12-17 15:39:53 -0800 2011-12-17 19:17:35 -0800 Patch bug-74794.diff text/plain 3945 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyNTlmMDQ5Li43MzE3YmU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkg QEAKIDIwMTEtMTItMTcgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgogCisgICAg ICAgIENTU1N0eWxlU2VsZWN0b3I6IENsZWFuIHVwIG1hdGNoUnVsZXMoKS4KKyAgICAgICAgPGh0 dHA6Ly93ZWJraXQub3JnL2IvNzQ3OTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgLSBFYXJseSByZXR1cm4gZnJvbSB0aGUgaXNDb2xsZWN0aW5nUnVs ZXNPbmx5KCkgcGF0aCB0byByZWR1Y2UgbmVzdGluZy4KKyAgICAgICAgLSBNb3ZlIHRoZSBjcmVh dGlvbiBvZiBtX3J1bGVMaXN0IG91dCBvZiB0aGUgbG9vcCB0aGF0IGJ1aWxkcyB0aGUgbGlzdC4K KyAgICAgICAgLSBSZW1vdmVkIHNvbWUgY29tbWVudHMgZnJvbSB0aGUgQ2FwdGFpbiBPYnZpb3Vz IGRlcGFydG1lbnQuCisKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjptYXRjaFJ1bGVzKToKKworMjAxMS0xMi0x NyAgQW5kcmVhcyBLbGluZyAgPGtsaW5nQHdlYmtpdC5vcmc+CisKICAgICAgICAgUnVsZVNldDog UmVtb3ZlIHN0eWxlIHNoZWV0IG51bGwtY2hlY2sgaW4gYWRkUnVsZXNGcm9tU2hlZXQoKS4KICAg ICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvNzQ3OTI+CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NT dHlsZVNlbGVjdG9yLmNwcAppbmRleCA1NWQ1NTdlLi41ZjU1ZmJjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv Y3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCkBAIC02NDIsMzEgKzY0MiwyOSBAQCB2b2lkIENTU1N0 eWxlU2VsZWN0b3I6Om1hdGNoUnVsZXMoUnVsZVNldCogcnVsZXMsIGludCYgZmlyc3RSdWxlSW5k ZXgsIGludCYgbGFzdAogICAgIG1hdGNoUnVsZXNGb3JMaXN0KHJ1bGVzLT50YWdSdWxlcyhtX2Vs ZW1lbnQtPmxvY2FsTmFtZSgpLmltcGwoKSksIGZpcnN0UnVsZUluZGV4LCBsYXN0UnVsZUluZGV4 LCBpbmNsdWRlRW1wdHlSdWxlcyk7CiAgICAgbWF0Y2hSdWxlc0Zvckxpc3QocnVsZXMtPnVuaXZl cnNhbFJ1bGVzKCksIGZpcnN0UnVsZUluZGV4LCBsYXN0UnVsZUluZGV4LCBpbmNsdWRlRW1wdHlS dWxlcyk7CiAKLSAgICAvLyBJZiB3ZSBkaWRuJ3QgbWF0Y2ggYW55IHJ1bGVzLCB3ZSdyZSBkb25l LgogICAgIGlmIChtX21hdGNoZWRSdWxlcy5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIAot ICAgIC8vIFNvcnQgdGhlIHNldCBvZiBtYXRjaGVkIHJ1bGVzLgogICAgIHNvcnRNYXRjaGVkUnVs ZXMoKTsKIAotICAgIC8vIE5vdyB0cmFuc2ZlciB0aGUgc2V0IG9mIG1hdGNoZWQgcnVsZXMgb3Zl ciB0byBvdXIgbGlzdCBvZiBkZWNscy4KLSAgICBpZiAoIW1fY2hlY2tlci5pc0NvbGxlY3RpbmdS dWxlc09ubHkoKSkgewotICAgICAgICAvLyBGSVhNRTogVGhpcyBzdWNrcywgdGhlIGluc3BlY3Rv ciBzaG91bGQgZ2V0IHRoZSBzdHlsZSBmcm9tIHRoZSB2aXNpdGVkIHN0eWxlIGl0c2VsZi4KLSAg ICAgICAgYm9vbCBzd2FwVmlzaXRlZFVudmlzaXRlZCA9IEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6Zm9yY2VQc2V1ZG9TdGF0ZShtX2VsZW1lbnQsIENTU1NlbGVjdG9yOjpQc2V1ZG9WaXNpdGVk KTsKLSAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fbWF0Y2hlZFJ1bGVzLnNpemUo KTsgaSsrKSB7Ci0gICAgICAgICAgICBpZiAobV9zdHlsZSAmJiBtX21hdGNoZWRSdWxlc1tpXS0+ Y29udGFpbnNVbmNvbW1vbkF0dHJpYnV0ZVNlbGVjdG9yKCkpCi0gICAgICAgICAgICAgICAgbV9z dHlsZS0+c2V0QWZmZWN0ZWRCeVVuY29tbW9uQXR0cmlidXRlU2VsZWN0b3JzKCk7Ci0gICAgICAg ICAgICB1bnNpZ25lZCBsaW5rTWF0Y2hUeXBlID0gbV9tYXRjaGVkUnVsZXNbaV0tPmxpbmtNYXRj aFR5cGUoKTsKLSAgICAgICAgICAgIGlmIChzd2FwVmlzaXRlZFVudmlzaXRlZCAmJiBsaW5rTWF0 Y2hUeXBlICYmIGxpbmtNYXRjaFR5cGUgIT0gU2VsZWN0b3JDaGVja2VyOjpNYXRjaEFsbCkKLSAg ICAgICAgICAgICAgICBsaW5rTWF0Y2hUeXBlID0gKGxpbmtNYXRjaFR5cGUgPT0gU2VsZWN0b3JD aGVja2VyOjpNYXRjaFZpc2l0ZWQpID8gU2VsZWN0b3JDaGVja2VyOjpNYXRjaExpbmsgOiBTZWxl Y3RvckNoZWNrZXI6Ok1hdGNoVmlzaXRlZDsKLSAgICAgICAgICAgIGFkZE1hdGNoZWREZWNsYXJh dGlvbihtX21hdGNoZWRSdWxlc1tpXS0+cnVsZSgpLT5kZWNsYXJhdGlvbigpLCBsaW5rTWF0Y2hU eXBlLCBtX21hdGNoZWRSdWxlc1tpXS0+cmVnaW9uU3R5bGVSdWxlKCkpOwotICAgICAgICB9Ci0g ICAgfSBlbHNlIHsKLSAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fbWF0Y2hlZFJ1 bGVzLnNpemUoKTsgaSsrKSB7Ci0gICAgICAgICAgICBpZiAoIW1fcnVsZUxpc3QpCi0gICAgICAg ICAgICAgICAgbV9ydWxlTGlzdCA9IENTU1J1bGVMaXN0OjpjcmVhdGUoKTsKKyAgICBpZiAobV9j aGVja2VyLmlzQ29sbGVjdGluZ1J1bGVzT25seSgpKSB7CisgICAgICAgIGlmICghbV9ydWxlTGlz dCkKKyAgICAgICAgICAgIG1fcnVsZUxpc3QgPSBDU1NSdWxlTGlzdDo6Y3JlYXRlKCk7CisgICAg ICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX21hdGNoZWRSdWxlcy5zaXplKCk7ICsraSkK ICAgICAgICAgICAgIG1fcnVsZUxpc3QtPmFwcGVuZChtX21hdGNoZWRSdWxlc1tpXS0+cnVsZSgp KTsKLSAgICAgICAgfQorICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgLy8gTm93IHRyYW5z ZmVyIHRoZSBzZXQgb2YgbWF0Y2hlZCBydWxlcyBvdmVyIHRvIG91ciBsaXN0IG9mIGRlY2xhcmF0 aW9ucy4KKyAgICAvLyBGSVhNRTogVGhpcyBzdWNrcywgdGhlIGluc3BlY3RvciBzaG91bGQgZ2V0 IHRoZSBzdHlsZSBmcm9tIHRoZSB2aXNpdGVkIHN0eWxlIGl0c2VsZi4KKyAgICBib29sIHN3YXBW aXNpdGVkVW52aXNpdGVkID0gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpmb3JjZVBzZXVkb1N0 YXRlKG1fZWxlbWVudCwgQ1NTU2VsZWN0b3I6OlBzZXVkb1Zpc2l0ZWQpOworICAgIGZvciAodW5z aWduZWQgaSA9IDA7IGkgPCBtX21hdGNoZWRSdWxlcy5zaXplKCk7IGkrKykgeworICAgICAgICBp ZiAobV9zdHlsZSAmJiBtX21hdGNoZWRSdWxlc1tpXS0+Y29udGFpbnNVbmNvbW1vbkF0dHJpYnV0 ZVNlbGVjdG9yKCkpCisgICAgICAgICAgICBtX3N0eWxlLT5zZXRBZmZlY3RlZEJ5VW5jb21tb25B dHRyaWJ1dGVTZWxlY3RvcnMoKTsKKyAgICAgICAgdW5zaWduZWQgbGlua01hdGNoVHlwZSA9IG1f bWF0Y2hlZFJ1bGVzW2ldLT5saW5rTWF0Y2hUeXBlKCk7CisgICAgICAgIGlmIChzd2FwVmlzaXRl ZFVudmlzaXRlZCAmJiBsaW5rTWF0Y2hUeXBlICYmIGxpbmtNYXRjaFR5cGUgIT0gU2VsZWN0b3JD aGVja2VyOjpNYXRjaEFsbCkKKyAgICAgICAgICAgIGxpbmtNYXRjaFR5cGUgPSAobGlua01hdGNo VHlwZSA9PSBTZWxlY3RvckNoZWNrZXI6Ok1hdGNoVmlzaXRlZCkgPyBTZWxlY3RvckNoZWNrZXI6 Ok1hdGNoTGluayA6IFNlbGVjdG9yQ2hlY2tlcjo6TWF0Y2hWaXNpdGVkOworICAgICAgICBhZGRN YXRjaGVkRGVjbGFyYXRpb24obV9tYXRjaGVkUnVsZXNbaV0tPnJ1bGUoKS0+ZGVjbGFyYXRpb24o KSwgbGlua01hdGNoVHlwZSwgbV9tYXRjaGVkUnVsZXNbaV0tPnJlZ2lvblN0eWxlUnVsZSgpKTsK ICAgICB9CiB9CiAK