91646 2012-07-18 11:37:09 -0700 Fix up old name in RuleSet::addRulesFromSheet 2012-07-18 13:10:16 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dglazkov dglazkov cmarcelo eric kling macpherson menard webkit.review.bot oldest_to_newest 672577 0 dglazkov 2012-07-18 11:37:09 -0700 Fix up old name in RuleSet::addRulesFromSheet 672581 1 153059 dglazkov 2012-07-18 11:38:23 -0700 Created attachment 153059 Patch 672582 2 dglazkov 2012-07-18 11:39:14 -0700 Was reading code, and got flummoxed by "styleSelector" name. Seems like a good idea to make it consistent with the rename. 672676 3 153059 webkit.review.bot 2012-07-18 13:10:10 -0700 Comment on attachment 153059 Patch Clearing flags on attachment: 153059 Committed r123006: <http://trac.webkit.org/changeset/123006> 672677 4 webkit.review.bot 2012-07-18 13:10:16 -0700 All reviewed patches have been landed. Closing bug. 153059 2012-07-18 11:38:23 -0700 2012-07-18 13:10:10 -0700 Patch bug-91646-20120718113822.patch text/plain 6645 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyOTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTZlYjhmNzQ3M2ZlYmMz N2E3NzM3YmM2YTUyYzAyNmFmYjY1N2M3MS4uYjcwYWZhNjc1Y2FiMDExZTQyMjg3ZjAxN2I3Y2Ew MDE5NDBmYTZjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA3LTE4ICBEaW1p dHJpIEdsYXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRml4IHVwIG9s ZCBuYW1lIGluIFJ1bGVTZXQ6OmFkZFJ1bGVzRnJvbVNoZWV0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTY0NgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNpbXBsZSBwYXJhbWV0ZXIgcmVuYW1lLCBubyBj aGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIGNzcy9TdHlsZVJlc29sdmVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OmNvbGxlY3RNYXRjaGluZ1J1bGVz Rm9yTGlzdCk6IFJlbmFtZWQgc3R5bGVTZWxlY3RvciB0byByZXNvbHZlciB0byByZWZsZWN0IHJl Y2VudCByZW5hbWUgb2YgdGhlIHBhcmFtZXRlciB0eXBlLgorCiAyMDEyLTA3LTE4ICBTdGV2ZSBW YW5EZUJvZ2FydCAgPHZhbmRlYm9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIENocm9tZS9Ta2lh OiBQREYgcHJpbnQgb3V0cHV0IGRvZXMgbm90IGhhdmUgY2xpY2thYmxlIGxpbmtzLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCmluZGV4IDJkYjM3ZDUyMzA0MjE0ZTkwMzU3YTc4N2E3 OWI1MzdkNjI3MzA0ZWUuLjA0ZDhjNjVjZDg4OTMwZjBmOGFmN2I1ZTA3MTdmMjg3YzdjNDMwYzcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKQEAgLTI2MDcsMTcgKzI2MDcsMTcg QEAgdm9pZCBSdWxlU2V0OjphZGRSZWdpb25SdWxlKFN0eWxlUnVsZVJlZ2lvbiogcmVnaW9uUnVs ZSwgYm9vbCBoYXNEb2N1bWVudFNlY3VyaXQKICAgICBtX3JlZ2lvblNlbGVjdG9yc0FuZFJ1bGVT ZXRzLmFwcGVuZChSdWxlU2V0U2VsZWN0b3JQYWlyKHJlZ2lvblJ1bGUtPnNlbGVjdG9yTGlzdCgp LmZpcnN0KCksIHJlZ2lvblJ1bGVTZXQucmVsZWFzZSgpKSk7CiB9CiAKLXZvaWQgUnVsZVNldDo6 YWRkUnVsZXNGcm9tU2hlZXQoU3R5bGVTaGVldENvbnRlbnRzKiBzaGVldCwgY29uc3QgTWVkaWFR dWVyeUV2YWx1YXRvciYgbWVkaXVtLCBTdHlsZVJlc29sdmVyKiBzdHlsZVNlbGVjdG9yLCBjb25z dCBDb250YWluZXJOb2RlKiBzY29wZSkKK3ZvaWQgUnVsZVNldDo6YWRkUnVsZXNGcm9tU2hlZXQo U3R5bGVTaGVldENvbnRlbnRzKiBzaGVldCwgY29uc3QgTWVkaWFRdWVyeUV2YWx1YXRvciYgbWVk aXVtLCBTdHlsZVJlc29sdmVyKiByZXNvbHZlciwgY29uc3QgQ29udGFpbmVyTm9kZSogc2NvcGUp CiB7CiAgICAgQVNTRVJUKHNoZWV0KTsKICAgICAKICAgICBjb25zdCBWZWN0b3I8UmVmUHRyPFN0 eWxlUnVsZUltcG9ydD4gPiYgaW1wb3J0UnVsZXMgPSBzaGVldC0+aW1wb3J0UnVsZXMoKTsKICAg ICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgaW1wb3J0UnVsZXMuc2l6ZSgpOyArK2kpIHsKICAg ICAgICAgU3R5bGVSdWxlSW1wb3J0KiBpbXBvcnRSdWxlID0gaW1wb3J0UnVsZXNbaV0uZ2V0KCk7 Ci0gICAgICAgIGlmIChpbXBvcnRSdWxlLT5zdHlsZVNoZWV0KCkgJiYgKCFpbXBvcnRSdWxlLT5t ZWRpYVF1ZXJpZXMoKSB8fCBtZWRpdW0uZXZhbChpbXBvcnRSdWxlLT5tZWRpYVF1ZXJpZXMoKSwg c3R5bGVTZWxlY3RvcikpKQotICAgICAgICAgICAgYWRkUnVsZXNGcm9tU2hlZXQoaW1wb3J0UnVs ZS0+c3R5bGVTaGVldCgpLCBtZWRpdW0sIHN0eWxlU2VsZWN0b3IsIHNjb3BlKTsKKyAgICAgICAg aWYgKGltcG9ydFJ1bGUtPnN0eWxlU2hlZXQoKSAmJiAoIWltcG9ydFJ1bGUtPm1lZGlhUXVlcmll cygpIHx8IG1lZGl1bS5ldmFsKGltcG9ydFJ1bGUtPm1lZGlhUXVlcmllcygpLCByZXNvbHZlcikp KQorICAgICAgICAgICAgYWRkUnVsZXNGcm9tU2hlZXQoaW1wb3J0UnVsZS0+c3R5bGVTaGVldCgp LCBtZWRpdW0sIHJlc29sdmVyLCBzY29wZSk7CiAgICAgfQotICAgIGJvb2wgaGFzRG9jdW1lbnRT ZWN1cml0eU9yaWdpbiA9IHN0eWxlU2VsZWN0b3IgJiYgc3R5bGVTZWxlY3Rvci0+ZG9jdW1lbnQo KS0+c2VjdXJpdHlPcmlnaW4oKS0+Y2FuUmVxdWVzdChzaGVldC0+YmFzZVVSTCgpKTsKKyAgICBi b29sIGhhc0RvY3VtZW50U2VjdXJpdHlPcmlnaW4gPSByZXNvbHZlciAmJiByZXNvbHZlci0+ZG9j dW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKS0+Y2FuUmVxdWVzdChzaGVldC0+YmFzZVVSTCgpKTsK IAogICAgIGNvbnN0IFZlY3RvcjxSZWZQdHI8U3R5bGVSdWxlQmFzZT4gPiYgcnVsZXMgPSBzaGVl dC0+Y2hpbGRSdWxlcygpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBydWxlcy5zaXpl KCk7ICsraSkgewpAQCAtMjYzMSw3ICsyNjMxLDcgQEAgdm9pZCBSdWxlU2V0OjphZGRSdWxlc0Zy b21TaGVldChTdHlsZVNoZWV0Q29udGVudHMqIHNoZWV0LCBjb25zdCBNZWRpYVF1ZXJ5RXZhbHUK ICAgICAgICAgZWxzZSBpZiAocnVsZS0+aXNNZWRpYVJ1bGUoKSkgewogICAgICAgICAgICAgU3R5 bGVSdWxlTWVkaWEqIG1lZGlhUnVsZSA9IHN0YXRpY19jYXN0PFN0eWxlUnVsZU1lZGlhKj4ocnVs ZSk7CiAKLSAgICAgICAgICAgIGlmICgoIW1lZGlhUnVsZS0+bWVkaWFRdWVyaWVzKCkgfHwgbWVk aXVtLmV2YWwobWVkaWFSdWxlLT5tZWRpYVF1ZXJpZXMoKSwgc3R5bGVTZWxlY3RvcikpKSB7Cisg ICAgICAgICAgICBpZiAoKCFtZWRpYVJ1bGUtPm1lZGlhUXVlcmllcygpIHx8IG1lZGl1bS5ldmFs KG1lZGlhUnVsZS0+bWVkaWFRdWVyaWVzKCksIHJlc29sdmVyKSkpIHsKICAgICAgICAgICAgICAg ICAvLyBUcmF2ZXJzZSBjaGlsZCBlbGVtZW50cyBvZiB0aGUgQG1lZGlhIHJ1bGUuCiAgICAgICAg ICAgICAgICAgY29uc3QgVmVjdG9yPFJlZlB0cjxTdHlsZVJ1bGVCYXNlPiA+JiBjaGlsZFJ1bGVz ID0gbWVkaWFSdWxlLT5jaGlsZFJ1bGVzKCk7CiAgICAgICAgICAgICAgICAgZm9yICh1bnNpZ25l ZCBqID0gMDsgaiA8IGNoaWxkUnVsZXMuc2l6ZSgpOyArK2opIHsKQEAgLTI2NDAsMzkgKzI2NDAs MzkgQEAgdm9pZCBSdWxlU2V0OjphZGRSdWxlc0Zyb21TaGVldChTdHlsZVNoZWV0Q29udGVudHMq IHNoZWV0LCBjb25zdCBNZWRpYVF1ZXJ5RXZhbHUKICAgICAgICAgICAgICAgICAgICAgICAgIGFk ZFN0eWxlUnVsZShzdGF0aWNfY2FzdDxTdHlsZVJ1bGUqPihjaGlsZFJ1bGUpLCBoYXNEb2N1bWVu dFNlY3VyaXR5T3JpZ2luLCAhc2NvcGUpOwogICAgICAgICAgICAgICAgICAgICBlbHNlIGlmIChj aGlsZFJ1bGUtPmlzUGFnZVJ1bGUoKSkKICAgICAgICAgICAgICAgICAgICAgICAgIGFkZFBhZ2VS dWxlKHN0YXRpY19jYXN0PFN0eWxlUnVsZVBhZ2UqPihjaGlsZFJ1bGUpKTsKLSAgICAgICAgICAg ICAgICAgICAgZWxzZSBpZiAoY2hpbGRSdWxlLT5pc0ZvbnRGYWNlUnVsZSgpICYmIHN0eWxlU2Vs ZWN0b3IpIHsKKyAgICAgICAgICAgICAgICAgICAgZWxzZSBpZiAoY2hpbGRSdWxlLT5pc0ZvbnRG YWNlUnVsZSgpICYmIHJlc29sdmVyKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAvLyBBZGQg dGhpcyBmb250IGZhY2UgdG8gb3VyIHNldC4KICAgICAgICAgICAgICAgICAgICAgICAgIC8vIEZJ WE1FKEJVRyA3MjQ2MSk6IFdlIGRvbid0IGFkZCBAZm9udC1mYWNlIHJ1bGVzIG9mIHNjb3BlZCBz dHlsZSBzaGVldHMgZm9yIHRoZSBtb21lbnQuCiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAo c2NvcGUpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAg ICAgICAgICAgICAgICBjb25zdCBTdHlsZVJ1bGVGb250RmFjZSogZm9udEZhY2VSdWxlID0gc3Rh dGljX2Nhc3Q8U3R5bGVSdWxlRm9udEZhY2UqPihjaGlsZFJ1bGUpOwotICAgICAgICAgICAgICAg ICAgICAgICAgc3R5bGVTZWxlY3Rvci0+Zm9udFNlbGVjdG9yKCktPmFkZEZvbnRGYWNlUnVsZShm b250RmFjZVJ1bGUpOwotICAgICAgICAgICAgICAgICAgICAgICAgc3R5bGVTZWxlY3Rvci0+aW52 YWxpZGF0ZU1hdGNoZWRQcm9wZXJ0aWVzQ2FjaGUoKTsKLSAgICAgICAgICAgICAgICAgICAgfSBl bHNlIGlmIChjaGlsZFJ1bGUtPmlzS2V5ZnJhbWVzUnVsZSgpICYmIHN0eWxlU2VsZWN0b3IpIHsK KyAgICAgICAgICAgICAgICAgICAgICAgIHJlc29sdmVyLT5mb250U2VsZWN0b3IoKS0+YWRkRm9u dEZhY2VSdWxlKGZvbnRGYWNlUnVsZSk7CisgICAgICAgICAgICAgICAgICAgICAgICByZXNvbHZl ci0+aW52YWxpZGF0ZU1hdGNoZWRQcm9wZXJ0aWVzQ2FjaGUoKTsKKyAgICAgICAgICAgICAgICAg ICAgfSBlbHNlIGlmIChjaGlsZFJ1bGUtPmlzS2V5ZnJhbWVzUnVsZSgpICYmIHJlc29sdmVyKSB7 CiAgICAgICAgICAgICAgICAgICAgICAgICAvLyBBZGQgdGhpcyBrZXlmcmFtZSBydWxlIHRvIG91 ciBzZXQuCiAgICAgICAgICAgICAgICAgICAgICAgICAvLyBGSVhNRShCVUcgNzI0NjIpOiBXZSBk b24ndCBhZGQgQGtleWZyYW1lIHJ1bGVzIG9mIHNjb3BlZCBzdHlsZSBzaGVldHMgZm9yIHRoZSBt b21lbnQuCiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoc2NvcGUpCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICAgICAgICAgICAgICBzdHlsZVNl bGVjdG9yLT5hZGRLZXlmcmFtZVN0eWxlKHN0YXRpY19jYXN0PFN0eWxlUnVsZUtleWZyYW1lcyo+ KGNoaWxkUnVsZSkpOworICAgICAgICAgICAgICAgICAgICAgICAgcmVzb2x2ZXItPmFkZEtleWZy YW1lU3R5bGUoc3RhdGljX2Nhc3Q8U3R5bGVSdWxlS2V5ZnJhbWVzKj4oY2hpbGRSdWxlKSk7CiAg ICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9IC8vIGZvciBydWxlcwogICAg ICAgICAgICAgfSAvLyBpZiBydWxlcwotICAgICAgICB9IGVsc2UgaWYgKHJ1bGUtPmlzRm9udEZh Y2VSdWxlKCkgJiYgc3R5bGVTZWxlY3RvcikgeworICAgICAgICB9IGVsc2UgaWYgKHJ1bGUtPmlz Rm9udEZhY2VSdWxlKCkgJiYgcmVzb2x2ZXIpIHsKICAgICAgICAgICAgIC8vIEFkZCB0aGlzIGZv bnQgZmFjZSB0byBvdXIgc2V0LgogICAgICAgICAgICAgLy8gRklYTUUoQlVHIDcyNDYxKTogV2Ug ZG9uJ3QgYWRkIEBmb250LWZhY2UgcnVsZXMgb2Ygc2NvcGVkIHN0eWxlIHNoZWV0cyBmb3IgdGhl IG1vbWVudC4KICAgICAgICAgICAgIGlmIChzY29wZSkKICAgICAgICAgICAgICAgICBjb250aW51 ZTsKICAgICAgICAgICAgIGNvbnN0IFN0eWxlUnVsZUZvbnRGYWNlKiBmb250RmFjZVJ1bGUgPSBz dGF0aWNfY2FzdDxTdHlsZVJ1bGVGb250RmFjZSo+KHJ1bGUpOwotICAgICAgICAgICAgc3R5bGVT ZWxlY3Rvci0+Zm9udFNlbGVjdG9yKCktPmFkZEZvbnRGYWNlUnVsZShmb250RmFjZVJ1bGUpOwot ICAgICAgICAgICAgc3R5bGVTZWxlY3Rvci0+aW52YWxpZGF0ZU1hdGNoZWRQcm9wZXJ0aWVzQ2Fj aGUoKTsKLSAgICAgICAgfSBlbHNlIGlmIChydWxlLT5pc0tleWZyYW1lc1J1bGUoKSAmJiBzdHls ZVNlbGVjdG9yKSB7CisgICAgICAgICAgICByZXNvbHZlci0+Zm9udFNlbGVjdG9yKCktPmFkZEZv bnRGYWNlUnVsZShmb250RmFjZVJ1bGUpOworICAgICAgICAgICAgcmVzb2x2ZXItPmludmFsaWRh dGVNYXRjaGVkUHJvcGVydGllc0NhY2hlKCk7CisgICAgICAgIH0gZWxzZSBpZiAocnVsZS0+aXNL ZXlmcmFtZXNSdWxlKCkgJiYgcmVzb2x2ZXIpIHsKICAgICAgICAgICAgIC8vIEZJWE1FIChCVUcg NzI0NjIpOiBXZSBkb24ndCBhZGQgQGtleWZyYW1lIHJ1bGVzIG9mIHNjb3BlZCBzdHlsZSBzaGVl dHMgZm9yIHRoZSBtb21lbnQuCiAgICAgICAgICAgICBpZiAoc2NvcGUpCiAgICAgICAgICAgICAg ICAgY29udGludWU7Ci0gICAgICAgICAgICBzdHlsZVNlbGVjdG9yLT5hZGRLZXlmcmFtZVN0eWxl KHN0YXRpY19jYXN0PFN0eWxlUnVsZUtleWZyYW1lcyo+KHJ1bGUpKTsKKyAgICAgICAgICAgIHJl c29sdmVyLT5hZGRLZXlmcmFtZVN0eWxlKHN0YXRpY19jYXN0PFN0eWxlUnVsZUtleWZyYW1lcyo+ KHJ1bGUpKTsKICAgICAgICAgfQogI2lmIEVOQUJMRShDU1NfUkVHSU9OUykKLSAgICAgICAgZWxz ZSBpZiAocnVsZS0+aXNSZWdpb25SdWxlKCkgJiYgc3R5bGVTZWxlY3RvcikgeworICAgICAgICBl bHNlIGlmIChydWxlLT5pc1JlZ2lvblJ1bGUoKSAmJiByZXNvbHZlcikgewogICAgICAgICAgICAg Ly8gRklYTUUgKEJVRyA3MjQ3Mik6IFdlIGRvbid0IGFkZCBALXdlYmtpdC1yZWdpb24gcnVsZXMg b2Ygc2NvcGVkIHN0eWxlIHNoZWV0cyBmb3IgdGhlIG1vbWVudC4KICAgICAgICAgICAgIGlmIChz Y29wZSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsK