85387 2012-05-02 10:45:10 -0700 Move title and media queries from StyleSheetInternal to CSSStyleSheet 2012-05-02 12:12:48 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned kling macpherson menard webkit.review.bot oldest_to_newest 614422 0 koivisto 2012-05-02 10:45:10 -0700 Stylesheet title and media queries are determined by the owner, not by the stylesheet itself. The fields belong to CSSStyleSheet. 614477 1 139846 koivisto 2012-05-02 11:34:25 -0700 Created attachment 139846 patch 614507 2 koivisto 2012-05-02 12:04:48 -0700 http://trac.webkit.org/changeset/115860 614509 3 139846 darin 2012-05-02 12:09:51 -0700 Comment on attachment 139846 patch View in context: https://bugs.webkit.org/attachment.cgi?id=139846&action=review > Source/WebCore/css/StyleResolver.cpp:-2483 > - // No media implies "all", but if a media list exists it must > - // contain our current medium Why did you remove this comment instead of moving it? 614513 4 koivisto 2012-05-02 12:12:48 -0700 (In reply to comment #3) > Why did you remove this comment instead of moving it? It seemed obvious. 139846 2012-05-02 11:34:25 -0700 2012-05-02 12:09:51 -0700 patch stylesheet-media-title-4.patch text/plain 15460 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNTg0OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ5IEBACisyMDEyLTA1LTAyICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIHRpdGxlIGFuZCBtZWRp YSBxdWVyaWVzIGZyb20gU3R5bGVTaGVldEludGVybmFsIHRvIENTU1N0eWxlU2hlZXQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1Mzg3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3R5bGVzaGVldCB0aXRs ZSBhbmQgbWVkaWEgcXVlcmllcyBhcmUgZGV0ZXJtaW5lZCBieSB0aGUgb3duZXIsIG5vdCBieSB0 aGUgc3R5bGVzaGVldCBpdHNlbGYuCisgICAgICAgIFRoZSBmaWVsZHMgYmVsb25nIHRvIENTU1N0 eWxlU2hlZXQuCisgICAgICAgIAorICAgICAgICBUaGlzIHdpbGwgbWFrZSBpdCBlYXNpZXIgdG8g c2hhcmUgU3R5bGVTaGVldEludGVybmFsIGluc3RhbmNlcyBiZXR3ZWVuIGRvY3VtZW50cy4KKwor ICAgICAgICAqIGNzcy9DU1NTdHlsZVNoZWV0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxl U2hlZXRJbnRlcm5hbDo6U3R5bGVTaGVldEludGVybmFsKToKKyAgICAgICAgKFdlYkNvcmU6OlN0 eWxlU2hlZXRJbnRlcm5hbDo6aXNDYWNoZWFibGUpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAg ICAgIChXZWJDb3JlOjpDU1NTdHlsZVNoZWV0OjpzZXREaXNhYmxlZCk6CisgICAgICAgIAorICAg ICAgICAgICAgSW52YWxpZGF0ZSB0aGUgZG9jdW1lbnQgc3R5bGUgZGlyZWN0bHkgaW5zdGVhZCBv ZiBwaW5nLXBvbmdpbmcgdGhyb3VnaCBTdHlsZVNoZWV0SW50ZXJuYWwuCisKKyAgICAgICAgKFdl YkNvcmU6OkNTU1N0eWxlU2hlZXQ6OnNldE1lZGlhUXVlcmllcyk6CisgICAgICAgIChXZWJDb3Jl OjpDU1NTdHlsZVNoZWV0OjptZWRpYSk6CisgICAgICAgICogY3NzL0NTU1N0eWxlU2hlZXQuaDoK KyAgICAgICAgKFN0eWxlU2hlZXRJbnRlcm5hbCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVNo ZWV0SW50ZXJuYWw6Om9yaWdpbmFsVVJMKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlU2hlZXRJ bnRlcm5hbDo6aGFzQ2hhcnNldFJ1bGUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTaGVl dDo6bWVkaWFRdWVyaWVzKToKKyAgICAgICAgKENTU1N0eWxlU2hlZXQpOgorICAgICAgICAoV2Vi Q29yZTo6Q1NTU3R5bGVTaGVldDo6c2V0VGl0bGUpOgorICAgICAgICAqIGNzcy9TdHlsZVJlc29s dmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OmFwcGVuZEF1dGhvclN0 eWxlc2hlZXRzKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OmNvbGxlY3RNYXRj aGluZ1J1bGVzRm9yTGlzdCk6CisgICAgICAgICogZG9tL0RPTUltcGxlbWVudGF0aW9uLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkRPTUltcGxlbWVudGF0aW9uOjpjcmVhdGVDU1NTdHlsZVNoZWV0 KToKKyAgICAgICAgKiBkb20vUHJvY2Vzc2luZ0luc3RydWN0aW9uLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlByb2Nlc3NpbmdJbnN0cnVjdGlvbjo6c2V0Q1NTU3R5bGVTaGVldCk6CisgICAgICAg ICogZG9tL1N0eWxlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUVsZW1lbnQ6 OmNyZWF0ZVNoZWV0KToKKyAgICAgICAgKiBodG1sL0hUTUxMaW5rRWxlbWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MTGlua0VsZW1lbnQ6OnBhcnNlQXR0cmlidXRlKToKKyAgICAgICAg KFdlYkNvcmU6OkhUTUxMaW5rRWxlbWVudDo6c2V0Q1NTU3R5bGVTaGVldCk6CisgICAgICAgICog aHRtbC9IVE1MU3R5bGVFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTdHlsZUVs ZW1lbnQ6OnBhcnNlQXR0cmlidXRlKToKKyAgICAgICAgKiBzdmcvU1ZHU3R5bGVFbGVtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR1N0eWxlRWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUpOgor CiAyMDEyLTA1LTAyICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAg IE5VTEwgcHRyIGluIFdlYkNvcmU6OkFwcGVuZE5vZGVDb21tYW5kOjpBcHBlbmROb2RlQ29tbWFu ZApJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2hlZXQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNoZWV0LmNwcAkocmV2aXNpb24gMTE1ODA1 KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2hlZXQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xMDksMTIgKzEwOSwxMCBAQCBTdHlsZVNoZWV0SW50ZXJuYWw6OlN0eWxlU2hlZXRJbnRl cm5hbChjCiAgICAgLCBtX293bmVyUnVsZSgwKQogICAgICwgbV9vcmlnaW5hbFVSTChvLm1fb3Jp Z2luYWxVUkwpCiAgICAgLCBtX2ZpbmFsVVJMKG8ubV9maW5hbFVSTCkKLSAgICAsIG1fdGl0bGUo by5tX3RpdGxlKQogICAgICwgbV9lbmNvZGluZ0Zyb21DaGFyc2V0UnVsZShvLm1fZW5jb2RpbmdG cm9tQ2hhcnNldFJ1bGUpCiAgICAgLCBtX2ltcG9ydFJ1bGVzKG8ubV9pbXBvcnRSdWxlcy5zaXpl KCkpCiAgICAgLCBtX2NoaWxkUnVsZXMoby5tX2NoaWxkUnVsZXMuc2l6ZSgpKQogICAgICwgbV9u YW1lc3BhY2VzKG8ubV9uYW1lc3BhY2VzKQotICAgICwgbV9tZWRpYVF1ZXJpZXMoby5tX21lZGlh UXVlcmllcyA/IG8ubV9tZWRpYVF1ZXJpZXMtPmNvcHkoKSA6IDApCiAgICAgLCBtX2xvYWRDb21w bGV0ZWQodHJ1ZSkKICAgICAsIG1faXNVc2VyU3R5bGVTaGVldChvLm1faXNVc2VyU3R5bGVTaGVl dCkKICAgICAsIG1faGFzU3ludGFjdGljYWxseVZhbGlkQ1NTSGVhZGVyKG8ubV9oYXNTeW50YWN0 aWNhbGx5VmFsaWRDU1NIZWFkZXIpCkBAIC00MTcsMTEgKzQxNSw2IEBAIERvY3VtZW50KiBTdHls ZVNoZWV0SW50ZXJuYWw6OnNpbmdsZU93bmUKICAgICByZXR1cm4gb3duZXJOb2RlID8gb3duZXJO b2RlLT5kb2N1bWVudCgpIDogMDsKIH0KIAotdm9pZCBTdHlsZVNoZWV0SW50ZXJuYWw6OnNldE1l ZGlhUXVlcmllcyhQYXNzUmVmUHRyPE1lZGlhUXVlcnlTZXQ+IG1lZGlhUXVlcmllcykKLXsKLSAg ICBtX21lZGlhUXVlcmllcyA9IG1lZGlhUXVlcmllczsKLX0KLQogdm9pZCBTdHlsZVNoZWV0SW50 ZXJuYWw6OnN0eWxlU2hlZXRDaGFuZ2VkKCkKIHsKICAgICBtX2hhc011dGF0ZWQgPSB0cnVlOwpA QCAtNTI1LDggKzUxOCwxNSBAQCB2b2lkIENTU1N0eWxlU2hlZXQ6OnNldERpc2FibGVkKGJvb2wg ZGlzCiB7IAogICAgIGlmIChkaXNhYmxlZCA9PSBtX2lzRGlzYWJsZWQpCiAgICAgICAgIHJldHVy bjsKLSAgICBtX2lzRGlzYWJsZWQgPSBkaXNhYmxlZDsgCi0gICAgbV9pbnRlcm5hbC0+c3R5bGVT aGVldENoYW5nZWQoKTsKKyAgICBtX2lzRGlzYWJsZWQgPSBkaXNhYmxlZDsKKyAgICBEb2N1bWVu dCogb3duZXIgPSBvd25lckRvY3VtZW50KCk7CisgICAgaWYgKG93bmVyKQorICAgICAgICBvd25l ci0+c3R5bGVSZXNvbHZlckNoYW5nZWQoRGVmZXJSZWNhbGNTdHlsZSk7Cit9CisKK3ZvaWQgQ1NT U3R5bGVTaGVldDo6c2V0TWVkaWFRdWVyaWVzKFBhc3NSZWZQdHI8TWVkaWFRdWVyeVNldD4gbWVk aWFRdWVyaWVzKQoreworICAgIG1fbWVkaWFRdWVyaWVzID0gbWVkaWFRdWVyaWVzOwogfQogCiB1 bnNpZ25lZCBDU1NTdHlsZVNoZWV0OjpsZW5ndGgoKSBjb25zdApAQCAtNjM5LDEwICs2MzksMTEg QEAgUGFzc1JlZlB0cjxDU1NSdWxlTGlzdD4gQ1NTU3R5bGVTaGVldDo6YwogCiBNZWRpYUxpc3Qq IENTU1N0eWxlU2hlZXQ6Om1lZGlhKCkgY29uc3QgCiB7IAotICAgIGlmICghbV9pbnRlcm5hbC0+ bWVkaWFRdWVyaWVzKCkpCisgICAgaWYgKCFtX21lZGlhUXVlcmllcykKICAgICAgICAgcmV0dXJu IDA7CisKICAgICBpZiAoIW1fbWVkaWFDU1NPTVdyYXBwZXIpCi0gICAgICAgIG1fbWVkaWFDU1NP TVdyYXBwZXIgPSBNZWRpYUxpc3Q6OmNyZWF0ZShtX2ludGVybmFsLT5tZWRpYVF1ZXJpZXMoKSwg Y29uc3RfY2FzdDxDU1NTdHlsZVNoZWV0Kj4odGhpcykpOworICAgICAgICBtX21lZGlhQ1NTT01X cmFwcGVyID0gTWVkaWFMaXN0OjpjcmVhdGUobV9tZWRpYVF1ZXJpZXMuZ2V0KCksIGNvbnN0X2Nh c3Q8Q1NTU3R5bGVTaGVldCo+KHRoaXMpKTsKICAgICByZXR1cm4gbV9tZWRpYUNTU09NV3JhcHBl ci5nZXQoKTsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2hlZXQuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTaGVldC5oCShyZXZpc2lv biAxMTU4MDUpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTaGVldC5oCSh3b3JraW5n IGNvcHkpCkBAIC0xMDUsOSArMTA1LDYgQEAgcHVibGljOgogICAgIGNvbnN0IFZlY3RvcjxSZWZQ dHI8U3R5bGVSdWxlQmFzZT4gPiYgY2hpbGRSdWxlcygpIGNvbnN0IHsgcmV0dXJuIG1fY2hpbGRS dWxlczsgfQogICAgIGNvbnN0IFZlY3RvcjxSZWZQdHI8U3R5bGVSdWxlSW1wb3J0PiA+JiBpbXBv cnRSdWxlcygpIGNvbnN0IHsgcmV0dXJuIG1faW1wb3J0UnVsZXM7IH0KIAotICAgIE1lZGlhUXVl cnlTZXQqIG1lZGlhUXVlcmllcygpIGNvbnN0IHsgcmV0dXJuIG1fbWVkaWFRdWVyaWVzLmdldCgp OyB9Ci0gICAgdm9pZCBzZXRNZWRpYVF1ZXJpZXMoUGFzc1JlZlB0cjxNZWRpYVF1ZXJ5U2V0Pik7 Ci0KICAgICB2b2lkIG5vdGlmeUxvYWRlZFNoZWV0KGNvbnN0IENhY2hlZENTU1N0eWxlU2hlZXQq KTsKICAgICAKICAgICBTdHlsZVNoZWV0SW50ZXJuYWwqIHBhcmVudFN0eWxlU2hlZXQoKSBjb25z dDsKQEAgLTExOCw4ICsxMTUsNiBAQCBwdWJsaWM6CiAgICAgLy8gdGhpcyBzdHlsZSBzaGVldC4g VGhpcyBwcm9wZXJ0eSBwcm9iYWJseSBpc24ndCB1c2VmdWwgZm9yIG11Y2ggZXhjZXB0CiAgICAg Ly8gdGhlIEphdmFTY3JpcHQgYmluZGluZyAod2hpY2ggbmVlZHMgdG8gdXNlIHRoaXMgdmFsdWUg Zm9yIHNlY3VyaXR5KS4KICAgICBTdHJpbmcgb3JpZ2luYWxVUkwoKSBjb25zdCB7IHJldHVybiBt X29yaWdpbmFsVVJMOyB9Ci0gICAgU3RyaW5nIHRpdGxlKCkgY29uc3QgeyByZXR1cm4gbV90aXRs ZTsgfQotICAgIHZvaWQgc2V0VGl0bGUoY29uc3QgU3RyaW5nJiB0aXRsZSkgeyBtX3RpdGxlID0g dGl0bGU7IH0KICAgICAKICAgICBjb25zdCBLVVJMJiBmaW5hbFVSTCgpIGNvbnN0IHsgcmV0dXJu IG1fZmluYWxVUkw7IH0KICAgICBjb25zdCBLVVJMJiBiYXNlVVJMKCkgY29uc3QgeyByZXR1cm4g bV9wYXJzZXJDb250ZXh0LmJhc2VVUkw7IH0KQEAgLTE0NiwyMSArMTQxLDE3IEBAIHByaXZhdGU6 CiAKICAgICB2b2lkIGNsZWFyQ2hhcnNldFJ1bGUoKTsKICAgICBib29sIGhhc0NoYXJzZXRSdWxl KCkgY29uc3QgeyByZXR1cm4gIW1fZW5jb2RpbmdGcm9tQ2hhcnNldFJ1bGUuaXNOdWxsKCk7IH0K LSAgICAKLSAgICB2b2lkIHVwZGF0ZUJhc2VVUkwoKTsKIAogICAgIFN0eWxlUnVsZUltcG9ydCog bV9vd25lclJ1bGU7CiAKICAgICBTdHJpbmcgbV9vcmlnaW5hbFVSTDsKICAgICBLVVJMIG1fZmlu YWxVUkw7Ci0gICAgU3RyaW5nIG1fdGl0bGU7CiAKICAgICBTdHJpbmcgbV9lbmNvZGluZ0Zyb21D aGFyc2V0UnVsZTsKICAgICBWZWN0b3I8UmVmUHRyPFN0eWxlUnVsZUltcG9ydD4gPiBtX2ltcG9y dFJ1bGVzOwogICAgIFZlY3RvcjxSZWZQdHI8U3R5bGVSdWxlQmFzZT4gPiBtX2NoaWxkUnVsZXM7 CiAgICAgdHlwZWRlZiBIYXNoTWFwPEF0b21pY1N0cmluZywgQXRvbWljU3RyaW5nPiBQcmVmaXhO YW1lc3BhY2VVUklNYXA7CiAgICAgUHJlZml4TmFtZXNwYWNlVVJJTWFwIG1fbmFtZXNwYWNlczsK LSAgICBSZWZQdHI8TWVkaWFRdWVyeVNldD4gbV9tZWRpYVF1ZXJpZXM7CiAKICAgICBib29sIG1f bG9hZENvbXBsZXRlZCA6IDE7CiAgICAgYm9vbCBtX2lzVXNlclN0eWxlU2hlZXQgOiAxOwpAQCAt MTkyLDcgKzE4Myw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIE5vZGUqIG93bmVyTm9kZSgpIGNv bnN0IE9WRVJSSURFIHsgcmV0dXJuIG1fb3duZXJOb2RlOyB9CiAgICAgdmlydHVhbCBNZWRpYUxp c3QqIG1lZGlhKCkgY29uc3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBTdHJpbmcgaHJlZigpIGNv bnN0IE9WRVJSSURFIHsgcmV0dXJuIG1faW50ZXJuYWwtPm9yaWdpbmFsVVJMKCk7IH0gIAotICAg IHZpcnR1YWwgU3RyaW5nIHRpdGxlKCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gbV9pbnRlcm5h bC0+dGl0bGUoKTsgfQorICAgIHZpcnR1YWwgU3RyaW5nIHRpdGxlKCkgY29uc3QgT1ZFUlJJREUg eyByZXR1cm4gbV90aXRsZTsgfQogICAgIHZpcnR1YWwgYm9vbCBkaXNhYmxlZCgpIGNvbnN0IE9W RVJSSURFIHsgcmV0dXJuIG1faXNEaXNhYmxlZDsgfQogICAgIHZpcnR1YWwgdm9pZCBzZXREaXNh YmxlZChib29sKSBPVkVSUklERTsKICAgICAKQEAgLTIxOCw2ICsyMDksOSBAQCBwdWJsaWM6CiAg ICAgdm9pZCBjbGVhck93bmVyUnVsZSgpIHsgbV9vd25lclJ1bGUgPSAwOyB9CiAgICAgdm9pZCBz dHlsZVNoZWV0Q2hhbmdlZCgpIHsgbV9pbnRlcm5hbC0+c3R5bGVTaGVldENoYW5nZWQoKTsgfQog ICAgIERvY3VtZW50KiBvd25lckRvY3VtZW50KCkgY29uc3Q7CisgICAgTWVkaWFRdWVyeVNldCog bWVkaWFRdWVyaWVzKCkgY29uc3QgeyByZXR1cm4gbV9tZWRpYVF1ZXJpZXMuZ2V0KCk7IH0KKyAg ICB2b2lkIHNldE1lZGlhUXVlcmllcyhQYXNzUmVmUHRyPE1lZGlhUXVlcnlTZXQ+KTsKKyAgICB2 b2lkIHNldFRpdGxlKGNvbnN0IFN0cmluZyYgdGl0bGUpIHsgbV90aXRsZSA9IHRpdGxlOyB9CiAg ICAgCiAgICAgdm9pZCBjbGVhckNoaWxkUnVsZUNTU09NV3JhcHBlcnMoKTsKIApAQCAtMjMyLDYg KzIyNiw4IEBAIHByaXZhdGU6CiAgICAgCiAgICAgUmVmUHRyPFN0eWxlU2hlZXRJbnRlcm5hbD4g bV9pbnRlcm5hbDsKICAgICBib29sIG1faXNEaXNhYmxlZDsKKyAgICBTdHJpbmcgbV90aXRsZTsK KyAgICBSZWZQdHI8TWVkaWFRdWVyeVNldD4gbV9tZWRpYVF1ZXJpZXM7CiAKICAgICBOb2RlKiBt X293bmVyTm9kZTsKICAgICBDU1NJbXBvcnRSdWxlKiBtX293bmVyUnVsZTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAJKHJldmlzaW9uIDExNTU1MSkKKysrIFNvdXJjZS9X ZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTA3LDYgKzUw NywxMCBAQCB2b2lkIFN0eWxlUmVzb2x2ZXI6OmFwcGVuZEF1dGhvclN0eWxlc2hlCiAgICAgICAg IGlmICghc3R5bGVzaGVldHNbaV0tPmlzQ1NTU3R5bGVTaGVldCgpIHx8IHN0eWxlc2hlZXRzW2ld LT5kaXNhYmxlZCgpKQogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIENTU1N0eWxlU2hl ZXQqIGNzc1NoZWV0ID0gc3RhdGljX2Nhc3Q8Q1NTU3R5bGVTaGVldCo+KHN0eWxlc2hlZXRzW2ld LmdldCgpKTsKKworICAgICAgICBpZiAoY3NzU2hlZXQtPm1lZGlhUXVlcmllcygpICYmICFtX21l ZGl1bS0+ZXZhbChjc3NTaGVldC0+bWVkaWFRdWVyaWVzKCksIHRoaXMpKQorICAgICAgICAgICAg Y29udGludWU7CisKICAgICAgICAgU3R5bGVTaGVldEludGVybmFsKiBzaGVldCA9IGNzc1NoZWV0 LT5pbnRlcm5hbCgpOwogI2lmIEVOQUJMRShTVFlMRV9TQ09QRUQpCiAgICAgICAgIGNvbnN0IENv bnRhaW5lck5vZGUqIHNjb3BlID0gZGV0ZXJtaW5lU2NvcGUoc2hlZXQpOwpAQCAtMjQ3OCwxMSAr MjQ4Miw2IEBAIHZvaWQgUnVsZVNldDo6YWRkUmVnaW9uUnVsZShTdHlsZVJ1bGVSZWcKIHZvaWQg UnVsZVNldDo6YWRkUnVsZXNGcm9tU2hlZXQoU3R5bGVTaGVldEludGVybmFsKiBzaGVldCwgY29u c3QgTWVkaWFRdWVyeUV2YWx1YXRvciYgbWVkaXVtLCBTdHlsZVJlc29sdmVyKiBzdHlsZVNlbGVj dG9yLCBjb25zdCBDb250YWluZXJOb2RlKiBzY29wZSkKIHsKICAgICBBU1NFUlQoc2hlZXQpOwot Ci0gICAgLy8gTm8gbWVkaWEgaW1wbGllcyAiYWxsIiwgYnV0IGlmIGEgbWVkaWEgbGlzdCBleGlz dHMgaXQgbXVzdAotICAgIC8vIGNvbnRhaW4gb3VyIGN1cnJlbnQgbWVkaXVtCi0gICAgaWYgKHNo ZWV0LT5tZWRpYVF1ZXJpZXMoKSAmJiAhbWVkaXVtLmV2YWwoc2hlZXQtPm1lZGlhUXVlcmllcygp LCBzdHlsZVNlbGVjdG9yKSkKLSAgICAgICAgcmV0dXJuOyAvLyB0aGUgc3R5bGUgc2hlZXQgZG9l c24ndCBhcHBseQogICAgIAogICAgIGNvbnN0IFZlY3RvcjxSZWZQdHI8U3R5bGVSdWxlSW1wb3J0 PiA+JiBpbXBvcnRSdWxlcyA9IHNoZWV0LT5pbXBvcnRSdWxlcygpOwogICAgIGZvciAodW5zaWdu ZWQgaSA9IDA7IGkgPCBpbXBvcnRSdWxlcy5zaXplKCk7ICsraSkgewpJbmRleDogU291cmNlL1dl YkNvcmUvZG9tL0RPTUltcGxlbWVudGF0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9kb20vRE9NSW1wbGVtZW50YXRpb24uY3BwCShyZXZpc2lvbiAxMTU1NTEpCisrKyBTb3Vy Y2UvV2ViQ29yZS9kb20vRE9NSW1wbGVtZW50YXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z MDcsOSArMzA3LDkgQEAgUGFzc1JlZlB0cjxDU1NTdHlsZVNoZWV0PiBET01JbXBsZW1lbnRhdAog ewogICAgIC8vIEZJWE1FOiBUaXRsZSBzaG91bGQgYmUgc2V0LgogICAgIC8vIEZJWE1FOiBNZWRp YSBjb3VsZCBoYXZlIHdyb25nIHN5bnRheCwgaW4gd2hpY2ggY2FzZSB3ZSBzaG91bGQgZ2VuZXJh dGUgYW4gZXhjZXB0aW9uLgotICAgIFJlZlB0cjxTdHlsZVNoZWV0SW50ZXJuYWw+IHNoZWV0ID0g U3R5bGVTaGVldEludGVybmFsOjpjcmVhdGUoKTsKKyAgICBSZWZQdHI8Q1NTU3R5bGVTaGVldD4g c2hlZXQgPSBDU1NTdHlsZVNoZWV0OjpjcmVhdGUoU3R5bGVTaGVldEludGVybmFsOjpjcmVhdGUo KSk7CiAgICAgc2hlZXQtPnNldE1lZGlhUXVlcmllcyhNZWRpYVF1ZXJ5U2V0OjpjcmVhdGVBbGxv d2luZ0Rlc2NyaXB0aW9uU3ludGF4KG1lZGlhKSk7Ci0gICAgcmV0dXJuIENTU1N0eWxlU2hlZXQ6 OmNyZWF0ZShzaGVldCk7CisgICAgcmV0dXJuIHNoZWV0OwogfQogCiBzdGF0aWMgY29uc3QgY2hh ciogY29uc3QgdmFsaWRYTUxNSU1FVHlwZUNoYXJzID0gIlswLTlhLXpBLVpfXFwtK34hJFxcXnt9 fC4lJ2AjJipdIjsgLy8gcGVyIFJGQ3M6IDMwMjMsIDIwNDUKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2RvbS9Qcm9jZXNzaW5nSW5zdHJ1Y3Rpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2RvbS9Qcm9jZXNzaW5nSW5zdHJ1Y3Rpb24uY3BwCShyZXZpc2lvbiAxMTU1NTEpCisrKyBT b3VyY2UvV2ViQ29yZS9kb20vUHJvY2Vzc2luZ0luc3RydWN0aW9uLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjEyLDE1ICsyMTIsMTkgQEAgdm9pZCBQcm9jZXNzaW5nSW5zdHJ1Y3Rpb246OnNldENT U1N0eWxlUwogCiAgICAgQVNTRVJUKG1faXNDU1MpOwogICAgIENTU1BhcnNlckNvbnRleHQgcGFy c2VyQ29udGV4dChkb2N1bWVudCgpLCBiYXNlVVJMLCBjaGFyc2V0KTsKKwogICAgIFJlZlB0cjxT dHlsZVNoZWV0SW50ZXJuYWw+IG5ld1NoZWV0ID0gU3R5bGVTaGVldEludGVybmFsOjpjcmVhdGUo aHJlZiwgYmFzZVVSTCwgcGFyc2VyQ29udGV4dCk7Ci0gICAgbV9zaGVldCA9IENTU1N0eWxlU2hl ZXQ6OmNyZWF0ZShuZXdTaGVldCwgdGhpcyk7CisKKyAgICBSZWZQdHI8Q1NTU3R5bGVTaGVldD4g Y3NzU2hlZXQgPSBDU1NTdHlsZVNoZWV0OjpjcmVhdGUobmV3U2hlZXQsIHRoaXMpOworICAgIGNz c1NoZWV0LT5zZXREaXNhYmxlZChtX2FsdGVybmF0ZSk7CisgICAgY3NzU2hlZXQtPnNldFRpdGxl KG1fdGl0bGUpOworICAgIGNzc1NoZWV0LT5zZXRNZWRpYVF1ZXJpZXMoTWVkaWFRdWVyeVNldDo6 Y3JlYXRlKG1fbWVkaWEpKTsKKworICAgIG1fc2hlZXQgPSBjc3NTaGVldC5yZWxlYXNlKCk7CisK ICAgICAvLyBXZSBkb24ndCBuZWVkIHRoZSBjcm9zcy1vcmlnaW4gc2VjdXJpdHkgY2hlY2sgaGVy ZSBiZWNhdXNlIHdlIGFyZQogICAgIC8vIGdldHRpbmcgdGhlIHNoZWV0IHRleHQgaW4gInN0cmlj dCIgbW9kZS4gVGhpcyBlbmZvcmNlcyBhIHZhbGlkIENTUyBNSU1FCiAgICAgLy8gdHlwZS4KLSAg ICBuZXdTaGVldC0+c2V0VGl0bGUobV90aXRsZSk7Ci0gICAgbmV3U2hlZXQtPnNldE1lZGlhUXVl cmllcyhNZWRpYVF1ZXJ5U2V0OjpjcmVhdGUobV9tZWRpYSkpOwotICAgIG1fc2hlZXQtPnNldERp c2FibGVkKG1fYWx0ZXJuYXRlKTsKLQogICAgIHBhcnNlU3R5bGVTaGVldChzaGVldC0+c2hlZXRU ZXh0KHRydWUpKTsKIH0KIApAQCAtMjYxLDcgKzI2NSw3IEBAIHZvaWQgUHJvY2Vzc2luZ0luc3Ry dWN0aW9uOjpzZXRDU1NTdHlsZVMKICAgICBBU1NFUlQoIW1fY2FjaGVkU2hlZXQpOwogICAgIEFT U0VSVCghbV9sb2FkaW5nKTsKICAgICBtX3NoZWV0ID0gc2hlZXQ7Ci0gICAgc2hlZXQtPmludGVy bmFsKCktPnNldFRpdGxlKG1fdGl0bGUpOworICAgIHNoZWV0LT5zZXRUaXRsZShtX3RpdGxlKTsK ICAgICBzaGVldC0+c2V0RGlzYWJsZWQobV9hbHRlcm5hdGUpOwogfQogCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9kb20vU3R5bGVFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9kb20vU3R5bGVFbGVtZW50LmNwcAkocmV2aXNpb24gMTE1NTUxKQorKysgU291cmNlL1dlYkNv cmUvZG9tL1N0eWxlRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3MCwxMSArMTcwLDEx IEBAIHZvaWQgU3R5bGVFbGVtZW50OjpjcmVhdGVTaGVldChFbGVtZW50KiAKICAgICAgICAgICAg IG1fbG9hZGluZyA9IHRydWU7CiAKICAgICAgICAgICAgIG1fc2hlZXQgPSBDU1NTdHlsZVNoZWV0 OjpjcmVhdGVJbmxpbmUoZSwgS1VSTCgpLCBkb2N1bWVudC0+aW5wdXRFbmNvZGluZygpKTsKLSAg ICAgICAgICAgIFJlZlB0cjxTdHlsZVNoZWV0SW50ZXJuYWw+IHN0eWxlU2hlZXQgPSBtX3NoZWV0 LT5pbnRlcm5hbCgpOworICAgICAgICAgICAgbV9zaGVldC0+c2V0TWVkaWFRdWVyaWVzKG1lZGlh UXVlcmllcy5yZWxlYXNlKCkpOworICAgICAgICAgICAgbV9zaGVldC0+c2V0VGl0bGUoZS0+dGl0 bGUoKSk7CisgICAgCisgICAgICAgICAgICBtX3NoZWV0LT5pbnRlcm5hbCgpLT5wYXJzZVN0cmlu Z0F0TGluZSh0ZXh0LCBzdGFydExpbmVOdW1iZXIpOwogCi0gICAgICAgICAgICBzdHlsZVNoZWV0 LT5wYXJzZVN0cmluZ0F0TGluZSh0ZXh0LCBzdGFydExpbmVOdW1iZXIpOwotICAgICAgICAgICAg c3R5bGVTaGVldC0+c2V0TWVkaWFRdWVyaWVzKG1lZGlhUXVlcmllcy5yZWxlYXNlKCkpOwotICAg ICAgICAgICAgc3R5bGVTaGVldC0+c2V0VGl0bGUoZS0+dGl0bGUoKSk7CiAgICAgICAgICAgICBt X2xvYWRpbmcgPSBmYWxzZTsKICAgICAgICAgfQogICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTExpbmtFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxMaW5rRWxlbWVudC5jcHAJKHJldmlzaW9uIDExNTgwNSkKKysrIFNvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTExpbmtFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU1LDcgKzE1 NSw3IEBAIHZvaWQgSFRNTExpbmtFbGVtZW50OjpwYXJzZUF0dHJpYnV0ZShBdHQKICAgICAgICAg c2V0QXR0cmlidXRlRXZlbnRMaXN0ZW5lcihldmVudE5hbWVzKCkuZXJyb3JFdmVudCwgY3JlYXRl QXR0cmlidXRlRXZlbnRMaXN0ZW5lcih0aGlzLCBhdHRyKSk7CiAgICAgZWxzZSB7CiAgICAgICAg IGlmIChhdHRyLT5uYW1lKCkgPT0gdGl0bGVBdHRyICYmIG1fc2hlZXQpCi0gICAgICAgICAgICBt X3NoZWV0LT5pbnRlcm5hbCgpLT5zZXRUaXRsZShhdHRyLT52YWx1ZSgpKTsKKyAgICAgICAgICAg IG1fc2hlZXQtPnNldFRpdGxlKGF0dHItPnZhbHVlKCkpOwogICAgICAgICBIVE1MRWxlbWVudDo6 cGFyc2VBdHRyaWJ1dGUoYXR0cik7CiAgICAgfQogfQpAQCAtMzAyLDEyICszMDIsMTAgQEAgdm9p ZCBIVE1MTGlua0VsZW1lbnQ6OnNldENTU1N0eWxlU2hlZXQoYwogICAgICAgICBBU1NFUlQocmVz dG9yZWRTaGVldC0+aXNDYWNoZWFibGUoKSk7CiAgICAgICAgIEFTU0VSVCghcmVzdG9yZWRTaGVl dC0+aXNMb2FkaW5nKCkpOwogCi0gICAgICAgIC8vIHJlc3RvcmVQYXJzZWRTdHlsZVNoZWV0KCkg Y3VycmVudGx5IHJldHVybnMgYSBjb3B5IHNvIGl0IGlzIG9rIHRvIG11dGF0ZSB0aGUgcXVlcmll cyBhbmQgdGhlIHRpdGxlIGxpa2UgdGhpcy4KLSAgICAgICAgUmVmUHRyPE1lZGlhUXVlcnlTZXQ+ IG1lZGlhID0gTWVkaWFRdWVyeVNldDo6Y3JlYXRlQWxsb3dpbmdEZXNjcmlwdGlvblN5bnRheCht X21lZGlhKTsKLSAgICAgICAgcmVzdG9yZWRTaGVldC0+c2V0TWVkaWFRdWVyaWVzKG1lZGlhLnJl bGVhc2UoKSk7Ci0gICAgICAgIHJlc3RvcmVkU2hlZXQtPnNldFRpdGxlKHRpdGxlKCkpOwotCiAg ICAgICAgIG1fc2hlZXQgPSBDU1NTdHlsZVNoZWV0OjpjcmVhdGUocmVzdG9yZWRTaGVldCwgdGhp cyk7CisgICAgICAgIG1fc2hlZXQtPnNldE1lZGlhUXVlcmllcyhNZWRpYVF1ZXJ5U2V0OjpjcmVh dGVBbGxvd2luZ0Rlc2NyaXB0aW9uU3ludGF4KG1fbWVkaWEpKTsKKyAgICAgICAgbV9zaGVldC0+ c2V0VGl0bGUodGl0bGUoKSk7CisKICAgICAgICAgbV9sb2FkaW5nID0gZmFsc2U7CiAgICAgICAg IHNoZWV0TG9hZGVkKCk7CiAgICAgICAgIG5vdGlmeUxvYWRlZFNoZWV0QW5kQWxsQ3JpdGljYWxT dWJyZXNvdXJjZXMoZmFsc2UpOwpAQCAtMzE1LDE0ICszMTMsMTMgQEAgdm9pZCBIVE1MTGlua0Vs ZW1lbnQ6OnNldENTU1N0eWxlU2hlZXQoYwogICAgIH0KIAogICAgIFJlZlB0cjxTdHlsZVNoZWV0 SW50ZXJuYWw+IHN0eWxlU2hlZXQgPSBTdHlsZVNoZWV0SW50ZXJuYWw6OmNyZWF0ZShocmVmLCBi YXNlVVJMLCBwYXJzZXJDb250ZXh0KTsKKwogICAgIG1fc2hlZXQgPSBDU1NTdHlsZVNoZWV0Ojpj cmVhdGUoc3R5bGVTaGVldCwgdGhpcyk7CisgICAgbV9zaGVldC0+c2V0TWVkaWFRdWVyaWVzKE1l ZGlhUXVlcnlTZXQ6OmNyZWF0ZUFsbG93aW5nRGVzY3JpcHRpb25TeW50YXgobV9tZWRpYSkpOwor ICAgIG1fc2hlZXQtPnNldFRpdGxlKHRpdGxlKCkpOwogCiAgICAgc3R5bGVTaGVldC0+cGFyc2VB dXRob3JTdHlsZVNoZWV0KGNhY2hlZFN0eWxlU2hlZXQsIGRvY3VtZW50KCktPnNlY3VyaXR5T3Jp Z2luKCkpOwogCi0gICAgUmVmUHRyPE1lZGlhUXVlcnlTZXQ+IG1lZGlhID0gTWVkaWFRdWVyeVNl dDo6Y3JlYXRlQWxsb3dpbmdEZXNjcmlwdGlvblN5bnRheChtX21lZGlhKTsKLSAgICBzdHlsZVNo ZWV0LT5zZXRNZWRpYVF1ZXJpZXMobWVkaWEucmVsZWFzZSgpKTsKLSAgICBzdHlsZVNoZWV0LT5z ZXRUaXRsZSh0aXRsZSgpKTsKLQogICAgIG1fbG9hZGluZyA9IGZhbHNlOwogICAgIHN0eWxlU2hl ZXQtPm5vdGlmeUxvYWRlZFNoZWV0KGNhY2hlZFN0eWxlU2hlZXQpOwogICAgIHN0eWxlU2hlZXQt PmNoZWNrTG9hZGVkKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTdHlsZUVsZW1l bnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFN0eWxlRWxlbWVu dC5jcHAJKHJldmlzaW9uIDExNTU1MSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFN0eWxl RWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTczLDcgKzczLDcgQEAgUGFzc1JlZlB0cjxI VE1MU3R5bGVFbGVtZW50PiBIVE1MU3R5bGVFbAogdm9pZCBIVE1MU3R5bGVFbGVtZW50OjpwYXJz ZUF0dHJpYnV0ZShBdHRyaWJ1dGUqIGF0dHIpCiB7CiAgICAgaWYgKGF0dHItPm5hbWUoKSA9PSB0 aXRsZUF0dHIgJiYgbV9zaGVldCkKLSAgICAgICAgbV9zaGVldC0+aW50ZXJuYWwoKS0+c2V0VGl0 bGUoYXR0ci0+dmFsdWUoKSk7CisgICAgICAgIG1fc2hlZXQtPnNldFRpdGxlKGF0dHItPnZhbHVl KCkpOwogICAgIGVsc2UgaWYgKGF0dHItPm5hbWUoKSA9PSBvbmxvYWRBdHRyKQogICAgICAgICBz ZXRBdHRyaWJ1dGVFdmVudExpc3RlbmVyKGV2ZW50TmFtZXMoKS5sb2FkRXZlbnQsIGNyZWF0ZUF0 dHJpYnV0ZUV2ZW50TGlzdGVuZXIodGhpcywgYXR0cikpOwogICAgIGVsc2UgaWYgKGF0dHItPm5h bWUoKSA9PSBvbmVycm9yQXR0cikKQEAgLTg0LDcgKzg0LDYgQEAgdm9pZCBIVE1MU3R5bGVFbGVt ZW50OjpwYXJzZUF0dHJpYnV0ZShBdAogICAgICAgICAgICAgcmVnaXN0ZXJXaXRoU2NvcGluZ05v ZGUoKTsKICAgICAgICAgZWxzZSBpZiAoYXR0ci0+aXNOdWxsKCkgJiYgbV9pc1JlZ2lzdGVyZWRX aXRoU2NvcGluZ05vZGUpCiAgICAgICAgICAgICB1bnJlZ2lzdGVyV2l0aFNjb3BpbmdOb2RlKCk7 Ci0KICAgICB9CiAjZW5kaWYKICAgICBlbHNlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZH U3R5bGVFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHU3R5 bGVFbGVtZW50LmNwcAkocmV2aXNpb24gMTE1NTUxKQorKysgU291cmNlL1dlYkNvcmUvc3ZnL1NW R1N0eWxlRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExOCw3ICsxMTgsNyBAQCB2b2lk IFNWR1N0eWxlRWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUoQXR0CiAKICAgICBpZiAoYXR0ci0+bmFt ZSgpID09IFNWR05hbWVzOjp0aXRsZUF0dHIpIHsKICAgICAgICAgaWYgKG1fc2hlZXQpCi0gICAg ICAgICAgICBtX3NoZWV0LT5pbnRlcm5hbCgpLT5zZXRUaXRsZShhdHRyLT52YWx1ZSgpKTsKKyAg ICAgICAgICAgIG1fc2hlZXQtPnNldFRpdGxlKGF0dHItPnZhbHVlKCkpOwogICAgICAgICByZXR1 cm47CiAgICAgfQogCg==