115309 2013-04-27 13:07:11 -0700 Replace uses of StorageTask with StorageThread::dispatch and WTF::bind 2013-04-27 13:27:27 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 882209 0 andersca 2013-04-27 13:07:11 -0700 Replace uses of StorageTask with StorageThread::dispatch and WTF::bind 882210 1 199910 andersca 2013-04-27 13:07:51 -0700 Created attachment 199910 Patch 882213 2 199910 kling 2013-04-27 13:25:24 -0700 Comment on attachment 199910 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=199910&action=review r=me > Source/WebCore/storage/StorageTask.cpp:94 > break; This line should also be removed. > Source/WebCore/storage/StorageTracker.cpp:391 > + m_thread->dispatch(bind(&StorageTracker::syncDeleteAllOrigins, this)); Dispatching a "sync" method sure looks odd. 882214 3 andersca 2013-04-27 13:27:27 -0700 Committed r149242: <http://trac.webkit.org/changeset/149242> 199910 2013-04-27 13:07:51 -0700 2013-04-27 13:25:24 -0700 Patch bug-115309-20130427130710.patch text/plain 10700 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5MjQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWFkYzZmMzZmOWRhMzYy MGY4ZDNlMDAwOTJmMDFiZjQ3ZWJlYzM2Ny4uMzMxZTMyYzMxMmQ3NzIxYzBhNzExMjAxNzk3ODUz MWZlNTM1NTM2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEzLTA0LTI3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVwbGFjZSB1c2Vz IG9mIFN0b3JhZ2VUYXNrIHdpdGggU3RvcmFnZVRocmVhZDo6ZGlzcGF0Y2ggYW5kIFdURjo6Ymlu ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1MzA5 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzdG9y YWdlL1N0b3JhZ2VUYXNrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VUYXNrOjpTdG9y YWdlVGFzayk6CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdlVGFzazo6cGVyZm9ybVRhc2spOgor ICAgICAgICAqIHN0b3JhZ2UvU3RvcmFnZVRhc2suaDoKKyAgICAgICAgKiBzdG9yYWdlL1N0b3Jh Z2VUaHJlYWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZVRocmVhZDo6dGVybWluYXRl KToKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VUaHJlYWQ6OnJlbGVhc2VGYXN0TWFsbG9jRnJl ZU1lbW9yeUluQWxsVGhyZWFkcyk6CisgICAgICAgICogc3RvcmFnZS9TdG9yYWdlVGhyZWFkLmg6 CisgICAgICAgICogc3RvcmFnZS9TdG9yYWdlVHJhY2tlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTdG9yYWdlVHJhY2tlcjo6aW1wb3J0T3JpZ2luSWRlbnRpZmllcnMpOgorICAgICAgICAoV2Vi Q29yZTo6U3RvcmFnZVRyYWNrZXI6OmRlbGV0ZUFsbE9yaWdpbnMpOgorCisyMDEzLTA0LTI3ICBB bmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgQWRkIFN0b3Jh Z2VUaHJlYWQ6OmRpc3BhdGNoCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTUzMDgKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9T dG9yYWdlVGFzay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VUYXNrLmNwcApp bmRleCAzNGFjNDNiNDE1N2E1ZjMxZWViZGU0MzA5MTZiNjYyMDJiNDczYmY5Li5lYTczZmNmMGMz NGMxZmVkNzNjYzU0N2YyOTkxN2Q1ZTZiNmZkYzBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9zdG9yYWdlL1N0b3JhZ2VUYXNrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0 b3JhZ2VUYXNrLmNwcApAQCAtMzYsNyArMzYsNiBAQCBTdG9yYWdlVGFzazo6U3RvcmFnZVRhc2so VHlwZSB0eXBlLCBjb25zdCBGdW5jdGlvbjx2b2lkKCk+JiBmdW5jdGlvbikKICAgICA6IG1fdHlw ZSh0eXBlKQogICAgICwgbV9mdW5jdGlvbihmdW5jdGlvbikKICAgICAsIG1fYXJlYSgwKQotICAg ICwgbV90aHJlYWQoMCkKIHsKICAgICBBU1NFUlQoIW1fZnVuY3Rpb24uaXNOdWxsKCkpOwogICAg IEFTU0VSVChtX3R5cGUgPT0gRGlzcGF0Y2gpOwpAQCAtNDUsMzMgKzQ0LDE0IEBAIFN0b3JhZ2VU YXNrOjpTdG9yYWdlVGFzayhUeXBlIHR5cGUsIGNvbnN0IEZ1bmN0aW9uPHZvaWQoKT4mIGZ1bmN0 aW9uKQogU3RvcmFnZVRhc2s6OlN0b3JhZ2VUYXNrKFR5cGUgdHlwZSwgU3RvcmFnZUFyZWFTeW5j KiBhcmVhKQogICAgIDogbV90eXBlKHR5cGUpCiAgICAgLCBtX2FyZWEoYXJlYSkKLSAgICAsIG1f dGhyZWFkKDApCiB7CiAgICAgQVNTRVJUKG1fYXJlYSk7CiAgICAgQVNTRVJUKG1fdHlwZSA9PSBB cmVhSW1wb3J0IHx8IG1fdHlwZSA9PSBBcmVhU3luYyB8fCBtX3R5cGUgPT0gRGVsZXRlRW1wdHlE YXRhYmFzZSk7CiB9CiAKLVN0b3JhZ2VUYXNrOjpTdG9yYWdlVGFzayhUeXBlIHR5cGUsIFN0b3Jh Z2VUaHJlYWQqIHRocmVhZCkKLSAgICA6IG1fdHlwZSh0eXBlKQotICAgICwgbV9hcmVhKDApCi0g ICAgLCBtX3RocmVhZCh0aHJlYWQpCi17Ci0gICAgQVNTRVJUKG1fdGhyZWFkKTsKLSAgICBBU1NF UlQobV90eXBlID09IFRlcm1pbmF0ZVRocmVhZCk7Ci19Ci0KLVN0b3JhZ2VUYXNrOjpTdG9yYWdl VGFzayhUeXBlIHR5cGUpCi0gICAgOiBtX3R5cGUodHlwZSkKLSAgICAsIG1fYXJlYSgwKQotICAg ICwgbV90aHJlYWQoMCkKLXsKLSAgICBBU1NFUlQobV90eXBlID09IEltcG9ydE9yaWdpbnMgfHwg bV90eXBlID09IERlbGV0ZUFsbE9yaWdpbnMgfHwgbV90eXBlID09IFJlbGVhc2VGYXN0TWFsbG9j RnJlZU1lbW9yeSk7Ci19Ci0KIFN0b3JhZ2VUYXNrOjpTdG9yYWdlVGFzayhUeXBlIHR5cGUsIGNv bnN0IFN0cmluZyYgb3JpZ2luSWRlbnRpZmllcikKICAgICA6IG1fdHlwZSh0eXBlKQogICAgICwg bV9hcmVhKDApCi0gICAgLCBtX3RocmVhZCgwKQogICAgICwgbV9vcmlnaW5JZGVudGlmaWVyKG9y aWdpbklkZW50aWZpZXIpCiB7CiAgICAgQVNTRVJUKG1fdHlwZSA9PSBEZWxldGVPcmlnaW4pOwpA QCAtODAsNyArNjAsNiBAQCBTdG9yYWdlVGFzazo6U3RvcmFnZVRhc2soVHlwZSB0eXBlLCBjb25z dCBTdHJpbmcmIG9yaWdpbklkZW50aWZpZXIpCiBTdG9yYWdlVGFzazo6U3RvcmFnZVRhc2soVHlw ZSB0eXBlLCBjb25zdCBTdHJpbmcmIG9yaWdpbklkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgZGF0 YWJhc2VGaWxlbmFtZSkKICAgICA6IG1fdHlwZSh0eXBlKQogICAgICwgbV9hcmVhKDApCi0gICAg LCBtX3RocmVhZCgwKQogICAgICwgbV9vcmlnaW5JZGVudGlmaWVyKG9yaWdpbklkZW50aWZpZXIp CiAgICAgLCBtX2RhdGFiYXNlRmlsZW5hbWUoZGF0YWJhc2VGaWxlbmFtZSkKIHsKQEAgLTEwNiwy MyArODUsMTIgQEAgdm9pZCBTdG9yYWdlVGFzazo6cGVyZm9ybVRhc2soKQogICAgICAgICBjYXNl IFNldE9yaWdpbkRldGFpbHM6CiAgICAgICAgICAgICBTdG9yYWdlVHJhY2tlcjo6dHJhY2tlcigp LnN5bmNTZXRPcmlnaW5EZXRhaWxzKG1fb3JpZ2luSWRlbnRpZmllciwgbV9kYXRhYmFzZUZpbGVu YW1lKTsKICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIEltcG9ydE9yaWdpbnM6Ci0g ICAgICAgICAgICBTdG9yYWdlVHJhY2tlcjo6dHJhY2tlcigpLnN5bmNJbXBvcnRPcmlnaW5JZGVu dGlmaWVycygpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgRGVsZXRlQWxsT3Jp Z2luczoKLSAgICAgICAgICAgIFN0b3JhZ2VUcmFja2VyOjp0cmFja2VyKCkuc3luY0RlbGV0ZUFs bE9yaWdpbnMoKTsKLSAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIERlbGV0ZU9yaWdp bjoKICAgICAgICAgICAgIFN0b3JhZ2VUcmFja2VyOjp0cmFja2VyKCkuc3luY0RlbGV0ZU9yaWdp bihtX29yaWdpbklkZW50aWZpZXIpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2Ug RGVsZXRlRW1wdHlEYXRhYmFzZToKICAgICAgICAgICAgIG1fYXJlYS0+ZGVsZXRlRW1wdHlEYXRh YmFzZSgpOwogICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgUmVsZWFzZUZhc3RNYWxs b2NGcmVlTWVtb3J5OgotICAgICAgICAgICAgV1RGOjpyZWxlYXNlRmFzdE1hbGxvY0ZyZWVNZW1v cnkoKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIFRlcm1pbmF0ZVRocmVhZDoK LSAgICAgICAgICAgIG1fdGhyZWFkLT5wZXJmb3JtVGVybWluYXRlKCk7CiAgICAgICAgICAgICBi cmVhazsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3Jh Z2VUYXNrLmggYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VUYXNrLmgKaW5kZXggNjll YTU1YjMyMGJkNTIzMzhjMTEzNTU4ZGRlZTlkOGE3ZTI4NGZjYy4uYmM4MTg3NjQyMjZkM2QzODRh MGQ3YjliMThlYWJlMDljMjIxNmU1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3RvcmFn ZS9TdG9yYWdlVGFzay5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZVRhc2su aApAQCAtMzQsMTIgKzM0LDExIEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICBjbGFzcyBT dG9yYWdlQXJlYVN5bmM7Ci0gICAgY2xhc3MgU3RvcmFnZVRocmVhZDsKIAogICAgIGNsYXNzIFN0 b3JhZ2VUYXNrIHsKICAgICAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoU3RvcmFnZVRhc2spOyBX VEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKICAgICBwdWJsaWM6Ci0gICAgICAgIGVudW0gVHlwZSB7 IERpc3BhdGNoLCBBcmVhSW1wb3J0LCBBcmVhU3luYywgRGVsZXRlRW1wdHlEYXRhYmFzZSwgU2V0 T3JpZ2luRGV0YWlscywgSW1wb3J0T3JpZ2lucywgRGVsZXRlQWxsT3JpZ2lucywgRGVsZXRlT3Jp Z2luLCBSZWxlYXNlRmFzdE1hbGxvY0ZyZWVNZW1vcnksIFRlcm1pbmF0ZVRocmVhZCB9OworICAg ICAgICBlbnVtIFR5cGUgeyBEaXNwYXRjaCwgQXJlYUltcG9ydCwgQXJlYVN5bmMsIERlbGV0ZUVt cHR5RGF0YWJhc2UsIFNldE9yaWdpbkRldGFpbHMsIERlbGV0ZU9yaWdpbiB9OwogCiAgICAgICAg IH5TdG9yYWdlVGFzaygpOwogCkBAIC00NywyNyArNDYsMjAgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgICAgICBzdGF0aWMgUGFzc093blB0cjxTdG9yYWdlVGFzaz4gY3JlYXRlSW1wb3J0KFN0 b3JhZ2VBcmVhU3luYyogYXJlYSkgeyByZXR1cm4gYWRvcHRQdHIobmV3IFN0b3JhZ2VUYXNrKEFy ZWFJbXBvcnQsIGFyZWEpKTsgfQogICAgICAgICBzdGF0aWMgUGFzc093blB0cjxTdG9yYWdlVGFz az4gY3JlYXRlU3luYyhTdG9yYWdlQXJlYVN5bmMqIGFyZWEpIHsgcmV0dXJuIGFkb3B0UHRyKG5l dyBTdG9yYWdlVGFzayhBcmVhU3luYywgYXJlYSkpOyB9CiAgICAgICAgIHN0YXRpYyBQYXNzT3du UHRyPFN0b3JhZ2VUYXNrPiBjcmVhdGVEZWxldGVFbXB0eURhdGFiYXNlKFN0b3JhZ2VBcmVhU3lu YyogYXJlYSkgeyByZXR1cm4gYWRvcHRQdHIobmV3IFN0b3JhZ2VUYXNrKERlbGV0ZUVtcHR5RGF0 YWJhc2UsIGFyZWEpKTsgfQotICAgICAgICBzdGF0aWMgUGFzc093blB0cjxTdG9yYWdlVGFzaz4g Y3JlYXRlT3JpZ2luSWRlbnRpZmllcnNJbXBvcnQoKSB7IHJldHVybiBhZG9wdFB0cihuZXcgU3Rv cmFnZVRhc2soSW1wb3J0T3JpZ2lucykpOyB9CiAgICAgICAgIHN0YXRpYyBQYXNzT3duUHRyPFN0 b3JhZ2VUYXNrPiBjcmVhdGVTZXRPcmlnaW5EZXRhaWxzKGNvbnN0IFN0cmluZyYgb3JpZ2luSWRl bnRpZmllciwgY29uc3QgU3RyaW5nJiBkYXRhYmFzZUZpbGVuYW1lKSB7IHJldHVybiBhZG9wdFB0 cihuZXcgU3RvcmFnZVRhc2soU2V0T3JpZ2luRGV0YWlscywgb3JpZ2luSWRlbnRpZmllciwgZGF0 YWJhc2VGaWxlbmFtZSkpOyB9CiAgICAgICAgIHN0YXRpYyBQYXNzT3duUHRyPFN0b3JhZ2VUYXNr PiBjcmVhdGVEZWxldGVPcmlnaW4oY29uc3QgU3RyaW5nJiBvcmlnaW5JZGVudGlmaWVyKSB7IHJl dHVybiBhZG9wdFB0cihuZXcgU3RvcmFnZVRhc2soRGVsZXRlT3JpZ2luLCBvcmlnaW5JZGVudGlm aWVyKSk7IH0KLSAgICAgICAgc3RhdGljIFBhc3NPd25QdHI8U3RvcmFnZVRhc2s+IGNyZWF0ZURl bGV0ZUFsbE9yaWdpbnMoKSB7IHJldHVybiBhZG9wdFB0cihuZXcgU3RvcmFnZVRhc2soRGVsZXRl QWxsT3JpZ2lucykpOyB9Ci0gICAgICAgIHN0YXRpYyBQYXNzT3duUHRyPFN0b3JhZ2VUYXNrPiBj cmVhdGVSZWxlYXNlRmFzdE1hbGxvY0ZyZWVNZW1vcnkoKSB7IHJldHVybiBhZG9wdFB0cihuZXcg U3RvcmFnZVRhc2soUmVsZWFzZUZhc3RNYWxsb2NGcmVlTWVtb3J5KSk7IH0KLSAgICAgICAgc3Rh dGljIFBhc3NPd25QdHI8U3RvcmFnZVRhc2s+IGNyZWF0ZVRlcm1pbmF0ZShTdG9yYWdlVGhyZWFk KiB0aHJlYWQpIHsgcmV0dXJuIGFkb3B0UHRyKG5ldyBTdG9yYWdlVGFzayhUZXJtaW5hdGVUaHJl YWQsIHRocmVhZCkpOyB9CiAKICAgICAgICAgdm9pZCBwZXJmb3JtVGFzaygpOwogCiAgICAgcHJp dmF0ZToKICAgICAgICAgU3RvcmFnZVRhc2soVHlwZSwgY29uc3QgRnVuY3Rpb248dm9pZCgpPiYp OwogICAgICAgICBTdG9yYWdlVGFzayhUeXBlLCBTdG9yYWdlQXJlYVN5bmMqKTsKLSAgICAgICAg U3RvcmFnZVRhc2soVHlwZSwgU3RvcmFnZVRocmVhZCopOwogICAgICAgICBTdG9yYWdlVGFzayhU eXBlLCBjb25zdCBTdHJpbmcmIG9yaWdpbklkZW50aWZpZXIpOwogICAgICAgICBTdG9yYWdlVGFz ayhUeXBlLCBjb25zdCBTdHJpbmcmIG9yaWdpbklkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgZGF0 YWJhc2VGaWxlbmFtZSk7Ci0gICAgICAgIGV4cGxpY2l0IFN0b3JhZ2VUYXNrKFR5cGUpOwogCiAg ICAgICAgIFR5cGUgbV90eXBlOwogICAgICAgICBGdW5jdGlvbjx2b2lkICgpPiBtX2Z1bmN0aW9u OwogICAgICAgICBTdG9yYWdlQXJlYVN5bmMqIG1fYXJlYTsKLSAgICAgICAgU3RvcmFnZVRocmVh ZCogbV90aHJlYWQ7CiAgICAgICAgIFN0cmluZyBtX29yaWdpbklkZW50aWZpZXI7CiAgICAgICAg IFN0cmluZyBtX2RhdGFiYXNlRmlsZW5hbWU7CiAgICAgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZVRocmVhZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdl L1N0b3JhZ2VUaHJlYWQuY3BwCmluZGV4IDdmMDkxYmM3NWI4NWQyYTM3OWYwM2Y3MmZkMWE2MjYy NzE5OTEyYWMuLjFkMmQ3NmUyOGE4YmYzMDhkYWJlMGM4ZTgxYzFjNzMwZmNiYmY5NGIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZVRocmVhZC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlVGhyZWFkLmNwcApAQCAtMTA0LDcgKzEwNCw3IEBA IHZvaWQgU3RvcmFnZVRocmVhZDo6dGVybWluYXRlKCkKICAgICBpZiAoIW1fdGhyZWFkSUQpCiAg ICAgICAgIHJldHVybjsKIAotICAgIG1fcXVldWUuYXBwZW5kKFN0b3JhZ2VUYXNrOjpjcmVhdGVU ZXJtaW5hdGUodGhpcykpOworICAgIG1fcXVldWUuYXBwZW5kKFN0b3JhZ2VUYXNrOjpjcmVhdGVE aXNwYXRjaChiaW5kKCZTdG9yYWdlVGhyZWFkOjpwZXJmb3JtVGVybWluYXRlLCB0aGlzKSkpOwog ICAgIHdhaXRGb3JUaHJlYWRDb21wbGV0aW9uKG1fdGhyZWFkSUQpOwogICAgIEFTU0VSVChtX3F1 ZXVlLmtpbGxlZCgpKTsKICAgICBtX3RocmVhZElEID0gMDsKQEAgLTExOSw5ICsxMTksOSBAQCB2 b2lkIFN0b3JhZ2VUaHJlYWQ6OnBlcmZvcm1UZXJtaW5hdGUoKQogdm9pZCBTdG9yYWdlVGhyZWFk OjpyZWxlYXNlRmFzdE1hbGxvY0ZyZWVNZW1vcnlJbkFsbFRocmVhZHMoKQogewogICAgIEhhc2hT ZXQ8U3RvcmFnZVRocmVhZCo+JiB0aHJlYWRzID0gYWN0aXZlU3RvcmFnZVRocmVhZHMoKTsKLSAg ICBIYXNoU2V0PFN0b3JhZ2VUaHJlYWQqPjo6aXRlcmF0b3IgZW5kID0gdGhyZWFkcy5lbmQoKTsK LSAgICBmb3IgKEhhc2hTZXQ8U3RvcmFnZVRocmVhZCo+OjppdGVyYXRvciBpdCA9IHRocmVhZHMu YmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KQotICAgICAgICAoKml0KS0+c2NoZWR1bGVUYXNrKFN0 b3JhZ2VUYXNrOjpjcmVhdGVSZWxlYXNlRmFzdE1hbGxvY0ZyZWVNZW1vcnkoKSk7CisKKyAgICBm b3IgKEhhc2hTZXQ8U3RvcmFnZVRocmVhZCo+OjppdGVyYXRvciBpdCA9IHRocmVhZHMuYmVnaW4o KSwgZW5kID0gdGhyZWFkcy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KQorICAgICAgICAoKml0KS0+ ZGlzcGF0Y2goYmluZChXVEY6OnJlbGVhc2VGYXN0TWFsbG9jRnJlZU1lbW9yeSkpOwogfQogCiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VUaHJlYWQuaCBiL1Nv dXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZVRocmVhZC5oCmluZGV4IDQyYjIyZTBmODg2Nzhm NWZjNjJmYTIxYzdmOWEyODEzZDRkNGZlMzguLjMyMWQyMDVhMTY0NDBiNjRiYTllYzk3YjZiOGQ2 NDU4NzhkZGM2ZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZVRo cmVhZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZVRocmVhZC5oCkBAIC0z NSwzNiArMzUsMzYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0gICAgY2xhc3MgU3RvcmFn ZUFyZWFTeW5jOwotICAgIGNsYXNzIFN0b3JhZ2VUYXNrOworY2xhc3MgU3RvcmFnZUFyZWFTeW5j OworY2xhc3MgU3RvcmFnZVRhc2s7CiAKLSAgICBjbGFzcyBTdG9yYWdlVGhyZWFkIHsKLSAgICAg ICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoU3RvcmFnZVRocmVhZCk7IFdURl9NQUtFX0ZBU1RfQUxM T0NBVEVEOwotICAgIHB1YmxpYzoKLSAgICAgICAgc3RhdGljIFBhc3NPd25QdHI8U3RvcmFnZVRo cmVhZD4gY3JlYXRlKCk7Ci0gICAgICAgIH5TdG9yYWdlVGhyZWFkKCk7CitjbGFzcyBTdG9yYWdl VGhyZWFkIHsKKyAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShTdG9yYWdlVGhyZWFkKTsgV1RGX01B S0VfRkFTVF9BTExPQ0FURUQ7CitwdWJsaWM6CisgICAgc3RhdGljIFBhc3NPd25QdHI8U3RvcmFn ZVRocmVhZD4gY3JlYXRlKCk7CisgICAgflN0b3JhZ2VUaHJlYWQoKTsKIAotICAgICAgICBib29s IHN0YXJ0KCk7Ci0gICAgICAgIHZvaWQgdGVybWluYXRlKCk7Ci0gICAgICAgIHZvaWQgc2NoZWR1 bGVUYXNrKFBhc3NPd25QdHI8U3RvcmFnZVRhc2s+KTsKKyAgICBib29sIHN0YXJ0KCk7CisgICAg dm9pZCB0ZXJtaW5hdGUoKTsKKyAgICB2b2lkIHNjaGVkdWxlVGFzayhQYXNzT3duUHRyPFN0b3Jh Z2VUYXNrPik7CiAKLSAgICAgICAgdm9pZCBkaXNwYXRjaChjb25zdCBGdW5jdGlvbjx2b2lkKCk+ Jik7CisgICAgdm9pZCBkaXNwYXRjaChjb25zdCBGdW5jdGlvbjx2b2lkKCk+Jik7CiAKLSAgICAg ICAgLy8gQmFja2dyb3VuZCB0aHJlYWQgcGFydCBvZiB0aGUgdGVybWluYXRlIHByb2NlZHVyZS4K LSAgICAgICAgdm9pZCBwZXJmb3JtVGVybWluYXRlKCk7CisgICAgc3RhdGljIHZvaWQgcmVsZWFz ZUZhc3RNYWxsb2NGcmVlTWVtb3J5SW5BbGxUaHJlYWRzKCk7CiAKLSAgICAgICAgc3RhdGljIHZv aWQgcmVsZWFzZUZhc3RNYWxsb2NGcmVlTWVtb3J5SW5BbGxUaHJlYWRzKCk7Citwcml2YXRlOgor ICAgIFN0b3JhZ2VUaHJlYWQoKTsKIAotICAgIHByaXZhdGU6Ci0gICAgICAgIFN0b3JhZ2VUaHJl YWQoKTsKKyAgICAvLyBDYWxsZWQgb24gYmFja2dyb3VuZCB0aHJlYWQuCisgICAgc3RhdGljIHZv aWQgdGhyZWFkRW50cnlQb2ludENhbGxiYWNrKHZvaWQqKTsKKyAgICB2b2lkIHRocmVhZEVudHJ5 UG9pbnQoKTsKIAotICAgICAgICAvLyBDYWxsZWQgb24gYmFja2dyb3VuZCB0aHJlYWQuCi0gICAg ICAgIHN0YXRpYyB2b2lkIHRocmVhZEVudHJ5UG9pbnRDYWxsYmFjayh2b2lkKik7Ci0gICAgICAg IHZvaWQgdGhyZWFkRW50cnlQb2ludCgpOworICAgIC8vIEJhY2tncm91bmQgdGhyZWFkIHBhcnQg b2YgdGhlIHRlcm1pbmF0ZSBwcm9jZWR1cmUuCisgICAgdm9pZCBwZXJmb3JtVGVybWluYXRlKCk7 CiAKLSAgICAgICAgVGhyZWFkSWRlbnRpZmllciBtX3RocmVhZElEOwotICAgICAgICBNZXNzYWdl UXVldWU8U3RvcmFnZVRhc2s+IG1fcXVldWU7Ci0gICAgfTsKKyAgICBUaHJlYWRJZGVudGlmaWVy IG1fdGhyZWFkSUQ7CisgICAgTWVzc2FnZVF1ZXVlPFN0b3JhZ2VUYXNrPiBtX3F1ZXVlOworfTsK IAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9z dG9yYWdlL1N0b3JhZ2VUcmFja2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFn ZVRyYWNrZXIuY3BwCmluZGV4IDQyYTUzNmY2OTNkYWVhYzAwNzIyOWFkMmUwZThhMDkwMmQ5MjY2 ZmYuLmVmMzgyYmZjZDcwYTkzNTg5YTA5MmE5NmViYjVjZTRkZTE0Y2M4NDggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZVRyYWNrZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZVRyYWNrZXIuY3BwCkBAIC0xNjgsNyArMTY4LDcgQEAgdm9p ZCBTdG9yYWdlVHJhY2tlcjo6aW1wb3J0T3JpZ2luSWRlbnRpZmllcnMoKQogICAgIEFTU0VSVChp c01haW5UaHJlYWQoKSk7CiAgICAgQVNTRVJUKG1fdGhyZWFkKTsKIAotICAgIG1fdGhyZWFkLT5z Y2hlZHVsZVRhc2soU3RvcmFnZVRhc2s6OmNyZWF0ZU9yaWdpbklkZW50aWZpZXJzSW1wb3J0KCkp OworICAgIG1fdGhyZWFkLT5kaXNwYXRjaChiaW5kKCZTdG9yYWdlVHJhY2tlcjo6c3luY0ltcG9y dE9yaWdpbklkZW50aWZpZXJzLCB0aGlzKSk7CiB9CiAKIHZvaWQgU3RvcmFnZVRyYWNrZXI6Om5v dGlmeUZpbmlzaGVkSW1wb3J0aW5nT3JpZ2luSWRlbnRpZmllcnNPbk1haW5UaHJlYWQodm9pZCop CkBAIC0zODcsOCArMzg3LDggQEAgdm9pZCBTdG9yYWdlVHJhY2tlcjo6ZGVsZXRlQWxsT3JpZ2lu cygpCiAgICAgfQogCiAgICAgUGFnZUdyb3VwOjpjbGVhckxvY2FsU3RvcmFnZUZvckFsbE9yaWdp bnMoKTsKLSAgICAKLSAgICBtX3RocmVhZC0+c2NoZWR1bGVUYXNrKFN0b3JhZ2VUYXNrOjpjcmVh dGVEZWxldGVBbGxPcmlnaW5zKCkpOworCisgICAgbV90aHJlYWQtPmRpc3BhdGNoKGJpbmQoJlN0 b3JhZ2VUcmFja2VyOjpzeW5jRGVsZXRlQWxsT3JpZ2lucywgdGhpcykpOwogfQogICAgIAogdm9p ZCBTdG9yYWdlVHJhY2tlcjo6c3luY0RlbGV0ZUFsbE9yaWdpbnMoKQo=