212397 2020-05-26 19:13:54 -0700 Add OptionSetTraits<> and use with WebCore::DragDestinationAction 2020-06-16 15:11:18 -0700 1 1 1 Unclassified WebKit Web Template Framework Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=211988 InRadar P2 Normal --- 212115 213264 1 ddkilzer ddkilzer achristensen benjamin cdumez cmarcelo darin ews-watchlist webkit-bug-importer wenson_hsieh oldest_to_newest 1656256 0 ddkilzer 2020-05-26 19:13:54 -0700 Add OptionSetTraits<> and use with WebCore::DragDestinationAction. This change was split out from Bug 212115 Attachment #400121 (Patch v4). 1656259 1 ddkilzer 2020-05-26 19:28:18 -0700 Waiting to post patch until fix for Bug 212115 lands. 1656331 2 webkit-bug-importer 2020-05-27 03:25:35 -0700 <rdar://problem/63669015> 1656392 3 400341 ddkilzer 2020-05-27 09:39:36 -0700 Created attachment 400341 Patch v1 1656570 4 ews-feeder 2020-05-27 14:04:46 -0700 Committed r262216: <https://trac.webkit.org/changeset/262216> All reviewed patches have been landed. Closing bug and clearing flags on attachment 400341. 400341 2020-05-27 09:39:36 -0700 2020-05-27 14:04:47 -0700 Patch v1 bug-212397-20200527094115.patch text/plain 9587 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDcwNGE0NTMzODc5YTU0MjQxZGJlODhk NTIyODE4MDM2ZWEzYWQ1MjMuLmNiNGNmMjJkN2NhYjg2N2YwMzZkMTM5ZmQ5YjQ1NDVkM2ViOGJl N2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMjAtMDUtMjYgIERhdmlkIEtpbHplciAgPGRka2ls emVyQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgT3B0aW9uU2V0VHJhaXRzPD4gYW5kIHVzZSB3 aXRoIFdlYkNvcmU6OkRyYWdEZXN0aW5hdGlvbkFjdGlvbgorICAgICAgICA8aHR0cHM6Ly93ZWJr aXQub3JnL2IvMjEyMzk3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZCBPcHRpb25TZXRUcmFpdHM8PiAoc2ltaWxhciB0byBFbnVtVHJhaXRzPD4p IHRvIGRlZmluZSBhbGwKKyAgICAgICAgdmFsaWQgdmFsdWVzIGZvciBhIGdpdmVuIGVudW0gdHlw ZS4gIFRoaXMgYWxsb3dzIHVzIHRvIHVzZSB0aGF0CisgICAgICAgIGJpdG1hc2sgd2l0aCBPcHRp b25TZXQ8Pjo6ZnJvbVJhdygpIHRvIGNsZWFyIHVuZGVmaW5lZCBiaXRzLCBhbmQKKyAgICAgICAg dG8gdmFsaWRhdGUgZW51bSB2YWx1ZXMgdXNlZCB3aXRoIHRoZSBPcHRpb25TZXQ8PiBjb25zdHJ1 Y3RvcnMuCisKKyAgICAgICAgTm90ZSB0aGF0IHRoZSBleHRyYSB2YWxpZGF0aW9uIHBvc3NpYmxl IHdpdGggT3B0aW9uU2V0VHJhaXRzPD4KKyAgICAgICAgaXMgZW5hYmxlZCBiYXNlZCBvbiB0aGUg ZXhpc3RlbmNlIG9mIHRoYXQgdHlwZSB1c2luZyB0aGUgbmV3CisgICAgICAgIFdURjo6aXNfdHlw ZV9jb21wbGV0ZV92PD4gdHlwZSB0cmFpdC4gIE90aGVyIE9wdGlvblNldDw+IGVudW1zCisgICAg ICAgIGZhbGwgYmFjayB0byB0aGUgb3JpZ2luYWwgdmFsaWRhdGlvbiBjaGVja3MuCisKKyAgICAg ICAgRmluYWxseSwgdHlwZW5hbWUgPFQ+IGlzIGNoYW5nZWQgdG8gPEU+IGZvciBPcHRpb25TZXQ8 PiB0bworICAgICAgICBlbXBoYXNpemUgdGhhdCBpdCdzIGFuIGVudW0gdHlwZW5hbWUuCisKKyAg ICAgICAgKiB3dGYvT3B0aW9uU2V0Lmg6CisgICAgICAgIChXVEY6OmlzX3R5cGVfY29tcGxldGVf dik6IEFkZC4KKyAgICAgICAgKFdURjo6T3B0aW9uU2V0VHJhaXRzKTogQWRkLgorICAgICAgICAo V1RGOjpPcHRpb25TZXRWYWx1ZXMpOiBBZGQuCisgICAgICAgIChXVEY6Ok9wdGlvblNldFZhbHVl Q2hlY2tlcik6IEFkZC4KKyAgICAgICAgKFdURjo6aXNWYWxpZE9wdGlvblNldEVudW0pOiBBZGQu CisgICAgICAgIChXVEY6Om1hc2tSYXdWYWx1ZSk6IEFkZC4KKyAgICAgICAgKFdURjo6T3B0aW9u U2V0OjpJdGVyYXRvcjo6b3BlcmF0b3IqIGNvbnN0KToKKyAgICAgICAgKFdURjo6T3B0aW9uU2V0 Ojpmcm9tUmF3KToKKyAgICAgICAgKFdURjo6T3B0aW9uU2V0OjpPcHRpb25TZXQpOgorICAgICAg ICAoV1RGOjpPcHRpb25TZXQ6OmNvbnRhaW5zIGNvbnN0KToKKwogMjAyMC0wNS0yMiAgRGF2aWQg S2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFdURjo6aXNWYWxpZEVudW0o KSBoYXMgYSB0eXBvIGluIHN0YXRpY19hc3NlcnQgbWFraW5nIGl0IGEgdGF1dG9sb2dpY2FsIGNv bXBhcmlzb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2MWI0OTFjMzU1YjE3NjE3ZTYzY2Y2ODc4NTg0OGQ4NmEx Njk2NjgxLi5lMDRiNDI1ZGViNGI0MmY0NTYzNmM5Yjc3ZTI1OTRhYjA4ZWU1YWQzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDUtMjYgIERhdmlkIEtpbHplciAgPGRka2lsemVy QGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgT3B0aW9uU2V0VHJhaXRzPD4gYW5kIHVzZSB3aXRo IFdlYkNvcmU6OkRyYWdEZXN0aW5hdGlvbkFjdGlvbgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQu b3JnL2IvMjEyMzk3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogcGFnZS9EcmFnQWN0aW9ucy5oOgorICAgICAgICAoV1RGOjpPcHRpb25TZXRUcmFp dHM8V2ViQ29yZTo6RHJhZ0Rlc3RpbmF0aW9uQWN0aW9uPik6CisgICAgICAgIC0gQWRkIGZvciB1 c2Ugd2l0aCBPcHRpb25TZXQ8Pi4KKwogMjAyMC0wNS0yNiAgRGF2aWQgS2lsemVyICA8ZGRraWx6 ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBPcHRpb25TZXQ8RHJhZ0Rlc3RpbmF0aW9uQWN0 aW9uPiBmb3IgbWFzayB2YWx1ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL09wdGlvblNl dC5oIGIvU291cmNlL1dURi93dGYvT3B0aW9uU2V0LmgKaW5kZXggNzBjYjllYzFhOGRkYWI3MzNl ZDM2NmE3NTBlYTI4YWVkMWYyNTU2MS4uMmFkNjhmYjUzMTZkNzA3OWMzZmRkYjg0YTQ5NWM1ZTA1 N2NlMDMxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvT3B0aW9uU2V0LmgKKysrIGIvU291 cmNlL1dURi93dGYvT3B0aW9uU2V0LmgKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0 IChDKSAyMDE2LTIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJp Z2h0IChDKSAyMDE2LTIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0zMywyMSArMzMsOTYgQEAKIAogbmFtZXNwYWNl IFdURiB7CiAKKy8vIERldGVjdGluZyBpbiBDKysgd2hldGhlciBhIHR5cGUgaXMgZGVmaW5lZCwg cGFydCAzOiBTRklOQUUgYW5kIGluY29tcGxldGUgdHlwZXMKKy8vIDxodHRwczovL2RldmJsb2dz Lm1pY3Jvc29mdC5jb20vb2xkbmV3dGhpbmcvMjAxOTA3MTAtMDAvP3A9MTAyNjc4PgordGVtcGxh dGU8dHlwZW5hbWUsIHR5cGVuYW1lID0gdm9pZD4KK2NvbnN0ZXhwciBib29sIGlzX3R5cGVfY29t cGxldGVfdiA9IGZhbHNlOworCit0ZW1wbGF0ZTx0eXBlbmFtZSBUPgorY29uc3RleHByIGJvb2wg aXNfdHlwZV9jb21wbGV0ZV92PFQsIHN0ZDo6dm9pZF90PGRlY2x0eXBlKHNpemVvZihUKSk+PiA9 IHRydWU7CisKKwordGVtcGxhdGU8dHlwZW5hbWUgRT4gY2xhc3MgT3B0aW9uU2V0OworCisKKy8v IE9wdGlvblNldFRyYWl0cyBhcmUgbGlrZSBFbnVtVHJhaXRzLCBidXQgZm9yIHZhbGlkYXRpbmcg T3B0aW9uU2V0IHZhbHVlcy4KK3RlbXBsYXRlPHR5cGVuYW1lPiBzdHJ1Y3QgT3B0aW9uU2V0VHJh aXRzOworCit0ZW1wbGF0ZTx0eXBlbmFtZSBFLCBFLi4uPiBzdHJ1Y3QgT3B0aW9uU2V0VmFsdWVz OworCit0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBFPiBzdHJ1Y3QgT3B0aW9uU2V0VmFs dWVDaGVja2VyOworCit0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBFLCBFIGUsIEUuLi4g ZXM+CitzdHJ1Y3QgT3B0aW9uU2V0VmFsdWVDaGVja2VyPFQsIE9wdGlvblNldFZhbHVlczxFLCBl LCBlcy4uLj4+IHsKKyAgICBzdGF0aWMgY29uc3RleHByIFQgYWxsVmFsaWRCaXRzKCkKKyAgICB7 CisgICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxUPihlKSB8IE9wdGlvblNldFZhbHVlQ2hlY2tl cjxULCBPcHRpb25TZXRWYWx1ZXM8RSwgZXMuLi4+Pjo6YWxsVmFsaWRCaXRzKCk7CisgICAgfQor CisgICAgc3RhdGljIGNvbnN0ZXhwciBib29sIGlzVmFsaWRPcHRpb25TZXRFbnVtKFQgdCkKKyAg ICB7CisgICAgICAgIHJldHVybiAoc3RhdGljX2Nhc3Q8VD4oZSkgPT0gdCkgPyB0cnVlIDogT3B0 aW9uU2V0VmFsdWVDaGVja2VyPFQsIE9wdGlvblNldFZhbHVlczxFLCBlcy4uLj4+Ojppc1ZhbGlk T3B0aW9uU2V0RW51bSh0KTsKKyAgICB9Cit9OworCit0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBl bmFtZSBFPgorc3RydWN0IE9wdGlvblNldFZhbHVlQ2hlY2tlcjxULCBPcHRpb25TZXRWYWx1ZXM8 RT4+IHsKKyAgICBzdGF0aWMgY29uc3RleHByIFQgYWxsVmFsaWRCaXRzKCkKKyAgICB7CisgICAg ICAgIHJldHVybiAwOworICAgIH0KKworICAgIHN0YXRpYyBjb25zdGV4cHIgYm9vbCBpc1ZhbGlk T3B0aW9uU2V0RW51bShUKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KK307 CisKKwordGVtcGxhdGU8dHlwZW5hbWUgRSwgc3RkOjplbmFibGVfaWZfdDxzdGQ6OmlzX2VudW08 RT46OnZhbHVlICYmIGlzX3R5cGVfY29tcGxldGVfdjxPcHRpb25TZXRUcmFpdHM8RT4+PiogPSBu dWxscHRyPgorY29uc3RleHByIGJvb2wgaXNWYWxpZE9wdGlvblNldEVudW0oRSBlKQoreworICAg IHJldHVybiBPcHRpb25TZXRWYWx1ZUNoZWNrZXI8c3RkOjp1bmRlcmx5aW5nX3R5cGVfdDxFPiwg dHlwZW5hbWUgT3B0aW9uU2V0VHJhaXRzPEU+Ojp2YWx1ZXM+Ojppc1ZhbGlkT3B0aW9uU2V0RW51 bShzdGF0aWNfY2FzdDxzdGQ6OnVuZGVybHlpbmdfdHlwZV90PEU+PihlKSk7Cit9CisKK3RlbXBs YXRlPHR5cGVuYW1lIEUsIHN0ZDo6ZW5hYmxlX2lmX3Q8c3RkOjppc19lbnVtPEU+Ojp2YWx1ZSAm JiAhaXNfdHlwZV9jb21wbGV0ZV92PE9wdGlvblNldFRyYWl0czxFPj4+KiA9IG51bGxwdHI+Citj b25zdGV4cHIgYm9vbCBpc1ZhbGlkT3B0aW9uU2V0RW51bShFIGUpCit7CisgICAgLy8gRklYTUU6 IFJlbW92ZSBvbmNlIGFsbCBPcHRpb25TZXQ8PiBlbnVtcyBoYXZlIE9wdGlvblNldFRyYWl0czw+ IGRlZmluZWQuCisgICAgcmV0dXJuIGhhc09uZUJpdFNldChzdGF0aWNfY2FzdDx0eXBlbmFtZSBP cHRpb25TZXQ8RT46OlN0b3JhZ2VUeXBlPihlKSk7Cit9CisKKwordGVtcGxhdGU8dHlwZW5hbWUg RSwgc3RkOjplbmFibGVfaWZfdDxzdGQ6OmlzX2VudW08RT46OnZhbHVlICYmIGlzX3R5cGVfY29t cGxldGVfdjxPcHRpb25TZXRUcmFpdHM8RT4+PiogPSBudWxscHRyPgorY29uc3RleHByIHR5cGVu YW1lIE9wdGlvblNldDxFPjo6U3RvcmFnZVR5cGUgbWFza1Jhd1ZhbHVlKHR5cGVuYW1lIE9wdGlv blNldDxFPjo6U3RvcmFnZVR5cGUgcmF3VmFsdWUpCit7CisgICAgYXV0byBhbGxWYWxpZEJpdHNW YWx1ZSA9IE9wdGlvblNldFZhbHVlQ2hlY2tlcjxzdGQ6OnVuZGVybHlpbmdfdHlwZV90PEU+LCB0 eXBlbmFtZSBPcHRpb25TZXRUcmFpdHM8RT46OnZhbHVlcz46OmFsbFZhbGlkQml0cygpOworICAg IHJldHVybiByYXdWYWx1ZSAmIGFsbFZhbGlkQml0c1ZhbHVlOworfQorCit0ZW1wbGF0ZTx0eXBl bmFtZSBFLCBzdGQ6OmVuYWJsZV9pZl90PHN0ZDo6aXNfZW51bTxFPjo6dmFsdWUgJiYgIWlzX3R5 cGVfY29tcGxldGVfdjxPcHRpb25TZXRUcmFpdHM8RT4+PiogPSBudWxscHRyPgorY29uc3RleHBy IHR5cGVuYW1lIE9wdGlvblNldDxFPjo6U3RvcmFnZVR5cGUgbWFza1Jhd1ZhbHVlKHR5cGVuYW1l IE9wdGlvblNldDxFPjo6U3RvcmFnZVR5cGUgcmF3VmFsdWUpCit7CisgICAgLy8gRklYTUU6IFJl bW92ZSBvbmNlIGFsbCBPcHRpb25TZXQ8PiBlbnVtcyBoYXZlIE9wdGlvblNldFRyYWl0czw+IGRl ZmluZWQuCisgICAgcmV0dXJuIHJhd1ZhbHVlOworfQorCisKIC8vIE9wdGlvblNldCBpcyBhIGNs YXNzIHRoYXQgcmVwcmVzZW50cyBhIHNldCBvZiBlbnVtZXJhdG9ycyBpbiBhIHNwYWNlLWVmZmlj aWVudCBtYW5uZXIuIFRoZSBlbnVtZXJhdG9ycwogLy8gbXVzdCBiZSBwb3dlcnMgb2YgdHdvIGdy ZWF0ZXIgdGhhbiAwLiBUaGlzIGNsYXNzIGlzIHVzZWZ1bCBhcyBhIHJlcGxhY2VtZW50IGZvciBw YXNzaW5nIGEgYml0bWFzayBvZgogLy8gZW51bWVyYXRvcnMgYXJvdW5kLgotdGVtcGxhdGU8dHlw ZW5hbWUgVD4gY2xhc3MgT3B0aW9uU2V0IHsKK3RlbXBsYXRlPHR5cGVuYW1lIEU+IGNsYXNzIE9w dGlvblNldCB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7Ci0gICAgc3RhdGljX2Fzc2Vy dChzdGQ6OmlzX2VudW08VD46OnZhbHVlLCAiVCBpcyBub3QgYW4gZW51bSB0eXBlIik7CisgICAg c3RhdGljX2Fzc2VydChzdGQ6OmlzX2VudW08RT46OnZhbHVlLCAiVCBpcyBub3QgYW4gZW51bSB0 eXBlIik7CiAKIHB1YmxpYzoKLSAgICB1c2luZyBTdG9yYWdlVHlwZSA9IHN0ZDo6bWFrZV91bnNp Z25lZF90PHN0ZDo6dW5kZXJseWluZ190eXBlX3Q8VD4+OworICAgIHVzaW5nIFN0b3JhZ2VUeXBl ID0gc3RkOjptYWtlX3Vuc2lnbmVkX3Q8c3RkOjp1bmRlcmx5aW5nX3R5cGVfdDxFPj47CiAKICAg ICB0ZW1wbGF0ZTx0eXBlbmFtZSBTdG9yYWdlVHlwZT4gY2xhc3MgSXRlcmF0b3IgewogICAgICAg ICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKICAgICBwdWJsaWM6CiAgICAgICAgIC8vIElzb2xh dGUgdGhlIHJpZ2h0bW9zdCBzZXQgYml0LgotICAgICAgICBUIG9wZXJhdG9yKigpIGNvbnN0IHsg cmV0dXJuIHN0YXRpY19jYXN0PFQ+KG1fdmFsdWUgJiAtbV92YWx1ZSk7IH0KKyAgICAgICAgRSBv cGVyYXRvciooKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxFPihtX3ZhbHVlICYgLW1fdmFs dWUpOyB9CiAKICAgICAgICAgLy8gSXRlcmF0ZXMgZnJvbSBzbWFsbGVzdCB0byBsYXJnZXN0IGVu dW0gdmFsdWUgYnkgdHVybmluZyBvZmYgdGhlIHJpZ2h0bW9zdCBzZXQgYml0LgogICAgICAgICBJ dGVyYXRvciYgb3BlcmF0b3IrKygpCkBAIC02OSwyOSArMTQ0LDIzIEBAIHB1YmxpYzoKICAgICB9 OwogICAgIHVzaW5nIGl0ZXJhdG9yID0gSXRlcmF0b3I8U3RvcmFnZVR5cGU+OwogCi0gICAgc3Rh dGljIGNvbnN0ZXhwciBPcHRpb25TZXQgZnJvbVJhdyhTdG9yYWdlVHlwZSBzdG9yYWdlVHlwZSkK KyAgICBzdGF0aWMgY29uc3RleHByIE9wdGlvblNldCBmcm9tUmF3KFN0b3JhZ2VUeXBlIHJhd1Zh bHVlKQogICAgIHsKLSAgICAgICAgcmV0dXJuIE9wdGlvblNldChzdGF0aWNfY2FzdDxUPihzdG9y YWdlVHlwZSksIEZyb21SYXdWYWx1ZSk7CisgICAgICAgIHJldHVybiBPcHRpb25TZXQoc3RhdGlj X2Nhc3Q8RT4obWFza1Jhd1ZhbHVlPEU+KHJhd1ZhbHVlKSksIEZyb21SYXdWYWx1ZSk7CiAgICAg fQogCiAgICAgY29uc3RleHByIE9wdGlvblNldCgpID0gZGVmYXVsdDsKIAotICAgIGNvbnN0ZXhw ciBPcHRpb25TZXQoVCB0KQotICAgICAgICA6IG1fc3RvcmFnZShzdGF0aWNfY2FzdDxTdG9yYWdl VHlwZT4odCkpCisgICAgY29uc3RleHByIE9wdGlvblNldChFIGUpCisgICAgICAgIDogbV9zdG9y YWdlKHN0YXRpY19jYXN0PFN0b3JhZ2VUeXBlPihlKSkKICAgICB7Ci0jaWZuZGVmIE5ERUJVRwot ICAgICAgICAvLyBUaGlzIGFzc2VydGlvbiB3aWxsIGNvbmZsaWN0IHdpdGggdGhlIGNvbnN0ZXhw ciBhdHRyaWJ1dGUgaWYgd2UgZW5hYmxlIGl0IG9uIE5ERUJVRyBidWlsZHMuCi0gICAgICAgIEFT U0VSVF9XSVRIX01FU1NBR0UoIW1fc3RvcmFnZSB8fCBoYXNPbmVCaXRTZXQobV9zdG9yYWdlKSwg IkVudW1lcmF0b3IgaXMgbm90IGEgemVybyBvciBhIHBvc2l0aXZlIHBvd2VyIG9mIHR3by4iKTsK LSNlbmRpZgorICAgICAgICBBU1NFUlQoIW1fc3RvcmFnZSB8fCBpc1ZhbGlkT3B0aW9uU2V0RW51 bShlKSk7CiAgICAgfQogCi0gICAgY29uc3RleHByIE9wdGlvblNldChzdGQ6OmluaXRpYWxpemVy X2xpc3Q8VD4gaW5pdGlhbGl6ZXJMaXN0KQorICAgIGNvbnN0ZXhwciBPcHRpb25TZXQoc3RkOjpp bml0aWFsaXplcl9saXN0PEU+IGluaXRpYWxpemVyTGlzdCkKICAgICB7CiAgICAgICAgIGZvciAo YXV0byYgb3B0aW9uIDogaW5pdGlhbGl6ZXJMaXN0KSB7Ci0jaWZuZGVmIE5ERUJVRwotICAgICAg ICAgICAgLy8gVGhpcyBhc3NlcnRpb24gd2lsbCBjb25mbGljdCB3aXRoIHRoZSBjb25zdGV4cHIg YXR0cmlidXRlIGlmIHdlIGVuYWJsZSBpdCBvbiBOREVCVUcgYnVpbGRzLgotICAgICAgICAgICAg QVNTRVJUX1dJVEhfTUVTU0FHRShoYXNPbmVCaXRTZXQoc3RhdGljX2Nhc3Q8U3RvcmFnZVR5cGU+ KG9wdGlvbikpLCAiRW51bWVyYXRvciBpcyBub3QgYSBwb3NpdGl2ZSBwb3dlciBvZiB0d28uIik7 Ci0jZW5kaWYKKyAgICAgICAgICAgIEFTU0VSVChpc1ZhbGlkT3B0aW9uU2V0RW51bShvcHRpb24p KTsKICAgICAgICAgICAgIG1fc3RvcmFnZSB8PSBzdGF0aWNfY2FzdDxTdG9yYWdlVHlwZT4ob3B0 aW9uKTsKICAgICAgICAgfQogICAgIH0KQEAgLTEwNSw3ICsxNzQsNyBAQCBwdWJsaWM6CiAKICAg ICBjb25zdGV4cHIgZXhwbGljaXQgb3BlcmF0b3IgYm9vbCgpIHsgcmV0dXJuICFpc0VtcHR5KCk7 IH0KIAotICAgIGNvbnN0ZXhwciBib29sIGNvbnRhaW5zKFQgb3B0aW9uKSBjb25zdAorICAgIGNv bnN0ZXhwciBib29sIGNvbnRhaW5zKEUgb3B0aW9uKSBjb25zdAogICAgIHsKICAgICAgICAgcmV0 dXJuIGNvbnRhaW5zQW55KG9wdGlvbik7CiAgICAgfQpAQCAtMTYyLDEzICsyMzEsMTMgQEAgcHVi bGljOgogCiBwcml2YXRlOgogICAgIGVudW0gSW5pdGlhbGl6YXRpb25UYWcgeyBGcm9tUmF3VmFs dWUgfTsKLSAgICBjb25zdGV4cHIgT3B0aW9uU2V0KFQgdCwgSW5pdGlhbGl6YXRpb25UYWcpCi0g ICAgICAgIDogbV9zdG9yYWdlKHN0YXRpY19jYXN0PFN0b3JhZ2VUeXBlPih0KSkKKyAgICBjb25z dGV4cHIgT3B0aW9uU2V0KEUgZSwgSW5pdGlhbGl6YXRpb25UYWcpCisgICAgICAgIDogbV9zdG9y YWdlKHN0YXRpY19jYXN0PFN0b3JhZ2VUeXBlPihlKSkKICAgICB7CiAgICAgfQogICAgIFN0b3Jh Z2VUeXBlIG1fc3RvcmFnZSB7IDAgfTsKIH07CiAKLX0KK30gLy8gbmFtZXNwYWNlIFdURgogCiB1 c2luZyBXVEY6Ok9wdGlvblNldDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJh Z0FjdGlvbnMuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0FjdGlvbnMuaAppbmRleCAyNDlm MmI3ODlmNmJmMzUxZDA1OGEwOGNmNzRjZGU2OWRkMTJjODQwLi5jODE3NzQwMmY5N2M1MDgzYjc1 ODA4MTAwZTNkYTc4YzIwOGZmY2I0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Ry YWdBY3Rpb25zLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQWN0aW9ucy5oCkBAIC05 Myw0ICs5MywxMyBAQCB0ZW1wbGF0ZTw+IHN0cnVjdCBFbnVtVHJhaXRzPFdlYkNvcmU6OkRyYWdI YW5kbGluZ01ldGhvZD4gewogICAgID47CiB9OwogCit0ZW1wbGF0ZTw+IHN0cnVjdCBPcHRpb25T ZXRUcmFpdHM8V2ViQ29yZTo6RHJhZ0Rlc3RpbmF0aW9uQWN0aW9uPiB7CisgICAgdXNpbmcgdmFs dWVzID0gT3B0aW9uU2V0VmFsdWVzPAorICAgICAgICBXZWJDb3JlOjpEcmFnRGVzdGluYXRpb25B Y3Rpb24sCisgICAgICAgIFdlYkNvcmU6OkRyYWdEZXN0aW5hdGlvbkFjdGlvbjo6REhUTUwsCisg ICAgICAgIFdlYkNvcmU6OkRyYWdEZXN0aW5hdGlvbkFjdGlvbjo6RWRpdCwKKyAgICAgICAgV2Vi Q29yZTo6RHJhZ0Rlc3RpbmF0aW9uQWN0aW9uOjpMb2FkCisgICAgPjsKK307CisKIH0gLy8gbmFt ZXNwYWNlIFdURgo=