234411 2021-12-16 17:24:56 -0800 Add custom copy() method for Ref<T> to CrossThreadCopier 2021-12-17 14:55:38 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu benjamin cdumez cmarcelo darin ews-watchlist webkit-bug-importer youennf oldest_to_newest 1824919 0 sihui_liu 2021-12-16 17:24:56 -0800 ... 1824969 1 447417 sihui_liu 2021-12-16 20:49:07 -0800 Created attachment 447417 Patch 1825187 2 ews-feeder 2021-12-17 14:26:27 -0800 Committed r287207 (245374@main): <https://commits.webkit.org/245374@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447417. 1825188 3 webkit-bug-importer 2021-12-17 14:27:19 -0800 <rdar://problem/86650725> 1825202 4 447417 darin 2021-12-17 14:55:38 -0800 Comment on attachment 447417 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447417&action=review > Source/WTF/wtf/CrossThreadCopier.h:58 > + typedef T Type; Reminds me that in newer code we’d love to use "using" rather than typedef. > Source/WTF/wtf/CrossThreadCopier.h:107 > + typedef Ref<T> Type; Like here too. > Source/WTF/wtf/CrossThreadCopier.h:111 > + static Type copy(const Type& ref) > + { > + return ref; > + } I probably would write these as one-liners. 447417 2021-12-16 20:49:07 -0800 2021-12-17 14:26:29 -0800 Patch bug-234411-20211216204906.patch text/plain 12759 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDAyMWU0YTkzYWZmOTJhNDY4ZmI5YTZm ZDNjNmMwNDBjMDQ3YTQ4ZDMuLmFhZjJkMDFiNWY0MzFmYTVjYzRlYzQ5NmNjMDU0NzI5ZDMxZDhm ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMTItMTYgIFNpaHVpIExpdSAgPHNpaHVpX2xp dUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGN1c3RvbSBjb3B5KCkgbWV0aG9kIGZvciBSZWY8 VD4gdG8gQ3Jvc3NUaHJlYWRDb3BpZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzNDQxMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogd3RmL0Nyb3NzVGhyZWFkQ29waWVyLmNwcDoKKyAgICAgICAgKiB3 dGYvQ3Jvc3NUaHJlYWRDb3BpZXIuaDoKKwogMjAyMS0xMi0xNiAgQWxleCBDaHJpc3RlbnNlbiAg PGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGlu ZyByMjg3MDU2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDUzZWI5ZDBjMTE0M2E5NTk2OTk5YzY3OTQzYTAxZTBh YmZkMTRlNzcuLjczOWE0OGE5YTQ2NDExYzI5N2JlZWU5NzBhMTU1Y2YwNGJmN2UwYTMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMS0xMi0xNiAgU2lodWkgTGl1ICA8c2lodWlfbGl1 QGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgY3VzdG9tIGNvcHkoKSBtZXRob2QgZm9yIFJlZjxU PiB0byBDcm9zc1RocmVhZENvcGllcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM0NDExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBNb2R1bGVzL2ZpbGVzeXN0ZW1hY2Nlc3MvRmlsZVN5c3RlbVN0b3Jh Z2VDb25uZWN0aW9uLmg6CisgICAgICAgICogTW9kdWxlcy9maWxlc3lzdGVtYWNjZXNzL1dvcmtl ckZpbGVTeXN0ZW1TdG9yYWdlQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXb3Jr ZXJGaWxlU3lzdGVtU3RvcmFnZUNvbm5lY3Rpb246OmdldEZpbGVIYW5kbGUpOgorICAgICAgICAo V2ViQ29yZTo6V29ya2VyRmlsZVN5c3RlbVN0b3JhZ2VDb25uZWN0aW9uOjpnZXREaXJlY3RvcnlI YW5kbGUpOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyRmlsZVN5c3RlbVN0b3JhZ2VDb25uZWN0 aW9uOjpnZXRIYW5kbGUpOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyRmlsZVN5c3RlbVN0b3Jh Z2VDb25uZWN0aW9uOjpkaWRHZXRIYW5kbGVXaXRoVHlwZSk6IERlbGV0ZWQuCisgICAgICAgICog TW9kdWxlcy9maWxlc3lzdGVtYWNjZXNzL1dvcmtlckZpbGVTeXN0ZW1TdG9yYWdlQ29ubmVjdGlv bi5oOgorCiAyMDIxLTEyLTE2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAog ICAgICAgICBBbGxvdyBBdWRpb1NhbXBsZURhdGFTb3VyY2UgdG8gaW5jcmVhc2UvZGVjcmVhc2Ug YnVmZmVyZWQgZGF0YSBwcm9ncmVzc2l2ZWx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9D cm9zc1RocmVhZENvcGllci5jcHAgYi9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVhZENvcGllci5j cHAKaW5kZXggNWE2YWJhYTc5YTM1ZDZiMDEwMGU4NmQ3ODg4ZDc2NjBhMTljODIwZC4uZmYwMmFk ODM2YTNiMWMyYTE3MzRlZTk4MWRlODk1ZWE4NzlhODU5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dU Ri93dGYvQ3Jvc3NUaHJlYWRDb3BpZXIuY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL0Nyb3NzVGhy ZWFkQ29waWVyLmNwcApAQCAtNDAsMTYgKzQwLDkgQEAgbmFtZXNwYWNlIFdURiB7CiBjbGFzcyBD b3BpZXJUaHJlYWRTYWZlUmVmQ291bnRlZFRlc3QgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50 ZWQ8Q29waWVyVGhyZWFkU2FmZVJlZkNvdW50ZWRUZXN0PiB7CiB9OwogCi1DT01QSUxFX0FTU0VS VCgoc3RkOjppc19zYW1lPAotICAgICAgICAgICAgICAgICAgICBSZWZQdHI8Q29waWVyVGhyZWFk U2FmZVJlZkNvdW50ZWRUZXN0PiwKLSAgICAgICAgICAgICAgICAgICAgQ3Jvc3NUaHJlYWRDb3Bp ZXI8UmVmUHRyPENvcGllclRocmVhZFNhZmVSZWZDb3VudGVkVGVzdD4+OjpUeXBlCi0gICAgICAg ICAgICAgICAgPjo6dmFsdWUpLAotICAgICAgICAgICAgICAgIFJlZlB0clRlc3QpOwotQ09NUElM RV9BU1NFUlQoKHN0ZDo6aXNfc2FtZTwKLSAgICAgICAgICAgICAgICAgICAgUmVmUHRyPENvcGll clRocmVhZFNhZmVSZWZDb3VudGVkVGVzdD4sCi0gICAgICAgICAgICAgICAgICAgIENyb3NzVGhy ZWFkQ29waWVyPENvcGllclRocmVhZFNhZmVSZWZDb3VudGVkVGVzdCo+OjpUeXBlCi0gICAgICAg ICAgICAgICAgPjo6dmFsdWUpLAotICAgICAgICAgICAgICAgIFJhd1BvaW50ZXJUZXN0KTsKK0NP TVBJTEVfQVNTRVJUKChzdGQ6OmlzX3NhbWU8UmVmUHRyPENvcGllclRocmVhZFNhZmVSZWZDb3Vu dGVkVGVzdD4sIENyb3NzVGhyZWFkQ29waWVyPFJlZlB0cjxDb3BpZXJUaHJlYWRTYWZlUmVmQ291 bnRlZFRlc3Q+Pjo6VHlwZT46OnZhbHVlKSwgUmVmUHRyVGVzdCk7CitDT01QSUxFX0FTU0VSVCgo c3RkOjppc19zYW1lPFJlZlB0cjxDb3BpZXJUaHJlYWRTYWZlUmVmQ291bnRlZFRlc3Q+LCBDcm9z c1RocmVhZENvcGllcjxDb3BpZXJUaHJlYWRTYWZlUmVmQ291bnRlZFRlc3QqPjo6VHlwZT46OnZh bHVlKSwgUmF3UG9pbnRlclRlc3QpOworQ09NUElMRV9BU1NFUlQoKHN0ZDo6aXNfc2FtZTxSZWY8 Q29waWVyVGhyZWFkU2FmZVJlZkNvdW50ZWRUZXN0PiwgQ3Jvc3NUaHJlYWRDb3BpZXI8UmVmPENv cGllclRocmVhZFNhZmVSZWZDb3VudGVkVGVzdD4+OjpUeXBlPjo6dmFsdWUpLCBSYXdQb2ludGVy VGVzdCk7CiAKIC8vIEFkZCBzcGVjaWFsaXphdGlvbnMgZm9yIFJlZkNvdW50ZWQgdHlwZXMgd2hp Y2ggd2lsbCBsZXQgdXMgdmVyaWZ5IHRoYXQgbm8gb3RoZXIgdGVtcGxhdGUgbWF0Y2hlcy4KIHRl bXBsYXRlPHR5cGVuYW1lIFQ+IHN0cnVjdCBDcm9zc1RocmVhZENvcGllckJhc2U8ZmFsc2UsIGZh bHNlLCBSZWZQdHI8VD4+IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0Nyb3NzVGhyZWFk Q29waWVyLmggYi9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVhZENvcGllci5oCmluZGV4IGJhMTc3 ZjkxYzBlNmJkZjQyZGNmOTE0YmMxOWQwMTc0NGJmYjA4ZDYuLjAxZDJhNzc2MzNiMGIwMmNmNGRm NTI1MGZmZDIzNGNiZjAzOTdiODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0Nyb3NzVGhy ZWFkQ29waWVyLmgKKysrIGIvU291cmNlL1dURi93dGYvQ3Jvc3NUaHJlYWRDb3BpZXIuaApAQCAt NTQsMTIgKzU0LDE2IEBAIHN0cnVjdCBDcm9zc1RocmVhZENvcGllckJhc2VIZWxwZXIgewogICAg ICAgICB0eXBlZGVmIFQgVHlwZTsKICAgICB9OwogCisgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4g c3RydWN0IFJlbW92ZVBvaW50ZXI8UmVmPFQ+PiB7CisgICAgICAgIHR5cGVkZWYgVCBUeXBlOwor ICAgIH07CisKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBzdHJ1Y3QgSXNFbnVtT3JDb252ZXJ0 aWJsZVRvSW50ZWdlciB7CiAgICAgICAgIHN0YXRpYyBjb25zdGV4cHIgYm9vbCB2YWx1ZSA9IHN0 ZDo6aXNfaW50ZWdyYWw8VD46OnZhbHVlIHx8IHN0ZDo6aXNfZW51bTxUPjo6dmFsdWUgfHwgc3Rk Ojppc19jb252ZXJ0aWJsZTxULCBsb25nIGRvdWJsZT46OnZhbHVlOwogICAgIH07CiAKICAgICB0 ZW1wbGF0ZTx0eXBlbmFtZSBUPiBzdHJ1Y3QgSXNUaHJlYWRTYWZlUmVmQ291bnRlZFBvaW50ZXIg ewotICAgICAgICBzdGF0aWMgY29uc3RleHByIGJvb2wgdmFsdWUgPSBzdGQ6OmlzX2NvbnZlcnRp YmxlPHR5cGVuYW1lIFJlbW92ZVBvaW50ZXI8VD46OlR5cGUqLCBUaHJlYWRTYWZlUmVmQ291bnRl ZDx0eXBlbmFtZSBSZW1vdmVQb2ludGVyPFQ+OjpUeXBlPio+Ojp2YWx1ZTsKKyAgICAgICAgc3Rh dGljIGNvbnN0ZXhwciBib29sIHZhbHVlID0gc3RkOjppc19jb252ZXJ0aWJsZTx0eXBlbmFtZSBS ZW1vdmVQb2ludGVyPFQ+OjpUeXBlKiwgVGhyZWFkU2FmZVJlZkNvdW50ZWRCYXNlKj46OnZhbHVl OwogICAgIH07CiB9OwogCkBAIC04OCw3ICs5Miw3IEBAIHRlbXBsYXRlPGNsYXNzIFQ+IHN0cnVj dCBDcm9zc1RocmVhZENvcGllckJhc2U8ZmFsc2UsIGZhbHNlLCBUPiB7CiAvLyBDdXN0b20gY29w eSBtZXRob2RzLgogdGVtcGxhdGU8dHlwZW5hbWUgVD4gc3RydWN0IENyb3NzVGhyZWFkQ29waWVy QmFzZTxmYWxzZSwgdHJ1ZSwgVD4gewogICAgIHR5cGVkZWYgdHlwZW5hbWUgQ3Jvc3NUaHJlYWRD b3BpZXJCYXNlSGVscGVyOjpSZW1vdmVQb2ludGVyPFQ+OjpUeXBlIFJlZkNvdW50ZWRUeXBlOwot ICAgIHN0YXRpY19hc3NlcnQoc3RkOjppc19jb252ZXJ0aWJsZTxSZWZDb3VudGVkVHlwZSosIFRo cmVhZFNhZmVSZWZDb3VudGVkPFJlZkNvdW50ZWRUeXBlPio+Ojp2YWx1ZSwgIlQgaXMgbm90IGNv bnZlcnRpYmxlIHRvIFRocmVhZFNhZmVSZWZDb3VudGVkISIpOworICAgIHN0YXRpY19hc3NlcnQo c3RkOjppc19jb252ZXJ0aWJsZTxSZWZDb3VudGVkVHlwZSosIFRocmVhZFNhZmVSZWZDb3VudGVk QmFzZSo+Ojp2YWx1ZSwgIlQgaXMgbm90IGNvbnZlcnRpYmxlIHRvIFRocmVhZFNhZmVSZWZDb3Vu dGVkISIpOwogCiAgICAgdHlwZWRlZiBSZWZQdHI8UmVmQ291bnRlZFR5cGU+IFR5cGU7CiAgICAg c3RhdGljIFR5cGUgY29weShjb25zdCBUJiByZWZQdHIpCkBAIC05Nyw2ICsxMDEsMTYgQEAgdGVt cGxhdGU8dHlwZW5hbWUgVD4gc3RydWN0IENyb3NzVGhyZWFkQ29waWVyQmFzZTxmYWxzZSwgdHJ1 ZSwgVD4gewogICAgIH0KIH07CiAKK3RlbXBsYXRlPHR5cGVuYW1lIFQ+IHN0cnVjdCBDcm9zc1Ro cmVhZENvcGllckJhc2U8ZmFsc2UsIHRydWUsIFJlZjxUPj4geworICAgIHN0YXRpY19hc3NlcnQo c3RkOjppc19jb252ZXJ0aWJsZTxUKiwgVGhyZWFkU2FmZVJlZkNvdW50ZWRCYXNlKj46OnZhbHVl LCAiVCBpcyBub3QgY29udmVydGlibGUgdG8gVGhyZWFkU2FmZVJlZkNvdW50ZWQhIik7CisKKyAg ICB0eXBlZGVmIFJlZjxUPiBUeXBlOworICAgIHN0YXRpYyBUeXBlIGNvcHkoY29uc3QgVHlwZSYg cmVmKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHJlZjsKKyAgICB9Cit9OworCiB0ZW1wbGF0ZTw+ IHN0cnVjdCBDcm9zc1RocmVhZENvcGllckJhc2U8ZmFsc2UsIGZhbHNlLCBXVEY6OkFTQ0lJTGl0 ZXJhbD4gewogICAgIHR5cGVkZWYgV1RGOjpBU0NJSUxpdGVyYWwgVHlwZTsKICAgICBzdGF0aWMg VHlwZSBjb3B5KGNvbnN0IFR5cGUmIHNvdXJjZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvZmlsZXN5c3RlbWFjY2Vzcy9GaWxlU3lzdGVtU3RvcmFnZUNvbm5lY3Rpb24uaCBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmlsZXN5c3RlbWFjY2Vzcy9GaWxlU3lzdGVtU3RvcmFn ZUNvbm5lY3Rpb24uaAppbmRleCA2ZTM5ZTZlNThmYzg1M2U1OGMzYzAzY2FmNmFlNjQxOGM2OGM1 YzI3Li4xMzdiYjQ4YjZhNDkwNGU0OWY1YTVjM2MwOTQ3MzIxODA2ZjdhZWEzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZpbGVzeXN0ZW1hY2Nlc3MvRmlsZVN5c3RlbVN0b3Jh Z2VDb25uZWN0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9maWxlc3lzdGVtYWNj ZXNzL0ZpbGVTeXN0ZW1TdG9yYWdlQ29ubmVjdGlvbi5oCkBAIC01MSw3ICs1MSw2IEBAIHB1Ymxp YzoKICAgICB1c2luZyBHZXRBY2Nlc3NIYW5kbGVDYWxsYmFjayA9IENvbXBsZXRpb25IYW5kbGVy PHZvaWQoRXhjZXB0aW9uT3I8c3RkOjpwYWlyPEZpbGVTeXN0ZW1TeW5jQWNjZXNzSGFuZGxlSWRl bnRpZmllciwgRmlsZVN5c3RlbTo6UGxhdGZvcm1GaWxlSGFuZGxlPj4mJik+OwogICAgIHVzaW5n IFZvaWRDYWxsYmFjayA9IENvbXBsZXRpb25IYW5kbGVyPHZvaWQoRXhjZXB0aW9uT3I8dm9pZD4m Jik+OwogICAgIHVzaW5nIEdldEhhbmRsZU5hbWVzQ2FsbGJhY2sgPSBDb21wbGV0aW9uSGFuZGxl cjx2b2lkKEV4Y2VwdGlvbk9yPFZlY3RvcjxTdHJpbmc+PiYmKT47Ci0gICAgdXNpbmcgR2V0SGFu ZGxlV2l0aFR5cGVDYWxsYmFjayA9IENvbXBsZXRpb25IYW5kbGVyPHZvaWQoRXhjZXB0aW9uT3I8 c3RkOjpwYWlyPEZpbGVTeXN0ZW1IYW5kbGVJZGVudGlmaWVyLCBib29sPj4mJik+OwogICAgIHVz aW5nIFN0cmluZ0NhbGxiYWNrID0gQ29tcGxldGlvbkhhbmRsZXI8dm9pZChFeGNlcHRpb25PcjxT dHJpbmc+JiYpPjsKIAogICAgIHZpcnR1YWwgYm9vbCBpc1dvcmtlcigpIGNvbnN0IHsgcmV0dXJu IGZhbHNlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZpbGVzeXN0ZW1h Y2Nlc3MvV29ya2VyRmlsZVN5c3RlbVN0b3JhZ2VDb25uZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvZmlsZXN5c3RlbWFjY2Vzcy9Xb3JrZXJGaWxlU3lzdGVtU3RvcmFnZUNvbm5l Y3Rpb24uY3BwCmluZGV4IGIyMmVlMDgxYmZjNzQ5MDBmOGMyYzQ1YWE3YjBhNWE5YzFhNjE5NzAu LmNiM2VjZWJkNDE4ZjllZWY5YjRjNjNhMGJjNGRiMjEwYWU1Y2U3M2QgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvZmlsZXN5c3RlbWFjY2Vzcy9Xb3JrZXJGaWxlU3lzdGVtU3Rv cmFnZUNvbm5lY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmlsZXN5c3Rl bWFjY2Vzcy9Xb3JrZXJGaWxlU3lzdGVtU3RvcmFnZUNvbm5lY3Rpb24uY3BwCkBAIC0xMjksOCAr MTI5LDcgQEAgdm9pZCBXb3JrZXJGaWxlU3lzdGVtU3RvcmFnZUNvbm5lY3Rpb246OmdldEZpbGVI YW5kbGUoRmlsZVN5c3RlbUhhbmRsZUlkZW50aWZpZXIKIAogICAgIGNhbGxPbk1haW5UaHJlYWQo W2NhbGxiYWNrSWRlbnRpZmllciwgd29ya2VyVGhyZWFkID0gUmVmIHsgbV9zY29wZS0+dGhyZWFk KCkgfSwgbWFpblRocmVhZENvbm5lY3Rpb24gPSBtX21haW5UaHJlYWRDb25uZWN0aW9uLCBpZGVu dGlmaWVyLCBuYW1lID0gbmFtZS5pc29sYXRlZENvcHkoKSwgY3JlYXRlSWZOZWNlc3NhcnldKCkg bXV0YWJsZSB7CiAgICAgICAgIGF1dG8gbWFpblRocmVhZENhbGxiYWNrID0gW2NhbGxiYWNrSWRl bnRpZmllciwgd29ya2VyVGhyZWFkID0gV1RGTW92ZSh3b3JrZXJUaHJlYWQpXShhdXRvIHJlc3Vs dCkgbXV0YWJsZSB7Ci0gICAgICAgICAgICBhdXRvIGNyb3NzVGhyZWFkUmVzdWx0ID0gcmVzdWx0 Lmhhc0V4Y2VwdGlvbigpID8gRXhjZXB0aW9uT3I8UmVmPEZpbGVTeXN0ZW1IYW5kbGVDbG9zZVNj b3BlPj4geyBjcm9zc1RocmVhZENvcHkocmVzdWx0LmV4Y2VwdGlvbigpKSB9IDogRXhjZXB0aW9u T3I8UmVmPEZpbGVTeXN0ZW1IYW5kbGVDbG9zZVNjb3BlPj4geyByZXN1bHQucmVsZWFzZVJldHVy blZhbHVlKCkgfTsKLSAgICAgICAgICAgIHdvcmtlclRocmVhZC0+cnVuTG9vcCgpLnBvc3RUYXNr Rm9yTW9kZShbY2FsbGJhY2tJZGVudGlmaWVyLCByZXN1bHQgPSBXVEZNb3ZlKGNyb3NzVGhyZWFk UmVzdWx0KV0gKGF1dG8mIHNjb3BlKSBtdXRhYmxlIHsKKyAgICAgICAgICAgIHdvcmtlclRocmVh ZC0+cnVuTG9vcCgpLnBvc3RUYXNrRm9yTW9kZShbY2FsbGJhY2tJZGVudGlmaWVyLCByZXN1bHQg PSBjcm9zc1RocmVhZENvcHkocmVzdWx0KV0gKGF1dG8mIHNjb3BlKSBtdXRhYmxlIHsKICAgICAg ICAgICAgICAgICBpZiAoYXV0byBjb25uZWN0aW9uID0gZG93bmNhc3Q8V29ya2VyR2xvYmFsU2Nv cGU+KHNjb3BlKS5maWxlU3lzdGVtU3RvcmFnZUNvbm5lY3Rpb24oKSkKICAgICAgICAgICAgICAg ICAgICAgY29ubmVjdGlvbi0+ZGlkR2V0SGFuZGxlKGNhbGxiYWNrSWRlbnRpZmllciwgV1RGTW92 ZShyZXN1bHQpKTsKICAgICAgICAgICAgIH0sIFdvcmtlclJ1bkxvb3A6OmRlZmF1bHRNb2RlKCkp OwpAQCAtMTUwLDggKzE0OSw3IEBAIHZvaWQgV29ya2VyRmlsZVN5c3RlbVN0b3JhZ2VDb25uZWN0 aW9uOjpnZXREaXJlY3RvcnlIYW5kbGUoRmlsZVN5c3RlbUhhbmRsZUlkZW50CiAKICAgICBjYWxs T25NYWluVGhyZWFkKFtjYWxsYmFja0lkZW50aWZpZXIsIHdvcmtlclRocmVhZCA9IFJlZiB7IG1f c2NvcGUtPnRocmVhZCgpIH0sIG1haW5UaHJlYWRDb25uZWN0aW9uID0gbV9tYWluVGhyZWFkQ29u bmVjdGlvbiwgaWRlbnRpZmllciwgbmFtZSA9IG5hbWUuaXNvbGF0ZWRDb3B5KCksIGNyZWF0ZUlm TmVjZXNzYXJ5XSgpIG11dGFibGUgewogICAgICAgICBhdXRvIG1haW5UaHJlYWRDYWxsYmFjayA9 IFtjYWxsYmFja0lkZW50aWZpZXIsIHdvcmtlclRocmVhZCA9IFdURk1vdmUod29ya2VyVGhyZWFk KV0oYXV0byByZXN1bHQpIG11dGFibGUgewotICAgICAgICAgICAgYXV0byBjcm9zc1RocmVhZFJl c3VsdCA9IHJlc3VsdC5oYXNFeGNlcHRpb24oKSA/IEV4Y2VwdGlvbk9yPFJlZjxGaWxlU3lzdGVt SGFuZGxlQ2xvc2VTY29wZT4+IHsgY3Jvc3NUaHJlYWRDb3B5KHJlc3VsdC5leGNlcHRpb24oKSkg fSA6IEV4Y2VwdGlvbk9yPFJlZjxGaWxlU3lzdGVtSGFuZGxlQ2xvc2VTY29wZT4+IHsgcmVzdWx0 LnJlbGVhc2VSZXR1cm5WYWx1ZSgpIH07Ci0gICAgICAgICAgICB3b3JrZXJUaHJlYWQtPnJ1bkxv b3AoKS5wb3N0VGFza0Zvck1vZGUoW2NhbGxiYWNrSWRlbnRpZmllciwgcmVzdWx0ID0gV1RGTW92 ZShjcm9zc1RocmVhZFJlc3VsdCldIChhdXRvJiBzY29wZSkgbXV0YWJsZSB7CisgICAgICAgICAg ICB3b3JrZXJUaHJlYWQtPnJ1bkxvb3AoKS5wb3N0VGFza0Zvck1vZGUoW2NhbGxiYWNrSWRlbnRp ZmllciwgcmVzdWx0ID0gY3Jvc3NUaHJlYWRDb3B5KHJlc3VsdCldIChhdXRvJiBzY29wZSkgbXV0 YWJsZSB7CiAgICAgICAgICAgICAgICAgaWYgKGF1dG8gY29ubmVjdGlvbiA9IGRvd25jYXN0PFdv cmtlckdsb2JhbFNjb3BlPihzY29wZSkuZmlsZVN5c3RlbVN0b3JhZ2VDb25uZWN0aW9uKCkpCiAg ICAgICAgICAgICAgICAgICAgIGNvbm5lY3Rpb24tPmRpZEdldEhhbmRsZShjYWxsYmFja0lkZW50 aWZpZXIsIFdURk1vdmUocmVzdWx0KSk7CiAgICAgICAgICAgICB9LCBXb3JrZXJSdW5Mb29wOjpk ZWZhdWx0TW9kZSgpKTsKQEAgLTM1NSw4ICszNTMsNyBAQCB2b2lkIFdvcmtlckZpbGVTeXN0ZW1T dG9yYWdlQ29ubmVjdGlvbjo6Z2V0SGFuZGxlKEZpbGVTeXN0ZW1IYW5kbGVJZGVudGlmaWVyIGlk ZQogCiAgICAgY2FsbE9uTWFpblRocmVhZChbY2FsbGJhY2tJZGVudGlmaWVyLCB3b3JrZXJUaHJl YWQgPSBSZWYgeyBtX3Njb3BlLT50aHJlYWQoKSB9LCBtYWluVGhyZWFkQ29ubmVjdGlvbiA9IG1f bWFpblRocmVhZENvbm5lY3Rpb24sIGlkZW50aWZpZXIsIG5hbWUgPSBuYW1lLmlzb2xhdGVkQ29w eSgpXSgpIG11dGFibGUgewogICAgICAgICBhdXRvIG1haW5UaHJlYWRDYWxsYmFjayA9IFtjYWxs YmFja0lkZW50aWZpZXIsIHdvcmtlclRocmVhZCA9IFdURk1vdmUod29ya2VyVGhyZWFkKV0oYXV0 byByZXN1bHQpIG11dGFibGUgewotICAgICAgICAgICAgYXV0byBjcm9zc1RocmVhZFJlc3VsdCA9 IHJlc3VsdC5oYXNFeGNlcHRpb24oKSA/IEV4Y2VwdGlvbk9yPFJlZjxGaWxlU3lzdGVtSGFuZGxl Q2xvc2VTY29wZT4+IHsgY3Jvc3NUaHJlYWRDb3B5KHJlc3VsdC5leGNlcHRpb24oKSkgfSA6IEV4 Y2VwdGlvbk9yPFJlZjxGaWxlU3lzdGVtSGFuZGxlQ2xvc2VTY29wZT4+IHsgcmVzdWx0LnJlbGVh c2VSZXR1cm5WYWx1ZSgpIH07Ci0gICAgICAgICAgICB3b3JrZXJUaHJlYWQtPnJ1bkxvb3AoKS5w b3N0VGFza0Zvck1vZGUoW2NhbGxiYWNrSWRlbnRpZmllciwgcmVzdWx0ID0gV1RGTW92ZShjcm9z c1RocmVhZFJlc3VsdCldIChhdXRvJiBzY29wZSkgbXV0YWJsZSB7CisgICAgICAgICAgICB3b3Jr ZXJUaHJlYWQtPnJ1bkxvb3AoKS5wb3N0VGFza0Zvck1vZGUoW2NhbGxiYWNrSWRlbnRpZmllciwg cmVzdWx0ID0gY3Jvc3NUaHJlYWRDb3B5KHJlc3VsdCldIChhdXRvJiBzY29wZSkgbXV0YWJsZSB7 CiAgICAgICAgICAgICAgICAgaWYgKGF1dG8gY29ubmVjdGlvbiA9IGRvd25jYXN0PFdvcmtlckds b2JhbFNjb3BlPihzY29wZSkuZmlsZVN5c3RlbVN0b3JhZ2VDb25uZWN0aW9uKCkpCiAgICAgICAg ICAgICAgICAgICAgIGNvbm5lY3Rpb24tPmRpZEdldEhhbmRsZShjYWxsYmFja0lkZW50aWZpZXIs IFdURk1vdmUocmVzdWx0KSk7CiAgICAgICAgICAgICB9LCBXb3JrZXJSdW5Mb29wOjpkZWZhdWx0 TW9kZSgpKTsKQEAgLTM2NiwxMiArMzYzLDYgQEAgdm9pZCBXb3JrZXJGaWxlU3lzdGVtU3RvcmFn ZUNvbm5lY3Rpb246OmdldEhhbmRsZShGaWxlU3lzdGVtSGFuZGxlSWRlbnRpZmllciBpZGUKICAg ICB9KTsKIH0KIAotdm9pZCBXb3JrZXJGaWxlU3lzdGVtU3RvcmFnZUNvbm5lY3Rpb246OmRpZEdl dEhhbmRsZVdpdGhUeXBlKENhbGxiYWNrSWRlbnRpZmllciBjYWxsYmFja0lkZW50aWZpZXIsIEV4 Y2VwdGlvbk9yPHN0ZDo6cGFpcjxGaWxlU3lzdGVtSGFuZGxlSWRlbnRpZmllciwgYm9vbD4+JiYg cmVzdWx0KQotewotICAgIGlmIChhdXRvIGNhbGxiYWNrID0gbV9nZXRIYW5kbGVXaXRoVHlwZUNh bGxiYWNrcy50YWtlKGNhbGxiYWNrSWRlbnRpZmllcikpCi0gICAgICAgIGNhbGxiYWNrKFdURk1v dmUocmVzdWx0KSk7Ci19Ci0KIHZvaWQgV29ya2VyRmlsZVN5c3RlbVN0b3JhZ2VDb25uZWN0aW9u Ojptb3ZlKEZpbGVTeXN0ZW1IYW5kbGVJZGVudGlmaWVyIGlkZW50aWZpZXIsIEZpbGVTeXN0ZW1I YW5kbGVJZGVudGlmaWVyIGRlc3RpbmF0aW9uSWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBuZXdO YW1lLCBWb2lkQ2FsbGJhY2smJiBjYWxsYmFjaykKIHsKICAgICBpZiAoIW1fc2NvcGUpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZpbGVzeXN0ZW1hY2Nlc3MvV29ya2VyRmls ZVN5c3RlbVN0b3JhZ2VDb25uZWN0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZpbGVz eXN0ZW1hY2Nlc3MvV29ya2VyRmlsZVN5c3RlbVN0b3JhZ2VDb25uZWN0aW9uLmgKaW5kZXggZjU0 ZWUzMDA5YzU3MDQwY2ZiNmZiZWM1Njc3Y2MxOWI5ZGY2N2NmNi4uZTU3N2ZiMWI0Y2VmY2U3ODZi NDQ3YmViZmI1MDk1ZmVhZmVjYzFkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9maWxlc3lzdGVtYWNjZXNzL1dvcmtlckZpbGVTeXN0ZW1TdG9yYWdlQ29ubmVjdGlvbi5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmlsZXN5c3RlbWFjY2Vzcy9Xb3JrZXJGaWxlU3lz dGVtU3RvcmFnZUNvbm5lY3Rpb24uaApAQCAtNTMsNyArNTMsNiBAQCBwdWJsaWM6CiAgICAgdm9p ZCBkaWRDcmVhdGVTeW5jQWNjZXNzSGFuZGxlKENhbGxiYWNrSWRlbnRpZmllciwgRXhjZXB0aW9u T3I8c3RkOjpwYWlyPEZpbGVTeXN0ZW1TeW5jQWNjZXNzSGFuZGxlSWRlbnRpZmllciwgRmlsZVN5 c3RlbTo6UGxhdGZvcm1GaWxlSGFuZGxlPj4mJik7CiAgICAgdm9pZCBjb21wbGV0ZVZvaWRDYWxs YmFjayhDYWxsYmFja0lkZW50aWZpZXIsIEV4Y2VwdGlvbk9yPHZvaWQ+JiYgcmVzdWx0KTsKICAg ICB2b2lkIGRpZEdldEhhbmRsZU5hbWVzKENhbGxiYWNrSWRlbnRpZmllciwgRXhjZXB0aW9uT3I8 VmVjdG9yPFN0cmluZz4+JiYpOwotICAgIHZvaWQgZGlkR2V0SGFuZGxlV2l0aFR5cGUoQ2FsbGJh Y2tJZGVudGlmaWVyLCBFeGNlcHRpb25PcjxzdGQ6OnBhaXI8RmlsZVN5c3RlbUhhbmRsZUlkZW50 aWZpZXIsIGJvb2w+PiYmKTsKIAogcHJpdmF0ZToKICAgICBXb3JrZXJGaWxlU3lzdGVtU3RvcmFn ZUNvbm5lY3Rpb24oV29ya2VyR2xvYmFsU2NvcGUmLCBSZWY8RmlsZVN5c3RlbVN0b3JhZ2VDb25u ZWN0aW9uPiYmKTsKQEAgLTg0LDcgKzgzLDYgQEAgcHJpdmF0ZToKICAgICBIYXNoTWFwPENhbGxi YWNrSWRlbnRpZmllciwgRmlsZVN5c3RlbVN0b3JhZ2VDb25uZWN0aW9uOjpHZXRBY2Nlc3NIYW5k bGVDYWxsYmFjaz4gbV9nZXRBY2Nlc3NIYW5kbENhbGxiYWNrczsKICAgICBIYXNoTWFwPENhbGxi YWNrSWRlbnRpZmllciwgRmlsZVN5c3RlbVN0b3JhZ2VDb25uZWN0aW9uOjpWb2lkQ2FsbGJhY2s+ IG1fdm9pZENhbGxiYWNrczsKICAgICBIYXNoTWFwPENhbGxiYWNrSWRlbnRpZmllciwgRmlsZVN5 c3RlbVN0b3JhZ2VDb25uZWN0aW9uOjpHZXRIYW5kbGVOYW1lc0NhbGxiYWNrPiBtX2dldEhhbmRs ZU5hbWVzQ2FsbGJhY2tzOwotICAgIEhhc2hNYXA8Q2FsbGJhY2tJZGVudGlmaWVyLCBGaWxlU3lz dGVtU3RvcmFnZUNvbm5lY3Rpb246OkdldEhhbmRsZVdpdGhUeXBlQ2FsbGJhY2s+IG1fZ2V0SGFu ZGxlV2l0aFR5cGVDYWxsYmFja3M7CiAgICAgSGFzaE1hcDxDYWxsYmFja0lkZW50aWZpZXIsIEZp bGVTeXN0ZW1TdG9yYWdlQ29ubmVjdGlvbjo6U3RyaW5nQ2FsbGJhY2s+IG1fc3RyaW5nQ2FsbGJh Y2tzOwogICAgIEhhc2hNYXA8RmlsZVN5c3RlbVN5bmNBY2Nlc3NIYW5kbGVJZGVudGlmaWVyLCBG dW5jdGlvbjx2b2lkKCk+PiBtX2FjY2Vzc0hhbmRsZUludmFsaWRhdGlvbkhhbmRsZXJzOwogICAg IEhhc2hNYXA8RmlsZVN5c3RlbVN5bmNBY2Nlc3NIYW5kbGVJZGVudGlmaWVyLCBXZWFrUHRyPEZp bGVTeXN0ZW1TeW5jQWNjZXNzSGFuZGxlPj4gbV9zeW5jQWNjZXNzSGFuZGxlczsK