155211 2016-03-08 18:57:05 -0800 Stop using the UserContentController for injecting the override style sheet from CaptionUserPreferences 2016-03-08 20:39:35 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam cdumez commit-queue esprehn+autocc kangil.han oldest_to_newest 1172342 0 sam 2016-03-08 18:57:05 -0800 Stop using the UserContentController for injecting the override style sheet frrom CaptionUserPreferences 1172344 1 273372 sam 2016-03-08 19:20:22 -0800 Created attachment 273372 Patch 1172359 2 273376 sam 2016-03-08 20:06:58 -0800 Created attachment 273376 Patch 1172375 3 273376 mitz 2016-03-08 20:34:52 -0800 Comment on attachment 273376 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=273376&action=review > Source/WebCore/dom/ExtensionStyleSheets.cpp:124 > + RefPtr<CSSStyleSheet> groupSheet = CSSStyleSheet::createInline(const_cast<Document&>(m_document), captionsStyleSheetURL.get()); Why is it called groupSheet? 1172377 4 sam 2016-03-08 20:39:35 -0800 Committed r197831: <http://trac.webkit.org/changeset/197831> 273372 2016-03-08 19:20:22 -0800 2016-03-08 20:06:54 -0800 Patch bug-155211-20160308192008.patch text/plain 12835 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NzgzMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUwIEBACisyMDE2LTAzLTA4ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU3RvcCB1c2luZyB0aGUgVXNlckNvbnRl bnRDb250cm9sbGVyIGZvciBpbmplY3RpbmcgdGhlIG92ZXJyaWRlIHN0eWxlIHNoZWV0IGZyb20g Q2FwdGlvblVzZXJQcmVmZXJlbmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTU1MjExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhlIFVzZXJDb250ZW50Q29udHJvbGxlciBpcyBnb2luZyB0byBiZWNv bWUgcmVhZCBvbmx5IGZyb20gV2ViQ29yZSdzIHBlcnNwZWN0aXZlLiBUaGUgQ2FwdGlvblVzZXJQ cmVmZXJlbmNlcworICAgICAgICB3YXMgcmVseWluZyBvbiBiZWluZyBhYmxlIHRvIHNldCBhIFVz ZXJTdHlsZVNoZWV0IG9uIGl0LCBidXQgdGhpcyB3YXMgcmVhbGx5IHVubmVjZXNzYXJ5IGNvbXBs ZXhpdHkuIFNpbXBsaWZ5CisgICAgICAgIHRoaW5ncyBieSBzdG9yaW5nIHRoZSBzdHlsZSBzaGVl dCdzIHNvdXJjZSBkaXJlY3RseSBvbiB0aGUgUGFnZSBhbmQgdGVhY2hpbmcgRXh0ZW5zaW9uU3R5 bGVTaGVldHMgYWJvdXQgaXQKKyAgICAgICAgZXhwbGljaXRseS4KKworICAgICAgICAqIGRvbS9F eHRlbnNpb25TdHlsZVNoZWV0cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFeHRlbnNpb25TdHls ZVNoZWV0czo6dXBkYXRlSW5qZWN0ZWRTdHlsZVNoZWV0Q2FjaGUpOgorICAgICAgICBJZiB0aGVy ZSBpcyBhIGNhcHRpb25Vc2VyUHJlZmVyZW5jZXNTdHlsZVNoZWV0IG9uIHRoZSBwYWdlLCBpbmpl Y3QgaXQuCisKKyAgICAgICAgKiBwYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXMuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlczo6dXBkYXRlQ2FwdGlvblN0eWxl U2hlZXRPdmVyaWRlKToKKyAgICAgICAgR3JlYXRseSBzaW1wbGlmeSB0aGUgY29kZS4gTm93LCBh bGwgdGhpcyBkb2VzIGlzIHNldCB0aGUgc3R5bGUgc2hlZXQgb24gZWFjaCBwYWdlLgorCisgICAg ICAgICogcGFnZS9QYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OmludmFsaWRhdGVJ bmplY3RlZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVzKToKKyAgICAgICAgRXh0cmFjdCB0aGlz IG91dCBmcm9tIFVzZXJDb250ZW50Q29udHJvbGxlci4KKworICAgICAgICAoV2ViQ29yZTo6UGFn ZTo6c2V0VXNlckNvbnRlbnRDb250cm9sbGVyKToKKyAgICAgICAgQ2FsbCB0aGUgbmV3bHkgZXh0 cmFjdGVkIGludmFsaWRhdGVJbmplY3RlZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVzKCkuCisK KyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OmNhcHRpb25Vc2VyUHJlZmVyZW5jZXNTdHlsZVNoZWV0 KToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OnNldENhcHRpb25Vc2VyUHJlZmVyZW5jZXNTdHls ZVNoZWV0KToKKyAgICAgICAgQWRkIGdldHRlci9zZXR0ZXIuIFdoZW4gc2V0dGluZywgaW52YWxp ZGF0ZSB0aGUgc3R5bGUgc2hlZXQgY2FjaGUuCisKKyAgICAgICAgKiBwYWdlL1BhZ2UuaDoKKyAg ICAgICAgQWRkIG5ldyBtZW1iZXJzIGFuZCBmdW5jdGlvbnMuCisKKyAgICAgICAgKiBwYWdlL1Vz ZXJDb250ZW50Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpVc2VyQ29udGVudENv bnRyb2xsZXI6OmFkZFVzZXJTdHlsZVNoZWV0KToKKyAgICAgICAgKFdlYkNvcmU6OlVzZXJDb250 ZW50Q29udHJvbGxlcjo6cmVtb3ZlVXNlclN0eWxlU2hlZXQpOgorICAgICAgICAoV2ViQ29yZTo6 VXNlckNvbnRlbnRDb250cm9sbGVyOjpyZW1vdmVVc2VyU3R5bGVTaGVldHMpOgorICAgICAgICAo V2ViQ29yZTo6VXNlckNvbnRlbnRDb250cm9sbGVyOjpyZW1vdmVBbGxVc2VyQ29udGVudCk6Cisg ICAgICAgIFN3aXRjaCB0byBjYWxsaW5nIGludmFsaWRhdGVJbmplY3RlZFN0eWxlU2hlZXRDYWNo ZUluQWxsRnJhbWVzSW5BbGxQYWdlcygpLgorCisgICAgICAgIChXZWJDb3JlOjpVc2VyQ29udGVu dENvbnRyb2xsZXI6OmludmFsaWRhdGVJbmplY3RlZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVz SW5BbGxQYWdlcyk6CisgICAgICAgIFJlbmFtZSBhbmQgaW1wbGVtZW50IGluIHRlcm1zIG9mIFBh Z2U6OmludmFsaWRhdGVJbmplY3RlZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVzKCkuCisKKyAg ICAgICAgKiBwYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5oOgorICAgICAgICBSZW5hbWUgZnVu Y3Rpb24uCisKIDIwMTYtMDMtMDggIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNv bT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBNZW1vcnkgVGltZWxpbmUgc2hvdWxkIHNob3cg TWVtb3J5UHJlc3N1cmUgZXZlbnRzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRXh0ZW5zaW9u U3R5bGVTaGVldHMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9FeHRlbnNp b25TdHlsZVNoZWV0cy5jcHAJKHJldmlzaW9uIDE5NzgyNykKKysrIFNvdXJjZS9XZWJDb3JlL2Rv bS9FeHRlbnNpb25TdHlsZVNoZWV0cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNyw2ICsxMTcs MTcgQEAgdm9pZCBFeHRlbnNpb25TdHlsZVNoZWV0czo6dXBkYXRlSW5qZWN0ZQogICAgIGlmICgh b3duaW5nUGFnZSkKICAgICAgICAgcmV0dXJuOwogCisgICAgaWYgKCFvd25pbmdQYWdlLT5jYXB0 aW9uVXNlclByZWZlcmVuY2VzU3R5bGVTaGVldCgpLmlzRW1wdHkoKSkgeworICAgICAgICAvLyBJ ZGVudGlmeSBvdXIgb3ZlcnJpZGUgc3R5bGUgc2hlZXQgd2l0aCBhIHVuaXF1ZSBVUkwgLSBhIG5l dyBzY2hlbWUgYW5kIGEgVVVJRC4KKyAgICAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFVSTD4g Y2FwdGlvbnNTdHlsZVNoZWV0VVJMKFBhcnNlZFVSTFN0cmluZywgInVzZXItY2FwdGlvbnMtb3Zl cnJpZGU6MDFGNkFGMTItQzNCMC00RjcwLUFGNUUtQTNFMDAyMzREQzIzIik7CisKKyAgICAgICAg UmVmUHRyPENTU1N0eWxlU2hlZXQ+IGdyb3VwU2hlZXQgPSBDU1NTdHlsZVNoZWV0OjpjcmVhdGVJ bmxpbmUoY29uc3RfY2FzdDxEb2N1bWVudCY+KG1fZG9jdW1lbnQpLCBjYXB0aW9uc1N0eWxlU2hl ZXRVUkwuZ2V0KCkpOworICAgICAgICBtX2luamVjdGVkQXV0aG9yU3R5bGVTaGVldHMuYXBwZW5k KGdyb3VwU2hlZXQpOworCisgICAgICAgIGdyb3VwU2hlZXQtPmNvbnRlbnRzKCkuc2V0SXNVc2Vy U3R5bGVTaGVldChmYWxzZSk7CisgICAgICAgIGdyb3VwU2hlZXQtPmNvbnRlbnRzKCkucGFyc2VT dHJpbmcob3duaW5nUGFnZS0+Y2FwdGlvblVzZXJQcmVmZXJlbmNlc1N0eWxlU2hlZXQoKSk7Cisg ICAgfQorCiAgICAgY29uc3QgYXV0byogdXNlckNvbnRlbnRDb250cm9sbGVyID0gb3duaW5nUGFn ZS0+dXNlckNvbnRlbnRDb250cm9sbGVyKCk7CiAgICAgaWYgKCF1c2VyQ29udGVudENvbnRyb2xs ZXIpCiAgICAgICAgIHJldHVybjsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVz ZXJQcmVmZXJlbmNlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0 aW9uVXNlclByZWZlcmVuY2VzLmNwcAkocmV2aXNpb24gMTk3ODI3KQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjk4 LDI1ICsyOTgsOSBAQCB2b2lkIENhcHRpb25Vc2VyUHJlZmVyZW5jZXM6OnNldENhcHRpb25zCiAK IHZvaWQgQ2FwdGlvblVzZXJQcmVmZXJlbmNlczo6dXBkYXRlQ2FwdGlvblN0eWxlU2hlZXRPdmVy aWRlKCkKIHsKLSAgICAvLyBJZGVudGlmeSBvdXIgb3ZlcnJpZGUgc3R5bGUgc2hlZXQgd2l0aCBh IHVuaXF1ZSBVUkwgLSBhIG5ldyBzY2hlbWUgYW5kIGEgVVVJRC4KLSAgICBzdGF0aWMgTmV2ZXJE ZXN0cm95ZWQ8VVJMPiBjYXB0aW9uc1N0eWxlU2hlZXRVUkwoUGFyc2VkVVJMU3RyaW5nLCAidXNl ci1jYXB0aW9ucy1vdmVycmlkZTowMUY2QUYxMi1DM0IwLTRGNzAtQUY1RS1BM0UwMDIzNERDMjMi KTsKLQotICAgIGF1dG8mIHBhZ2VzID0gbV9wYWdlR3JvdXAucGFnZXMoKTsKLSAgICBmb3IgKGF1 dG8mIHBhZ2UgOiBwYWdlcykgewotICAgICAgICBpZiAoYXV0byogcGFnZVVzZXJDb250ZW50Q29u dHJvbGxlciA9IHBhZ2UtPnVzZXJDb250ZW50Q29udHJvbGxlcigpKQotICAgICAgICAgICAgcGFn ZVVzZXJDb250ZW50Q29udHJvbGxlci0+cmVtb3ZlVXNlclN0eWxlU2hlZXQobWFpblRocmVhZE5v cm1hbFdvcmxkKCksIGNhcHRpb25zU3R5bGVTaGVldFVSTCk7Ci0gICAgfQotCiAgICAgU3RyaW5n IGNhcHRpb25zT3ZlcnJpZGVTdHlsZVNoZWV0ID0gY2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUo KTsKLSAgICBpZiAoY2FwdGlvbnNPdmVycmlkZVN0eWxlU2hlZXQuaXNFbXB0eSgpKQotICAgICAg ICByZXR1cm47Ci0KLSAgICBmb3IgKGF1dG8mIHBhZ2UgOiBwYWdlcykgewotICAgICAgICBpZiAo YXV0byogcGFnZVVzZXJDb250ZW50Q29udHJvbGxlciA9IHBhZ2UtPnVzZXJDb250ZW50Q29udHJv bGxlcigpKSB7Ci0gICAgICAgICAgICBhdXRvIHVzZXJTdHlsZVNoZWV0ID0gc3RkOjptYWtlX3Vu aXF1ZTxVc2VyU3R5bGVTaGVldD4oY2FwdGlvbnNPdmVycmlkZVN0eWxlU2hlZXQsIGNhcHRpb25z U3R5bGVTaGVldFVSTCwgVmVjdG9yPFN0cmluZz4oKSwgVmVjdG9yPFN0cmluZz4oKSwgSW5qZWN0 SW5BbGxGcmFtZXMsIFVzZXJTdHlsZUF1dGhvckxldmVsKTsKLSAgICAgICAgICAgIHBhZ2VVc2Vy Q29udGVudENvbnRyb2xsZXItPmFkZFVzZXJTdHlsZVNoZWV0KG1haW5UaHJlYWROb3JtYWxXb3Js ZCgpLCBXVEZNb3ZlKHVzZXJTdHlsZVNoZWV0KSwgSW5qZWN0SW5FeGlzdGluZ0RvY3VtZW50cyk7 Ci0gICAgICAgIH0KLSAgICB9CisgICAgZm9yIChhdXRvJiBwYWdlIDogbV9wYWdlR3JvdXAucGFn ZXMoKSkKKyAgICAgICAgcGFnZS0+c2V0Q2FwdGlvblVzZXJQcmVmZXJlbmNlc1N0eWxlU2hlZXQo Y2FwdGlvbnNPdmVycmlkZVN0eWxlU2hlZXQpOwogfQogCiBTdHJpbmcgQ2FwdGlvblVzZXJQcmVm ZXJlbmNlczo6cHJpbWFyeUF1ZGlvVHJhY2tMYW5ndWFnZU92ZXJyaWRlKCkgY29uc3QKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGFnZS9QYWdlLmNwcAkocmV2aXNpb24gMTk3ODI3KQorKysgU291cmNlL1dlYkNvcmUvcGFn ZS9QYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTEyNiw2ICsxMTI2LDE3IEBAIHZvaWQgUGFn ZTo6aW52YWxpZGF0ZVN0eWxlc0ZvckxpbmsoTGlua0gKICAgICB9CiB9CiAKK3ZvaWQgUGFnZTo6 aW52YWxpZGF0ZUluamVjdGVkU3R5bGVTaGVldENhY2hlSW5BbGxGcmFtZXMoKQoreworICAgIGZv ciAoRnJhbWUqIGZyYW1lID0gbV9tYWluRnJhbWUuZ2V0KCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1l LT50cmVlKCkudHJhdmVyc2VOZXh0KCkpIHsKKyAgICAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0g ZnJhbWUtPmRvY3VtZW50KCk7CisgICAgICAgIGlmICghZG9jdW1lbnQpCisgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgZG9jdW1lbnQtPmV4dGVuc2lvblN0eWxlU2hlZXRzKCkuaW52YWxp ZGF0ZUluamVjdGVkU3R5bGVTaGVldENhY2hlKCk7CisgICAgICAgIGRvY3VtZW50LT5zdHlsZVJl c29sdmVyQ2hhbmdlZChEZWZlclJlY2FsY1N0eWxlKTsKKyAgICB9Cit9CisKIHZvaWQgUGFnZTo6 c2V0RGVidWdnZXIoSlNDOjpEZWJ1Z2dlciogZGVidWdnZXIpCiB7CiAgICAgaWYgKG1fZGVidWdn ZXIgPT0gZGVidWdnZXIpCkBAIC0xODE4LDEyICsxODI5LDcgQEAgdm9pZCBQYWdlOjpzZXRVc2Vy Q29udGVudENvbnRyb2xsZXIoVXNlcgogICAgIGlmIChtX3VzZXJDb250ZW50Q29udHJvbGxlcikK ICAgICAgICAgbV91c2VyQ29udGVudENvbnRyb2xsZXItPmFkZFBhZ2UoKnRoaXMpOwogCi0gICAg Zm9yIChGcmFtZSogZnJhbWUgPSAmbWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50 cmVlKCkudHJhdmVyc2VOZXh0KCkpIHsKLSAgICAgICAgaWYgKERvY3VtZW50ICpkb2N1bWVudCA9 IGZyYW1lLT5kb2N1bWVudCgpKSB7Ci0gICAgICAgICAgICBkb2N1bWVudC0+ZXh0ZW5zaW9uU3R5 bGVTaGVldHMoKS5pbnZhbGlkYXRlSW5qZWN0ZWRTdHlsZVNoZWV0Q2FjaGUoKTsKLSAgICAgICAg ICAgIGRvY3VtZW50LT5zdHlsZVJlc29sdmVyQ2hhbmdlZChEZWZlclJlY2FsY1N0eWxlKTsKLSAg ICAgICAgfQotICAgIH0KKyAgICBpbnZhbGlkYXRlSW5qZWN0ZWRTdHlsZVNoZWV0Q2FjaGVJbkFs bEZyYW1lcygpOwogfQogCiB2b2lkIFBhZ2U6OnNldFN0b3JhZ2VOYW1lc3BhY2VQcm92aWRlcihS ZWY8U3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyPiYmIHN0b3JhZ2VOYW1lc3BhY2VQcm92aWRlcikK QEAgLTIwMDgsNCArMjAxNCwxOSBAQCBib29sIFBhZ2U6OmlzQWx3YXlzT25Mb2dnaW5nQWxsb3dl ZCgpIGNvCiAgICAgcmV0dXJuIG1fc2Vzc2lvbklELmlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgp OwogfQogCitTdHJpbmcgUGFnZTo6Y2FwdGlvblVzZXJQcmVmZXJlbmNlc1N0eWxlU2hlZXQoKQor eworICAgIHJldHVybiBtX2NhcHRpb25Vc2VyUHJlZmVyZW5jZXNTdHlsZVNoZWV0OworfQorCit2 b2lkIFBhZ2U6OnNldENhcHRpb25Vc2VyUHJlZmVyZW5jZXNTdHlsZVNoZWV0KGNvbnN0IFN0cmlu ZyYgc3R5bGVTaGVldCkKK3sKKyAgICBpZiAobV9jYXB0aW9uVXNlclByZWZlcmVuY2VzU3R5bGVT aGVldCA9PSBzdHlsZVNoZWV0KQorICAgICAgICByZXR1cm47CisKKyAgICBtX2NhcHRpb25Vc2Vy UHJlZmVyZW5jZXNTdHlsZVNoZWV0ID0gc3R5bGVTaGVldDsKKyAgICAKKyAgICBpbnZhbGlkYXRl SW5qZWN0ZWRTdHlsZVNoZWV0Q2FjaGVJbkFsbEZyYW1lcygpOworfQorCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAkocmV2aXNpb24gMTk3ODI3KQorKysgU291cmNl L1dlYkNvcmUvcGFnZS9QYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTM1Nyw2ICszNTcsOCBAQCBw dWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBpbnZhbGlkYXRlU3R5bGVzRm9yQWxsTGlu a3MoKTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGludmFsaWRhdGVTdHlsZXNGb3JMaW5rKExp bmtIYXNoKTsKIAorICAgIHZvaWQgaW52YWxpZGF0ZUluamVjdGVkU3R5bGVTaGVldENhY2hlSW5B bGxGcmFtZXMoKTsKKwogICAgIFN0b3JhZ2VOYW1lc3BhY2UqIHNlc3Npb25TdG9yYWdlKGJvb2wg b3B0aW9uYWxDcmVhdGUgPSB0cnVlKTsKICAgICB2b2lkIHNldFNlc3Npb25TdG9yYWdlKFJlZlB0 cjxTdG9yYWdlTmFtZXNwYWNlPiYmKTsKIApAQCAtNTA5LDYgKzUxMSw5IEBAIHB1YmxpYzoKIAog ICAgIGJvb2wgaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCkgY29uc3Q7CiAKKyAgICBTdHJpbmcg Y2FwdGlvblVzZXJQcmVmZXJlbmNlc1N0eWxlU2hlZXQoKTsKKyAgICB2b2lkIHNldENhcHRpb25V c2VyUHJlZmVyZW5jZXNTdHlsZVNoZWV0KGNvbnN0IFN0cmluZyYpOworCiBwcml2YXRlOgogICAg IFdFQkNPUkVfRVhQT1JUIHZvaWQgaW5pdEdyb3VwKCk7CiAKQEAgLTYwOSw2ICs2MTQsOCBAQCBw cml2YXRlOgogICAgIG11dGFibGUgYm9vbCBtX2RpZExvYWRVc2VyU3R5bGVTaGVldDsKICAgICBt dXRhYmxlIHRpbWVfdCBtX3VzZXJTdHlsZVNoZWV0TW9kaWZpY2F0aW9uVGltZTsKIAorICAgIFN0 cmluZyBtX2NhcHRpb25Vc2VyUHJlZmVyZW5jZXNTdHlsZVNoZWV0OworCiAgICAgc3RkOjp1bmlx dWVfcHRyPFBhZ2VHcm91cD4gbV9zaW5nbGVQYWdlR3JvdXA7CiAgICAgUGFnZUdyb3VwKiBtX2dy b3VwOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9Vc2VyQ29udGVudENvbnRyb2xs ZXIuY3BwCShyZXZpc2lvbiAxOTc4MjcpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250 ZW50Q29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMyw3ICsxMjMsNyBAQCB2b2lk IFVzZXJDb250ZW50Q29udHJvbGxlcjo6YWRkVXNlclN0eWxlCiAgICAgc3R5bGVTaGVldHNJbldv cmxkLT5hcHBlbmQoV1RGTW92ZSh1c2VyU3R5bGVTaGVldCkpOwogCiAgICAgaWYgKGluamVjdGlv blRpbWUgPT0gSW5qZWN0SW5FeGlzdGluZ0RvY3VtZW50cykKLSAgICAgICAgaW52YWxpZGF0ZUlu amVjdGVkU3R5bGVTaGVldENhY2hlSW5BbGxGcmFtZXMoKTsKKyAgICAgICAgaW52YWxpZGF0ZUlu amVjdGVkU3R5bGVTaGVldENhY2hlSW5BbGxGcmFtZXNJbkFsbFBhZ2VzKCk7CiB9CiAKIHZvaWQg VXNlckNvbnRlbnRDb250cm9sbGVyOjpyZW1vdmVVc2VyU3R5bGVTaGVldChET01XcmFwcGVyV29y bGQmIHdvcmxkLCBjb25zdCBVUkwmIHVybCkKQEAgLTE1MSw3ICsxNTEsNyBAQCB2b2lkIFVzZXJD b250ZW50Q29udHJvbGxlcjo6cmVtb3ZlVXNlclN0CiAgICAgaWYgKHN0eWxlc2hlZXRzLmlzRW1w dHkoKSkKICAgICAgICAgbV91c2VyU3R5bGVTaGVldHMtPnJlbW92ZShpdCk7CiAKLSAgICBpbnZh bGlkYXRlSW5qZWN0ZWRTdHlsZVNoZWV0Q2FjaGVJbkFsbEZyYW1lcygpOworICAgIGludmFsaWRh dGVJbmplY3RlZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVzSW5BbGxQYWdlcygpOwogfQogCiB2 b2lkIFVzZXJDb250ZW50Q29udHJvbGxlcjo6cmVtb3ZlVXNlclN0eWxlU2hlZXRzKERPTVdyYXBw ZXJXb3JsZCYgd29ybGQpCkBAIC0xNjIsNyArMTYyLDcgQEAgdm9pZCBVc2VyQ29udGVudENvbnRy b2xsZXI6OnJlbW92ZVVzZXJTdAogICAgIGlmICghbV91c2VyU3R5bGVTaGVldHMtPnJlbW92ZSgm d29ybGQpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpbnZhbGlkYXRlSW5qZWN0ZWRTdHlsZVNo ZWV0Q2FjaGVJbkFsbEZyYW1lcygpOworICAgIGludmFsaWRhdGVJbmplY3RlZFN0eWxlU2hlZXRD YWNoZUluQWxsRnJhbWVzSW5BbGxQYWdlcygpOwogfQogCiAjaWYgRU5BQkxFKFVTRVJfTUVTU0FH RV9IQU5ETEVSUykKQEAgLTI0OSwxOCArMjQ5LDE0IEBAIHZvaWQgVXNlckNvbnRlbnRDb250cm9s bGVyOjpyZW1vdmVBbGxVc2UKIAogICAgIGlmIChtX3VzZXJTdHlsZVNoZWV0cykgewogICAgICAg ICBtX3VzZXJTdHlsZVNoZWV0cyA9IG51bGxwdHI7Ci0gICAgICAgIGludmFsaWRhdGVJbmplY3Rl ZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVzKCk7CisgICAgICAgIGludmFsaWRhdGVJbmplY3Rl ZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVzSW5BbGxQYWdlcygpOwogICAgIH0KIH0KIAotdm9p ZCBVc2VyQ29udGVudENvbnRyb2xsZXI6OmludmFsaWRhdGVJbmplY3RlZFN0eWxlU2hlZXRDYWNo ZUluQWxsRnJhbWVzKCkKK3ZvaWQgVXNlckNvbnRlbnRDb250cm9sbGVyOjppbnZhbGlkYXRlSW5q ZWN0ZWRTdHlsZVNoZWV0Q2FjaGVJbkFsbEZyYW1lc0luQWxsUGFnZXMoKQogewotICAgIGZvciAo YXV0byYgcGFnZSA6IG1fcGFnZXMpIHsKLSAgICAgICAgZm9yIChGcmFtZSogZnJhbWUgPSAmcGFn ZS0+bWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJhdmVyc2VOZXh0 KCkpIHsKLSAgICAgICAgICAgIGZyYW1lLT5kb2N1bWVudCgpLT5leHRlbnNpb25TdHlsZVNoZWV0 cygpLmludmFsaWRhdGVJbmplY3RlZFN0eWxlU2hlZXRDYWNoZSgpOwotICAgICAgICAgICAgZnJh bWUtPmRvY3VtZW50KCktPnN0eWxlUmVzb2x2ZXJDaGFuZ2VkKERlZmVyUmVjYWxjU3R5bGUpOwot ICAgICAgICB9Ci0gICAgfQorICAgIGZvciAoYXV0byYgcGFnZSA6IG1fcGFnZXMpCisgICAgICAg IHBhZ2UtPmludmFsaWRhdGVJbmplY3RlZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVzKCk7CiB9 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvVXNl ckNvbnRlbnRDb250cm9sbGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9V c2VyQ29udGVudENvbnRyb2xsZXIuaAkocmV2aXNpb24gMTk3ODI3KQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9Vc2VyQ29udGVudENvbnRyb2xsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTAzLDcg KzEwMyw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgVXNlckNvbnRlbnRDb250cm9sbGVyKCk7 CiAKLSAgICB2b2lkIGludmFsaWRhdGVJbmplY3RlZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVz KCk7CisgICAgdm9pZCBpbnZhbGlkYXRlSW5qZWN0ZWRTdHlsZVNoZWV0Q2FjaGVJbkFsbEZyYW1l c0luQWxsUGFnZXMoKTsKIAogICAgIEhhc2hTZXQ8UGFnZSo+IG1fcGFnZXM7CiAKSW5kZXg6IFNv dXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHJldmlzaW9uIDE5NzgyNykKKysrIFNvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTAwNCw3 ICsxMDA0LDcgQEAgLSAodm9pZClfY29tbW9uSW5pdGlhbGl6YXRpb25XaXRoRnJhbWVOYQogICAg IHBhZ2VDb25maWd1cmF0aW9uLnByb2dyZXNzVHJhY2tlckNsaWVudCA9IG5ldyBXZWJQcm9ncmVz c1RyYWNrZXJDbGllbnQoc2VsZik7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24uZGF0YWJhc2VQcm92 aWRlciA9ICZXZWJEYXRhYmFzZVByb3ZpZGVyOjpzaW5nbGV0b24oKTsKICAgICBwYWdlQ29uZmln dXJhdGlvbi5zdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIgPSAmX3ByaXZhdGUtPmdyb3VwLT5zdG9y YWdlTmFtZXNwYWNlUHJvdmlkZXIoKTsKLSAgICBwYWdlQ29uZmlndXJhdGlvbi51c2VyQ29udGVu dENvbnRyb2xsZXIgPSAmX3ByaXZhdGUtPmdyb3VwLT51c2VyQ29udGVudENvbnRyb2xsZXIoKTsK KyAgICBwYWdlQ29uZmlndXJhdGlvbi51c2VyQ29udGVudFByb3ZpZGVyID0gJl9wcml2YXRlLT5n cm91cC0+dXNlckNvbnRlbnRDb250cm9sbGVyKCk7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24udmlz aXRlZExpbmtTdG9yZSA9ICZfcHJpdmF0ZS0+Z3JvdXAtPnZpc2l0ZWRMaW5rU3RvcmUoKTsKICAg ICBfcHJpdmF0ZS0+cGFnZSA9IG5ldyBQYWdlKHBhZ2VDb25maWd1cmF0aW9uKTsKIApAQCAtMTI0 OSw3ICsxMjQ5LDcgQEAgLSAoaWQpaW5pdFNpbXBsZUhUTUxEb2N1bWVudFdpdGhTdHlsZTooTgog ICAgIHBhZ2VDb25maWd1cmF0aW9uLnByb2dyZXNzVHJhY2tlckNsaWVudCA9IG5ldyBXZWJQcm9n cmVzc1RyYWNrZXJDbGllbnQoc2VsZik7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24uZGF0YWJhc2VQ cm92aWRlciA9ICZXZWJEYXRhYmFzZVByb3ZpZGVyOjpzaW5nbGV0b24oKTsKICAgICBwYWdlQ29u ZmlndXJhdGlvbi5zdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIgPSAmX3ByaXZhdGUtPmdyb3VwLT5z dG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIoKTsKLSAgICBwYWdlQ29uZmlndXJhdGlvbi51c2VyQ29u dGVudENvbnRyb2xsZXIgPSAmX3ByaXZhdGUtPmdyb3VwLT51c2VyQ29udGVudENvbnRyb2xsZXIo KTsKKyAgICBwYWdlQ29uZmlndXJhdGlvbi51c2VyQ29udGVudFByb3ZpZGVyID0gJl9wcml2YXRl LT5ncm91cC0+dXNlckNvbnRlbnRDb250cm9sbGVyKCk7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24u dmlzaXRlZExpbmtTdG9yZSA9ICZfcHJpdmF0ZS0+Z3JvdXAtPnZpc2l0ZWRMaW5rU3RvcmUoKTsK IAogICAgIF9wcml2YXRlLT5wYWdlID0gbmV3IFBhZ2UocGFnZUNvbmZpZ3VyYXRpb24pOwpAQCAt NjE5NSw3ICs2MTk1LDcgQEAgLSAodm9pZClzZXRHcm91cE5hbWU6KE5TU3RyaW5nICopZ3JvdXBO YQogICAgIGlmICghX3ByaXZhdGUtPnBhZ2UpCiAgICAgICAgIHJldHVybjsKIAotICAgIF9wcml2 YXRlLT5wYWdlLT5zZXRVc2VyQ29udGVudENvbnRyb2xsZXIoJl9wcml2YXRlLT5ncm91cC0+dXNl ckNvbnRlbnRDb250cm9sbGVyKCkpOworICAgIF9wcml2YXRlLT5wYWdlLT5zZXRVc2VyQ29udGVu dFByb3ZpZGVyKF9wcml2YXRlLT5ncm91cC0+dXNlckNvbnRlbnRDb250cm9sbGVyKCkpOwogICAg IF9wcml2YXRlLT5wYWdlLT5zZXRWaXNpdGVkTGlua1N0b3JlKF9wcml2YXRlLT5ncm91cC0+dmlz aXRlZExpbmtTdG9yZSgpKTsKICAgICBfcHJpdmF0ZS0+cGFnZS0+c2V0R3JvdXBOYW1lKGdyb3Vw TmFtZSk7CiB9Cg== 273376 2016-03-08 20:06:58 -0800 2016-03-08 20:34:52 -0800 Patch bug-155211-20160308200644.patch text/plain 10935 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NzgzMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUwIEBACisyMDE2LTAzLTA4ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU3RvcCB1c2luZyB0aGUgVXNlckNvbnRl bnRDb250cm9sbGVyIGZvciBpbmplY3RpbmcgdGhlIG92ZXJyaWRlIHN0eWxlIHNoZWV0IGZyb20g Q2FwdGlvblVzZXJQcmVmZXJlbmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTU1MjExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhlIFVzZXJDb250ZW50Q29udHJvbGxlciBpcyBnb2luZyB0byBiZWNv bWUgcmVhZCBvbmx5IGZyb20gV2ViQ29yZSdzIHBlcnNwZWN0aXZlLiBUaGUgQ2FwdGlvblVzZXJQ cmVmZXJlbmNlcworICAgICAgICB3YXMgcmVseWluZyBvbiBiZWluZyBhYmxlIHRvIHNldCBhIFVz ZXJTdHlsZVNoZWV0IG9uIGl0LCBidXQgdGhpcyB3YXMgcmVhbGx5IHVubmVjZXNzYXJ5IGNvbXBs ZXhpdHkuIFNpbXBsaWZ5CisgICAgICAgIHRoaW5ncyBieSBzdG9yaW5nIHRoZSBzdHlsZSBzaGVl dCdzIHNvdXJjZSBkaXJlY3RseSBvbiB0aGUgUGFnZSBhbmQgdGVhY2hpbmcgRXh0ZW5zaW9uU3R5 bGVTaGVldHMgYWJvdXQgaXQKKyAgICAgICAgZXhwbGljaXRseS4KKworICAgICAgICAqIGRvbS9F eHRlbnNpb25TdHlsZVNoZWV0cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFeHRlbnNpb25TdHls ZVNoZWV0czo6dXBkYXRlSW5qZWN0ZWRTdHlsZVNoZWV0Q2FjaGUpOgorICAgICAgICBJZiB0aGVy ZSBpcyBhIGNhcHRpb25Vc2VyUHJlZmVyZW5jZXNTdHlsZVNoZWV0IG9uIHRoZSBwYWdlLCBpbmpl Y3QgaXQuCisKKyAgICAgICAgKiBwYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXMuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlczo6dXBkYXRlQ2FwdGlvblN0eWxl U2hlZXRPdmVyaWRlKToKKyAgICAgICAgR3JlYXRseSBzaW1wbGlmeSB0aGUgY29kZS4gTm93LCBh bGwgdGhpcyBkb2VzIGlzIHNldCB0aGUgc3R5bGUgc2hlZXQgb24gZWFjaCBwYWdlLgorCisgICAg ICAgICogcGFnZS9QYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OmludmFsaWRhdGVJ bmplY3RlZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVzKToKKyAgICAgICAgRXh0cmFjdCB0aGlz IG91dCBmcm9tIFVzZXJDb250ZW50Q29udHJvbGxlci4KKworICAgICAgICAoV2ViQ29yZTo6UGFn ZTo6c2V0VXNlckNvbnRlbnRDb250cm9sbGVyKToKKyAgICAgICAgQ2FsbCB0aGUgbmV3bHkgZXh0 cmFjdGVkIGludmFsaWRhdGVJbmplY3RlZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVzKCkuCisK KyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OmNhcHRpb25Vc2VyUHJlZmVyZW5jZXNTdHlsZVNoZWV0 KToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OnNldENhcHRpb25Vc2VyUHJlZmVyZW5jZXNTdHls ZVNoZWV0KToKKyAgICAgICAgQWRkIGdldHRlci9zZXR0ZXIuIFdoZW4gc2V0dGluZywgaW52YWxp ZGF0ZSB0aGUgc3R5bGUgc2hlZXQgY2FjaGUuCisKKyAgICAgICAgKiBwYWdlL1BhZ2UuaDoKKyAg ICAgICAgQWRkIG5ldyBtZW1iZXJzIGFuZCBmdW5jdGlvbnMuCisKKyAgICAgICAgKiBwYWdlL1Vz ZXJDb250ZW50Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpVc2VyQ29udGVudENv bnRyb2xsZXI6OmFkZFVzZXJTdHlsZVNoZWV0KToKKyAgICAgICAgKFdlYkNvcmU6OlVzZXJDb250 ZW50Q29udHJvbGxlcjo6cmVtb3ZlVXNlclN0eWxlU2hlZXQpOgorICAgICAgICAoV2ViQ29yZTo6 VXNlckNvbnRlbnRDb250cm9sbGVyOjpyZW1vdmVVc2VyU3R5bGVTaGVldHMpOgorICAgICAgICAo V2ViQ29yZTo6VXNlckNvbnRlbnRDb250cm9sbGVyOjpyZW1vdmVBbGxVc2VyQ29udGVudCk6Cisg ICAgICAgIFN3aXRjaCB0byBjYWxsaW5nIGludmFsaWRhdGVJbmplY3RlZFN0eWxlU2hlZXRDYWNo ZUluQWxsRnJhbWVzSW5BbGxQYWdlcygpLgorCisgICAgICAgIChXZWJDb3JlOjpVc2VyQ29udGVu dENvbnRyb2xsZXI6OmludmFsaWRhdGVJbmplY3RlZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVz SW5BbGxQYWdlcyk6CisgICAgICAgIFJlbmFtZSBhbmQgaW1wbGVtZW50IGluIHRlcm1zIG9mIFBh Z2U6OmludmFsaWRhdGVJbmplY3RlZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVzKCkuCisKKyAg ICAgICAgKiBwYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5oOgorICAgICAgICBSZW5hbWUgZnVu Y3Rpb24uCisKIDIwMTYtMDMtMDggIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNv bT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBNZW1vcnkgVGltZWxpbmUgc2hvdWxkIHNob3cg TWVtb3J5UHJlc3N1cmUgZXZlbnRzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRXh0ZW5zaW9u U3R5bGVTaGVldHMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9FeHRlbnNp b25TdHlsZVNoZWV0cy5jcHAJKHJldmlzaW9uIDE5NzgyNykKKysrIFNvdXJjZS9XZWJDb3JlL2Rv bS9FeHRlbnNpb25TdHlsZVNoZWV0cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNyw2ICsxMTcs MTcgQEAgdm9pZCBFeHRlbnNpb25TdHlsZVNoZWV0czo6dXBkYXRlSW5qZWN0ZQogICAgIGlmICgh b3duaW5nUGFnZSkKICAgICAgICAgcmV0dXJuOwogCisgICAgaWYgKCFvd25pbmdQYWdlLT5jYXB0 aW9uVXNlclByZWZlcmVuY2VzU3R5bGVTaGVldCgpLmlzRW1wdHkoKSkgeworICAgICAgICAvLyBJ ZGVudGlmeSBvdXIgb3ZlcnJpZGUgc3R5bGUgc2hlZXQgd2l0aCBhIHVuaXF1ZSBVUkwgLSBhIG5l dyBzY2hlbWUgYW5kIGEgVVVJRC4KKyAgICAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFVSTD4g Y2FwdGlvbnNTdHlsZVNoZWV0VVJMKFBhcnNlZFVSTFN0cmluZywgInVzZXItY2FwdGlvbnMtb3Zl cnJpZGU6MDFGNkFGMTItQzNCMC00RjcwLUFGNUUtQTNFMDAyMzREQzIzIik7CisKKyAgICAgICAg UmVmUHRyPENTU1N0eWxlU2hlZXQ+IGdyb3VwU2hlZXQgPSBDU1NTdHlsZVNoZWV0OjpjcmVhdGVJ bmxpbmUoY29uc3RfY2FzdDxEb2N1bWVudCY+KG1fZG9jdW1lbnQpLCBjYXB0aW9uc1N0eWxlU2hl ZXRVUkwuZ2V0KCkpOworICAgICAgICBtX2luamVjdGVkQXV0aG9yU3R5bGVTaGVldHMuYXBwZW5k KGdyb3VwU2hlZXQpOworCisgICAgICAgIGdyb3VwU2hlZXQtPmNvbnRlbnRzKCkuc2V0SXNVc2Vy U3R5bGVTaGVldChmYWxzZSk7CisgICAgICAgIGdyb3VwU2hlZXQtPmNvbnRlbnRzKCkucGFyc2VT dHJpbmcob3duaW5nUGFnZS0+Y2FwdGlvblVzZXJQcmVmZXJlbmNlc1N0eWxlU2hlZXQoKSk7Cisg ICAgfQorCiAgICAgY29uc3QgYXV0byogdXNlckNvbnRlbnRDb250cm9sbGVyID0gb3duaW5nUGFn ZS0+dXNlckNvbnRlbnRDb250cm9sbGVyKCk7CiAgICAgaWYgKCF1c2VyQ29udGVudENvbnRyb2xs ZXIpCiAgICAgICAgIHJldHVybjsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVz ZXJQcmVmZXJlbmNlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0 aW9uVXNlclByZWZlcmVuY2VzLmNwcAkocmV2aXNpb24gMTk3ODI3KQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjk4 LDI1ICsyOTgsOSBAQCB2b2lkIENhcHRpb25Vc2VyUHJlZmVyZW5jZXM6OnNldENhcHRpb25zCiAK IHZvaWQgQ2FwdGlvblVzZXJQcmVmZXJlbmNlczo6dXBkYXRlQ2FwdGlvblN0eWxlU2hlZXRPdmVy aWRlKCkKIHsKLSAgICAvLyBJZGVudGlmeSBvdXIgb3ZlcnJpZGUgc3R5bGUgc2hlZXQgd2l0aCBh IHVuaXF1ZSBVUkwgLSBhIG5ldyBzY2hlbWUgYW5kIGEgVVVJRC4KLSAgICBzdGF0aWMgTmV2ZXJE ZXN0cm95ZWQ8VVJMPiBjYXB0aW9uc1N0eWxlU2hlZXRVUkwoUGFyc2VkVVJMU3RyaW5nLCAidXNl ci1jYXB0aW9ucy1vdmVycmlkZTowMUY2QUYxMi1DM0IwLTRGNzAtQUY1RS1BM0UwMDIzNERDMjMi KTsKLQotICAgIGF1dG8mIHBhZ2VzID0gbV9wYWdlR3JvdXAucGFnZXMoKTsKLSAgICBmb3IgKGF1 dG8mIHBhZ2UgOiBwYWdlcykgewotICAgICAgICBpZiAoYXV0byogcGFnZVVzZXJDb250ZW50Q29u dHJvbGxlciA9IHBhZ2UtPnVzZXJDb250ZW50Q29udHJvbGxlcigpKQotICAgICAgICAgICAgcGFn ZVVzZXJDb250ZW50Q29udHJvbGxlci0+cmVtb3ZlVXNlclN0eWxlU2hlZXQobWFpblRocmVhZE5v cm1hbFdvcmxkKCksIGNhcHRpb25zU3R5bGVTaGVldFVSTCk7Ci0gICAgfQotCiAgICAgU3RyaW5n IGNhcHRpb25zT3ZlcnJpZGVTdHlsZVNoZWV0ID0gY2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUo KTsKLSAgICBpZiAoY2FwdGlvbnNPdmVycmlkZVN0eWxlU2hlZXQuaXNFbXB0eSgpKQotICAgICAg ICByZXR1cm47Ci0KLSAgICBmb3IgKGF1dG8mIHBhZ2UgOiBwYWdlcykgewotICAgICAgICBpZiAo YXV0byogcGFnZVVzZXJDb250ZW50Q29udHJvbGxlciA9IHBhZ2UtPnVzZXJDb250ZW50Q29udHJv bGxlcigpKSB7Ci0gICAgICAgICAgICBhdXRvIHVzZXJTdHlsZVNoZWV0ID0gc3RkOjptYWtlX3Vu aXF1ZTxVc2VyU3R5bGVTaGVldD4oY2FwdGlvbnNPdmVycmlkZVN0eWxlU2hlZXQsIGNhcHRpb25z U3R5bGVTaGVldFVSTCwgVmVjdG9yPFN0cmluZz4oKSwgVmVjdG9yPFN0cmluZz4oKSwgSW5qZWN0 SW5BbGxGcmFtZXMsIFVzZXJTdHlsZUF1dGhvckxldmVsKTsKLSAgICAgICAgICAgIHBhZ2VVc2Vy Q29udGVudENvbnRyb2xsZXItPmFkZFVzZXJTdHlsZVNoZWV0KG1haW5UaHJlYWROb3JtYWxXb3Js ZCgpLCBXVEZNb3ZlKHVzZXJTdHlsZVNoZWV0KSwgSW5qZWN0SW5FeGlzdGluZ0RvY3VtZW50cyk7 Ci0gICAgICAgIH0KLSAgICB9CisgICAgZm9yIChhdXRvJiBwYWdlIDogbV9wYWdlR3JvdXAucGFn ZXMoKSkKKyAgICAgICAgcGFnZS0+c2V0Q2FwdGlvblVzZXJQcmVmZXJlbmNlc1N0eWxlU2hlZXQo Y2FwdGlvbnNPdmVycmlkZVN0eWxlU2hlZXQpOwogfQogCiBTdHJpbmcgQ2FwdGlvblVzZXJQcmVm ZXJlbmNlczo6cHJpbWFyeUF1ZGlvVHJhY2tMYW5ndWFnZU92ZXJyaWRlKCkgY29uc3QKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGFnZS9QYWdlLmNwcAkocmV2aXNpb24gMTk3ODI3KQorKysgU291cmNlL1dlYkNvcmUvcGFn ZS9QYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTEyNiw2ICsxMTI2LDE3IEBAIHZvaWQgUGFn ZTo6aW52YWxpZGF0ZVN0eWxlc0ZvckxpbmsoTGlua0gKICAgICB9CiB9CiAKK3ZvaWQgUGFnZTo6 aW52YWxpZGF0ZUluamVjdGVkU3R5bGVTaGVldENhY2hlSW5BbGxGcmFtZXMoKQoreworICAgIGZv ciAoRnJhbWUqIGZyYW1lID0gbV9tYWluRnJhbWUuZ2V0KCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1l LT50cmVlKCkudHJhdmVyc2VOZXh0KCkpIHsKKyAgICAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0g ZnJhbWUtPmRvY3VtZW50KCk7CisgICAgICAgIGlmICghZG9jdW1lbnQpCisgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgZG9jdW1lbnQtPmV4dGVuc2lvblN0eWxlU2hlZXRzKCkuaW52YWxp ZGF0ZUluamVjdGVkU3R5bGVTaGVldENhY2hlKCk7CisgICAgICAgIGRvY3VtZW50LT5zdHlsZVJl c29sdmVyQ2hhbmdlZChEZWZlclJlY2FsY1N0eWxlKTsKKyAgICB9Cit9CisKIHZvaWQgUGFnZTo6 c2V0RGVidWdnZXIoSlNDOjpEZWJ1Z2dlciogZGVidWdnZXIpCiB7CiAgICAgaWYgKG1fZGVidWdn ZXIgPT0gZGVidWdnZXIpCkBAIC0xODE4LDEyICsxODI5LDcgQEAgdm9pZCBQYWdlOjpzZXRVc2Vy Q29udGVudENvbnRyb2xsZXIoVXNlcgogICAgIGlmIChtX3VzZXJDb250ZW50Q29udHJvbGxlcikK ICAgICAgICAgbV91c2VyQ29udGVudENvbnRyb2xsZXItPmFkZFBhZ2UoKnRoaXMpOwogCi0gICAg Zm9yIChGcmFtZSogZnJhbWUgPSAmbWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50 cmVlKCkudHJhdmVyc2VOZXh0KCkpIHsKLSAgICAgICAgaWYgKERvY3VtZW50ICpkb2N1bWVudCA9 IGZyYW1lLT5kb2N1bWVudCgpKSB7Ci0gICAgICAgICAgICBkb2N1bWVudC0+ZXh0ZW5zaW9uU3R5 bGVTaGVldHMoKS5pbnZhbGlkYXRlSW5qZWN0ZWRTdHlsZVNoZWV0Q2FjaGUoKTsKLSAgICAgICAg ICAgIGRvY3VtZW50LT5zdHlsZVJlc29sdmVyQ2hhbmdlZChEZWZlclJlY2FsY1N0eWxlKTsKLSAg ICAgICAgfQotICAgIH0KKyAgICBpbnZhbGlkYXRlSW5qZWN0ZWRTdHlsZVNoZWV0Q2FjaGVJbkFs bEZyYW1lcygpOwogfQogCiB2b2lkIFBhZ2U6OnNldFN0b3JhZ2VOYW1lc3BhY2VQcm92aWRlcihS ZWY8U3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyPiYmIHN0b3JhZ2VOYW1lc3BhY2VQcm92aWRlcikK QEAgLTIwMDgsNCArMjAxNCwxOSBAQCBib29sIFBhZ2U6OmlzQWx3YXlzT25Mb2dnaW5nQWxsb3dl ZCgpIGNvCiAgICAgcmV0dXJuIG1fc2Vzc2lvbklELmlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgp OwogfQogCitTdHJpbmcgUGFnZTo6Y2FwdGlvblVzZXJQcmVmZXJlbmNlc1N0eWxlU2hlZXQoKQor eworICAgIHJldHVybiBtX2NhcHRpb25Vc2VyUHJlZmVyZW5jZXNTdHlsZVNoZWV0OworfQorCit2 b2lkIFBhZ2U6OnNldENhcHRpb25Vc2VyUHJlZmVyZW5jZXNTdHlsZVNoZWV0KGNvbnN0IFN0cmlu ZyYgc3R5bGVTaGVldCkKK3sKKyAgICBpZiAobV9jYXB0aW9uVXNlclByZWZlcmVuY2VzU3R5bGVT aGVldCA9PSBzdHlsZVNoZWV0KQorICAgICAgICByZXR1cm47CisKKyAgICBtX2NhcHRpb25Vc2Vy UHJlZmVyZW5jZXNTdHlsZVNoZWV0ID0gc3R5bGVTaGVldDsKKyAgICAKKyAgICBpbnZhbGlkYXRl SW5qZWN0ZWRTdHlsZVNoZWV0Q2FjaGVJbkFsbEZyYW1lcygpOworfQorCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAkocmV2aXNpb24gMTk3ODI3KQorKysgU291cmNl L1dlYkNvcmUvcGFnZS9QYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTM1Nyw2ICszNTcsOCBAQCBw dWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBpbnZhbGlkYXRlU3R5bGVzRm9yQWxsTGlu a3MoKTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGludmFsaWRhdGVTdHlsZXNGb3JMaW5rKExp bmtIYXNoKTsKIAorICAgIHZvaWQgaW52YWxpZGF0ZUluamVjdGVkU3R5bGVTaGVldENhY2hlSW5B bGxGcmFtZXMoKTsKKwogICAgIFN0b3JhZ2VOYW1lc3BhY2UqIHNlc3Npb25TdG9yYWdlKGJvb2wg b3B0aW9uYWxDcmVhdGUgPSB0cnVlKTsKICAgICB2b2lkIHNldFNlc3Npb25TdG9yYWdlKFJlZlB0 cjxTdG9yYWdlTmFtZXNwYWNlPiYmKTsKIApAQCAtNTA5LDYgKzUxMSw5IEBAIHB1YmxpYzoKIAog ICAgIGJvb2wgaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCkgY29uc3Q7CiAKKyAgICBTdHJpbmcg Y2FwdGlvblVzZXJQcmVmZXJlbmNlc1N0eWxlU2hlZXQoKTsKKyAgICB2b2lkIHNldENhcHRpb25V c2VyUHJlZmVyZW5jZXNTdHlsZVNoZWV0KGNvbnN0IFN0cmluZyYpOworCiBwcml2YXRlOgogICAg IFdFQkNPUkVfRVhQT1JUIHZvaWQgaW5pdEdyb3VwKCk7CiAKQEAgLTYwOSw2ICs2MTQsOCBAQCBw cml2YXRlOgogICAgIG11dGFibGUgYm9vbCBtX2RpZExvYWRVc2VyU3R5bGVTaGVldDsKICAgICBt dXRhYmxlIHRpbWVfdCBtX3VzZXJTdHlsZVNoZWV0TW9kaWZpY2F0aW9uVGltZTsKIAorICAgIFN0 cmluZyBtX2NhcHRpb25Vc2VyUHJlZmVyZW5jZXNTdHlsZVNoZWV0OworCiAgICAgc3RkOjp1bmlx dWVfcHRyPFBhZ2VHcm91cD4gbV9zaW5nbGVQYWdlR3JvdXA7CiAgICAgUGFnZUdyb3VwKiBtX2dy b3VwOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9Vc2VyQ29udGVudENvbnRyb2xs ZXIuY3BwCShyZXZpc2lvbiAxOTc4MjcpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250 ZW50Q29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMyw3ICsxMjMsNyBAQCB2b2lk IFVzZXJDb250ZW50Q29udHJvbGxlcjo6YWRkVXNlclN0eWxlCiAgICAgc3R5bGVTaGVldHNJbldv cmxkLT5hcHBlbmQoV1RGTW92ZSh1c2VyU3R5bGVTaGVldCkpOwogCiAgICAgaWYgKGluamVjdGlv blRpbWUgPT0gSW5qZWN0SW5FeGlzdGluZ0RvY3VtZW50cykKLSAgICAgICAgaW52YWxpZGF0ZUlu amVjdGVkU3R5bGVTaGVldENhY2hlSW5BbGxGcmFtZXMoKTsKKyAgICAgICAgaW52YWxpZGF0ZUlu amVjdGVkU3R5bGVTaGVldENhY2hlSW5BbGxGcmFtZXNJbkFsbFBhZ2VzKCk7CiB9CiAKIHZvaWQg VXNlckNvbnRlbnRDb250cm9sbGVyOjpyZW1vdmVVc2VyU3R5bGVTaGVldChET01XcmFwcGVyV29y bGQmIHdvcmxkLCBjb25zdCBVUkwmIHVybCkKQEAgLTE1MSw3ICsxNTEsNyBAQCB2b2lkIFVzZXJD b250ZW50Q29udHJvbGxlcjo6cmVtb3ZlVXNlclN0CiAgICAgaWYgKHN0eWxlc2hlZXRzLmlzRW1w dHkoKSkKICAgICAgICAgbV91c2VyU3R5bGVTaGVldHMtPnJlbW92ZShpdCk7CiAKLSAgICBpbnZh bGlkYXRlSW5qZWN0ZWRTdHlsZVNoZWV0Q2FjaGVJbkFsbEZyYW1lcygpOworICAgIGludmFsaWRh dGVJbmplY3RlZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVzSW5BbGxQYWdlcygpOwogfQogCiB2 b2lkIFVzZXJDb250ZW50Q29udHJvbGxlcjo6cmVtb3ZlVXNlclN0eWxlU2hlZXRzKERPTVdyYXBw ZXJXb3JsZCYgd29ybGQpCkBAIC0xNjIsNyArMTYyLDcgQEAgdm9pZCBVc2VyQ29udGVudENvbnRy b2xsZXI6OnJlbW92ZVVzZXJTdAogICAgIGlmICghbV91c2VyU3R5bGVTaGVldHMtPnJlbW92ZSgm d29ybGQpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpbnZhbGlkYXRlSW5qZWN0ZWRTdHlsZVNo ZWV0Q2FjaGVJbkFsbEZyYW1lcygpOworICAgIGludmFsaWRhdGVJbmplY3RlZFN0eWxlU2hlZXRD YWNoZUluQWxsRnJhbWVzSW5BbGxQYWdlcygpOwogfQogCiAjaWYgRU5BQkxFKFVTRVJfTUVTU0FH RV9IQU5ETEVSUykKQEAgLTI0OSwxOCArMjQ5LDE0IEBAIHZvaWQgVXNlckNvbnRlbnRDb250cm9s bGVyOjpyZW1vdmVBbGxVc2UKIAogICAgIGlmIChtX3VzZXJTdHlsZVNoZWV0cykgewogICAgICAg ICBtX3VzZXJTdHlsZVNoZWV0cyA9IG51bGxwdHI7Ci0gICAgICAgIGludmFsaWRhdGVJbmplY3Rl ZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVzKCk7CisgICAgICAgIGludmFsaWRhdGVJbmplY3Rl ZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVzSW5BbGxQYWdlcygpOwogICAgIH0KIH0KIAotdm9p ZCBVc2VyQ29udGVudENvbnRyb2xsZXI6OmludmFsaWRhdGVJbmplY3RlZFN0eWxlU2hlZXRDYWNo ZUluQWxsRnJhbWVzKCkKK3ZvaWQgVXNlckNvbnRlbnRDb250cm9sbGVyOjppbnZhbGlkYXRlSW5q ZWN0ZWRTdHlsZVNoZWV0Q2FjaGVJbkFsbEZyYW1lc0luQWxsUGFnZXMoKQogewotICAgIGZvciAo YXV0byYgcGFnZSA6IG1fcGFnZXMpIHsKLSAgICAgICAgZm9yIChGcmFtZSogZnJhbWUgPSAmcGFn ZS0+bWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJhdmVyc2VOZXh0 KCkpIHsKLSAgICAgICAgICAgIGZyYW1lLT5kb2N1bWVudCgpLT5leHRlbnNpb25TdHlsZVNoZWV0 cygpLmludmFsaWRhdGVJbmplY3RlZFN0eWxlU2hlZXRDYWNoZSgpOwotICAgICAgICAgICAgZnJh bWUtPmRvY3VtZW50KCktPnN0eWxlUmVzb2x2ZXJDaGFuZ2VkKERlZmVyUmVjYWxjU3R5bGUpOwot ICAgICAgICB9Ci0gICAgfQorICAgIGZvciAoYXV0byYgcGFnZSA6IG1fcGFnZXMpCisgICAgICAg IHBhZ2UtPmludmFsaWRhdGVJbmplY3RlZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVzKCk7CiB9 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvVXNl ckNvbnRlbnRDb250cm9sbGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9V c2VyQ29udGVudENvbnRyb2xsZXIuaAkocmV2aXNpb24gMTk3ODI3KQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9Vc2VyQ29udGVudENvbnRyb2xsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTAzLDcg KzEwMyw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgVXNlckNvbnRlbnRDb250cm9sbGVyKCk7 CiAKLSAgICB2b2lkIGludmFsaWRhdGVJbmplY3RlZFN0eWxlU2hlZXRDYWNoZUluQWxsRnJhbWVz KCk7CisgICAgdm9pZCBpbnZhbGlkYXRlSW5qZWN0ZWRTdHlsZVNoZWV0Q2FjaGVJbkFsbEZyYW1l c0luQWxsUGFnZXMoKTsKIAogICAgIEhhc2hTZXQ8UGFnZSo+IG1fcGFnZXM7CiAK