84716 2012-04-24 06:41:55 -0700 Move MediaList CSSOM wrapper ownership to parent rule or stylesheet 2012-04-24 08:28:08 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 77745 1 koivisto webkit-unassigned eric.carlson feature-media-reviews kling macpherson menard webkit.review.bot oldest_to_newest 608607 0 koivisto 2012-04-24 06:41:55 -0700 MediaList CSSOM wrapper should be owned by a rule or a stylesheet, not by the underlying MediaQuerySet. 608635 1 138554 koivisto 2012-04-24 07:18:41 -0700 Created attachment 138554 patch 608648 2 138554 menard 2012-04-24 07:37:33 -0700 Comment on attachment 138554 patch Looks ok to me. 608694 3 koivisto 2012-04-24 08:28:08 -0700 http://trac.webkit.org/changeset/115060 138554 2012-04-24 07:18:41 -0700 2012-04-24 08:22:21 -0700 patch medialist-parent.patch text/plain 12168 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNTA0NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUxIEBACisyMDEyLTA0LTI0ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIE1lZGlhTGlzdCBDU1NP TSB3cmFwcGVyIG93bmVyc2hpcCB0byBwYXJlbnQgcnVsZSBvciBzdHlsZXNoZWV0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDcxNgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1lZGlhTGlzdCBDU1NPTSB3 cmFwcGVyIHNob3VsZCBiZSBvd25lZCBieSBhIHJ1bGUgb3IgYSBzdHlsZXNoZWV0LCBub3QgYnkg dGhlIHVuZGVybHlpbmcgCisgICAgICAgIE1lZGlhUXVlcnlTZXQuCisgICAgICAgIAorICAgICAg ICBSZW1vdmUgdGhlIHJlZiBmb3J3YXJkaW5nIGZyb20gTWVkaWFMaXN0IGluIGZhdm9yIG9mIHJl Z3VsYXIgcmVmY291bnRpbmcuIFVzZSB0aGUgdXN1YWwKKyAgICAgICAgcGF0dGVybiB3aGVyZSB0 aGUgcGFyZW50IHdyYXBwZXIgcmVmcyB0aGUgY2hpbGQgd3JhcHBlciBhbmQgemVyb2VzIHRoZSBi YWNrcG9pbnRlcgorICAgICAgICBvbiBkZXN0cnVjdGlvbi4gCisKKyAgICAgICAgKiBiaW5kaW5n cy9qcy9KU0RPTUJpbmRpbmcuaDoKKyAgICAgICAgKFdlYkNvcmU6OnJvb3QpOgorICAgICAgICAq IGNzcy9DU1NJbXBvcnRSdWxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0ltcG9ydFJ1bGU6 On5DU1NJbXBvcnRSdWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU0ltcG9ydFJ1bGU6Om1lZGlh KToKKyAgICAgICAgKiBjc3MvQ1NTSW1wb3J0UnVsZS5oOgorICAgICAgICAoU3R5bGVSdWxlSW1w b3J0KToKKyAgICAgICAgKENTU0ltcG9ydFJ1bGUpOgorICAgICAgICAqIGNzcy9DU1NNZWRpYVJ1 bGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTTWVkaWFSdWxlOjp+Q1NTTWVkaWFSdWxlKToK KyAgICAgICAgKFdlYkNvcmU6OkNTU01lZGlhUnVsZTo6bWVkaWEpOgorICAgICAgICAqIGNzcy9D U1NNZWRpYVJ1bGUuaDoKKyAgICAgICAgKENTU01lZGlhUnVsZSk6CisgICAgICAgICogY3NzL0NT U1N0eWxlU2hlZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTaGVldDo6fkNTU1N0 eWxlU2hlZXQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTaGVldDo6bWVkaWEpOgorICAg ICAgICAqIGNzcy9DU1NTdHlsZVNoZWV0Lmg6CisgICAgICAgIChDU1NTdHlsZVNoZWV0KToKKyAg ICAgICAgKiBjc3MvTWVkaWFMaXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUXVlcnlT ZXQ6Om1lZGlhVGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUxpc3Q6Ok1lZGlhTGlzdCk6 CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhTGlzdDo6bm90aWZ5 Q2hhbmdlZCk6CisgICAgICAgICogY3NzL01lZGlhTGlzdC5oOgorICAgICAgICAoTWVkaWFRdWVy eVNldCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUxpc3Q6OmNyZWF0ZSk6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYUxpc3Q6OnBhcmVudFJ1bGUpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFM aXN0OjpjbGVhclBhcmVudFN0eWxlU2hlZXQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFMaXN0 OjpjbGVhclBhcmVudFJ1bGUpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFMaXN0OjpxdWVyaWVz KToKKyAgICAgICAgKE1lZGlhTGlzdCk6CisgICAgICAgICogY3NzL1N0eWxlUnVsZS5oOgorICAg ICAgICAoV2ViQ29yZTo6U3R5bGVSdWxlTWVkaWE6Om1lZGlhUXVlcmllcyk6CisKIDIwMTItMDQt MjQgIEFsZXhpcyBNZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CiAKICAgICAg ICAgUmVuYW1lIENTU1N0eWxlQXBwbHlQcm9wZXJ0eSBjbGFzcyB0byBTdHlsZUJ1aWxkZXIuCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuaAkocmV2aXNpb24g MTE1MDExKQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmgJKHdv cmtpbmcgY29weSkKQEAgLTIxNiw2ICsyMTYsOCBAQCBlbnVtIFBhcmFtZXRlckRlZmF1bHRQb2xp Y3kgewogCiAgICAgaW5saW5lIHZvaWQqIHJvb3QoTWVkaWFMaXN0KiBtZWRpYUxpc3QpCiAgICAg eworICAgICAgICBpZiAoQ1NTUnVsZSogcGFyZW50UnVsZSA9IG1lZGlhTGlzdC0+cGFyZW50UnVs ZSgpKQorICAgICAgICAgICAgcmV0dXJuIHJvb3QocGFyZW50UnVsZSk7CiAgICAgICAgIGlmIChD U1NTdHlsZVNoZWV0KiBwYXJlbnRTdHlsZVNoZWV0ID0gbWVkaWFMaXN0LT5wYXJlbnRTdHlsZVNo ZWV0KCkpCiAgICAgICAgICAgICByZXR1cm4gcm9vdChwYXJlbnRTdHlsZVNoZWV0KTsKICAgICAg ICAgcmV0dXJuIG1lZGlhTGlzdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NJbXBvcnRS dWxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTSW1wb3J0UnVsZS5j cHAJKHJldmlzaW9uIDExNTAxNikKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NJbXBvcnRSdWxl LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM0LDExICsxMzQsMTUgQEAgQ1NTSW1wb3J0UnVsZTo6 fkNTU0ltcG9ydFJ1bGUoKQogewogICAgIGlmIChtX3N0eWxlU2hlZXRDU1NPTVdyYXBwZXIpCiAg ICAgICAgIG1fc3R5bGVTaGVldENTU09NV3JhcHBlci0+Y2xlYXJPd25lclJ1bGUoKTsKKyAgICBp ZiAobV9tZWRpYUNTU09NV3JhcHBlcikKKyAgICAgICAgbV9tZWRpYUNTU09NV3JhcHBlci0+Y2xl YXJQYXJlbnRSdWxlKCk7CiB9CiAKLU1lZGlhTGlzdCogQ1NTSW1wb3J0UnVsZTo6bWVkaWEoKQor TWVkaWFMaXN0KiBDU1NJbXBvcnRSdWxlOjptZWRpYSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1f aW1wb3J0UnVsZS0+bWVkaWFRdWVyaWVzKCktPmVuc3VyZU1lZGlhTGlzdChwYXJlbnRTdHlsZVNo ZWV0KCkpOworICAgIGlmICghbV9tZWRpYUNTU09NV3JhcHBlcikKKyAgICAgICAgbV9tZWRpYUNT U09NV3JhcHBlciA9IE1lZGlhTGlzdDo6Y3JlYXRlKG1faW1wb3J0UnVsZS0+bWVkaWFRdWVyaWVz KCksIGNvbnN0X2Nhc3Q8Q1NTSW1wb3J0UnVsZSo+KHRoaXMpKTsKKyAgICByZXR1cm4gbV9tZWRp YUNTU09NV3JhcHBlci5nZXQoKTsKIH0KIAogU3RyaW5nIENTU0ltcG9ydFJ1bGU6OmNzc1RleHQo KSBjb25zdApJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU0ltcG9ydFJ1bGUuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTSW1wb3J0UnVsZS5oCShyZXZpc2lvbiAxMTUw MTEpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTSW1wb3J0UnVsZS5oCSh3b3JraW5nIGNvcHkp CkBAIC00OCw3ICs0OCw2IEBAIHB1YmxpYzoKICAgICBTdHJpbmcgaHJlZigpIGNvbnN0IHsgcmV0 dXJuIG1fc3RySHJlZjsgfQogICAgIFN0eWxlU2hlZXRJbnRlcm5hbCogc3R5bGVTaGVldCgpIGNv bnN0IHsgcmV0dXJuIG1fc3R5bGVTaGVldC5nZXQoKTsgfQogCi0gICAgLy8gTm90IHBhcnQgb2Yg dGhlIENTU09NLgogICAgIGJvb2wgaXNMb2FkaW5nKCkgY29uc3Q7CiAgICAgTWVkaWFRdWVyeVNl dCogbWVkaWFRdWVyaWVzKCkgeyByZXR1cm4gbV9tZWRpYVF1ZXJpZXMuZ2V0KCk7IH0KIApAQCAt OTEsNyArOTAsNyBAQCBwdWJsaWM6CiAgICAgfkNTU0ltcG9ydFJ1bGUoKTsKIAogICAgIFN0cmlu ZyBocmVmKCkgY29uc3QgeyByZXR1cm4gbV9pbXBvcnRSdWxlLT5ocmVmKCk7IH0KLSAgICBNZWRp YUxpc3QqIG1lZGlhKCk7CisgICAgTWVkaWFMaXN0KiBtZWRpYSgpIGNvbnN0OwogICAgIENTU1N0 eWxlU2hlZXQqIHN0eWxlU2hlZXQoKSBjb25zdDsKICAgICAKICAgICBTdHJpbmcgY3NzVGV4dCgp IGNvbnN0OwpAQCAtMTAxLDYgKzEwMCw3IEBAIHByaXZhdGU6CiAKICAgICBSZWZQdHI8U3R5bGVS dWxlSW1wb3J0PiBtX2ltcG9ydFJ1bGU7CiAKKyAgICBtdXRhYmxlIFJlZlB0cjxNZWRpYUxpc3Q+ IG1fbWVkaWFDU1NPTVdyYXBwZXI7CiAgICAgbXV0YWJsZSBSZWZQdHI8Q1NTU3R5bGVTaGVldD4g bV9zdHlsZVNoZWV0Q1NTT01XcmFwcGVyOwogfTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvY3Nz L0NTU01lZGlhUnVsZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU01l ZGlhUnVsZS5jcHAJKHJldmlzaW9uIDExNTAxMSkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NN ZWRpYVJ1bGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Niw2ICs0Niw4IEBAIENTU01lZGlhUnVs ZTo6fkNTU01lZGlhUnVsZSgpCiAgICAgICAgIGlmIChtX2NoaWxkUnVsZUNTU09NV3JhcHBlcnNb aV0pCiAgICAgICAgICAgICBtX2NoaWxkUnVsZUNTU09NV3JhcHBlcnNbaV0tPnNldFBhcmVudFJ1 bGUoMCk7CiAgICAgfQorICAgIGlmIChtX21lZGlhQ1NTT01XcmFwcGVyKQorICAgICAgICBtX21l ZGlhQ1NTT01XcmFwcGVyLT5jbGVhclBhcmVudFJ1bGUoKTsKIH0KIAogdW5zaWduZWQgQ1NTTWVk aWFSdWxlOjppbnNlcnRSdWxlKGNvbnN0IFN0cmluZyYgcnVsZVN0cmluZywgdW5zaWduZWQgaW5k ZXgsIEV4Y2VwdGlvbkNvZGUmIGVjKQpAQCAtMTI5LDkgKzEzMSwxMyBAQCBTdHJpbmcgQ1NTTWVk aWFSdWxlOjpjc3NUZXh0KCkgY29uc3QKICAgICByZXR1cm4gcmVzdWx0LnRvU3RyaW5nKCk7CiB9 CiAKLU1lZGlhTGlzdCogQ1NTTWVkaWFSdWxlOjptZWRpYSgpIGNvbnN0IAoteyAKLSAgICByZXR1 cm4gbV9tZWRpYVJ1bGUtPm1lZGlhUXVlcmllcygpID8gbV9tZWRpYVJ1bGUtPm1lZGlhUXVlcmll cygpLT5lbnN1cmVNZWRpYUxpc3QocGFyZW50U3R5bGVTaGVldCgpKSA6IDA7IAorTWVkaWFMaXN0 KiBDU1NNZWRpYVJ1bGU6Om1lZGlhKCkgY29uc3QKK3sKKyAgICBpZiAoIW1fbWVkaWFSdWxlLT5t ZWRpYVF1ZXJpZXMoKSkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgaWYgKCFtX21lZGlhQ1NTT01X cmFwcGVyKQorICAgICAgICBtX21lZGlhQ1NTT01XcmFwcGVyID0gTWVkaWFMaXN0OjpjcmVhdGUo bV9tZWRpYVJ1bGUtPm1lZGlhUXVlcmllcygpLCBjb25zdF9jYXN0PENTU01lZGlhUnVsZSo+KHRo aXMpKTsKKyAgICByZXR1cm4gbV9tZWRpYUNTU09NV3JhcHBlci5nZXQoKTsKIH0KIAogdW5zaWdu ZWQgQ1NTTWVkaWFSdWxlOjpsZW5ndGgoKSBjb25zdApJbmRleDogU291cmNlL1dlYkNvcmUvY3Nz L0NTU01lZGlhUnVsZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NNZWRp YVJ1bGUuaAkocmV2aXNpb24gMTE1MDExKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU01lZGlh UnVsZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01NSwxMCArNTUsOSBAQCBwcml2YXRlOgogICAgIAog ICAgIFJlZlB0cjxTdHlsZVJ1bGVNZWRpYT4gbV9tZWRpYVJ1bGU7CiAKKyAgICBtdXRhYmxlIFJl ZlB0cjxNZWRpYUxpc3Q+IG1fbWVkaWFDU1NPTVdyYXBwZXI7CiAgICAgbXV0YWJsZSBWZWN0b3I8 UmVmUHRyPENTU1J1bGU+ID4gbV9jaGlsZFJ1bGVDU1NPTVdyYXBwZXJzOwogICAgIG11dGFibGUg T3duUHRyPENTU1J1bGVMaXN0PiBtX3J1bGVMaXN0Q1NTT01XcmFwcGVyOwotICAgIAotICAgIGZy aWVuZCBjbGFzcyBTdHlsZVJ1bGU7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTaGVldC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2hlZXQuY3BwCShyZXZpc2lvbiAxMTUwMTYpCisrKyBT b3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTaGVldC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ1 OCw2ICs0NTgsOCBAQCBDU1NTdHlsZVNoZWV0Ojp+Q1NTU3R5bGVTaGVldCgpCiAgICAgICAgIGlm IChtX2NoaWxkUnVsZUNTU09NV3JhcHBlcnNbaV0pCiAgICAgICAgICAgICBtX2NoaWxkUnVsZUNT U09NV3JhcHBlcnNbaV0tPnNldFBhcmVudFN0eWxlU2hlZXQoMCk7CiAgICAgfQorICAgIGlmICht X21lZGlhQ1NTT01XcmFwcGVyKQorICAgICAgICBtX21lZGlhQ1NTT01XcmFwcGVyLT5jbGVhclBh cmVudFN0eWxlU2hlZXQoKTsKIH0KIAogdm9pZCBDU1NTdHlsZVNoZWV0OjpzZXREaXNhYmxlZChi b29sIGRpc2FibGVkKQpAQCAtNTgwLDcgKzU4Miw5IEBAIE1lZGlhTGlzdCogQ1NTU3R5bGVTaGVl dDo6bWVkaWEoKSBjb25zdCAKIHsgCiAgICAgaWYgKCFtX2ludGVybmFsLT5tZWRpYVF1ZXJpZXMo KSkKICAgICAgICAgcmV0dXJuIDA7Ci0gICAgcmV0dXJuIG1faW50ZXJuYWwtPm1lZGlhUXVlcmll cygpLT5lbnN1cmVNZWRpYUxpc3QoY29uc3RfY2FzdDxDU1NTdHlsZVNoZWV0Kj4odGhpcykpOwor ICAgIGlmICghbV9tZWRpYUNTU09NV3JhcHBlcikKKyAgICAgICAgbV9tZWRpYUNTU09NV3JhcHBl ciA9IE1lZGlhTGlzdDo6Y3JlYXRlKG1faW50ZXJuYWwtPm1lZGlhUXVlcmllcygpLCBjb25zdF9j YXN0PENTU1N0eWxlU2hlZXQqPih0aGlzKSk7CisgICAgcmV0dXJuIG1fbWVkaWFDU1NPTVdyYXBw ZXIuZ2V0KCk7CiB9CiAKIENTU1N0eWxlU2hlZXQqIENTU1N0eWxlU2hlZXQ6OnBhcmVudFN0eWxl U2hlZXQoKSBjb25zdCAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNoZWV0LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2hlZXQuaAkocmV2aXNp b24gMTE1MDE2KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2hlZXQuaAkod29ya2lu ZyBjb3B5KQpAQCAtMjI1LDYgKzIyNSw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lzRGlzYWJs ZWQ7CiAKICAgICBDU1NJbXBvcnRSdWxlKiBtX293bmVyUnVsZTsKKworICAgIG11dGFibGUgUmVm UHRyPE1lZGlhTGlzdD4gbV9tZWRpYUNTU09NV3JhcHBlcjsKICAgICBtdXRhYmxlIFZlY3RvcjxS ZWZQdHI8Q1NTUnVsZT4gPiBtX2NoaWxkUnVsZUNTU09NV3JhcHBlcnM7CiAgICAgbXV0YWJsZSBP d25QdHI8Q1NTUnVsZUxpc3Q+IG1fcnVsZUxpc3RDU1NPTVdyYXBwZXI7CiB9OwpJbmRleDogU291 cmNlL1dlYkNvcmUvY3NzL01lZGlhTGlzdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvY3NzL01lZGlhTGlzdC5jcHAJKHJldmlzaW9uIDExNTAxMSkKKysrIFNvdXJjZS9XZWJDb3Jl L2Nzcy9NZWRpYUxpc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTksMTcgKzE5OSwxOCBAQCBT dHJpbmcgTWVkaWFRdWVyeVNldDo6bWVkaWFUZXh0KCkgY29uc3QKICAgICB9CiAgICAgcmV0dXJu IHRleHQ7CiB9Ci0KLU1lZGlhTGlzdCogTWVkaWFRdWVyeVNldDo6ZW5zdXJlTWVkaWFMaXN0KENT U1N0eWxlU2hlZXQqIHBhcmVudFNoZWV0KSBjb25zdAotewotICAgIGlmICghbV9jc3NvbVdyYXBw ZXIpCi0gICAgICAgIG1fY3Nzb21XcmFwcGVyID0gYWRvcHRQdHIobmV3IE1lZGlhTGlzdChjb25z dF9jYXN0PE1lZGlhUXVlcnlTZXQqPih0aGlzKSwgcGFyZW50U2hlZXQpKTsKLSAgICByZXR1cm4g bV9jc3NvbVdyYXBwZXIuZ2V0KCk7Ci19CiAgICAgCiBNZWRpYUxpc3Q6Ok1lZGlhTGlzdChNZWRp YVF1ZXJ5U2V0KiBtZWRpYVF1ZXJpZXMsIENTU1N0eWxlU2hlZXQqIHBhcmVudFNoZWV0KQogICAg IDogbV9tZWRpYVF1ZXJpZXMobWVkaWFRdWVyaWVzKQogICAgICwgbV9wYXJlbnRTdHlsZVNoZWV0 KHBhcmVudFNoZWV0KQorICAgICwgbV9wYXJlbnRSdWxlKDApCit7Cit9CisKK01lZGlhTGlzdDo6 TWVkaWFMaXN0KE1lZGlhUXVlcnlTZXQqIG1lZGlhUXVlcmllcywgQ1NTUnVsZSogcGFyZW50UnVs ZSkKKyAgICA6IG1fbWVkaWFRdWVyaWVzKG1lZGlhUXVlcmllcykKKyAgICAsIG1fcGFyZW50U3R5 bGVTaGVldCgwKQorICAgICwgbV9wYXJlbnRSdWxlKHBhcmVudFJ1bGUpCiB7CiB9CiAKQEAgLTI1 OCwxMCArMjU5LDEwIEBAIHZvaWQgTWVkaWFMaXN0OjphcHBlbmRNZWRpdW0oY29uc3QgU3RyaW4K IAogdm9pZCBNZWRpYUxpc3Q6Om5vdGlmeUNoYW5nZWQoKQogewotICAgIGlmICghbV9wYXJlbnRT dHlsZVNoZWV0KQorICAgIENTU1N0eWxlU2hlZXQqIHBhcmVudFN0eWxlU2hlZXQgPSBtX3BhcmVu dFJ1bGUgPyBtX3BhcmVudFJ1bGUtPnBhcmVudFN0eWxlU2hlZXQoKSA6IG1fcGFyZW50U3R5bGVT aGVldDsKKyAgICBpZiAoIXBhcmVudFN0eWxlU2hlZXQpCiAgICAgICAgIHJldHVybjsKLQotICAg IG1fcGFyZW50U3R5bGVTaGVldC0+c3R5bGVTaGVldENoYW5nZWQoKTsKKyAgICBwYXJlbnRTdHls ZVNoZWV0LT5zdHlsZVNoZWV0Q2hhbmdlZCgpOwogfQogCiB9CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9jc3MvTWVkaWFMaXN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL01lZGlh TGlzdC5oCShyZXZpc2lvbiAxMTUwMTEpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvTWVkaWFMaXN0 LmgJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDcgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCitjbGFzcyBDU1NSdWxlOwogY2xhc3MgQ1NTU3R5bGVTaGVldDsKIGNsYXNzIE1lZGlhTGlz dDsKIGNsYXNzIE1lZGlhUXVlcnk7CkBAIC02MSw4ICs2Miw2IEBAIHB1YmxpYzoKICAgICBpbnQg bGFzdExpbmUoKSBjb25zdCB7IHJldHVybiBtX2xhc3RMaW5lOyB9CiAgICAgdm9pZCBzZXRMYXN0 TGluZShpbnQgbGFzdExpbmUpIHsgbV9sYXN0TGluZSA9IGxhc3RMaW5lOyB9CiAgICAgCi0gICAg TWVkaWFMaXN0KiBlbnN1cmVNZWRpYUxpc3QoQ1NTU3R5bGVTaGVldCopIGNvbnN0OwotICAgIAog ICAgIFN0cmluZyBtZWRpYVRleHQoKSBjb25zdDsKIAogcHJpdmF0ZToKQEAgLTcyLDE1ICs3MSwx OCBAQCBwcml2YXRlOgogICAgIHVuc2lnbmVkIG1fZmFsbGJhY2tUb0Rlc2NyaXB0b3IgOiAxOyAv LyB0cnVlIGlmIGZhaWxlZCBtZWRpYSBxdWVyeSBwYXJzaW5nIHNob3VsZCBmYWxsYmFjayB0byBt ZWRpYSBkZXNjcmlwdGlvbiBwYXJzaW5nLgogICAgIHNpZ25lZCBtX2xhc3RMaW5lIDogMzE7CiAg ICAgVmVjdG9yPE93blB0cjxNZWRpYVF1ZXJ5PiA+IG1fcXVlcmllczsKLSAgICAKLSAgICBtdXRh YmxlIE93blB0cjxNZWRpYUxpc3Q+IG1fY3Nzb21XcmFwcGVyOwogfTsKIAotY2xhc3MgTWVkaWFM aXN0IHsKLSAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShNZWRpYUxpc3QpOyBXVEZfTUFLRV9GQVNU X0FMTE9DQVRFRDsKK2NsYXNzIE1lZGlhTGlzdCA6IHB1YmxpYyBSZWZDb3VudGVkPE1lZGlhTGlz dD4gewogcHVibGljOgotICAgIHZvaWQgcmVmKCkgeyBtX21lZGlhUXVlcmllcy0+cmVmKCk7IH0K LSAgICB2b2lkIGRlcmVmKCkgeyBtX21lZGlhUXVlcmllcy0+ZGVyZWYoKTsgfQorICAgIHN0YXRp YyBQYXNzUmVmUHRyPE1lZGlhTGlzdD4gY3JlYXRlKE1lZGlhUXVlcnlTZXQqIG1lZGlhUXVlcmll cywgQ1NTU3R5bGVTaGVldCogcGFyZW50U2hlZXQpCisgICAgeworICAgICAgICByZXR1cm4gYWRv cHRSZWYobmV3IE1lZGlhTGlzdChtZWRpYVF1ZXJpZXMsIHBhcmVudFNoZWV0KSk7CisgICAgfQor ICAgIHN0YXRpYyBQYXNzUmVmUHRyPE1lZGlhTGlzdD4gY3JlYXRlKE1lZGlhUXVlcnlTZXQqIG1l ZGlhUXVlcmllcywgQ1NTUnVsZSogcGFyZW50UnVsZSkKKyAgICB7CisgICAgICAgIHJldHVybiBh ZG9wdFJlZihuZXcgTWVkaWFMaXN0KG1lZGlhUXVlcmllcywgcGFyZW50UnVsZSkpOworICAgIH0K IAogICAgIH5NZWRpYUxpc3QoKTsKIApAQCAtOTMsMjUgKzk1LDIyIEBAIHB1YmxpYzoKICAgICB2 b2lkIHNldE1lZGlhVGV4dChjb25zdCBTdHJpbmcmLCBFeGNlcHRpb25Db2RlJik7CiAKICAgICAv LyBOb3QgcGFydCBvZiBDU1NPTS4KKyAgICBDU1NSdWxlKiBwYXJlbnRSdWxlKCkgY29uc3QgeyBy ZXR1cm4gbV9wYXJlbnRSdWxlOyB9CiAgICAgQ1NTU3R5bGVTaGVldCogcGFyZW50U3R5bGVTaGVl dCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFyZW50U3R5bGVTaGVldDsgfQotICAgIHZvaWQgc2V0UGFy ZW50U3R5bGVTaGVldChDU1NTdHlsZVNoZWV0KiBzdHlsZVNoZWV0KQotICAgIHsKLSAgICAgICAg Ly8gTWVkaWFMaXN0IHNob3VsZCBuZXZlciBiZSBtb3ZlZCBiZXR3ZWVuIHN0eWxlIHNoZWV0cy4K LSAgICAgICAgQVNTRVJUKHN0eWxlU2hlZXQgPT0gbV9wYXJlbnRTdHlsZVNoZWV0IHx8ICFtX3Bh cmVudFN0eWxlU2hlZXQgfHwgIXN0eWxlU2hlZXQpOwotICAgICAgICBtX3BhcmVudFN0eWxlU2hl ZXQgPSBzdHlsZVNoZWV0OwotICAgIH0KLSAgICBjb25zdCBNZWRpYVF1ZXJ5U2V0KiBxdWVyaWVz KCkgY29uc3QgeyByZXR1cm4gbV9tZWRpYVF1ZXJpZXM7IH0KKyAgICB2b2lkIGNsZWFyUGFyZW50 U3R5bGVTaGVldCgpIHsgQVNTRVJUKG1fcGFyZW50U3R5bGVTaGVldCk7IG1fcGFyZW50U3R5bGVT aGVldCA9IDA7IH0KKyAgICB2b2lkIGNsZWFyUGFyZW50UnVsZSgpIHsgQVNTRVJUKG1fcGFyZW50 UnVsZSk7IG1fcGFyZW50UnVsZSA9IDA7IH0KKyAgICBjb25zdCBNZWRpYVF1ZXJ5U2V0KiBxdWVy aWVzKCkgY29uc3QgeyByZXR1cm4gbV9tZWRpYVF1ZXJpZXMuZ2V0KCk7IH0KIAogcHJpdmF0ZToK ICAgICBNZWRpYUxpc3QoKTsKICAgICBNZWRpYUxpc3QoTWVkaWFRdWVyeVNldCosIENTU1N0eWxl U2hlZXQqIHBhcmVudFNoZWV0KTsKKyAgICBNZWRpYUxpc3QoTWVkaWFRdWVyeVNldCosIENTU1J1 bGUqIHBhcmVudFJ1bGUpOwogCiAgICAgdm9pZCBub3RpZnlDaGFuZ2VkKCk7CiAKLSAgICBNZWRp YVF1ZXJ5U2V0KiBtX21lZGlhUXVlcmllczsKKyAgICBSZWZQdHI8TWVkaWFRdWVyeVNldD4gbV9t ZWRpYVF1ZXJpZXM7CiAgICAgQ1NTU3R5bGVTaGVldCogbV9wYXJlbnRTdHlsZVNoZWV0OwotICAg IAotICAgIGZyaWVuZCBjbGFzcyBNZWRpYVF1ZXJ5U2V0OworICAgIENTU1J1bGUqIG1fcGFyZW50 UnVsZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvU3R5 bGVSdWxlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUnVsZS5oCShy ZXZpc2lvbiAxMTUwMTEpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSdWxlLmgJKHdvcmtp bmcgY29weSkKQEAgLTE2MCw3ICsxNjAsNyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBhZG9w dFJlZihuZXcgU3R5bGVSdWxlTWVkaWEobWVkaWEsIGFkb3B0UnVsZXMpKTsKICAgICB9CiAKLSAg ICBjb25zdCBNZWRpYVF1ZXJ5U2V0KiBtZWRpYVF1ZXJpZXMoKSBjb25zdCB7IHJldHVybiBtX21l ZGlhUXVlcmllcy5nZXQoKTsgfQorICAgIE1lZGlhUXVlcnlTZXQqIG1lZGlhUXVlcmllcygpIGNv bnN0IHsgcmV0dXJuIG1fbWVkaWFRdWVyaWVzLmdldCgpOyB9CiAKIHByaXZhdGU6CiAgICAgU3R5 bGVSdWxlTWVkaWEoUGFzc1JlZlB0cjxNZWRpYVF1ZXJ5U2V0PiwgVmVjdG9yPFJlZlB0cjxTdHls ZVJ1bGVCYXNlPiA+JiBhZG9wdFJ1bGVzKTsK