274392 2024-05-20 08:43:10 -0700 AX: empty strings shouldn't be cached in isolated tree 2024-06-03 13:16:16 -0700 1 1 1 Unclassified WebKit Accessibility Safari Technology Preview All All RESOLVED FIXED InRadar P2 Normal --- 1 dm_mazzoni dm_mazzoni aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig samuel_white tyler_w webkit-bug-importer oldest_to_newest 2036415 0 dm_mazzoni 2024-05-20 08:43:10 -0700 AXIsolatedObject::setProperty checks to see if a property value is equal to the default to avoid setting it. This logic has a small bug when it comes to strings, because the null string and empty string are not considered equal, but we don't need to store either in the property map. By calling isEmpty() instead of comparing to emptyString(), we can ensure no empty strings are stored in the property map. The impact of this change on memory usage is negligible by itself, but it will help future optimizations by making the overall property map significantly smaller. 2036416 1 webkit-bug-importer 2024-05-20 08:43:19 -0700 <rdar://problem/128397189> 2036417 2 471443 dm_mazzoni 2024-05-20 08:45:37 -0700 Created attachment 471443 Patch 2039477 3 471576 dm_mazzoni 2024-06-03 11:38:09 -0700 Created attachment 471576 Patch 2039480 4 471578 dm_mazzoni 2024-06-03 11:39:52 -0700 Created attachment 471578 Patch 2039502 5 ews-feeder 2024-06-03 13:16:14 -0700 Committed 279669@main (056b2fd838ed): <https://commits.webkit.org/279669@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 471578. 471443 2024-05-20 08:45:37 -0700 2024-06-03 11:38:08 -0700 Patch bug-274392-20240520084536.patch text/plain 2015 dm_mazzoni RnJvbSAyMTRkNTVkNWY2MTYwMDhiOWVjNzkzZDFkMTM1YWI1OWE4NDdkZjcwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEb21pbmljIE1henpvbmkgPGRtX21henpvbmlAYXBwbGUuY29t PgpEYXRlOiBTdW4sIDE5IE1heSAyMDI0IDE1OjE0OjE1IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0g QVg6IGVtcHR5IHN0cmluZ3Mgc2hvdWxkbid0IGJlIGNhY2hlZCBpbiBpc29sYXRlZCB0cmVlCiBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc0MzkyIHJkYXI6Ly9wcm9i bGVtLzEyODM5NzE4OQoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpBWElzb2xhdGVkT2Jq ZWN0OjpzZXRQcm9wZXJ0eSBjaGVja3MgdG8gc2VlIGlmIGEgcHJvcGVydHkgdmFsdWUgaXMKZXF1 YWwgdG8gdGhlIGRlZmF1bHQgdG8gYXZvaWQgc2V0dGluZyBpdC4gVGhpcyBsb2dpYyBoYXMgYSBz bWFsbCBidWcKd2hlbiBpdCBjb21lcyB0byBzdHJpbmdzLCBiZWNhdXNlIHRoZSBudWxsIHN0cmlu ZyBhbmQgZW1wdHkgc3RyaW5nIGFyZQpub3QgY29uc2lkZXJlZCBlcXVhbCwgYnV0IHdlIGRvbid0 IG5lZWQgdG8gc3RvcmUgZWl0aGVyIGluIHRoZQpwcm9wZXJ0eSBtYXAuIEJ5IGNhbGxpbmcgaXNF bXB0eSgpIGluc3RlYWQgb2YgY29tcGFyaW5nIHRvCmVtcHR5U3RyaW5nKCksIHdlIGNhbiBlbnN1 cmUgbm8gZW1wdHkgc3RyaW5ncyBhcmUgc3RvcmVkIGluIHRoZQpwcm9wZXJ0eSBtYXAuCgpUaGUg aW1wYWN0IG9mIHRoaXMgY2hhbmdlIG9uIG1lbW9yeSB1c2FnZSBpcyBuZWdsaWdpYmxlIGJ5IGl0 c2VsZiwgYnV0Cml0IHdpbGwgaGVscCBmdXR1cmUgb3B0aW1pemF0aW9ucyBieSBtYWtpbmcgdGhl IG92ZXJhbGwgcHJvcGVydHkgbWFwCnNpZ25pZmljYW50bHkgc21hbGxlci4KCiogU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHA6CihX ZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0OjpzZXRQcm9wZXJ0eSk6Ci0tLQogU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAgfCAyICst CiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVk T2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRPYmplY3QuY3BwCmluZGV4IDQwOWFlYmI3OWIxNC4uOGIyOTRkOWFhOWM5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xh dGVkT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVk dHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcApAQCAtNDUwLDcgKzQ1MCw3IEBAIHZvaWQgQVhJc29s YXRlZE9iamVjdDo6c2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lLCBBWFBy b3BlcnR5VmFsdWVWCiAgICAgYm9vbCBpc0RlZmF1bHRWYWx1ZSA9IFdURjo6c3dpdGNoT24odmFs dWUsCiAgICAgICAgIFtdKHN0ZDo6bnVsbHB0cl90JikgeyByZXR1cm4gdHJ1ZTsgfSwKICAgICAg ICAgW10oQVhJRCB0eXBlZFZhbHVlKSB7IHJldHVybiAhdHlwZWRWYWx1ZS5pc1ZhbGlkKCk7IH0s Ci0gICAgICAgIFtdKFN0cmluZyYgdHlwZWRWYWx1ZSkgeyByZXR1cm4gdHlwZWRWYWx1ZSA9PSBl bXB0eVN0cmluZygpOyB9LAorICAgICAgICBbXShTdHJpbmcmIHR5cGVkVmFsdWUpIHsgcmV0dXJu IHR5cGVkVmFsdWUuaXNFbXB0eSgpOyB9LAogICAgICAgICBbXShib29sIHR5cGVkVmFsdWUpIHsg cmV0dXJuICF0eXBlZFZhbHVlOyB9LAogICAgICAgICBbXShpbnQgdHlwZWRWYWx1ZSkgeyByZXR1 cm4gIXR5cGVkVmFsdWU7IH0sCiAgICAgICAgIFtdKHVuc2lnbmVkIHR5cGVkVmFsdWUpIHsgcmV0 dXJuICF0eXBlZFZhbHVlOyB9LAo= 471576 2024-06-03 11:38:09 -0700 2024-06-03 11:39:50 -0700 Patch bug-274392-20240603113809.patch text/plain 4642 dm_mazzoni RnJvbSA4Yzk4NjBlNjBiMWQzMjdmOTRmZWJlMzk1YjFjMjE1MjY0ZmJhNzc1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEb21pbmljIE1henpvbmkgPGRtX21henpvbmlAYXBwbGUuY29t PgpEYXRlOiBTdW4sIDE5IE1heSAyMDI0IDE1OjE0OjE1IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0g QVg6IGVtcHR5IHN0cmluZ3Mgc2hvdWxkbid0IGJlIGNhY2hlZCBpbiBpc29sYXRlZCB0cmVlCiBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc0MzkyIHJkYXI6Ly9wcm9i bGVtLzEyODM5NzE4OQoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpBWElzb2xhdGVkT2Jq ZWN0OjpzZXRQcm9wZXJ0eSBjaGVja3MgdG8gc2VlIGlmIGEgcHJvcGVydHkgdmFsdWUgaXMKZXF1 YWwgdG8gdGhlIGRlZmF1bHQgdG8gYXZvaWQgc2V0dGluZyBpdC4gVGhpcyBsb2dpYyBoYXMgYSBz bWFsbCBidWcKd2hlbiBpdCBjb21lcyB0byBzdHJpbmdzLCBiZWNhdXNlIHRoZSBudWxsIHN0cmlu ZyBhbmQgZW1wdHkgc3RyaW5nIGFyZQpub3QgY29uc2lkZXJlZCBlcXVhbCwgYnV0IHdlIGRvbid0 IG5lZWQgdG8gc3RvcmUgZWl0aGVyIGluIHRoZQpwcm9wZXJ0eSBtYXAuIEJ5IGNhbGxpbmcgaXNF bXB0eSgpIGluc3RlYWQgb2YgY29tcGFyaW5nIHRvCmVtcHR5U3RyaW5nKCksIHdlIGNhbiBlbnN1 cmUgbm8gZW1wdHkgc3RyaW5ncyBhcmUgc3RvcmVkIGluIHRoZQpwcm9wZXJ0eSBtYXAuCgpUaGUg aW1wYWN0IG9mIHRoaXMgY2hhbmdlIG9uIG1lbW9yeSB1c2FnZSBpcyBuZWdsaWdpYmxlIGJ5IGl0 c2VsZiwgYnV0Cml0IHdpbGwgaGVscCBmdXR1cmUgb3B0aW1pemF0aW9ucyBieSBtYWtpbmcgdGhl IG92ZXJhbGwgcHJvcGVydHkgbWFwCnNpZ25pZmljYW50bHkgc21hbGxlci4KCiogU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHA6CihX ZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0OjpzZXRQcm9wZXJ0eSk6Ci0tLQogLi4uL2lzb2xhdGVk dHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcCAgICAgICAgICAgIHwgMTYgKysrKysrKysrKysrKysr LQogLi4uL2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmggICAgICAgICAgICAgIHwgIDMg KystCiAyIGZpbGVzIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJ c29sYXRlZE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVk dHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcAppbmRleCBiZTM0NTcyMDMzNjMuLmNkNDRkOTQyODlm MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUv QVhJc29sYXRlZE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9p c29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKQEAgLTQ0OSw3ICs0NDksMTIgQEAgdm9p ZCBBWElzb2xhdGVkT2JqZWN0OjpzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5h bWUsIEFYUHJvcGVydHlWYWx1ZVYKICAgICBib29sIGlzRGVmYXVsdFZhbHVlID0gV1RGOjpzd2l0 Y2hPbih2YWx1ZSwKICAgICAgICAgW10oc3RkOjpudWxscHRyX3QmKSB7IHJldHVybiB0cnVlOyB9 LAogICAgICAgICBbXShBWElEIHR5cGVkVmFsdWUpIHsgcmV0dXJuICF0eXBlZFZhbHVlLmlzVmFs aWQoKTsgfSwKLSAgICAgICAgW10oU3RyaW5nJiB0eXBlZFZhbHVlKSB7IHJldHVybiB0eXBlZFZh bHVlID09IGVtcHR5U3RyaW5nKCk7IH0sCisgICAgICAgIFsmXShTdHJpbmcmIHR5cGVkVmFsdWUp IHsKKyAgICAgICAgICAgIC8vIFdlIHVzZSBhIG51bGwgc3RyaW5nVmFsdWUgdG8gaW5kaWNhdGUg d2hlbiB0aGUgc3RyaW5nIHZhbHVlIGlzIGRpZmZlcmVudCB0aGFuIHRoZSB0ZXh0IGNvbnRlbnQu CisgICAgICAgICAgICBpZiAocHJvcGVydHlOYW1lID09IEFYUHJvcGVydHlOYW1lOjpTdHJpbmdW YWx1ZSkKKyAgICAgICAgICAgICAgICByZXR1cm4gdHlwZWRWYWx1ZSA9PSBlbXB0eVN0cmluZygp OyAvLyBPbmx5IGNvbXBhcmVzIGVtcHR5LCBub3QgbnVsbAorICAgICAgICAgICAgcmV0dXJuIHR5 cGVkVmFsdWUuaXNFbXB0eSgpOyAvLyBudWxsIG9yIGVtcHR5CisgICAgICAgIH0sCiAgICAgICAg IFtdKGJvb2wgdHlwZWRWYWx1ZSkgeyByZXR1cm4gIXR5cGVkVmFsdWU7IH0sCiAgICAgICAgIFtd KGludCB0eXBlZFZhbHVlKSB7IHJldHVybiAhdHlwZWRWYWx1ZTsgfSwKICAgICAgICAgW10odW5z aWduZWQgdHlwZWRWYWx1ZSkgeyByZXR1cm4gIXR5cGVkVmFsdWU7IH0sCkBAIC0xMDIzLDYgKzEw MjgsMTUgQEAgU3RyaW5nIEFYSXNvbGF0ZWRPYmplY3Q6OnN0cmluZ0F0dHJpYnV0ZVZhbHVlKEFY UHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkgY29uc3QKICAgICApOwogfQogCitTdHJpbmcgQVhJ c29sYXRlZE9iamVjdDo6c3RyaW5nQXR0cmlidXRlVmFsdWVOdWxsSWZNaXNzaW5nKEFYUHJvcGVy dHlOYW1lIHByb3BlcnR5TmFtZSkgY29uc3QKK3sKKyAgICBhdXRvIHZhbHVlID0gbV9wcm9wZXJ0 eU1hcC5nZXQocHJvcGVydHlOYW1lKTsKKyAgICByZXR1cm4gV1RGOjpzd2l0Y2hPbih2YWx1ZSwK KyAgICAgICAgW10gKFN0cmluZyYgdHlwZWRWYWx1ZSkgeyByZXR1cm4gdHlwZWRWYWx1ZTsgfSwK KyAgICAgICAgW10gKGF1dG8mKSB7IHJldHVybiBudWxsU3RyaW5nKCk7IH0KKyAgICApOworfQor CiBpbnQgQVhJc29sYXRlZE9iamVjdDo6aW50QXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWUg cHJvcGVydHlOYW1lKSBjb25zdAogewogICAgIGF1dG8gdmFsdWUgPSBtX3Byb3BlcnR5TWFwLmdl dChwcm9wZXJ0eU5hbWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCmluZGV4IDU5NDMwNjk1ODcy Ny4uNWJmYWU2NTljMGExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCkBAIC0xMTAsNiArMTEw LDcgQEAgcHJpdmF0ZToKICAgICAvLyBGSVhNRTogY29uc29saWRhdGUgYWxsIEF0dHJpYnV0ZVZh bHVlIHJldHJpZXZhbCBpbiBhIHNpbmdsZSB0ZW1wbGF0ZSBtZXRob2QuCiAgICAgYm9vbCBib29s QXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWUpIGNvbnN0OwogICAgIFN0cmluZyBzdHJpbmdB dHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZSkgY29uc3Q7CisgICAgU3RyaW5nIHN0cmluZ0F0 dHJpYnV0ZVZhbHVlTnVsbElmTWlzc2luZyhBWFByb3BlcnR5TmFtZSkgY29uc3Q7CiAgICAgaW50 IGludEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lKSBjb25zdDsKICAgICB1bnNpZ25lZCB1 bnNpZ25lZEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lKSBjb25zdDsKICAgICBkb3VibGUg ZG91YmxlQXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWUpIGNvbnN0OwpAQCAtMjkyLDcgKzI5 Myw3IEBAIHByaXZhdGU6CiAgICAgQXV0b0ZpbGxCdXR0b25UeXBlIHZhbHVlQXV0b2ZpbGxCdXR0 b25UeXBlKCkgY29uc3QgZmluYWwgeyByZXR1cm4gc3RhdGljX2Nhc3Q8QXV0b0ZpbGxCdXR0b25U eXBlPihpbnRBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZTo6VmFsdWVBdXRvZmlsbEJ1dHRv blR5cGUpKTsgfQogICAgIEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBhcmlhVHJlZVJvd3Mo KSBmaW5hbCB7IHJldHVybiB0cmVlKCktPm9iamVjdHNGb3JJRHModmVjdG9yQXR0cmlidXRlVmFs dWU8QVhJRD4oQVhQcm9wZXJ0eU5hbWU6OkFSSUFUcmVlUm93cykpOyB9CiAgICAgVVJMIHVybCgp IGNvbnN0IGZpbmFsIHsgcmV0dXJuIHVybEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lOjpV UkwpOyB9Ci0gICAgU3RyaW5nIGFjY2Vzc0tleSgpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIHN0cmlu Z0F0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lOjpBY2Nlc3NLZXkpOyB9CisgICAgU3RyaW5n IGFjY2Vzc0tleSgpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIHN0cmluZ0F0dHJpYnV0ZVZhbHVlTnVs bElmTWlzc2luZyhBWFByb3BlcnR5TmFtZTo6QWNjZXNzS2V5KTsgfQogICAgIFN0cmluZyBsb2Nh bGl6ZWRBY3Rpb25WZXJiKCkgY29uc3QgZmluYWwgeyByZXR1cm4gc3RyaW5nQXR0cmlidXRlVmFs dWUoQVhQcm9wZXJ0eU5hbWU6OkxvY2FsaXplZEFjdGlvblZlcmIpOyB9CiAgICAgU3RyaW5nIGFj dGlvblZlcmIoKSBjb25zdCBmaW5hbCB7IHJldHVybiBzdHJpbmdBdHRyaWJ1dGVWYWx1ZShBWFBy b3BlcnR5TmFtZTo6QWN0aW9uVmVyYik7IH0KICAgICBTdHJpbmcgYXV0b0NvbXBsZXRlVmFsdWUo KSBjb25zdCBmaW5hbCB7IHJldHVybiBzdHJpbmdBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFt ZTo6QXV0b0NvbXBsZXRlVmFsdWUpOyB9Cg== 471578 2024-06-03 11:39:52 -0700 2024-06-03 13:16:15 -0700 Patch bug-274392-20240603113951.patch text/plain 4776 dm_mazzoni RnJvbSBhN2FhOWI3ZTVkYWYzZDJhNTUzMTFiM2MyNTJjMGUyOTIzOTQwMzJlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEb21pbmljIE1henpvbmkgPGRtX21henpvbmlAYXBwbGUuY29t PgpEYXRlOiBTdW4sIDE5IE1heSAyMDI0IDE1OjE0OjE1IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0g QVg6IGVtcHR5IHN0cmluZ3Mgc2hvdWxkbid0IGJlIGNhY2hlZCBpbiBpc29sYXRlZCB0cmVlCiBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc0MzkyIHJkYXI6Ly9wcm9i bGVtLzEyODM5NzE4OQoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpBWElzb2xhdGVkT2Jq ZWN0OjpzZXRQcm9wZXJ0eSBjaGVja3MgdG8gc2VlIGlmIGEgcHJvcGVydHkgdmFsdWUgaXMKZXF1 YWwgdG8gdGhlIGRlZmF1bHQgdG8gYXZvaWQgc2V0dGluZyBpdC4gVGhpcyBsb2dpYyBoYXMgYSBz bWFsbCBidWcKd2hlbiBpdCBjb21lcyB0byBzdHJpbmdzLCBiZWNhdXNlIHRoZSBudWxsIHN0cmlu ZyBhbmQgZW1wdHkgc3RyaW5nIGFyZQpub3QgY29uc2lkZXJlZCBlcXVhbCwgYnV0IHdlIGRvbid0 IG5lZWQgdG8gc3RvcmUgZWl0aGVyIGluIHRoZQpwcm9wZXJ0eSBtYXAuIEJ5IGNhbGxpbmcgaXNF bXB0eSgpIGluc3RlYWQgb2YgY29tcGFyaW5nIHRvCmVtcHR5U3RyaW5nKCksIHdlIGNhbiBlbnN1 cmUgbm8gZW1wdHkgc3RyaW5ncyBhcmUgc3RvcmVkIGluIHRoZQpwcm9wZXJ0eSBtYXAuCgpUaGUg aW1wYWN0IG9mIHRoaXMgY2hhbmdlIG9uIG1lbW9yeSB1c2FnZSBpcyBuZWdsaWdpYmxlIGJ5IGl0 c2VsZiwgYnV0Cml0IHdpbGwgaGVscCBmdXR1cmUgb3B0aW1pemF0aW9ucyBieSBtYWtpbmcgdGhl IG92ZXJhbGwgcHJvcGVydHkgbWFwCnNpZ25pZmljYW50bHkgc21hbGxlci4KCiogU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHA6CihX ZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0OjpzZXRQcm9wZXJ0eSk6CihXZWJDb3JlOjpBWElzb2xh dGVkT2JqZWN0OjpzdHJpbmdBdHRyaWJ1dGVWYWx1ZU51bGxJZk1pc3NpbmcgY29uc3QpOgoqIFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3Qu aDoKLS0tCiAuLi4vaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwICAgICAgICAgICAg fCAxNiArKysrKysrKysrKysrKystCiAuLi4vaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3Qu aCAgICAgICAgICAgICAgfCAgMyArKy0KIDIgZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygr KSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCmluZGV4IGJlMzQ1 NzIwMzM2My4uY2Q0NGQ5NDI4OWYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcApAQCAt NDQ5LDcgKzQ0OSwxMiBAQCB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OnNldFByb3BlcnR5KEFYUHJv cGVydHlOYW1lIHByb3BlcnR5TmFtZSwgQVhQcm9wZXJ0eVZhbHVlVgogICAgIGJvb2wgaXNEZWZh dWx0VmFsdWUgPSBXVEY6OnN3aXRjaE9uKHZhbHVlLAogICAgICAgICBbXShzdGQ6Om51bGxwdHJf dCYpIHsgcmV0dXJuIHRydWU7IH0sCiAgICAgICAgIFtdKEFYSUQgdHlwZWRWYWx1ZSkgeyByZXR1 cm4gIXR5cGVkVmFsdWUuaXNWYWxpZCgpOyB9LAotICAgICAgICBbXShTdHJpbmcmIHR5cGVkVmFs dWUpIHsgcmV0dXJuIHR5cGVkVmFsdWUgPT0gZW1wdHlTdHJpbmcoKTsgfSwKKyAgICAgICAgWyZd KFN0cmluZyYgdHlwZWRWYWx1ZSkgeworICAgICAgICAgICAgLy8gV2UgdXNlIGEgbnVsbCBzdHJp bmdWYWx1ZSB0byBpbmRpY2F0ZSB3aGVuIHRoZSBzdHJpbmcgdmFsdWUgaXMgZGlmZmVyZW50IHRo YW4gdGhlIHRleHQgY29udGVudC4KKyAgICAgICAgICAgIGlmIChwcm9wZXJ0eU5hbWUgPT0gQVhQ cm9wZXJ0eU5hbWU6OlN0cmluZ1ZhbHVlKQorICAgICAgICAgICAgICAgIHJldHVybiB0eXBlZFZh bHVlID09IGVtcHR5U3RyaW5nKCk7IC8vIE9ubHkgY29tcGFyZXMgZW1wdHksIG5vdCBudWxsCisg ICAgICAgICAgICByZXR1cm4gdHlwZWRWYWx1ZS5pc0VtcHR5KCk7IC8vIG51bGwgb3IgZW1wdHkK KyAgICAgICAgfSwKICAgICAgICAgW10oYm9vbCB0eXBlZFZhbHVlKSB7IHJldHVybiAhdHlwZWRW YWx1ZTsgfSwKICAgICAgICAgW10oaW50IHR5cGVkVmFsdWUpIHsgcmV0dXJuICF0eXBlZFZhbHVl OyB9LAogICAgICAgICBbXSh1bnNpZ25lZCB0eXBlZFZhbHVlKSB7IHJldHVybiAhdHlwZWRWYWx1 ZTsgfSwKQEAgLTEwMjMsNiArMTAyOCwxNSBAQCBTdHJpbmcgQVhJc29sYXRlZE9iamVjdDo6c3Ry aW5nQXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lKSBjb25zdAogICAg ICk7CiB9CiAKK1N0cmluZyBBWElzb2xhdGVkT2JqZWN0OjpzdHJpbmdBdHRyaWJ1dGVWYWx1ZU51 bGxJZk1pc3NpbmcoQVhQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lKSBjb25zdAoreworICAgIGF1 dG8gdmFsdWUgPSBtX3Byb3BlcnR5TWFwLmdldChwcm9wZXJ0eU5hbWUpOworICAgIHJldHVybiBX VEY6OnN3aXRjaE9uKHZhbHVlLAorICAgICAgICBbXSAoU3RyaW5nJiB0eXBlZFZhbHVlKSB7IHJl dHVybiB0eXBlZFZhbHVlOyB9LAorICAgICAgICBbXSAoYXV0byYpIHsgcmV0dXJuIG51bGxTdHJp bmcoKTsgfQorICAgICk7Cit9CisKIGludCBBWElzb2xhdGVkT2JqZWN0OjppbnRBdHRyaWJ1dGVW YWx1ZShBWFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpIGNvbnN0CiB7CiAgICAgYXV0byB2YWx1 ZSA9IG1fcHJvcGVydHlNYXAuZ2V0KHByb3BlcnR5TmFtZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmggYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0 LmgKaW5kZXggNTk0MzA2OTU4NzI3Li41YmZhZTY1OWMwYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2Jq ZWN0LmgKQEAgLTExMCw2ICsxMTAsNyBAQCBwcml2YXRlOgogICAgIC8vIEZJWE1FOiBjb25zb2xp ZGF0ZSBhbGwgQXR0cmlidXRlVmFsdWUgcmV0cmlldmFsIGluIGEgc2luZ2xlIHRlbXBsYXRlIG1l dGhvZC4KICAgICBib29sIGJvb2xBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZSkgY29uc3Q7 CiAgICAgU3RyaW5nIHN0cmluZ0F0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lKSBjb25zdDsK KyAgICBTdHJpbmcgc3RyaW5nQXR0cmlidXRlVmFsdWVOdWxsSWZNaXNzaW5nKEFYUHJvcGVydHlO YW1lKSBjb25zdDsKICAgICBpbnQgaW50QXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWUpIGNv bnN0OwogICAgIHVuc2lnbmVkIHVuc2lnbmVkQXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWUp IGNvbnN0OwogICAgIGRvdWJsZSBkb3VibGVBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZSkg Y29uc3Q7CkBAIC0yOTIsNyArMjkzLDcgQEAgcHJpdmF0ZToKICAgICBBdXRvRmlsbEJ1dHRvblR5 cGUgdmFsdWVBdXRvZmlsbEJ1dHRvblR5cGUoKSBjb25zdCBmaW5hbCB7IHJldHVybiBzdGF0aWNf Y2FzdDxBdXRvRmlsbEJ1dHRvblR5cGU+KGludEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1l OjpWYWx1ZUF1dG9maWxsQnV0dG9uVHlwZSkpOyB9CiAgICAgQWNjZXNzaWJpbGl0eUNoaWxkcmVu VmVjdG9yIGFyaWFUcmVlUm93cygpIGZpbmFsIHsgcmV0dXJuIHRyZWUoKS0+b2JqZWN0c0ZvcklE cyh2ZWN0b3JBdHRyaWJ1dGVWYWx1ZTxBWElEPihBWFByb3BlcnR5TmFtZTo6QVJJQVRyZWVSb3dz KSk7IH0KICAgICBVUkwgdXJsKCkgY29uc3QgZmluYWwgeyByZXR1cm4gdXJsQXR0cmlidXRlVmFs dWUoQVhQcm9wZXJ0eU5hbWU6OlVSTCk7IH0KLSAgICBTdHJpbmcgYWNjZXNzS2V5KCkgY29uc3Qg ZmluYWwgeyByZXR1cm4gc3RyaW5nQXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6OkFjY2Vz c0tleSk7IH0KKyAgICBTdHJpbmcgYWNjZXNzS2V5KCkgY29uc3QgZmluYWwgeyByZXR1cm4gc3Ry aW5nQXR0cmlidXRlVmFsdWVOdWxsSWZNaXNzaW5nKEFYUHJvcGVydHlOYW1lOjpBY2Nlc3NLZXkp OyB9CiAgICAgU3RyaW5nIGxvY2FsaXplZEFjdGlvblZlcmIoKSBjb25zdCBmaW5hbCB7IHJldHVy biBzdHJpbmdBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZTo6TG9jYWxpemVkQWN0aW9uVmVy Yik7IH0KICAgICBTdHJpbmcgYWN0aW9uVmVyYigpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIHN0cmlu Z0F0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lOjpBY3Rpb25WZXJiKTsgfQogICAgIFN0cmlu ZyBhdXRvQ29tcGxldGVWYWx1ZSgpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIHN0cmluZ0F0dHJpYnV0 ZVZhbHVlKEFYUHJvcGVydHlOYW1lOjpBdXRvQ29tcGxldGVWYWx1ZSk7IH0K