156287 2016-04-06 04:31:22 -0700 REGRESSION(r196629): Messages text size only changes for sending text, conversation text size does not change 2016-04-06 05:27:31 -0700 1 1 1 Unclassified WebKit DOM WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned mmaxfield webkit-bug-importer oldest_to_newest 1181229 0 koivisto 2016-04-06 04:31:22 -0700 We may fail to invalidate descendant style if there are multiple attribute selectors that differ by value. 1181230 1 koivisto 2016-04-06 04:31:47 -0700 <rdar://problem/24264756> 1181231 2 275769 koivisto 2016-04-06 04:35:56 -0700 Created attachment 275769 patch 1181236 3 275771 koivisto 2016-04-06 05:04:49 -0700 Created attachment 275771 patch 1181237 4 koivisto 2016-04-06 05:27:31 -0700 http://trac.webkit.org/changeset/199099 275769 2016-04-06 04:35:56 -0700 2016-04-06 05:04:49 -0700 patch attribute-invalidation-multiple.patch text/plain 5240 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5OTA5OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE2LTA0LTA2ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIxOTY2Mjkp OiBNZXNzYWdlcyB0ZXh0IHNpemUgb25seSBjaGFuZ2VzIGZvciBzZW5kaW5nIHRleHQsIGNvbnZl cnNhdGlvbiB0ZXh0IHNpemUgZG9lcyBub3QgY2hhbmdlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTYyODcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzI0MjY0NzU2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogY3NzL1J1bGVGZWF0dXJlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJ1bGVGZWF0dXJl U2V0OjpyZWN1cnNpdmVseUNvbGxlY3RGZWF0dXJlc0Zyb21TZWxlY3Rvcik6CisgICAgICAgIChX ZWJDb3JlOjptYWtlQXR0cmlidXRlU2VsZWN0b3JLZXkpOgorCisgICAgICAgICAgICBJbmNsdWRl IGF0dHJpYnV0ZSB2YWx1ZSB0byB0aGUga2V5LiBPdGhlcndpc2Ugd2UgbWF5IGRlZHVwbGljYXRl IHNlbGVjdG9ycyB0aGF0IGFyZSBub3QgaW5kZW50aWNhbC4KKworICAgICAgICAoV2ViQ29yZTo6 UnVsZUZlYXR1cmVTZXQ6OmNvbGxlY3RGZWF0dXJlcyk6CisgICAgICAgICogY3NzL1J1bGVGZWF0 dXJlLmg6CisKIDIwMTYtMDQtMDYgIE1hbnVlbCBSZWdvIENhc2Fzbm92YXMgIDxyZWdvQGlnYWxp YS5jb20+CiAKICAgICAgICAgW2Nzcy1ncmlkXSBGaXggcG9zaXRpb25lZCBjaGlsZHJlbiBpbiBS VEwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9SdWxlRmVhdHVyZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvY3NzL1J1bGVGZWF0dXJlLmNwcAkocmV2aXNpb24gMTk5MDk3KQor KysgU291cmNlL1dlYkNvcmUvY3NzL1J1bGVGZWF0dXJlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt ODQsMTEgKzg0LDExIEBAIHZvaWQgUnVsZUZlYXR1cmVTZXQ6OnJlY3Vyc2l2ZWx5Q29sbGVjdEYK ICAgICB9IHdoaWxlIChzZWxlY3Rvcik7CiB9CiAKLXN0YXRpYyBzdGQ6OnBhaXI8QXRvbWljU3Ry aW5nSW1wbCosIHVuc2lnbmVkPiBtYWtlQXR0cmlidXRlU2VsZWN0b3JLZXkoY29uc3QgQ1NTU2Vs ZWN0b3ImIHNlbGVjdG9yKQorc3RhdGljIFJ1bGVGZWF0dXJlU2V0OjpBdHRyaWJ1dGVSdWxlczo6 S2V5IG1ha2VBdHRyaWJ1dGVTZWxlY3RvcktleShjb25zdCBDU1NTZWxlY3RvciYgc2VsZWN0b3Ip CiB7CiAgICAgYm9vbCBjYXNlSW5zZW5zaXRpdmUgPSBzZWxlY3Rvci5hdHRyaWJ1dGVWYWx1ZU1h dGNoaW5nSXNDYXNlSW5zZW5zaXRpdmUoKTsKICAgICB1bnNpZ25lZCBtYXRjaEFuZENhc2UgPSBz dGF0aWNfY2FzdDx1bnNpZ25lZD4oc2VsZWN0b3IubWF0Y2goKSkgPDwgMSB8IGNhc2VJbnNlbnNp dGl2ZTsKLSAgICByZXR1cm4gc3RkOjptYWtlX3BhaXIoc2VsZWN0b3IuYXR0cmlidXRlQ2Fub25p Y2FsTG9jYWxOYW1lKCkuaW1wbCgpLCBtYXRjaEFuZENhc2UpOworICAgIHJldHVybiBzdGQ6Om1h a2VfcGFpcihzZWxlY3Rvci5hdHRyaWJ1dGVDYW5vbmljYWxMb2NhbE5hbWUoKS5pbXBsKCksIHN0 ZDo6bWFrZV9wYWlyKHNlbGVjdG9yLnZhbHVlKCkuaW1wbCgpLCBtYXRjaEFuZENhc2UpKTsKIH0K IAogdm9pZCBSdWxlRmVhdHVyZVNldDo6Y29sbGVjdEZlYXR1cmVzKGNvbnN0IFJ1bGVEYXRhJiBy dWxlRGF0YSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9SdWxlRmVhdHVyZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9SdWxlRmVhdHVyZS5oCShyZXZpc2lvbiAxOTkwOTcp CisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvUnVsZUZlYXR1cmUuaAkod29ya2luZyBjb3B5KQpAQCAt NjEsNyArNjEsOCBAQCBzdHJ1Y3QgUnVsZUZlYXR1cmVTZXQgewogICAgIEhhc2hNYXA8QXRvbWlj U3RyaW5nSW1wbCosIHN0ZDo6dW5pcXVlX3B0cjxWZWN0b3I8UnVsZUZlYXR1cmU+Pj4gYW5jZXN0 b3JDbGFzc1J1bGVzOwogCiAgICAgc3RydWN0IEF0dHJpYnV0ZVJ1bGVzIHsKLSAgICAgICAgSGFz aE1hcDxzdGQ6OnBhaXI8QXRvbWljU3RyaW5nSW1wbCosIHVuc2lnbmVkPiwgY29uc3QgQ1NTU2Vs ZWN0b3IqPiBzZWxlY3RvcnM7CisgICAgICAgIHVzaW5nIEtleSA9IHN0ZDo6cGFpcjxBdG9taWNT dHJpbmdJbXBsKiwgc3RkOjpwYWlyPEF0b21pY1N0cmluZ0ltcGwqLCB1bnNpZ25lZD4+OworICAg ICAgICBIYXNoTWFwPEtleSwgY29uc3QgQ1NTU2VsZWN0b3IqPiBzZWxlY3RvcnM7CiAgICAgICAg IFZlY3RvcjxSdWxlRmVhdHVyZT4gZmVhdHVyZXM7CiAgICAgfTsKICAgICBIYXNoTWFwPEF0b21p Y1N0cmluZ0ltcGwqLCBzdGQ6OnVuaXF1ZV9wdHI8QXR0cmlidXRlUnVsZXM+PiBhbmNlc3RvckF0 dHJpYnV0ZVJ1bGVzRm9ySFRNTDsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5OTA5NykKKysrIExheW91 dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE2LTA0 LTA2ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNT SU9OKHIxOTY2MjkpOiBNZXNzYWdlcyB0ZXh0IHNpemUgb25seSBjaGFuZ2VzIGZvciBzZW5kaW5n IHRleHQsIGNvbnZlcnNhdGlvbiB0ZXh0IHNpemUgZG9lcyBub3QgY2hhbmdlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTYyODcKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzI0MjY0NzU2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogZmFzdC9jc3Mvc3R5bGUtaW52YWxpZGF0aW9uLWF0dHJpYnV0ZS1j aGFuZ2UtZGVzY2VuZGFudHMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvY3NzL3N0eWxl LWludmFsaWRhdGlvbi1hdHRyaWJ1dGUtY2hhbmdlLWRlc2NlbmRhbnRzLmh0bWw6CisKIDIwMTYt MDQtMDYgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIENvbXBv c2VkVHJlZUl0ZXJhdG9yIG1heSBjcmFzaCB3aGVuIGZpcnN0IGNoaWxkIG9mIHNoYWRvdyByb290 IGlzIGEgY29tbWVudCBub2RlCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9zdHlsZS1pbnZh bGlkYXRpb24tYXR0cmlidXRlLWNoYW5nZS1kZXNjZW5kYW50cy1leHBlY3RlZC50eHQKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9jc3Mvc3R5bGUtaW52YWxpZGF0aW9uLWF0dHJpYnV0 ZS1jaGFuZ2UtZGVzY2VuZGFudHMtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAxOTkwOTcpCisrKyBM YXlvdXRUZXN0cy9mYXN0L2Nzcy9zdHlsZS1pbnZhbGlkYXRpb24tYXR0cmlidXRlLWNoYW5nZS1k ZXNjZW5kYW50cy1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTE1NCw2ICsxNTQsMTEg QEAgUEFTUyB0ZXN0U3R5bGVDaGFuZ2VUeXBlKCJyb290IiwgIk5vU3R5bAogUEFTUyB0ZXN0U3R5 bGVDaGFuZ2VUeXBlKCJ0YXJnZXQiLCAiSW5saW5lU3R5bGVDaGFuZ2UiKSBpcyB0cnVlCiBQQVNT IHRlc3RTdHlsZUNoYW5nZVR5cGUoImluZXJ0IiwgIk5vU3R5bGVDaGFuZ2UiKSBpcyB0cnVlCiBQ QVNTIGhhc0V4cGVjdGVkU3R5bGUgaXMgdHJ1ZQorU2V0dGluZyBhdHRyaWJ1dGUgJ215YXR0cicg dmFsdWUgJ3ZhbHVlMTEnCitQQVNTIHRlc3RTdHlsZUNoYW5nZVR5cGUoInJvb3QiLCAiTm9TdHls ZUNoYW5nZSIpIHx8IHRlc3RTdHlsZUNoYW5nZVR5cGUoInJvb3QiLCAiSW5saW5lU3R5bGVDaGFu Z2UiKSBpcyB0cnVlCitQQVNTIHRlc3RTdHlsZUNoYW5nZVR5cGUoInRhcmdldCIsICJJbmxpbmVT dHlsZUNoYW5nZSIpIGlzIHRydWUKK1BBU1MgdGVzdFN0eWxlQ2hhbmdlVHlwZSgiaW5lcnQiLCAi Tm9TdHlsZUNoYW5nZSIpIGlzIHRydWUKK1BBU1MgaGFzRXhwZWN0ZWRTdHlsZSBpcyB0cnVlCiBQ QVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCiAKIFRFU1QgQ09NUExFVEUKSW5kZXg6IExh eW91dFRlc3RzL2Zhc3QvY3NzL3N0eWxlLWludmFsaWRhdGlvbi1hdHRyaWJ1dGUtY2hhbmdlLWRl c2NlbmRhbnRzLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9jc3Mvc3R5bGUt aW52YWxpZGF0aW9uLWF0dHJpYnV0ZS1jaGFuZ2UtZGVzY2VuZGFudHMuaHRtbAkocmV2aXNpb24g MTk5MDk3KQorKysgTGF5b3V0VGVzdHMvZmFzdC9jc3Mvc3R5bGUtaW52YWxpZGF0aW9uLWF0dHJp YnV0ZS1jaGFuZ2UtZGVzY2VuZGFudHMuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtNDYsNiArNDYs MTAgQEAgcm9vdDpub3QoW215bm90YXR0cl0pIHRhcmdldCB7CiAgICAgY29sb3I6IHJnYigxMCwg MCwgMCk7CiB9CiAKK1tteWF0dHI9dmFsdWUxMV0gdGFyZ2V0IHsKKyAgICBjb2xvcjogcmdiKDEx LCAwLCAwKTsKK30KKwogPC9zdHlsZT4KIDwvaGVhZD4KIDxib2R5PgpAQCAtMjUxLDYgKzI1NSwx MCBAQCBzZXRBdHRyaWJ1dGUoJ215bm90YXR0cicsICd2YWx1ZScpOwogdGVzdFN0eWxlSW52YWxp ZGF0aW9uKCJJbmxpbmVTdHlsZUNoYW5nZSIpOwogY2hlY2tTdHlsZSgxKTsKIAorc2V0QXR0cmli dXRlKCdteWF0dHInLCAndmFsdWUxMScpOwordGVzdFN0eWxlSW52YWxpZGF0aW9uKCJJbmxpbmVT dHlsZUNoYW5nZSIpOworY2hlY2tTdHlsZSgxMSk7CisKIDwvc2NyaXB0PgogPHNjcmlwdCBzcmM9 Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgogPC9odG1sPgo= 275771 2016-04-06 05:04:49 -0700 2016-04-06 05:12:59 -0700 patch attribute-invalidation-multiple-2.patch text/plain 5776 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5OTA5OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE2LTA0LTA2ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIxOTY2Mjkp OiBNZXNzYWdlcyB0ZXh0IHNpemUgb25seSBjaGFuZ2VzIGZvciBzZW5kaW5nIHRleHQsIGNvbnZl cnNhdGlvbiB0ZXh0IHNpemUgZG9lcyBub3QgY2hhbmdlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTYyODcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzI0MjY0NzU2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogY3NzL1J1bGVGZWF0dXJlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJ1bGVGZWF0dXJl U2V0OjpyZWN1cnNpdmVseUNvbGxlY3RGZWF0dXJlc0Zyb21TZWxlY3Rvcik6CisgICAgICAgIChX ZWJDb3JlOjptYWtlQXR0cmlidXRlU2VsZWN0b3JLZXkpOgorCisgICAgICAgICAgICBJbmNsdWRl IGF0dHJpYnV0ZSB2YWx1ZSB0byB0aGUga2V5LiBPdGhlcndpc2Ugd2UgbWF5IGRlZHVwbGljYXRl IHNlbGVjdG9ycyB0aGF0IGFyZSBub3QgaW5kZW50aWNhbC4KKworICAgICAgICAoV2ViQ29yZTo6 UnVsZUZlYXR1cmVTZXQ6OmNvbGxlY3RGZWF0dXJlcyk6CisgICAgICAgIChXZWJDb3JlOjpSdWxl RmVhdHVyZVNldDo6YWRkKToKKworICAgICAgICAgICAgVXNlIEhhc2hNYXA6OmVuc3VyZSgpLgor CisgICAgICAgICogY3NzL1J1bGVGZWF0dXJlLmg6CisKIDIwMTYtMDQtMDYgIE1hbnVlbCBSZWdv IENhc2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1ncmlkXSBGaXgg cG9zaXRpb25lZCBjaGlsZHJlbiBpbiBSVEwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9SdWxl RmVhdHVyZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL1J1bGVGZWF0dXJl LmNwcAkocmV2aXNpb24gMTk5MDk3KQorKysgU291cmNlL1dlYkNvcmUvY3NzL1J1bGVGZWF0dXJl LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODQsMTEgKzg0LDExIEBAIHZvaWQgUnVsZUZlYXR1cmVT ZXQ6OnJlY3Vyc2l2ZWx5Q29sbGVjdEYKICAgICB9IHdoaWxlIChzZWxlY3Rvcik7CiB9CiAKLXN0 YXRpYyBzdGQ6OnBhaXI8QXRvbWljU3RyaW5nSW1wbCosIHVuc2lnbmVkPiBtYWtlQXR0cmlidXRl U2VsZWN0b3JLZXkoY29uc3QgQ1NTU2VsZWN0b3ImIHNlbGVjdG9yKQorc3RhdGljIFJ1bGVGZWF0 dXJlU2V0OjpBdHRyaWJ1dGVSdWxlczo6U2VsZWN0b3JLZXkgbWFrZUF0dHJpYnV0ZVNlbGVjdG9y S2V5KGNvbnN0IENTU1NlbGVjdG9yJiBzZWxlY3RvcikKIHsKICAgICBib29sIGNhc2VJbnNlbnNp dGl2ZSA9IHNlbGVjdG9yLmF0dHJpYnV0ZVZhbHVlTWF0Y2hpbmdJc0Nhc2VJbnNlbnNpdGl2ZSgp OwogICAgIHVuc2lnbmVkIG1hdGNoQW5kQ2FzZSA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPihzZWxl Y3Rvci5tYXRjaCgpKSA8PCAxIHwgY2FzZUluc2Vuc2l0aXZlOwotICAgIHJldHVybiBzdGQ6Om1h a2VfcGFpcihzZWxlY3Rvci5hdHRyaWJ1dGVDYW5vbmljYWxMb2NhbE5hbWUoKS5pbXBsKCksIG1h dGNoQW5kQ2FzZSk7CisgICAgcmV0dXJuIHN0ZDo6bWFrZV9wYWlyKHNlbGVjdG9yLmF0dHJpYnV0 ZUNhbm9uaWNhbExvY2FsTmFtZSgpLmltcGwoKSwgc3RkOjptYWtlX3BhaXIoc2VsZWN0b3IudmFs dWUoKS5pbXBsKCksIG1hdGNoQW5kQ2FzZSkpOwogfQogCiB2b2lkIFJ1bGVGZWF0dXJlU2V0Ojpj b2xsZWN0RmVhdHVyZXMoY29uc3QgUnVsZURhdGEmIHJ1bGVEYXRhKQpAQCAtMTAwLDE2ICsxMDAs MTYgQEAgdm9pZCBSdWxlRmVhdHVyZVNldDo6Y29sbGVjdEZlYXR1cmVzKGNvbgogICAgIGlmIChy dWxlRGF0YS5jb250YWluc1VuY29tbW9uQXR0cmlidXRlU2VsZWN0b3IoKSkKICAgICAgICAgdW5j b21tb25BdHRyaWJ1dGVSdWxlcy5hcHBlbmQoUnVsZUZlYXR1cmUocnVsZURhdGEucnVsZSgpLCBy dWxlRGF0YS5zZWxlY3RvckluZGV4KCksIHJ1bGVEYXRhLmhhc0RvY3VtZW50U2VjdXJpdHlPcmln aW4oKSkpOwogICAgIGZvciAoYXV0byogY2xhc3NOYW1lIDogc2VsZWN0b3JGZWF0dXJlcy5jbGFz c2VzTWF0Y2hpbmdBbmNlc3RvcnMpIHsKLSAgICAgICAgYXV0byBhZGRSZXN1bHQgPSBhbmNlc3Rv ckNsYXNzUnVsZXMuYWRkKGNsYXNzTmFtZSwgbnVsbHB0cik7Ci0gICAgICAgIGlmIChhZGRSZXN1 bHQuaXNOZXdFbnRyeSkKLSAgICAgICAgICAgIGFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWUgPSBz dGQ6Om1ha2VfdW5pcXVlPFZlY3RvcjxSdWxlRmVhdHVyZT4+KCk7CisgICAgICAgIGF1dG8gYWRk UmVzdWx0ID0gYW5jZXN0b3JDbGFzc1J1bGVzLmVuc3VyZShjbGFzc05hbWUsIFtdIHsKKyAgICAg ICAgICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPFZlY3RvcjxSdWxlRmVhdHVyZT4+KCk7Cisg ICAgICAgIH0pOwogICAgICAgICBhZGRSZXN1bHQuaXRlcmF0b3ItPnZhbHVlLT5hcHBlbmQoUnVs ZUZlYXR1cmUocnVsZURhdGEucnVsZSgpLCBydWxlRGF0YS5zZWxlY3RvckluZGV4KCksIHJ1bGVE YXRhLmhhc0RvY3VtZW50U2VjdXJpdHlPcmlnaW4oKSkpOwogICAgIH0KICAgICBmb3IgKGF1dG8q IHNlbGVjdG9yIDogc2VsZWN0b3JGZWF0dXJlcy5hdHRyaWJ1dGVTZWxlY3RvcnNNYXRjaGluZ0Fu Y2VzdG9ycykgewogICAgICAgICAvLyBIYXNoaW5nIGJ5IGF0dHJpYnV0ZUNhbm9uaWNhbExvY2Fs TmFtZSBtYWtlcyB0aGlzIEhUTUwgc3BlY2lmaWMuCi0gICAgICAgIGF1dG8gYWRkUmVzdWx0ID0g YW5jZXN0b3JBdHRyaWJ1dGVSdWxlc0ZvckhUTUwuYWRkKHNlbGVjdG9yLT5hdHRyaWJ1dGVDYW5v bmljYWxMb2NhbE5hbWUoKS5pbXBsKCksIG51bGxwdHIpOwotICAgICAgICBpZiAoYWRkUmVzdWx0 LmlzTmV3RW50cnkpCi0gICAgICAgICAgICBhZGRSZXN1bHQuaXRlcmF0b3ItPnZhbHVlID0gc3Rk OjptYWtlX3VuaXF1ZTxBdHRyaWJ1dGVSdWxlcz4oKTsKKyAgICAgICAgYXV0byBhZGRSZXN1bHQg PSBhbmNlc3RvckF0dHJpYnV0ZVJ1bGVzRm9ySFRNTC5lbnN1cmUoc2VsZWN0b3ItPmF0dHJpYnV0 ZUNhbm9uaWNhbExvY2FsTmFtZSgpLmltcGwoKSwgW10geworICAgICAgICAgICAgcmV0dXJuIHN0 ZDo6bWFrZV91bmlxdWU8QXR0cmlidXRlUnVsZXM+KCk7CisgICAgICAgIH0pOwogICAgICAgICBh dXRvJiBydWxlcyA9ICphZGRSZXN1bHQuaXRlcmF0b3ItPnZhbHVlOwogICAgICAgICBydWxlcy5m ZWF0dXJlcy5hcHBlbmQoUnVsZUZlYXR1cmUocnVsZURhdGEucnVsZSgpLCBydWxlRGF0YS5zZWxl Y3RvckluZGV4KCksIHJ1bGVEYXRhLmhhc0RvY3VtZW50U2VjdXJpdHlPcmlnaW4oKSkpOwogICAg ICAgICAvLyBEZWR1cGxpY2F0ZSBzZWxlY3RvcnMuCkBAIC0xMjcsMTYgKzEyNywxNSBAQCB2b2lk IFJ1bGVGZWF0dXJlU2V0OjphZGQoY29uc3QgUnVsZUZlYXR1CiAgICAgc2libGluZ1J1bGVzLmFw cGVuZFZlY3RvcihvdGhlci5zaWJsaW5nUnVsZXMpOwogICAgIHVuY29tbW9uQXR0cmlidXRlUnVs ZXMuYXBwZW5kVmVjdG9yKG90aGVyLnVuY29tbW9uQXR0cmlidXRlUnVsZXMpOwogICAgIGZvciAo YXV0byYga2V5VmFsdWVQYWlyIDogb3RoZXIuYW5jZXN0b3JDbGFzc1J1bGVzKSB7Ci0gICAgICAg IGF1dG8gYWRkUmVzdWx0ID0gYW5jZXN0b3JDbGFzc1J1bGVzLmFkZChrZXlWYWx1ZVBhaXIua2V5 LCBudWxscHRyKTsKLSAgICAgICAgaWYgKGFkZFJlc3VsdC5pc05ld0VudHJ5KQotICAgICAgICAg ICAgYWRkUmVzdWx0Lml0ZXJhdG9yLT52YWx1ZSA9IHN0ZDo6bWFrZV91bmlxdWU8VmVjdG9yPFJ1 bGVGZWF0dXJlPj4oKmtleVZhbHVlUGFpci52YWx1ZSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAg ICAgIGFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWUtPmFwcGVuZFZlY3Rvcigqa2V5VmFsdWVQYWly LnZhbHVlKTsKKyAgICAgICAgYXV0byBhZGRSZXN1bHQgPSBhbmNlc3RvckNsYXNzUnVsZXMuZW5z dXJlKGtleVZhbHVlUGFpci5rZXksIFtdIHsKKyAgICAgICAgICAgIHJldHVybiBzdGQ6Om1ha2Vf dW5pcXVlPFZlY3RvcjxSdWxlRmVhdHVyZT4+KCk7CisgICAgICAgIH0pOworICAgICAgICBhZGRS ZXN1bHQuaXRlcmF0b3ItPnZhbHVlLT5hcHBlbmRWZWN0b3IoKmtleVZhbHVlUGFpci52YWx1ZSk7 CiAgICAgfQogICAgIGZvciAoYXV0byYga2V5VmFsdWVQYWlyIDogb3RoZXIuYW5jZXN0b3JBdHRy aWJ1dGVSdWxlc0ZvckhUTUwpIHsKLSAgICAgICAgYXV0byBhZGRSZXN1bHQgPSBhbmNlc3RvckF0 dHJpYnV0ZVJ1bGVzRm9ySFRNTC5hZGQoa2V5VmFsdWVQYWlyLmtleSwgbnVsbHB0cik7Ci0gICAg ICAgIGlmIChhZGRSZXN1bHQuaXNOZXdFbnRyeSkKLSAgICAgICAgICAgIGFkZFJlc3VsdC5pdGVy YXRvci0+dmFsdWUgPSBzdGQ6Om1ha2VfdW5pcXVlPEF0dHJpYnV0ZVJ1bGVzPigpOworICAgICAg ICBhdXRvIGFkZFJlc3VsdCA9IGFuY2VzdG9yQXR0cmlidXRlUnVsZXNGb3JIVE1MLmVuc3VyZShr ZXlWYWx1ZVBhaXIua2V5LCBbXSB7CisgICAgICAgICAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1 ZTxBdHRyaWJ1dGVSdWxlcz4oKTsKKyAgICAgICAgfSk7CiAgICAgICAgIGF1dG8mIHJ1bGVzID0g KmFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWU7CiAgICAgICAgIHJ1bGVzLmZlYXR1cmVzLmFwcGVu ZFZlY3RvcihrZXlWYWx1ZVBhaXIudmFsdWUtPmZlYXR1cmVzKTsKICAgICAgICAgZm9yIChhdXRv JiBzZWxlY3RvclBhaXIgOiBrZXlWYWx1ZVBhaXIudmFsdWUtPnNlbGVjdG9ycykKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2Nzcy9SdWxlRmVhdHVyZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2Nzcy9SdWxlRmVhdHVyZS5oCShyZXZpc2lvbiAxOTkwOTcpCisrKyBTb3VyY2UvV2ViQ29y ZS9jc3MvUnVsZUZlYXR1cmUuaAkod29ya2luZyBjb3B5KQpAQCAtNjEsNyArNjEsOCBAQCBzdHJ1 Y3QgUnVsZUZlYXR1cmVTZXQgewogICAgIEhhc2hNYXA8QXRvbWljU3RyaW5nSW1wbCosIHN0ZDo6 dW5pcXVlX3B0cjxWZWN0b3I8UnVsZUZlYXR1cmU+Pj4gYW5jZXN0b3JDbGFzc1J1bGVzOwogCiAg ICAgc3RydWN0IEF0dHJpYnV0ZVJ1bGVzIHsKLSAgICAgICAgSGFzaE1hcDxzdGQ6OnBhaXI8QXRv bWljU3RyaW5nSW1wbCosIHVuc2lnbmVkPiwgY29uc3QgQ1NTU2VsZWN0b3IqPiBzZWxlY3RvcnM7 CisgICAgICAgIHVzaW5nIFNlbGVjdG9yS2V5ID0gc3RkOjpwYWlyPEF0b21pY1N0cmluZ0ltcGwq LCBzdGQ6OnBhaXI8QXRvbWljU3RyaW5nSW1wbCosIHVuc2lnbmVkPj47CisgICAgICAgIEhhc2hN YXA8U2VsZWN0b3JLZXksIGNvbnN0IENTU1NlbGVjdG9yKj4gc2VsZWN0b3JzOwogICAgICAgICBW ZWN0b3I8UnVsZUZlYXR1cmU+IGZlYXR1cmVzOwogICAgIH07CiAgICAgSGFzaE1hcDxBdG9taWNT dHJpbmdJbXBsKiwgc3RkOjp1bmlxdWVfcHRyPEF0dHJpYnV0ZVJ1bGVzPj4gYW5jZXN0b3JBdHRy aWJ1dGVSdWxlc0ZvckhUTUw7Cg==