147706 2015-08-05 16:44:09 -0700 Move the last DatabaseBackendBase functions over to Database 2015-08-05 16:50:18 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1115178 0 andersca 2015-08-05 16:44:09 -0700 Move the last DatabaseBackendBase functions over to Database 1115179 1 258321 andersca 2015-08-05 16:44:32 -0700 Created attachment 258321 Patch 1115182 2 andersca 2015-08-05 16:50:18 -0700 Committed r188004: <http://trac.webkit.org/changeset/188004> 258321 2015-08-05 16:44:32 -0700 2015-08-05 16:47:03 -0700 Patch bug-147706-20150805164424.patch text/plain 17159 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3OTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDJlODg1Nzg4YTgyYTk5 NDE1MzM0M2FkYmM5ODMyOWY2OWFhYzA1ZC4uNTRjOTU0MTRmNjgwNzM1NWU0MzEzYWVkZWRkYjVi MGUxYzcyYWZhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ4IEBACisyMDE1LTA4LTA1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSB0aGUgbGFz dCBEYXRhYmFzZUJhY2tlbmRCYXNlIGZ1bmN0aW9ucyBvdmVyIHRvIERhdGFiYXNlCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc3MDYKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1vZHVsZXMvd2ViZGF0 YWJhc2UvRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2U6On5EYXRhYmFz ZSk6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZTo6c2V0RXhwZWN0ZWRWZXJzaW9uKToKKyAg ICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlOjpnZXRBY3R1YWxWZXJzaW9uRm9yVHJhbnNhY3Rpb24p OgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2U6OnZlcnNpb24pOgorICAgICAgICAoV2ViQ29y ZTo6RGF0YWJhc2U6OnN0cmluZ0lkZW50aWZpZXIpOgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJh c2U6OmRpc3BsYXlOYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlOjplc3RpbWF0ZWRT aXplKToKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlOjpmaWxlTmFtZSk6CisgICAgICAgIChX ZWJDb3JlOjpEYXRhYmFzZTo6ZGV0YWlscyk6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZTo6 bWF4aW11bVNpemUpOgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2U6OmRhdGFiYXNlRGVidWdO YW1lKToKKyAgICAgICAgKiBNb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlLmg6CisgICAgICAg ICogTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZUJhY2tlbmRCYXNlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkRhdGFiYXNlQmFja2VuZEJhc2U6OmRhdGFiYXNlRGVidWdOYW1lKTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlQmFja2VuZEJhc2U6On5EYXRhYmFzZUJhY2tl bmRCYXNlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlQmFja2VuZEJhc2U6 OnZlcnNpb24pOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VCYWNrZW5kQmFz ZTo6c2VjdXJpdHlPcmlnaW4pOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VC YWNrZW5kQmFzZTo6c3RyaW5nSWRlbnRpZmllcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpEYXRhYmFzZUJhY2tlbmRCYXNlOjpkaXNwbGF5TmFtZSk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJDb3JlOjpEYXRhYmFzZUJhY2tlbmRCYXNlOjplc3RpbWF0ZWRTaXplKTogRGVsZXRlZC4KKyAg ICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlQmFja2VuZEJhc2U6OmZpbGVOYW1lKTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlQmFja2VuZEJhc2U6OmRldGFpbHMpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VCYWNrZW5kQmFzZTo6c2V0RXhwZWN0ZWRWZXJz aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlQmFja2VuZEJhc2U6Omdl dEFjdHVhbFZlcnNpb25Gb3JUcmFuc2FjdGlvbik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpEYXRhYmFzZUJhY2tlbmRCYXNlOjptYXhpbXVtU2l6ZSk6IERlbGV0ZWQuCisgICAgICAgICog TW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZUJhY2tlbmRCYXNlLmg6CisgICAgICAgIChXZWJD b3JlOjpEYXRhYmFzZUJhY2tlbmRCYXNlOjpvcGVuZWQpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6RGF0YWJhc2VCYWNrZW5kQmFzZTo6aXNOZXcpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6RGF0YWJhc2VCYWNrZW5kQmFzZTo6c3FsaXRlRGF0YWJhc2UpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6RGF0YWJhc2VCYWNrZW5kQmFzZTo6ZXhwZWN0ZWRWZXJzaW9uKTogRGVs ZXRlZC4KKyAgICAgICAgKiBNb2R1bGVzL3dlYmRhdGFiYXNlL1NRTFRyYW5zYWN0aW9uQ2xpZW50 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNRTFRyYW5zYWN0aW9uQ2xpZW50OjpkaWRDb21taXRX cml0ZVRyYW5zYWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlNRTFRyYW5zYWN0aW9uQ2xpZW50 OjpkaWRFeGNlZWRRdW90YSk6CisgICAgICAgICogTW9kdWxlcy93ZWJkYXRhYmFzZS9TUUxUcmFu c2FjdGlvbkNsaWVudC5oOgorCiAyMDE1LTA4LTA1ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNj YUBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBtb3JlIGZ1bmN0aW9ucyBmcm9tIERhdGFiYXNl QmFja2VuZEJhc2UgdG8gRGF0YWJhc2UKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0NzcwNQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vi ZGF0YWJhc2UvRGF0YWJhc2UuY3BwCmluZGV4IDYwZjU0M2Y3MmQ3YmEzMDExY2E2ZWY5ODE5MDVj MGVhM2U3ZTVmY2UuLjViZjA0YTA1NTRmZmMyZmNkZjIxZDM1ZTVhYmYxYmJhMjg5OTU0M2QgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2UuY3BwCkBA IC0yMjgsNiArMjI4LDE3IEBAIERhdGFiYXNlOjp+RGF0YWJhc2UoKQogICAgICAgICAgICAgUmVm UHRyPFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ+IHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQocGFzc2Vk Q29udGV4dCk7CiAgICAgICAgIH19KTsKICAgICB9CisKKyAgICAvLyBTUUxpdGUgaXMgIm11bHRp LXRocmVhZCBzYWZlIiwgYnV0IGVhY2ggZGF0YWJhc2UgaGFuZGxlIGNhbiBvbmx5IGJlIHVzZWQK KyAgICAvLyBvbiBhIHNpbmdsZSB0aHJlYWQgYXQgYSB0aW1lLgorICAgIC8vCisgICAgLy8gRm9y IERhdGFiYXNlQmFja2VuZCwgd2Ugb3BlbiB0aGUgU1FMaXRlIGRhdGFiYXNlIG9uIHRoZSBEYXRh YmFzZVRocmVhZCwKKyAgICAvLyBhbmQgaGVuY2Ugd2Ugc2hvdWxkIGFsc28gY2xvc2UgaXQgb24g dGhhdCBzYW1lIHRocmVhZC4gVGhpcyBtZWFucyB0aGF0IHRoZQorICAgIC8vIFNRTGl0ZSBkYXRh YmFzZSBuZWVkIHRvIGJlIGNsb3NlZCBieSBhbm90aGVyIG1lY2hhbmlzbSAoc2VlCisgICAgLy8g RGF0YWJhc2VDb250ZXh0OjpzdG9wRGF0YWJhc2VzKCkpLiBCeSB0aGUgdGltZSB3ZSBnZXQgaGVy ZSwgdGhlIFNRTGl0ZQorICAgIC8vIGRhdGFiYXNlIHNob3VsZCBoYXZlIGFscmVhZHkgYmVlbiBj bG9zZWQuCisKKyAgICBBU1NFUlQoIW1fb3BlbmVkKTsKIH0KIAogYm9vbCBEYXRhYmFzZTo6b3Bl bkFuZFZlcmlmeVZlcnNpb24oYm9vbCBzZXRWZXJzaW9uSW5OZXdEYXRhYmFzZSwgRGF0YWJhc2VF cnJvciYgZXJyb3IsIFN0cmluZyYgZXJyb3JNZXNzYWdlKQpAQCAtNDczLDYgKzQ4NCwxMSBAQCBi b29sIERhdGFiYXNlOjpzZXRWZXJzaW9uSW5EYXRhYmFzZShjb25zdCBTdHJpbmcmIHZlcnNpb24s IGJvb2wgc2hvdWxkQ2FjaGVWZXJzaQogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKK3ZvaWQgRGF0 YWJhc2U6OnNldEV4cGVjdGVkVmVyc2lvbihjb25zdCBTdHJpbmcmIHZlcnNpb24pCit7CisgICAg bV9leHBlY3RlZFZlcnNpb24gPSB2ZXJzaW9uLmlzb2xhdGVkQ29weSgpOworfQorCiBTdHJpbmcg RGF0YWJhc2U6OmdldENhY2hlZFZlcnNpb24oKSBjb25zdAogewogICAgIHN0ZDo6bG9ja19ndWFy ZDxzdGQ6Om11dGV4PiBsb2NrZXIoZ3VpZE11dGV4KCkpOwpAQCAtNDg4LDYgKzUwNCwxNSBAQCB2 b2lkIERhdGFiYXNlOjpzZXRDYWNoZWRWZXJzaW9uKGNvbnN0IFN0cmluZyYgYWN0dWFsVmVyc2lv bikKICAgICB1cGRhdGVHdWlkVmVyc2lvbk1hcChtX2d1aWQsIGFjdHVhbFZlcnNpb24pOwogfQog Citib29sIERhdGFiYXNlOjpnZXRBY3R1YWxWZXJzaW9uRm9yVHJhbnNhY3Rpb24oU3RyaW5nICZh Y3R1YWxWZXJzaW9uKQoreworICAgIEFTU0VSVChtX3NxbGl0ZURhdGFiYXNlLnRyYW5zYWN0aW9u SW5Qcm9ncmVzcygpKTsKKworICAgIC8vIE5vdGU6IEluIG11bHRpLXByb2Nlc3MgYnJvd3NlcnMg dGhlIGNhY2hlZCB2YWx1ZSBtYXkgYmUgaW5hY2N1cmF0ZS4KKyAgICAvLyBTbyB3ZSByZXRyaWV2 ZSB0aGUgdmFsdWUgZnJvbSB0aGUgZGF0YWJhc2UgYW5kIHVwZGF0ZSB0aGUgY2FjaGVkIHZhbHVl IGhlcmUuCisgICAgcmV0dXJuIGdldFZlcnNpb25Gcm9tRGF0YWJhc2UoYWN0dWFsVmVyc2lvbiwg dHJ1ZSk7Cit9CisKIHZvaWQgRGF0YWJhc2U6OnNjaGVkdWxlVHJhbnNhY3Rpb24oKQogewogICAg IEFTU0VSVCghbV90cmFuc2FjdGlvbkluUHJvZ3Jlc3NNdXRleC50cnlMb2NrKCkpOyAvLyBMb2Nr ZWQgYnkgY2FsbGVyLgpAQCAtNTYwLDcgKzU4NSwxMSBAQCBTdHJpbmcgRGF0YWJhc2U6OnZlcnNp b24oKSBjb25zdAogewogICAgIGlmIChtX2RlbGV0ZWQpCiAgICAgICAgIHJldHVybiBTdHJpbmco KTsKLSAgICByZXR1cm4gRGF0YWJhc2VCYWNrZW5kQmFzZTo6dmVyc2lvbigpOworCisgICAgLy8g Tm90ZTogSW4gbXVsdGktcHJvY2VzcyBicm93c2VycyB0aGUgY2FjaGVkIHZhbHVlIG1heSBiZSBh Y2N1cmF0ZSwgYnV0IHdlIGNhbm5vdCByZWFkIHRoZQorICAgIC8vIGFjdHVhbCB2ZXJzaW9uIGZy b20gdGhlIGRhdGFiYXNlIHdpdGhvdXQgcG90ZW50aWFsbHkgaW5kdWNpbmcgYSBkZWFkbG9jay4K KyAgICAvLyBGSVhNRTogQWRkIGFuIGFzeW5jIHZlcnNpb24gZ2V0dGVyIHRvIHRoZSBEYXRhYmFz ZUFQSS4KKyAgICByZXR1cm4gZ2V0Q2FjaGVkVmVyc2lvbigpOwogfQogCiB2b2lkIERhdGFiYXNl OjptYXJrQXNEZWxldGVkQW5kQ2xvc2UoKQpAQCAtNjAwLDYgKzYyOSwzNSBAQCB2b2lkIERhdGFi YXNlOjpyZWFkVHJhbnNhY3Rpb24oUGFzc1JlZlB0cjxTUUxUcmFuc2FjdGlvbkNhbGxiYWNrPiBj YWxsYmFjaywgUGFzcwogICAgIHJ1blRyYW5zYWN0aW9uKGNhbGxiYWNrLCBlcnJvckNhbGxiYWNr LCBzdWNjZXNzQ2FsbGJhY2ssIHRydWUpOwogfQogCitTdHJpbmcgRGF0YWJhc2U6OnN0cmluZ0lk ZW50aWZpZXIoKSBjb25zdAoreworICAgIC8vIFJldHVybiBhIGRlZXAgY29weSBmb3IgcmVmIGNv dW50aW5nIHRocmVhZCBzYWZldHkKKyAgICByZXR1cm4gbV9uYW1lLmlzb2xhdGVkQ29weSgpOwor fQorCitTdHJpbmcgRGF0YWJhc2U6OmRpc3BsYXlOYW1lKCkgY29uc3QKK3sKKyAgICAvLyBSZXR1 cm4gYSBkZWVwIGNvcHkgZm9yIHJlZiBjb3VudGluZyB0aHJlYWQgc2FmZXR5CisgICAgcmV0dXJu IG1fZGlzcGxheU5hbWUuaXNvbGF0ZWRDb3B5KCk7Cit9CisKK3Vuc2lnbmVkIGxvbmcgRGF0YWJh c2U6OmVzdGltYXRlZFNpemUoKSBjb25zdAoreworICAgIHJldHVybiBtX2VzdGltYXRlZFNpemU7 Cit9CisKK1N0cmluZyBEYXRhYmFzZTo6ZmlsZU5hbWUoKSBjb25zdAoreworICAgIC8vIFJldHVy biBhIGRlZXAgY29weSBmb3IgcmVmIGNvdW50aW5nIHRocmVhZCBzYWZldHkKKyAgICByZXR1cm4g bV9maWxlbmFtZS5pc29sYXRlZENvcHkoKTsKK30KKworRGF0YWJhc2VEZXRhaWxzIERhdGFiYXNl OjpkZXRhaWxzKCkgY29uc3QKK3sKKyAgICAvLyBUaGlzIGNvZGUgcGF0aCBpcyBvbmx5IHVzZWQg Zm9yIGRhdGFiYXNlIHF1b3RhIGRlbGVnYXRlIGNhbGxzLCBzbyBmaWxlIGRhdGVzIGFyZSBpcnJl bGV2YW50IGFuZCBsZWZ0IHVuaW5pdGlhbGl6ZWQuCisgICAgcmV0dXJuIERhdGFiYXNlRGV0YWls cyhzdHJpbmdJZGVudGlmaWVyKCksIGRpc3BsYXlOYW1lKCksIGVzdGltYXRlZFNpemUoKSwgMCwg MCwgMCk7Cit9CisKIHZvaWQgRGF0YWJhc2U6OmRpc2FibGVBdXRob3JpemVyKCkKIHsKICAgICBB U1NFUlQobV9kYXRhYmFzZUF1dGhvcml6ZXIpOwpAQCAtNzQxLDQgKzc5OSwxNiBAQCBTZWN1cml0 eU9yaWdpbiogRGF0YWJhc2U6OnNlY3VyaXR5T3JpZ2luKCkgY29uc3QKICAgICByZXR1cm4gMDsK IH0KIAordW5zaWduZWQgbG9uZyBsb25nIERhdGFiYXNlOjptYXhpbXVtU2l6ZSgpIGNvbnN0Cit7 CisgICAgcmV0dXJuIERhdGFiYXNlVHJhY2tlcjo6dHJhY2tlcigpLmdldE1heFNpemVGb3JEYXRh YmFzZSh0aGlzKTsKK30KKworI2lmICFMT0dfRElTQUJMRUQgfHwgIUVSUk9SX0RJU0FCTEVECitT dHJpbmcgRGF0YWJhc2U6OmRhdGFiYXNlRGVidWdOYW1lKCkgY29uc3QKK3sKKyAgICByZXR1cm4g bV9jb250ZXh0VGhyZWFkU2VjdXJpdHlPcmlnaW4tPnRvU3RyaW5nKCkgKyAiOjoiICsgbV9uYW1l OworfQorI2VuZGlmCisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2UuaCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2UuaAppbmRleCBhMjE0OWQyNGUyZWE5MWM5OWQ4 NDYwZDMxNzA4YTU2Y2NhZTA5Zjk1Li4zYWIzMTNlOTg2NTQ0OGJjZDhhOWZlZDU0Mzk4NjY3ZTk5 Y2YzZmYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0Rh dGFiYXNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFz ZS5oCkBAIC01Nyw2ICs1NywxMSBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIG9wZW5BbmRW ZXJpZnlWZXJzaW9uKGJvb2wgc2V0VmVyc2lvbkluTmV3RGF0YWJhc2UsIERhdGFiYXNlRXJyb3Im LCBTdHJpbmcmIGVycm9yTWVzc2FnZSk7CiAgICAgdm9pZCBjbG9zZSgpOwogCisgICAgYm9vbCBv cGVuZWQoKSBjb25zdCB7IHJldHVybiBtX29wZW5lZDsgfQorICAgIGJvb2wgaXNOZXcoKSBjb25z dCB7IHJldHVybiBtX25ldzsgfQorCisgICAgdW5zaWduZWQgbG9uZyBsb25nIG1heGltdW1TaXpl KCkgY29uc3Q7CisKICAgICBQYXNzUmVmUHRyPFNRTFRyYW5zYWN0aW9uQmFja2VuZD4gcnVuVHJh bnNhY3Rpb24oUGFzc1JlZlB0cjxTUUxUcmFuc2FjdGlvbj4sIGJvb2wgcmVhZE9ubHksIGNvbnN0 IENoYW5nZVZlcnNpb25EYXRhKik7CiAgICAgdm9pZCBzY2hlZHVsZVRyYW5zYWN0aW9uU3RlcChT UUxUcmFuc2FjdGlvbkJhY2tlbmQqKTsKICAgICB2b2lkIGluUHJvZ3Jlc3NUcmFuc2FjdGlvbkNv bXBsZXRlZCgpOwpAQCAtNzAsMTMgKzc1LDIwIEBAIHB1YmxpYzoKICAgICBTUUxUcmFuc2FjdGlv bkNvb3JkaW5hdG9yKiB0cmFuc2FjdGlvbkNvb3JkaW5hdG9yKCkgY29uc3Q7CiAKICAgICAvLyBE aXJlY3Qgc3VwcG9ydCBmb3IgdGhlIERPTSBBUEkKLSAgICB2aXJ0dWFsIFN0cmluZyB2ZXJzaW9u KCkgY29uc3Q7CisgICAgU3RyaW5nIHZlcnNpb24oKSBjb25zdDsKICAgICB2b2lkIGNoYW5nZVZl cnNpb24oY29uc3QgU3RyaW5nJiBvbGRWZXJzaW9uLCBjb25zdCBTdHJpbmcmIG5ld1ZlcnNpb24s IFBhc3NSZWZQdHI8U1FMVHJhbnNhY3Rpb25DYWxsYmFjaz4sCiAgICAgICAgICAgICAgICAgICAg ICAgIFBhc3NSZWZQdHI8U1FMVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrPiwgUGFzc1JlZlB0cjxW b2lkQ2FsbGJhY2s+IHN1Y2Nlc3NDYWxsYmFjayk7CiAgICAgdm9pZCB0cmFuc2FjdGlvbihQYXNz UmVmUHRyPFNRTFRyYW5zYWN0aW9uQ2FsbGJhY2s+LCBQYXNzUmVmUHRyPFNRTFRyYW5zYWN0aW9u RXJyb3JDYWxsYmFjaz4sIFBhc3NSZWZQdHI8Vm9pZENhbGxiYWNrPiBzdWNjZXNzQ2FsbGJhY2sp OwogICAgIHZvaWQgcmVhZFRyYW5zYWN0aW9uKFBhc3NSZWZQdHI8U1FMVHJhbnNhY3Rpb25DYWxs YmFjaz4sIFBhc3NSZWZQdHI8U1FMVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrPiwgUGFzc1JlZlB0 cjxWb2lkQ2FsbGJhY2s+IHN1Y2Nlc3NDYWxsYmFjayk7CiAKICAgICAvLyBJbnRlcm5hbCBlbmdp bmUgc3VwcG9ydAorICAgIFN0cmluZyBzdHJpbmdJZGVudGlmaWVyKCkgY29uc3Q7CisgICAgU3Ry aW5nIGRpc3BsYXlOYW1lKCkgY29uc3Q7CisgICAgdW5zaWduZWQgbG9uZyBlc3RpbWF0ZWRTaXpl KCkgY29uc3Q7CisgICAgU3RyaW5nIGZpbGVOYW1lKCkgY29uc3Q7CisgICAgRGF0YWJhc2VEZXRh aWxzIGRldGFpbHMoKSBjb25zdDsKKyAgICBTUUxpdGVEYXRhYmFzZSYgc3FsaXRlRGF0YWJhc2Uo KSB7IHJldHVybiBtX3NxbGl0ZURhdGFiYXNlOyB9CisKICAgICB2b2lkIGRpc2FibGVBdXRob3Jp emVyKCk7CiAgICAgdm9pZCBlbmFibGVBdXRob3JpemVyKCk7CiAgICAgdm9pZCBzZXRBdXRob3Jp emVyUGVybWlzc2lvbnMoaW50KTsKQEAgLTExMiwxMyArMTI0LDIwIEBAIHByaXZhdGU6CiAKICAg ICBib29sIGdldFZlcnNpb25Gcm9tRGF0YWJhc2UoU3RyaW5nJiB2ZXJzaW9uLCBib29sIHNob3Vs ZENhY2hlVmVyc2lvbiA9IHRydWUpOwogICAgIGJvb2wgc2V0VmVyc2lvbkluRGF0YWJhc2UoY29u c3QgU3RyaW5nJiB2ZXJzaW9uLCBib29sIHNob3VsZENhY2hlVmVyc2lvbiA9IHRydWUpOworICAg IHZvaWQgc2V0RXhwZWN0ZWRWZXJzaW9uKGNvbnN0IFN0cmluZyYpOworICAgIGNvbnN0IFN0cmlu ZyYgZXhwZWN0ZWRWZXJzaW9uKCkgY29uc3QgeyByZXR1cm4gbV9leHBlY3RlZFZlcnNpb247IH0K ICAgICBTdHJpbmcgZ2V0Q2FjaGVkVmVyc2lvbigpY29uc3Q7CiAgICAgdm9pZCBzZXRDYWNoZWRW ZXJzaW9uKGNvbnN0IFN0cmluZyYpOworICAgIGJvb2wgZ2V0QWN0dWFsVmVyc2lvbkZvclRyYW5z YWN0aW9uKFN0cmluZyYgdmVyc2lvbik7CiAKICAgICB2b2lkIHNjaGVkdWxlVHJhbnNhY3Rpb24o KTsKIAogICAgIHZvaWQgcnVuVHJhbnNhY3Rpb24oUmVmUHRyPFNRTFRyYW5zYWN0aW9uQ2FsbGJh Y2s+JiYsIFJlZlB0cjxTUUxUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2s+JiYsIFJlZlB0cjxWb2lk Q2FsbGJhY2s+JiYgc3VjY2Vzc0NhbGxiYWNrLCBib29sIHJlYWRPbmx5LCBjb25zdCBDaGFuZ2VW ZXJzaW9uRGF0YSogPSBudWxscHRyKTsKIAorI2lmICFMT0dfRElTQUJMRUQgfHwgIUVSUk9SX0RJ U0FCTEVECisgICAgU3RyaW5nIGRhdGFiYXNlRGVidWdOYW1lKCkgY29uc3Q7CisjZW5kaWYKKwog ICAgIERlcXVlPFJlZlB0cjxTUUxUcmFuc2FjdGlvbkJhY2tlbmQ+PiBtX3RyYW5zYWN0aW9uUXVl dWU7CiAgICAgRGVwcmVjYXRlZE11dGV4IG1fdHJhbnNhY3Rpb25JblByb2dyZXNzTXV0ZXg7CiAg ICAgYm9vbCBtX3RyYW5zYWN0aW9uSW5Qcm9ncmVzczsKQEAgLTEzNyw2ICsxNTYsNyBAQCBwcml2 YXRlOgogICAgIGZyaWVuZCBjbGFzcyBEYXRhYmFzZVNlcnZlcjsgLy8gRklYTUU6IHJlbW92ZSB0 aGlzIHdoZW4gdGhlIGJhY2tlbmQgaGFzIGJlZW4gc3BsaXQgb3V0LgogICAgIGZyaWVuZCBjbGFz cyBTUUxTdGF0ZW1lbnQ7CiAgICAgZnJpZW5kIGNsYXNzIFNRTFRyYW5zYWN0aW9uOworICAgIGZy aWVuZCBjbGFzcyBTUUxUcmFuc2FjdGlvbkJhY2tlbmQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0Rh dGFiYXNlQmFja2VuZEJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFz ZS9EYXRhYmFzZUJhY2tlbmRCYXNlLmNwcAppbmRleCBhYTAxYmUyZDlhOTNmM2IzMGIzMDA3ZDYx ODAzNWY2ZTA4M2JhZjNhLi4wMzBmMzMzNTk0MWMxNWNmM2FiOWU3NmU0ZGNhODAyMTdjNjMwYTQ5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNl QmFja2VuZEJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2Uv RGF0YWJhc2VCYWNrZW5kQmFzZS5jcHAKQEAgLTgwLDEzICs4MCw2IEBACiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAotI2lmICFMT0dfRElTQUJMRUQgfHwgIUVSUk9SX0RJU0FCTEVECi1TdHJpbmcg RGF0YWJhc2VCYWNrZW5kQmFzZTo6ZGF0YWJhc2VEZWJ1Z05hbWUoKSBjb25zdAotewotICAgIHJl dHVybiBtX2NvbnRleHRUaHJlYWRTZWN1cml0eU9yaWdpbi0+dG9TdHJpbmcoKSArICI6OiIgKyBt X25hbWU7Ci19Ci0jZW5kaWYKLQogRGF0YWJhc2VCYWNrZW5kQmFzZTo6RGF0YWJhc2VCYWNrZW5k QmFzZShQYXNzUmVmUHRyPERhdGFiYXNlQ29udGV4dD4gZGF0YWJhc2VDb250ZXh0LCBjb25zdCBT dHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgZXhwZWN0ZWRWZXJzaW9uLCBjb25zdCBTdHJpbmcm IGRpc3BsYXlOYW1lLCB1bnNpZ25lZCBsb25nIGVzdGltYXRlZFNpemUpCiAgICAgOiBtX2RhdGFi YXNlQ29udGV4dChkYXRhYmFzZUNvbnRleHQpCiAgICAgLCBtX25hbWUobmFtZS5pc29sYXRlZENv cHkoKSkKQEAgLTEwMCw3NiArOTMsNiBAQCBEYXRhYmFzZUJhY2tlbmRCYXNlOjpEYXRhYmFzZUJh Y2tlbmRCYXNlKFBhc3NSZWZQdHI8RGF0YWJhc2VDb250ZXh0PiBkYXRhYmFzZUNvbgogCiBEYXRh YmFzZUJhY2tlbmRCYXNlOjp+RGF0YWJhc2VCYWNrZW5kQmFzZSgpCiB7Ci0gICAgLy8gU1FMaXRl IGlzICJtdWx0aS10aHJlYWQgc2FmZSIsIGJ1dCBlYWNoIGRhdGFiYXNlIGhhbmRsZSBjYW4gb25s eSBiZSB1c2VkCi0gICAgLy8gb24gYSBzaW5nbGUgdGhyZWFkIGF0IGEgdGltZS4KLSAgICAvLwot ICAgIC8vIEZvciBEYXRhYmFzZUJhY2tlbmQsIHdlIG9wZW4gdGhlIFNRTGl0ZSBkYXRhYmFzZSBv biB0aGUgRGF0YWJhc2VUaHJlYWQsCi0gICAgLy8gYW5kIGhlbmNlIHdlIHNob3VsZCBhbHNvIGNs b3NlIGl0IG9uIHRoYXQgc2FtZSB0aHJlYWQuIFRoaXMgbWVhbnMgdGhhdCB0aGUKLSAgICAvLyBT UUxpdGUgZGF0YWJhc2UgbmVlZCB0byBiZSBjbG9zZWQgYnkgYW5vdGhlciBtZWNoYW5pc20gKHNl ZQotICAgIC8vIERhdGFiYXNlQ29udGV4dDo6c3RvcERhdGFiYXNlcygpKS4gQnkgdGhlIHRpbWUg d2UgZ2V0IGhlcmUsIHRoZSBTUUxpdGUKLSAgICAvLyBkYXRhYmFzZSBzaG91bGQgaGF2ZSBhbHJl YWR5IGJlZW4gY2xvc2VkLgotCi0gICAgQVNTRVJUKCFtX29wZW5lZCk7Ci19Ci0KLVN0cmluZyBE YXRhYmFzZUJhY2tlbmRCYXNlOjp2ZXJzaW9uKCkgY29uc3QKLXsKLSAgICAvLyBOb3RlOiBJbiBt dWx0aS1wcm9jZXNzIGJyb3dzZXJzIHRoZSBjYWNoZWQgdmFsdWUgbWF5IGJlIGFjY3VyYXRlLCBi dXQgd2UgY2Fubm90IHJlYWQgdGhlCi0gICAgLy8gYWN0dWFsIHZlcnNpb24gZnJvbSB0aGUgZGF0 YWJhc2Ugd2l0aG91dCBwb3RlbnRpYWxseSBpbmR1Y2luZyBhIGRlYWRsb2NrLgotICAgIC8vIEZJ WE1FOiBBZGQgYW4gYXN5bmMgdmVyc2lvbiBnZXR0ZXIgdG8gdGhlIERhdGFiYXNlQVBJLgotICAg IHJldHVybiBtX2Zyb250ZW5kLT5nZXRDYWNoZWRWZXJzaW9uKCk7Ci19Ci0KLVNlY3VyaXR5T3Jp Z2luKiBEYXRhYmFzZUJhY2tlbmRCYXNlOjpzZWN1cml0eU9yaWdpbigpIGNvbnN0Ci17Ci0gICAg cmV0dXJuIG1fY29udGV4dFRocmVhZFNlY3VyaXR5T3JpZ2luLmdldCgpOwotfQotCi1TdHJpbmcg RGF0YWJhc2VCYWNrZW5kQmFzZTo6c3RyaW5nSWRlbnRpZmllcigpIGNvbnN0Ci17Ci0gICAgLy8g UmV0dXJuIGEgZGVlcCBjb3B5IGZvciByZWYgY291bnRpbmcgdGhyZWFkIHNhZmV0eQotICAgIHJl dHVybiBtX25hbWUuaXNvbGF0ZWRDb3B5KCk7Ci19Ci0KLVN0cmluZyBEYXRhYmFzZUJhY2tlbmRC YXNlOjpkaXNwbGF5TmFtZSgpIGNvbnN0Ci17Ci0gICAgLy8gUmV0dXJuIGEgZGVlcCBjb3B5IGZv ciByZWYgY291bnRpbmcgdGhyZWFkIHNhZmV0eQotICAgIHJldHVybiBtX2Rpc3BsYXlOYW1lLmlz b2xhdGVkQ29weSgpOwotfQotCi11bnNpZ25lZCBsb25nIERhdGFiYXNlQmFja2VuZEJhc2U6OmVz dGltYXRlZFNpemUoKSBjb25zdAotewotICAgIHJldHVybiBtX2VzdGltYXRlZFNpemU7Ci19Ci0K LVN0cmluZyBEYXRhYmFzZUJhY2tlbmRCYXNlOjpmaWxlTmFtZSgpIGNvbnN0Ci17Ci0gICAgLy8g UmV0dXJuIGEgZGVlcCBjb3B5IGZvciByZWYgY291bnRpbmcgdGhyZWFkIHNhZmV0eQotICAgIHJl dHVybiBtX2ZpbGVuYW1lLmlzb2xhdGVkQ29weSgpOwotfQotCi1EYXRhYmFzZURldGFpbHMgRGF0 YWJhc2VCYWNrZW5kQmFzZTo6ZGV0YWlscygpIGNvbnN0Ci17Ci0gICAgLy8gVGhpcyBjb2RlIHBh dGggaXMgb25seSB1c2VkIGZvciBkYXRhYmFzZSBxdW90YSBkZWxlZ2F0ZSBjYWxscywgc28gZmls ZSBkYXRlcyBhcmUgaXJyZWxldmFudCBhbmQgbGVmdCB1bmluaXRpYWxpemVkLgotICAgIHJldHVy biBEYXRhYmFzZURldGFpbHMoc3RyaW5nSWRlbnRpZmllcigpLCBkaXNwbGF5TmFtZSgpLCBlc3Rp bWF0ZWRTaXplKCksIDAsIDAsIDApOwotfQotCi12b2lkIERhdGFiYXNlQmFja2VuZEJhc2U6OnNl dEV4cGVjdGVkVmVyc2lvbihjb25zdCBTdHJpbmcmIHZlcnNpb24pCi17Ci0gICAgbV9leHBlY3Rl ZFZlcnNpb24gPSB2ZXJzaW9uLmlzb2xhdGVkQ29weSgpOwotfQotCi1ib29sIERhdGFiYXNlQmFj a2VuZEJhc2U6OmdldEFjdHVhbFZlcnNpb25Gb3JUcmFuc2FjdGlvbihTdHJpbmcgJmFjdHVhbFZl cnNpb24pCi17Ci0gICAgQVNTRVJUKG1fc3FsaXRlRGF0YWJhc2UudHJhbnNhY3Rpb25JblByb2dy ZXNzKCkpOwotICAgIC8vIE5vdGU6IEluIG11bHRpLXByb2Nlc3MgYnJvd3NlcnMgdGhlIGNhY2hl ZCB2YWx1ZSBtYXkgYmUgaW5hY2N1cmF0ZS4KLSAgICAvLyBTbyB3ZSByZXRyaWV2ZSB0aGUgdmFs dWUgZnJvbSB0aGUgZGF0YWJhc2UgYW5kIHVwZGF0ZSB0aGUgY2FjaGVkIHZhbHVlIGhlcmUuCi0g ICAgcmV0dXJuIG1fZnJvbnRlbmQtPmdldFZlcnNpb25Gcm9tRGF0YWJhc2UoYWN0dWFsVmVyc2lv biwgdHJ1ZSk7Ci19Ci0KLXVuc2lnbmVkIGxvbmcgbG9uZyBEYXRhYmFzZUJhY2tlbmRCYXNlOjpt YXhpbXVtU2l6ZSgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIERhdGFiYXNlVHJhY2tlcjo6dHJhY2tl cigpLmdldE1heFNpemVGb3JEYXRhYmFzZShzdGF0aWNfY2FzdDxjb25zdCBEYXRhYmFzZSo+KHRo aXMpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZUJhY2tlbmRCYXNlLmggYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlQmFja2VuZEJhc2UuaAppbmRleCBh ZDBhNTYwOTIwMDkyYWQ5OGI2YzUzZWI4NTE4ZWRjY2FlNmQzMTI1Li5jMTc4MmVjM2NlNGJlOTU4 NzEzYjg2MzEyN2VjMDQ0ZDZjZmJkNDdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlQmFja2VuZEJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlQmFja2VuZEJhc2UuaApAQCAtNTAsMjAgKzUw LDYgQEAgY2xhc3MgRGF0YWJhc2VCYWNrZW5kQmFzZSA6IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291 bnRlZDxEYXRhYmFzZUJhY2tlbmRCYXNlPiB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB+RGF0YWJh c2VCYWNrZW5kQmFzZSgpOwogCi0gICAgdmlydHVhbCBTdHJpbmcgdmVyc2lvbigpIGNvbnN0Owot Ci0gICAgYm9vbCBvcGVuZWQoKSBjb25zdCB7IHJldHVybiBtX29wZW5lZDsgfQotICAgIGJvb2wg aXNOZXcoKSBjb25zdCB7IHJldHVybiBtX25ldzsgfQotCi0gICAgdmlydHVhbCBTZWN1cml0eU9y aWdpbiogc2VjdXJpdHlPcmlnaW4oKSBjb25zdDsKLSAgICB2aXJ0dWFsIFN0cmluZyBzdHJpbmdJ ZGVudGlmaWVyKCkgY29uc3Q7Ci0gICAgdmlydHVhbCBTdHJpbmcgZGlzcGxheU5hbWUoKSBjb25z dDsKLSAgICB2aXJ0dWFsIHVuc2lnbmVkIGxvbmcgZXN0aW1hdGVkU2l6ZSgpIGNvbnN0OwotICAg IHZpcnR1YWwgU3RyaW5nIGZpbGVOYW1lKCkgY29uc3Q7Ci0gICAgdmlydHVhbCBEYXRhYmFzZURl dGFpbHMgZGV0YWlscygpIGNvbnN0OwotICAgIFNRTGl0ZURhdGFiYXNlJiBzcWxpdGVEYXRhYmFz ZSgpIHsgcmV0dXJuIG1fc3FsaXRlRGF0YWJhc2U7IH0KLQotICAgIHVuc2lnbmVkIGxvbmcgbG9u ZyBtYXhpbXVtU2l6ZSgpIGNvbnN0OwogCiAgICAgRGF0YWJhc2VDb250ZXh0KiBkYXRhYmFzZUNv bnRleHQoKSBjb25zdCB7IHJldHVybiBtX2RhdGFiYXNlQ29udGV4dC5nZXQoKTsgfQogICAgIHZv aWQgc2V0RnJvbnRlbmQoRGF0YWJhc2UqIGZyb250ZW5kKSB7IG1fZnJvbnRlbmQgPSBmcm9udGVu ZDsgfQpAQCAtNzcsMTUgKzYzLDYgQEAgcHJvdGVjdGVkOgogCiAgICAgRGF0YWJhc2VCYWNrZW5k QmFzZShQYXNzUmVmUHRyPERhdGFiYXNlQ29udGV4dD4sIGNvbnN0IFN0cmluZyYgbmFtZSwgY29u c3QgU3RyaW5nJiBleHBlY3RlZFZlcnNpb24sIGNvbnN0IFN0cmluZyYgZGlzcGxheU5hbWUsIHVu c2lnbmVkIGxvbmcgZXN0aW1hdGVkU2l6ZSk7CiAKLQotICAgIHZvaWQgc2V0RXhwZWN0ZWRWZXJz aW9uKGNvbnN0IFN0cmluZyYpOwotICAgIGNvbnN0IFN0cmluZyYgZXhwZWN0ZWRWZXJzaW9uKCkg Y29uc3QgeyByZXR1cm4gbV9leHBlY3RlZFZlcnNpb247IH0KLSAgICBib29sIGdldEFjdHVhbFZl cnNpb25Gb3JUcmFuc2FjdGlvbihTdHJpbmcmIHZlcnNpb24pOwotCi0jaWYgIUxPR19ESVNBQkxF RCB8fCAhRVJST1JfRElTQUJMRUQKLSAgICBTdHJpbmcgZGF0YWJhc2VEZWJ1Z05hbWUoKSBjb25z dDsKLSNlbmRpZgotCiAgICAgUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiBtX2NvbnRleHRUaHJlYWRT ZWN1cml0eU9yaWdpbjsKICAgICBSZWZQdHI8RGF0YWJhc2VDb250ZXh0PiBtX2RhdGFiYXNlQ29u dGV4dDsgLy8gQXNzb2NpYXRlZCB3aXRoIG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dC4KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9TUUxUcmFuc2FjdGlv bkNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL1NRTFRyYW5z YWN0aW9uQ2xpZW50LmNwcAppbmRleCAxODgzOTFiOTlhYmRhNDhkMWVkNDI2N2ZhZWIxZjY3Zjhh NDEwNDVmLi45Yjg2Yzk5YzMzNGQzOThhMDY1OGFiNTk4OTViMWIzZWM4MTNiODA4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL1NRTFRyYW5zYWN0aW9uQ2xp ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL1NRTFRyYW5z YWN0aW9uQ2xpZW50LmNwcApAQCAtMzEsNyArMzEsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgog I2luY2x1ZGUgIlNRTFRyYW5zYWN0aW9uQ2xpZW50LmgiCiAKLSNpbmNsdWRlICJEYXRhYmFzZUJh Y2tlbmRCYXNlLmgiCisjaW5jbHVkZSAiRGF0YWJhc2UuaCIKICNpbmNsdWRlICJEYXRhYmFzZUNv bnRleHQuaCIKICNpbmNsdWRlICJEYXRhYmFzZU1hbmFnZXIuaCIKICNpbmNsdWRlICJEYXRhYmFz ZVRyYWNrZXIuaCIKQEAgLTQwLDEzICs0MCwxMyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK LXZvaWQgU1FMVHJhbnNhY3Rpb25DbGllbnQ6OmRpZENvbW1pdFdyaXRlVHJhbnNhY3Rpb24oRGF0 YWJhc2VCYWNrZW5kQmFzZSogZGF0YWJhc2UpCit2b2lkIFNRTFRyYW5zYWN0aW9uQ2xpZW50Ojpk aWRDb21taXRXcml0ZVRyYW5zYWN0aW9uKERhdGFiYXNlKiBkYXRhYmFzZSkKIHsKICAgICBEYXRh YmFzZVRyYWNrZXI6OnRyYWNrZXIoKS5zY2hlZHVsZU5vdGlmeURhdGFiYXNlQ2hhbmdlZCgKICAg ICAgICAgZGF0YWJhc2UtPnNlY3VyaXR5T3JpZ2luKCksIGRhdGFiYXNlLT5zdHJpbmdJZGVudGlm aWVyKCkpOwogfQogCi1ib29sIFNRTFRyYW5zYWN0aW9uQ2xpZW50OjpkaWRFeGNlZWRRdW90YShE YXRhYmFzZUJhY2tlbmRCYXNlKiBkYXRhYmFzZSkKK2Jvb2wgU1FMVHJhbnNhY3Rpb25DbGllbnQ6 OmRpZEV4Y2VlZFF1b3RhKERhdGFiYXNlKiBkYXRhYmFzZSkKIHsKICAgICBBU1NFUlQoZGF0YWJh c2UtPmRhdGFiYXNlQ29udGV4dCgpLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPmlzQ29udGV4 dFRocmVhZCgpKTsKICAgICBhdXRvJiBkYXRhYmFzZU1hbmFnZXIgPSBEYXRhYmFzZU1hbmFnZXI6 OnNpbmdsZXRvbigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRh YmFzZS9TUUxUcmFuc2FjdGlvbkNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJk YXRhYmFzZS9TUUxUcmFuc2FjdGlvbkNsaWVudC5oCmluZGV4IDYxNzI4MjA2MzA5Y2NiZGM3YzU5 YWM4MWE2NzU0ZGIzOTgxYzE5N2IuLjVhYTA1MDk4NGNiZDBhOTBmNjYxYmIxNmY2OTFmMGI2ZTM0 YTI2ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvU1FM VHJhbnNhY3Rpb25DbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFi YXNlL1NRTFRyYW5zYWN0aW9uQ2xpZW50LmgKQEAgLTM2LDcgKzM2LDcgQEAKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCi1jbGFzcyBEYXRhYmFzZUJhY2tlbmRCYXNlOworY2xhc3MgRGF0YWJhc2U7 CiAKIC8vIEEgY2xpZW50IHRvIHRoZSBTUUxUcmFuc2FjdGlvbiBjbGFzcy4gQWxsb3dzIFNRTFRy YW5zYWN0aW9uIHRvIG5vdGlmeSBpbnRlcmVzdGVkCiAvLyBwYXJ0aWVzIHRoYXQgY2VydGFpbiB0 aGluZ3MgaGF2ZSBoYXBwZW5lZCBpbiBhIHRyYW5zYWN0aW9uLgpAQCAtNDQsOCArNDQsOCBAQCBj bGFzcyBTUUxUcmFuc2FjdGlvbkNsaWVudCB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoU1FM VHJhbnNhY3Rpb25DbGllbnQpOyBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKICAg ICBTUUxUcmFuc2FjdGlvbkNsaWVudCgpIHsgfQotICAgIHZvaWQgZGlkQ29tbWl0V3JpdGVUcmFu c2FjdGlvbihEYXRhYmFzZUJhY2tlbmRCYXNlKik7Ci0gICAgYm9vbCBkaWRFeGNlZWRRdW90YShE YXRhYmFzZUJhY2tlbmRCYXNlKik7CisgICAgdm9pZCBkaWRDb21taXRXcml0ZVRyYW5zYWN0aW9u KERhdGFiYXNlKik7CisgICAgYm9vbCBkaWRFeGNlZWRRdW90YShEYXRhYmFzZSopOwogfTsKIAog fQo=