139505 2014-12-10 14:12:42 -0800 Implement the rest of the transient local storage namespace code 2014-12-10 14:31:17 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1054297 0 andersca 2014-12-10 14:12:42 -0800 Implement the rest of the transient local storage namespace code 1054300 1 243065 andersca 2014-12-10 14:21:05 -0800 Created attachment 243065 Patch 1054302 2 andersca 2014-12-10 14:31:17 -0800 Committed r177100: <http://trac.webkit.org/changeset/177100> 243065 2014-12-10 14:21:05 -0800 2014-12-10 14:27:26 -0800 Patch bug-139505-20141210142147.patch text/plain 11182 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MDkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzliOTE1NDdhYmQxODBk MjhjOTk5OGYwODlkNGQ4MzJiNWM3NzIzZi4uZDgwYjk1ZGUxM2I5ODkwOTQ4NjY0Yzc1NDRhMmNk MjU1MThhNzhkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQwIEBACiAyMDE0LTEyLTEwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgSW1wbGVtZW50IHRo ZSByZXN0IG9mIHRoZSB0cmFuc2llbnQgbG9jYWwgc3RvcmFnZSBuYW1lc3BhY2UgY29kZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NTA1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv U3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5h Z2VyOjpUcmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2U6OmNyZWF0ZSk6CisgICAgICAgIChX ZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpUcmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2U6On5U cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2UpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdl TWFuYWdlcjo6VHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlOjpnZXRPckNyZWF0ZVN0b3Jh Z2VBcmVhKToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OlRyYW5zaWVudExvY2Fs U3RvcmFnZU5hbWVzcGFjZTo6Y2xlYXJTdG9yYWdlQXJlYXNNYXRjaGluZ09yaWdpbik6CisgICAg ICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpUcmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3Bh Y2U6OmNsZWFyQWxsU3RvcmFnZUFyZWFzKToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFn ZXI6OlRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZTo6VHJhbnNpZW50TG9jYWxTdG9yYWdl TmFtZXNwYWNlKToKKyAgICAgICAgSW50cm9kdWNlIGEgbmV3IFRyYW5zaWVudExvY2FsU3RvcmFn ZU5hbWVzcGFjZSB0aGF0J3MganVzdCBhIGdsb3JpZmllZCBTZWN1cml0eU9yaWdpbiAtPiBTdG9y YWdlQXJlYSBIYXNoTWFwLgorCisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpTdG9y YWdlQXJlYTo6Y3JlYXRlKToKKyAgICAgICAgQ2hhbmdlIHRoZSByZXR1cm4gdHlwZSB0byBSZWZQ dHIuCisKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUVudHJpZXNGb3JP cmlnaW4pOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlQWxsRW50cmll cyk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVMb2NhbFN0b3JhZ2VP cmlnaW5zTW9kaWZpZWRTaW5jZSk6CisgICAgICAgIFVzZSBsYW1iZGFzIGluc3RlYWQgb2YgYmlu ZC4gRGVsZXRlIHRoZSB0cmFuc2llbnQgbG9jYWwgc3RvcmFnZSBhcyB3ZWxsLgorCisgICAgICAg IChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGVUcmFuc2llbnRMb2NhbFN0b3JhZ2VNYXAp OgorICAgICAgICBHZXQgYSB0cmFuc2llbnQgbG9jYWwgc3RvcmFnZSBuYW1lc3BhY2UgYW5kIGFz ayBpdCBmb3IgYSBzdG9yYWdlIGFyZWEuCisKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFn ZXI6OmdldE9yQ3JlYXRlVHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlKToKKyAgICAgICAg TG9vayB1cCB0aGUgbmFtZXNwYWNlIGZyb20gdGhlIG1hcCBhbmQgY3JlYXRlIG9uZSBpZiBpdCBk b2Vzbid0IGV4aXN0LgorCisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVF bnRyaWVzRm9yT3JpZ2luSW50ZXJuYWwpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpTdG9y YWdlTWFuYWdlcjo6ZGVsZXRlQWxsRW50cmllc0ludGVybmFsKTogRGVsZXRlZC4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmg6CisKKzIwMTQtMTItMTAgIEFu ZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBCZWdpbiBmaXhp bmcgdHJhbnNpZW50IGxvY2FsIHN0b3JhZ2UgaGFuZGxpbmcKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTUwMwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAKaW5kZXggYzJmYjNkODJh YzQ2Y2YwYTNiOTljMTE0YjI4NTdhMmE3N2Y3YTMyMC4uNzAwZjE2ZjBjNWYwYzk1ZTQ0YmZhNDBl NDk4YzIwMzVmZDRmMWQ2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0 b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9T dG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcApAQCAtNDYsNyArNDYsNyBAQCBuYW1lc3BhY2UgV2Vi S2l0IHsKIAogY2xhc3MgU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhIDogcHVibGljIFRocmVh ZFNhZmVSZWZDb3VudGVkPFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYT4gewogcHVibGljOgot ICAgIHN0YXRpYyBQYXNzUmVmUHRyPFN0b3JhZ2VBcmVhPiBjcmVhdGUoTG9jYWxTdG9yYWdlTmFt ZXNwYWNlKiwgUGFzc1JlZlB0cjxTZWN1cml0eU9yaWdpbj4sIHVuc2lnbmVkIHF1b3RhSW5CeXRl cyk7CisgICAgc3RhdGljIFJlZlB0cjxTdG9yYWdlQXJlYT4gY3JlYXRlKExvY2FsU3RvcmFnZU5h bWVzcGFjZSosIFBhc3NSZWZQdHI8U2VjdXJpdHlPcmlnaW4+LCB1bnNpZ25lZCBxdW90YUluQnl0 ZXMpOwogICAgIH5TdG9yYWdlQXJlYSgpOwogCiAgICAgU2VjdXJpdHlPcmlnaW4qIHNlY3VyaXR5 T3JpZ2luKCkgY29uc3QgeyByZXR1cm4gbV9zZWN1cml0eU9yaWdpbi5nZXQoKTsgfQpAQCAtMTA2 LDcgKzEwNiw1NSBAQCBwcml2YXRlOgogICAgIEhhc2hNYXA8UmVmUHRyPFNlY3VyaXR5T3JpZ2lu PiwgU3RvcmFnZUFyZWEqPiBtX3N0b3JhZ2VBcmVhTWFwOwogfTsKIAotUGFzc1JlZlB0cjxTdG9y YWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE+IFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6Y3Jl YXRlKExvY2FsU3RvcmFnZU5hbWVzcGFjZSogbG9jYWxTdG9yYWdlTmFtZXNwYWNlLCBQYXNzUmVm UHRyPFNlY3VyaXR5T3JpZ2luPiBzZWN1cml0eU9yaWdpbiwgdW5zaWduZWQgcXVvdGFJbkJ5dGVz KQorY2xhc3MgU3RvcmFnZU1hbmFnZXI6OlRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZSA6 IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxUcmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3Bh Y2U+IHsKK3B1YmxpYzoKKyAgICBzdGF0aWMgUmVmUHRyPFRyYW5zaWVudExvY2FsU3RvcmFnZU5h bWVzcGFjZT4gY3JlYXRlKCkKKyAgICB7CisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgVHJh bnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlKCkpOworICAgIH0KKworICAgIH5UcmFuc2llbnRM b2NhbFN0b3JhZ2VOYW1lc3BhY2UoKQorICAgIHsKKyAgICB9CisKKyAgICBSZWZQdHI8U3RvcmFn ZUFyZWE+IGdldE9yQ3JlYXRlU3RvcmFnZUFyZWEoUGFzc1JlZlB0cjxTZWN1cml0eU9yaWdpbj4g c2VjdXJpdHlPcmlnaW4pCisgICAgeworICAgICAgICBhdXRvJiBzbG90ID0gbV9zdG9yYWdlQXJl YU1hcC5hZGQoc2VjdXJpdHlPcmlnaW4uZ2V0KCksIG51bGxwdHIpLml0ZXJhdG9yLT52YWx1ZTsK KyAgICAgICAgaWYgKHNsb3QpCisgICAgICAgICAgICByZXR1cm4gc2xvdDsKKworICAgICAgICBh dXRvIHN0b3JhZ2VBcmVhID0gU3RvcmFnZUFyZWE6OmNyZWF0ZShudWxscHRyLCBzZWN1cml0eU9y aWdpbiwgbV9xdW90YUluQnl0ZXMpOworICAgICAgICBzbG90ID0gc3RvcmFnZUFyZWEuZ2V0KCk7 CisKKyAgICAgICAgcmV0dXJuIHN0b3JhZ2VBcmVhOworICAgIH0KKworICAgIHZvaWQgY2xlYXJT dG9yYWdlQXJlYXNNYXRjaGluZ09yaWdpbihjb25zdCBTZWN1cml0eU9yaWdpbiYgc2VjdXJpdHlP cmlnaW4pCisgICAgeworICAgICAgICBmb3IgKGF1dG8mIHN0b3JhZ2VBcmVhIDogbV9zdG9yYWdl QXJlYU1hcC52YWx1ZXMoKSkgeworICAgICAgICAgICAgaWYgKHN0b3JhZ2VBcmVhLT5zZWN1cml0 eU9yaWdpbigpLT5lcXVhbCgmc2VjdXJpdHlPcmlnaW4pKQorICAgICAgICAgICAgICAgIHN0b3Jh Z2VBcmVhLT5jbGVhcigpOworICAgICAgICB9CisgICAgfQorCisgICAgdm9pZCBjbGVhckFsbFN0 b3JhZ2VBcmVhcygpCisgICAgeworICAgICAgICBmb3IgKGF1dG8mIHN0b3JhZ2VBcmVhIDogbV9z dG9yYWdlQXJlYU1hcC52YWx1ZXMoKSkKKyAgICAgICAgICAgIHN0b3JhZ2VBcmVhLT5jbGVhcigp OworICAgIH0KKworcHJpdmF0ZToKKyAgICBleHBsaWNpdCBUcmFuc2llbnRMb2NhbFN0b3JhZ2VO YW1lc3BhY2UoKQorICAgIHsKKyAgICB9CisKKyAgICBjb25zdCB1bnNpZ25lZCBtX3F1b3RhSW5C eXRlcyA9IDUgKiAxMDI0ICogMTAyNDsKKworICAgIC8vIFdlIGRvbid0IGhvbGQgYW4gZXhwbGlj aXQgcmVmZXJlbmNlIHRvIHRoZSBTdG9yYWdlQXJlYXM7IHRoZXkgYXJlIGtlcHQgYWxpdmUgYnkg dGhlIG1fc3RvcmFnZUFyZWFzQnlDb25uZWN0aW9uIG1hcCBpbiBTdG9yYWdlTWFuYWdlci4KKyAg ICBIYXNoTWFwPFJlZlB0cjxTZWN1cml0eU9yaWdpbj4sIFN0b3JhZ2VBcmVhKj4gbV9zdG9yYWdl QXJlYU1hcDsKK307CisKK1JlZlB0cjxTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE+IFN0b3Jh Z2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6Y3JlYXRlKExvY2FsU3RvcmFnZU5hbWVzcGFjZSogbG9j YWxTdG9yYWdlTmFtZXNwYWNlLCBQYXNzUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiBzZWN1cml0eU9y aWdpbiwgdW5zaWduZWQgcXVvdGFJbkJ5dGVzKQogewogICAgIHJldHVybiBhZG9wdFJlZihuZXcg U3RvcmFnZUFyZWEobG9jYWxTdG9yYWdlTmFtZXNwYWNlLCBzZWN1cml0eU9yaWdpbiwgcXVvdGFJ bkJ5dGVzKSk7CiB9CkBAIC00NDYsMTIgKzQ5NCwzMyBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpn ZXRTdG9yYWdlRGV0YWlsc0J5T3JpZ2luKHN0ZDo6ZnVuY3Rpb248dm9pZCAoVmVjdG9yPExvY2Fs UwogCiB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVFbnRyaWVzRm9yT3JpZ2luKGNvbnN0IFNl Y3VyaXR5T3JpZ2luJiBzZWN1cml0eU9yaWdpbikKIHsKLSAgICBtX3F1ZXVlLT5kaXNwYXRjaChi aW5kKCZTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlRW50cmllc0Zvck9yaWdpbkludGVybmFsLCB0aGlz LCBSZWZQdHI8U2VjdXJpdHlPcmlnaW4+KGNvbnN0X2Nhc3Q8U2VjdXJpdHlPcmlnaW4qPigmc2Vj dXJpdHlPcmlnaW4pKSkpOworICAgIFJlZlB0cjxTdG9yYWdlTWFuYWdlcj4gc3RvcmFnZU1hbmFn ZXIodGhpcyk7CisKKyAgICBSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IGNvcGllZE9yaWdpbiA9IHNl Y3VyaXR5T3JpZ2luLmlzb2xhdGVkQ29weSgpOworICAgIG1fcXVldWUtPmRpc3BhdGNoKFtzdG9y YWdlTWFuYWdlciwgY29waWVkT3JpZ2luXSB7CisgICAgICAgIGZvciAoYXV0byYgbG9jYWxTdG9y YWdlTmFtZXNwYWNlIDogc3RvcmFnZU1hbmFnZXItPm1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlcy52 YWx1ZXMoKSkKKyAgICAgICAgICAgIGxvY2FsU3RvcmFnZU5hbWVzcGFjZS0+Y2xlYXJTdG9yYWdl QXJlYXNNYXRjaGluZ09yaWdpbihjb3BpZWRPcmlnaW4uZ2V0KCkpOworCisgICAgICAgIGZvciAo YXV0byYgdHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlIDogc3RvcmFnZU1hbmFnZXItPm1f dHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlcy52YWx1ZXMoKSkKKyAgICAgICAgICAgIHRy YW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZS0+Y2xlYXJTdG9yYWdlQXJlYXNNYXRjaGluZ09y aWdpbigqY29waWVkT3JpZ2luKTsKKworICAgICAgICBzdG9yYWdlTWFuYWdlci0+bV9sb2NhbFN0 b3JhZ2VEYXRhYmFzZVRyYWNrZXItPmRlbGV0ZURhdGFiYXNlV2l0aE9yaWdpbihjb3BpZWRPcmln aW4uZ2V0KCkpOworICAgIH0pOwogfQogCiB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVBbGxF bnRyaWVzKCkKIHsKLSAgICBtX3F1ZXVlLT5kaXNwYXRjaChiaW5kKCZTdG9yYWdlTWFuYWdlcjo6 ZGVsZXRlQWxsRW50cmllc0ludGVybmFsLCB0aGlzKSk7CisgICAgUmVmUHRyPFN0b3JhZ2VNYW5h Z2VyPiBzdG9yYWdlTWFuYWdlcih0aGlzKTsKKworICAgIG1fcXVldWUtPmRpc3BhdGNoKFtzdG9y YWdlTWFuYWdlcl0geworICAgICAgICBmb3IgKGF1dG8mIGxvY2FsU3RvcmFnZU5hbWVzcGFjZSA6 IHN0b3JhZ2VNYW5hZ2VyLT5tX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMudmFsdWVzKCkpCisgICAg ICAgICAgICBsb2NhbFN0b3JhZ2VOYW1lc3BhY2UtPmNsZWFyQWxsU3RvcmFnZUFyZWFzKCk7CisK KyAgICAgICAgZm9yIChhdXRvJiB0cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2UgOiBzdG9y YWdlTWFuYWdlci0+bV90cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2VzLnZhbHVlcygpKQor ICAgICAgICAgICAgdHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlLT5jbGVhckFsbFN0b3Jh Z2VBcmVhcygpOworCisgICAgICAgIHN0b3JhZ2VNYW5hZ2VyLT5tX2xvY2FsU3RvcmFnZURhdGFi YXNlVHJhY2tlci0+ZGVsZXRlQWxsRGF0YWJhc2VzKCk7CisgICAgfSk7CiB9CiAKIHZvaWQgU3Rv cmFnZU1hbmFnZXI6OmRlbGV0ZUxvY2FsU3RvcmFnZU9yaWdpbnNNb2RpZmllZFNpbmNlKHRpbWVf dCB0aW1lLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGNvbXBsZXRpb25IYW5kbGVyKQpAQCAtNDY2 LDYgKzUzNSw5IEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUxvY2FsU3RvcmFnZU9yaWdp bnNNb2RpZmllZFNpbmNlKHRpbWVfdCB0aW1lLCBzdGQ6OmZ1CiAgICAgICAgICAgICAgICAgbG9j YWxTdG9yYWdlTmFtZXNwYWNlLT5jbGVhclN0b3JhZ2VBcmVhc01hdGNoaW5nT3JpZ2luKG9yaWdp bi5nZXQoKSk7CiAgICAgICAgIH0KIAorICAgICAgICBmb3IgKGF1dG8mIHRyYW5zaWVudExvY2Fs U3RvcmFnZU5hbWVzcGFjZSA6IHN0b3JhZ2VNYW5hZ2VyLT5tX3RyYW5zaWVudExvY2FsU3RvcmFn ZU5hbWVzcGFjZXMudmFsdWVzKCkpCisgICAgICAgICAgICB0cmFuc2llbnRMb2NhbFN0b3JhZ2VO YW1lc3BhY2UtPmNsZWFyQWxsU3RvcmFnZUFyZWFzKCk7CisKICAgICAgICAgUnVuTG9vcDo6bWFp bigpLmRpc3BhdGNoKGNvbXBsZXRpb25IYW5kbGVyKTsKICAgICB9KTsKIH0KQEAgLTQ5Niw3ICs1 NjgsMjAgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6Y3JlYXRlTG9jYWxTdG9yYWdlTWFwKElQQzo6 Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0X3QKIAogdm9pZCBTdG9yYWdlTWFuYWdlcjo6 Y3JlYXRlVHJhbnNpZW50TG9jYWxTdG9yYWdlTWFwKElQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlv biwgdWludDY0X3Qgc3RvcmFnZU1hcElELCB1aW50NjRfdCBzdG9yYWdlTmFtZXNwYWNlSUQsIGNv bnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYgdG9wTGV2ZWxPcmlnaW5EYXRhLCBjb25zdCBTZWN1cml0 eU9yaWdpbkRhdGEmIHNlY3VyaXR5T3JpZ2luRGF0YSkKIHsKLSAgICAvLyBGSVhNRTogSW1wbGVt ZW50IHRoaXMuCisgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJlIGEgbWVzc2FnZSBjaGVjay4K KyAgICBBU1NFUlQobV9zdG9yYWdlQXJlYXNCeUNvbm5lY3Rpb24uaXNWYWxpZEtleSh7IGNvbm5l Y3Rpb24sIHN0b3JhZ2VNYXBJRCB9KSk7CisKKyAgICBhdXRvJiBzbG90ID0gbV9zdG9yYWdlQXJl YXNCeUNvbm5lY3Rpb24uYWRkKHsgY29ubmVjdGlvbiwgc3RvcmFnZU1hcElEIH0sIG51bGxwdHIp Lml0ZXJhdG9yLT52YWx1ZTsKKworICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBhIG1lc3Nh Z2UgY2hlY2suCisgICAgQVNTRVJUKCFzbG90KTsKKworICAgIFRyYW5zaWVudExvY2FsU3RvcmFn ZU5hbWVzcGFjZSogdHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlID0gZ2V0T3JDcmVhdGVU cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2Uoc3RvcmFnZU5hbWVzcGFjZUlELCAqdG9wTGV2 ZWxPcmlnaW5EYXRhLnNlY3VyaXR5T3JpZ2luKCkpOworCisgICAgYXV0byBzdG9yYWdlQXJlYSA9 IHRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZS0+Z2V0T3JDcmVhdGVTdG9yYWdlQXJlYShz ZWN1cml0eU9yaWdpbkRhdGEuc2VjdXJpdHlPcmlnaW4oKSk7CisgICAgc3RvcmFnZUFyZWEtPmFk ZExpc3RlbmVyKGNvbm5lY3Rpb24sIHN0b3JhZ2VNYXBJRCk7CisKKyAgICBzbG90ID0gV1RGOjpt b3ZlKHN0b3JhZ2VBcmVhKTsKIH0KIAogdm9pZCBTdG9yYWdlTWFuYWdlcjo6Y3JlYXRlU2Vzc2lv blN0b3JhZ2VNYXAoSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCB1aW50NjRfdCBzdG9yYWdl TWFwSUQsIHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3BhY2VJRCwgY29uc3QgU2VjdXJpdHlPcmlnaW5E YXRhJiBzZWN1cml0eU9yaWdpbkRhdGEpCkBAIC02ODYsMjEgKzc3MSwxNiBAQCBTdG9yYWdlTWFu YWdlcjo6TG9jYWxTdG9yYWdlTmFtZXNwYWNlKiBTdG9yYWdlTWFuYWdlcjo6Z2V0T3JDcmVhdGVM b2NhbFN0b3JhZ2VOYQogICAgIHJldHVybiByZXN1bHQuaXRlcmF0b3ItPnZhbHVlLmdldCgpOwog fQogCi12b2lkIFN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVFbnRyaWVzRm9yT3JpZ2luSW50ZXJuYWwo U2VjdXJpdHlPcmlnaW4qIHNlY3VyaXR5T3JpZ2luKQorU3RvcmFnZU1hbmFnZXI6OlRyYW5zaWVu dExvY2FsU3RvcmFnZU5hbWVzcGFjZSogU3RvcmFnZU1hbmFnZXI6OmdldE9yQ3JlYXRlVHJhbnNp ZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlKHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3BhY2VJRCwgV2Vi Q29yZTo6U2VjdXJpdHlPcmlnaW4mIHRvcExldmVsT3JpZ2luKQogewotICAgIGZvciAoYXV0byBp dCA9IG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlcy5iZWdpbigpLCBlbmQgPSBtX2xvY2FsU3RvcmFn ZU5hbWVzcGFjZXMuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkKLSAgICAgICAgaXQtPnZhbHVlLT5j bGVhclN0b3JhZ2VBcmVhc01hdGNoaW5nT3JpZ2luKHNlY3VyaXR5T3JpZ2luKTsKKyAgICBpZiAo IW1fdHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlcy5pc1ZhbGlkS2V5KHsgc3RvcmFnZU5h bWVzcGFjZUlELCAmdG9wTGV2ZWxPcmlnaW4gfSkpCisgICAgICAgIHJldHVybiBudWxscHRyOwog Ci0gICAgbV9sb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXItPmRlbGV0ZURhdGFiYXNlV2l0aE9y aWdpbihzZWN1cml0eU9yaWdpbik7Ci19CisgICAgYXV0byYgc2xvdCA9IG1fdHJhbnNpZW50TG9j YWxTdG9yYWdlTmFtZXNwYWNlcy5hZGQoeyBzdG9yYWdlTmFtZXNwYWNlSUQsICZ0b3BMZXZlbE9y aWdpbiB9LCBudWxscHRyKS5pdGVyYXRvci0+dmFsdWU7CisgICAgaWYgKCFzbG90KQorICAgICAg ICBzbG90ID0gVHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlOjpjcmVhdGUoKTsKIAotdm9p ZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlQWxsRW50cmllc0ludGVybmFsKCkKLXsKLSAgICBmb3Ig KGF1dG8gaXQgPSBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMuYmVnaW4oKSwgZW5kID0gbV9sb2Nh bFN0b3JhZ2VOYW1lc3BhY2VzLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpCi0gICAgICAgIGl0LT52 YWx1ZS0+Y2xlYXJBbGxTdG9yYWdlQXJlYXMoKTsKLQotICAgIG1fbG9jYWxTdG9yYWdlRGF0YWJh c2VUcmFja2VyLT5kZWxldGVBbGxEYXRhYmFzZXMoKTsKKyAgICByZXR1cm4gc2xvdC5nZXQoKTsK IH0KIAotCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCmluZGV4IGZmMzIwMzQ1MmQ1NjczZTIwZTA4 YWY5OWZmOTQ0ZWIwYWI2MzMzYWYuLjZkNDkwYzZlY2YwYmM2ZWE0Y2JiODI1OWQ3NmY2OTAwNDhm OTU4MzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3Jh Z2VNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFn ZU1hbmFnZXIuaApAQCAtOTgsMTQgKzk4LDE2IEBAIHByaXZhdGU6CiAgICAgY2xhc3MgTG9jYWxT dG9yYWdlTmFtZXNwYWNlOwogICAgIExvY2FsU3RvcmFnZU5hbWVzcGFjZSogZ2V0T3JDcmVhdGVM b2NhbFN0b3JhZ2VOYW1lc3BhY2UodWludDY0X3Qgc3RvcmFnZU5hbWVzcGFjZUlEKTsKIAotICAg IHZvaWQgZGVsZXRlRW50cmllc0Zvck9yaWdpbkludGVybmFsKFdlYkNvcmU6OlNlY3VyaXR5T3Jp Z2luKik7Ci0gICAgdm9pZCBkZWxldGVBbGxFbnRyaWVzSW50ZXJuYWwoKTsKKyAgICBjbGFzcyBU cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2U7CisgICAgVHJhbnNpZW50TG9jYWxTdG9yYWdl TmFtZXNwYWNlKiBnZXRPckNyZWF0ZVRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZSh1aW50 NjRfdCBzdG9yYWdlTmFtZXNwYWNlSUQsIFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luJiB0b3BMZXZl bE9yaWdpbik7CiAKICAgICBSZWZQdHI8V29ya1F1ZXVlPiBtX3F1ZXVlOwogCiAgICAgUmVmUHRy PExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcj4gbV9sb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNr ZXI7CiAgICAgSGFzaE1hcDx1aW50NjRfdCwgUmVmUHRyPExvY2FsU3RvcmFnZU5hbWVzcGFjZT4+ IG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlczsKIAorICAgIEhhc2hNYXA8c3RkOjpwYWlyPHVpbnQ2 NF90LCBSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+PiwgUmVmUHRyPFRyYW5zaWVudExv Y2FsU3RvcmFnZU5hbWVzcGFjZT4+IG1fdHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlczsK KwogICAgIGNsYXNzIFNlc3Npb25TdG9yYWdlTmFtZXNwYWNlOwogICAgIEhhc2hNYXA8dWludDY0 X3QsIFJlZlB0cjxTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZT4+IG1fc2Vzc2lvblN0b3JhZ2VOYW1l c3BhY2VzOwogCg==