139257 2014-12-04 08:36:32 -0800 Simplify StorageManager callback functions 2014-12-04 11:39:22 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue oldest_to_newest 1052480 0 andersca 2014-12-04 08:36:32 -0800 Simplify StorageManager callback functions 1052481 1 242571 andersca 2014-12-04 08:37:39 -0800 Created attachment 242571 Patch 1052482 2 commit-queue 2014-12-04 08:39:51 -0800 Attachment 242571 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp:101: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.h:63: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.h:64: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.cpp:421: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.cpp:434: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 5 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1052522 3 242571 commit-queue 2014-12-04 11:39:19 -0800 Comment on attachment 242571 Patch Clearing flags on attachment: 242571 Committed r176806: <http://trac.webkit.org/changeset/176806> 1052523 4 commit-queue 2014-12-04 11:39:22 -0800 All reviewed patches have been landed. Closing bug. 242571 2014-12-04 08:37:39 -0800 2014-12-04 11:39:19 -0800 Patch bug-139257-20141204083813.patch text/plain 11727 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2Nzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMzhjODIwYThlNmMyMjBh MGNiMTE5YWU1NDI2NjI0YzAyNWI4N2RlMC4uOGU5N2VlM2FjYTg1YTEyOTdjMjJhMzI3YWJhYTU0 YWQ0Mzk4MmQyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTEyLTA0ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxpZnkgU3Rv cmFnZU1hbmFnZXIgY2FsbGJhY2sgZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzkyNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2Vy LmNwcDoKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmdldE9yaWdpbnMpOgorICAg ICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6Z2V0U3RvcmFnZURldGFpbHNCeU9yaWdpbik6 CisgICAgICAgIChXZWJLaXQ6OmNhbGxDYWxsYmFja0Z1bmN0aW9uKTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmdldE9yaWdpbnNJbnRlcm5hbCk6IERlbGV0ZWQu CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpnZXRTdG9yYWdlRGV0YWlsc0J5T3Jp Z2luSW50ZXJuYWwpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL1N0b3Jh Z2VNYW5hZ2VyLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYktleVZhbHVlU3RvcmFnZU1hbmFn ZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjpnZXRL ZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zKToKKyAgICAgICAgKFdlYktpdDo6V2ViS2V5VmFsdWVTdG9y YWdlTWFuYWdlcjo6Z2V0U3RvcmFnZURldGFpbHNCeU9yaWdpbik6CisgICAgICAgIChXZWJLaXQ6 OmRpZEdldEtleVZhbHVlU3RvcmFnZU9yaWdpbnMpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0 OjpkaWRHZXRTdG9yYWdlRGV0YWlsc0J5T3JpZ2luKTogRGVsZXRlZC4KKwogMjAxNC0xMi0wMyAg QW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBhIHdh eSB0byBkZWxldGUgbG9jYWwgc3RvcmFnZSBvcmlnaW5zIG1vZGlmaWVkIGFmdGVyIGEgZ2l2ZW4g ZGF0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFn ZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1h bmFnZXIuY3BwCmluZGV4IDBmYmVmMTY4ZTVmNjQ3N2FhNGU2MDQ5OGQ4Nzk4ZmNhM2FiMzQ1MGYu LmUzNzc3MTI5OTQ4MjYwMTQ4YmY2OTBkODcxMDUwYzljOTgzZDY5YzEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAKQEAgLTQx OCwxNCArNDE4LDMwIEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OnByb2Nlc3NXaWxsQ2xvc2VDb25u ZWN0aW9uKFdlYlByb2Nlc3NQcm94eSogd2ViUHJvY2Vzc1Byb3h5CiAgICAgbV9xdWV1ZS0+ZGlz cGF0Y2goYmluZCgmU3RvcmFnZU1hbmFnZXI6OmludmFsaWRhdGVDb25uZWN0aW9uSW50ZXJuYWws IHRoaXMsIFJlZlB0cjxJUEM6OkNvbm5lY3Rpb24+KHdlYlByb2Nlc3NQcm94eS0+Y29ubmVjdGlv bigpKSkpOwogfQogCi12b2lkIFN0b3JhZ2VNYW5hZ2VyOjpnZXRPcmlnaW5zKEZ1bmN0aW9uRGlz cGF0Y2hlciYgY2FsbGJhY2tEaXNwYXRjaGVyLCB2b2lkKiBjb250ZXh0LCB2b2lkICgqY2FsbGJh Y2spKGNvbnN0IFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+PiYgc2VjdXJp dHlPcmlnaW5zLCB2b2lkKiBjb250ZXh0KSkKK3ZvaWQgU3RvcmFnZU1hbmFnZXI6OmdldE9yaWdp bnMoc3RkOjpmdW5jdGlvbjx2b2lkIChWZWN0b3I8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3Jp Z2luPj4pPiBjb21wbGV0aW9uSGFuZGxlcikKIHsKLSAgICBtX3F1ZXVlLT5kaXNwYXRjaChiaW5k KCZTdG9yYWdlTWFuYWdlcjo6Z2V0T3JpZ2luc0ludGVybmFsLCB0aGlzLCBSZWZQdHI8RnVuY3Rp b25EaXNwYXRjaGVyPigmY2FsbGJhY2tEaXNwYXRjaGVyKSwgY29udGV4dCwgY2FsbGJhY2spKTsK KyAgICBSZWZQdHI8U3RvcmFnZU1hbmFnZXI+IHN0b3JhZ2VNYW5hZ2VyKHRoaXMpOworCisgICAg bV9xdWV1ZS0+ZGlzcGF0Y2goW3N0b3JhZ2VNYW5hZ2VyLCBjb21wbGV0aW9uSGFuZGxlcl0gewor ICAgICAgICBhdXRvIG9yaWdpbnMgPSBzdG9yYWdlTWFuYWdlci0+bV9sb2NhbFN0b3JhZ2VEYXRh YmFzZVRyYWNrZXItPm9yaWdpbnMoKTsKKworICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0 Y2goW29yaWdpbnMsIGNvbXBsZXRpb25IYW5kbGVyXSgpIG11dGFibGUgeworICAgICAgICAgICAg Y29tcGxldGlvbkhhbmRsZXIoV1RGOjptb3ZlKG9yaWdpbnMpKTsKKyAgICAgICAgfSk7CisgICAg fSk7CiB9CiAKLXZvaWQgU3RvcmFnZU1hbmFnZXI6OmdldFN0b3JhZ2VEZXRhaWxzQnlPcmlnaW4o RnVuY3Rpb25EaXNwYXRjaGVyJiBjYWxsYmFja0Rpc3BhdGNoZXIsIHZvaWQqIGNvbnRleHQsIHZv aWQgKCpjYWxsYmFjaykoY29uc3QgVmVjdG9yPExvY2FsU3RvcmFnZURldGFpbHM+JiBzdG9yYWdl RGV0YWlscywgdm9pZCogY29udGV4dCkpCit2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpnZXRTdG9yYWdl RGV0YWlsc0J5T3JpZ2luKHN0ZDo6ZnVuY3Rpb248dm9pZCAoVmVjdG9yPExvY2FsU3RvcmFnZURl dGFpbHM+KT4gY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgbV9xdWV1ZS0+ZGlzcGF0Y2goYmlu ZCgmU3RvcmFnZU1hbmFnZXI6OmdldFN0b3JhZ2VEZXRhaWxzQnlPcmlnaW5JbnRlcm5hbCwgdGhp cywgUmVmUHRyPEZ1bmN0aW9uRGlzcGF0Y2hlcj4oJmNhbGxiYWNrRGlzcGF0Y2hlciksIGNvbnRl eHQsIGNhbGxiYWNrKSk7CisgICAgUmVmUHRyPFN0b3JhZ2VNYW5hZ2VyPiBzdG9yYWdlTWFuYWdl cih0aGlzKTsKKworICAgIG1fcXVldWUtPmRpc3BhdGNoKFtzdG9yYWdlTWFuYWdlciwgY29tcGxl dGlvbkhhbmRsZXJdIHsKKyAgICAgICAgYXV0byBzdG9yYWdlRGV0YWlscyA9IHN0b3JhZ2VNYW5h Z2VyLT5tX2xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci0+ZGV0YWlscygpOworCisgICAgICAg IFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbc3RvcmFnZURldGFpbHMsIGNvbXBsZXRpb25IYW5k bGVyXSgpIG11dGFibGUgeworICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoV1RGOjptb3Zl KHN0b3JhZ2VEZXRhaWxzKSk7CisgICAgICAgIH0pOworICAgIH0pOwogfQogCiB2b2lkIFN0b3Jh Z2VNYW5hZ2VyOjpkZWxldGVFbnRyaWVzRm9yT3JpZ2luKGNvbnN0IFNlY3VyaXR5T3JpZ2luJiBz ZWN1cml0eU9yaWdpbikKQEAgLTY2NSwyNCArNjgxLDYgQEAgU3RvcmFnZU1hbmFnZXI6OkxvY2Fs U3RvcmFnZU5hbWVzcGFjZSogU3RvcmFnZU1hbmFnZXI6OmdldE9yQ3JlYXRlTG9jYWxTdG9yYWdl TmEKICAgICByZXR1cm4gcmVzdWx0Lml0ZXJhdG9yLT52YWx1ZS5nZXQoKTsKIH0KIAotc3RhdGlj IHZvaWQgY2FsbENhbGxiYWNrRnVuY3Rpb24odm9pZCogY29udGV4dCwgdm9pZCAoKmNhbGxiYWNr RnVuY3Rpb24pKGNvbnN0IFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+PiYg c2VjdXJpdHlPcmlnaW5zLCB2b2lkKiBjb250ZXh0KSwgVmVjdG9yPFJlZlB0cjxXZWJDb3JlOjpT ZWN1cml0eU9yaWdpbj4+KiBzZWN1cml0eU9yaWdpbnNQdHIpCi17Ci0gICAgc3RkOjp1bmlxdWVf cHRyPFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+Pj4gc2VjdXJpdHlPcmln aW5zKHNlY3VyaXR5T3JpZ2luc1B0cik7Ci0gICAgY2FsbGJhY2tGdW5jdGlvbigqc2VjdXJpdHlP cmlnaW5zLCBjb250ZXh0KTsKLX0KLQotdm9pZCBTdG9yYWdlTWFuYWdlcjo6Z2V0T3JpZ2luc0lu dGVybmFsKEZ1bmN0aW9uRGlzcGF0Y2hlciogZGlzcGF0Y2hlciwgdm9pZCogY29udGV4dCwgdm9p ZCAoKmNhbGxiYWNrRnVuY3Rpb24pKGNvbnN0IFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6U2VjdXJp dHlPcmlnaW4+PiYgc2VjdXJpdHlPcmlnaW5zLCB2b2lkKiBjb250ZXh0KSkKLXsKLSAgICBhdXRv IHNlY3VyaXR5T3JpZ2lucyA9IHN0ZDo6bWFrZV91bmlxdWU8VmVjdG9yPFJlZlB0cjxXZWJDb3Jl OjpTZWN1cml0eU9yaWdpbj4+PihtX2xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci0+b3JpZ2lu cygpKTsKLSAgICBkaXNwYXRjaGVyLT5kaXNwYXRjaChiaW5kKGNhbGxDYWxsYmFja0Z1bmN0aW9u LCBjb250ZXh0LCBjYWxsYmFja0Z1bmN0aW9uLCBzZWN1cml0eU9yaWdpbnMucmVsZWFzZSgpKSk7 Ci19Ci0KLXZvaWQgU3RvcmFnZU1hbmFnZXI6OmdldFN0b3JhZ2VEZXRhaWxzQnlPcmlnaW5JbnRl cm5hbChGdW5jdGlvbkRpc3BhdGNoZXIqIGRpc3BhdGNoZXIsIHZvaWQqIGNvbnRleHQsIHZvaWQg KCpjYWxsYmFja0Z1bmN0aW9uKShjb25zdCBWZWN0b3I8TG9jYWxTdG9yYWdlRGV0YWlscz4mIHN0 b3JhZ2VEZXRhaWxzLCB2b2lkKiBjb250ZXh0KSkKLXsKLSAgICBWZWN0b3I8TG9jYWxTdG9yYWdl RGV0YWlscz4gc3RvcmFnZURldGFpbHMgPSBtX2xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci0+ ZGV0YWlscygpOwotICAgIGRpc3BhdGNoZXItPmRpc3BhdGNoKGJpbmQoY2FsbGJhY2tGdW5jdGlv biwgV1RGOjptb3ZlKHN0b3JhZ2VEZXRhaWxzKSwgY29udGV4dCkpOwotfQotCiB2b2lkIFN0b3Jh Z2VNYW5hZ2VyOjpkZWxldGVFbnRyaWVzRm9yT3JpZ2luSW50ZXJuYWwoU2VjdXJpdHlPcmlnaW4q IHNlY3VyaXR5T3JpZ2luKQogewogICAgIGZvciAoYXV0byBpdCA9IG1fbG9jYWxTdG9yYWdlTmFt ZXNwYWNlcy5iZWdpbigpLCBlbmQgPSBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMuZW5kKCk7IGl0 ICE9IGVuZDsgKytpdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9y YWdlL1N0b3JhZ2VNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9T dG9yYWdlTWFuYWdlci5oCmluZGV4IDkzNDMwNmZkZmY1YmQzMzcwNDg2NmQwMzcwZGQxNmFkN2Nk NWQzZjcuLjk5M2U2NGVlMDA4ZTRlMzM1MTRlODUzODdmNWFmZTlhYjE3NzhlY2QgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmgKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaApAQCAt NjAsMTAgKzYwLDggQEAgcHVibGljOgogICAgIHZvaWQgcHJvY2Vzc1dpbGxDbG9zZUNvbm5lY3Rp b24oV2ViUHJvY2Vzc1Byb3h5Kik7CiAgICAgdm9pZCBhcHBsaWNhdGlvbldpbGxUZXJtaW5hdGUo KTsKIAotICAgIC8vIEZJWE1FOiBJbnN0ZWFkIG9mIGEgY29udGV4dCArIEMgZnVuY3Rpb24sIHRo aXMgc2hvdWxkIHRha2UgYSBXVEY6OkZ1bmN0aW9uLCBidXQgd2UgY3VycmVudGx5IGRvbid0Ci0g ICAgLy8gc3VwcG9ydCBhcmd1bWVudHMgaW4gZnVuY3Rpb25zLgotICAgIHZvaWQgZ2V0T3JpZ2lu cyhGdW5jdGlvbkRpc3BhdGNoZXImIGNhbGxiYWNrRGlzcGF0Y2hlciwgdm9pZCogY29udGV4dCwg dm9pZCAoKmNhbGxiYWNrKShjb25zdCBWZWN0b3I8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3Jp Z2luPj4mLCB2b2lkKiBjb250ZXh0KSk7Ci0gICAgdm9pZCBnZXRTdG9yYWdlRGV0YWlsc0J5T3Jp Z2luKEZ1bmN0aW9uRGlzcGF0Y2hlciYgY2FsbGJhY2tEaXNwYXRjaGVyLCB2b2lkKiBjb250ZXh0 LCB2b2lkICgqY2FsbGJhY2spKGNvbnN0IFZlY3RvcjxMb2NhbFN0b3JhZ2VEZXRhaWxzPiYsIHZv aWQqIGNvbnRleHQpKTsKKyAgICB2b2lkIGdldE9yaWdpbnMoc3RkOjpmdW5jdGlvbjx2b2lkIChW ZWN0b3I8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4pPiBjb21wbGV0aW9uSGFuZGxl cik7CisgICAgdm9pZCBnZXRTdG9yYWdlRGV0YWlsc0J5T3JpZ2luKHN0ZDo6ZnVuY3Rpb248dm9p ZCAoVmVjdG9yPExvY2FsU3RvcmFnZURldGFpbHM+KT4gY29tcGxldGlvbkhhbmRsZXIpOwogICAg IHZvaWQgZGVsZXRlRW50cmllc0Zvck9yaWdpbihjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdp biYpOwogICAgIHZvaWQgZGVsZXRlQWxsRW50cmllcygpOwogCkBAIC05OSw4ICs5Nyw2IEBAIHBy aXZhdGU6CiAgICAgY2xhc3MgTG9jYWxTdG9yYWdlTmFtZXNwYWNlOwogICAgIExvY2FsU3RvcmFn ZU5hbWVzcGFjZSogZ2V0T3JDcmVhdGVMb2NhbFN0b3JhZ2VOYW1lc3BhY2UodWludDY0X3Qgc3Rv cmFnZU5hbWVzcGFjZUlEKTsKIAotICAgIHZvaWQgZ2V0T3JpZ2luc0ludGVybmFsKEZ1bmN0aW9u RGlzcGF0Y2hlciogY2FsbGJhY2tEaXNwYXRjaGVyLCB2b2lkKiBjb250ZXh0LCB2b2lkICgqY2Fs bGJhY2spKGNvbnN0IFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+PiYsIHZv aWQqIGNvbnRleHQpKTsKLSAgICB2b2lkIGdldFN0b3JhZ2VEZXRhaWxzQnlPcmlnaW5JbnRlcm5h bChGdW5jdGlvbkRpc3BhdGNoZXIqIGNhbGxiYWNrRGlzcGF0Y2hlciwgdm9pZCogY29udGV4dCwg dm9pZCAoKmNhbGxiYWNrKShjb25zdCBWZWN0b3I8TG9jYWxTdG9yYWdlRGV0YWlscz4mLCB2b2lk KiBjb250ZXh0KSk7CiAgICAgdm9pZCBkZWxldGVFbnRyaWVzRm9yT3JpZ2luSW50ZXJuYWwoV2Vi Q29yZTo6U2VjdXJpdHlPcmlnaW4qKTsKICAgICB2b2lkIGRlbGV0ZUFsbEVudHJpZXNJbnRlcm5h bCgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViS2V5VmFsdWVT dG9yYWdlTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViS2V5VmFsdWVT dG9yYWdlTWFuYWdlci5jcHAKaW5kZXggNThmZmMwMWUzYjA0MjZhZjdhZDk0ZWY3YjAyNDIwNzBj Mjc5MjFiYS4uZjIxYTdiZmJhZDBkMmMwMzU4YmM3MDMwOWJlNGFkNWQ5Njg3YzVjYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYktleVZhbHVlU3RvcmFnZU1hbmFnZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5h Z2VyLmNwcApAQCAtODYsNTEgKzg2LDQxIEBAIHZvaWQgV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdl cjo6ZGVyZWZXZWJDb250ZXh0U3VwcGxlbWVudCgpCiAgICAgQVBJOjpPYmplY3Q6OmRlcmVmKCk7 CiB9CiAKLXN0YXRpYyB2b2lkIGRpZEdldEtleVZhbHVlU3RvcmFnZU9yaWdpbnMoY29uc3QgVmVj dG9yPFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+JiBzZWN1cml0eU9yaWdpbnMsIHZvaWQqIGNvbnRl eHQpCi17Ci0gICAgUmVmUHRyPEFycmF5Q2FsbGJhY2s+IGNhbGxiYWNrID0gYWRvcHRSZWYoc3Rh dGljX2Nhc3Q8QXJyYXlDYWxsYmFjayo+KGNvbnRleHQpKTsKLQotICAgIFZlY3RvcjxSZWZQdHI8 QVBJOjpPYmplY3Q+PiB3ZWJTZWN1cml0eU9yaWdpbnM7Ci0gICAgd2ViU2VjdXJpdHlPcmlnaW5z LnJlc2VydmVJbml0aWFsQ2FwYWNpdHkoc2VjdXJpdHlPcmlnaW5zLnNpemUoKSk7Ci0KLSAgICBm b3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgc2VjdXJpdHlPcmlnaW5zLnNpemUoKTsgKytpKQotICAg ICAgICB3ZWJTZWN1cml0eU9yaWdpbnMudW5jaGVja2VkQXBwZW5kKFdlYlNlY3VyaXR5T3JpZ2lu OjpjcmVhdGUoc2VjdXJpdHlPcmlnaW5zW2ldKSk7Ci0KLSAgICBjYWxsYmFjay0+cGVyZm9ybUNh bGxiYWNrV2l0aFJldHVyblZhbHVlKEFQSTo6QXJyYXk6OmNyZWF0ZShXVEY6Om1vdmUod2ViU2Vj dXJpdHlPcmlnaW5zKSkuZ2V0KCkpOwotfQotCiB2b2lkIFdlYktleVZhbHVlU3RvcmFnZU1hbmFn ZXI6OmdldEtleVZhbHVlU3RvcmFnZU9yaWdpbnMoc3RkOjpmdW5jdGlvbjx2b2lkIChBUEk6OkFy cmF5KiwgQ2FsbGJhY2tCYXNlOjpFcnJvcik+IGNhbGxiYWNrRnVuY3Rpb24pCiB7Ci0gICAgY29u dGV4dCgpLT5zdG9yYWdlTWFuYWdlcigpLmdldE9yaWdpbnMoUnVuTG9vcDo6bWFpbigpLCBBcnJh eUNhbGxiYWNrOjpjcmVhdGUoV1RGOjptb3ZlKGNhbGxiYWNrRnVuY3Rpb24pKS5sZWFrUmVmKCks IGRpZEdldEtleVZhbHVlU3RvcmFnZU9yaWdpbnMpOworICAgIGNvbnRleHQoKS0+c3RvcmFnZU1h bmFnZXIoKS5nZXRPcmlnaW5zKFtjYWxsYmFja0Z1bmN0aW9uXShWZWN0b3I8UmVmUHRyPFNlY3Vy aXR5T3JpZ2luPj4gc2VjdXJpdHlPcmlnaW5zKSB7CisgICAgICAgIFZlY3RvcjxSZWZQdHI8QVBJ OjpPYmplY3Q+PiB3ZWJTZWN1cml0eU9yaWdpbnM7CisgICAgICAgIHdlYlNlY3VyaXR5T3JpZ2lu cy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KHNlY3VyaXR5T3JpZ2lucy5zaXplKCkpOworICAgICAg ICBmb3IgKGF1dG8mIG9yaWdpbiA6IHNlY3VyaXR5T3JpZ2lucykKKyAgICAgICAgICAgIHdlYlNl Y3VyaXR5T3JpZ2lucy51bmNoZWNrZWRBcHBlbmQoV2ViU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShX VEY6Om1vdmUob3JpZ2luKSkpOworCisgICAgICAgIGNhbGxiYWNrRnVuY3Rpb24oQVBJOjpBcnJh eTo6Y3JlYXRlKFdURjo6bW92ZSh3ZWJTZWN1cml0eU9yaWdpbnMpKS5nZXQoKSwgQ2FsbGJhY2tC YXNlOjpFcnJvcjo6Tm9uZSk7CisgICAgfSk7CiB9CiAKLXN0YXRpYyB2b2lkIGRpZEdldFN0b3Jh Z2VEZXRhaWxzQnlPcmlnaW4oY29uc3QgVmVjdG9yPExvY2FsU3RvcmFnZURldGFpbHM+JiBzdG9y YWdlRGV0YWlscywgdm9pZCogY29udGV4dCkKK3ZvaWQgV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdl cjo6Z2V0U3RvcmFnZURldGFpbHNCeU9yaWdpbihzdGQ6OmZ1bmN0aW9uPHZvaWQgKEFQSTo6QXJy YXkqLCBDYWxsYmFja0Jhc2U6OkVycm9yKT4gY2FsbGJhY2tGdW5jdGlvbikKIHsKLSAgICBSZWZQ dHI8QXJyYXlDYWxsYmFjaz4gY2FsbGJhY2sgPSBhZG9wdFJlZihzdGF0aWNfY2FzdDxBcnJheUNh bGxiYWNrKj4oY29udGV4dCkpOwotCi0gICAgVmVjdG9yPFJlZlB0cjxBUEk6Ok9iamVjdD4+IHJl c3VsdDsKLSAgICByZXN1bHQucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShzdG9yYWdlRGV0YWlscy5z aXplKCkpOwotCi0gICAgZm9yIChjb25zdCBMb2NhbFN0b3JhZ2VEZXRhaWxzJiBvcmlnaW5EZXRh aWxzIDogc3RvcmFnZURldGFpbHMpIHsKKyAgICBjb250ZXh0KCktPnN0b3JhZ2VNYW5hZ2VyKCku Z2V0U3RvcmFnZURldGFpbHNCeU9yaWdpbihbY2FsbGJhY2tGdW5jdGlvbl0oVmVjdG9yPExvY2Fs U3RvcmFnZURldGFpbHM+IHN0b3JhZ2VEZXRhaWxzKSB7CiAgICAgICAgIEhhc2hNYXA8U3RyaW5n LCBSZWZQdHI8QVBJOjpPYmplY3Q+PiBkZXRhaWxzTWFwOworICAgICAgICBWZWN0b3I8UmVmUHRy PEFQSTo6T2JqZWN0Pj4gcmVzdWx0OworICAgICAgICByZXN1bHQucmVzZXJ2ZUluaXRpYWxDYXBh Y2l0eShzdG9yYWdlRGV0YWlscy5zaXplKCkpOwogCi0gICAgICAgIFJlZlB0cjxBUEk6Ok9iamVj dD4gb3JpZ2luID0gV2ViU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShTZWN1cml0eU9yaWdpbjo6Y3Jl YXRlRnJvbURhdGFiYXNlSWRlbnRpZmllcihvcmlnaW5EZXRhaWxzLm9yaWdpbklkZW50aWZpZXIp KTsKKyAgICAgICAgZm9yIChjb25zdCBMb2NhbFN0b3JhZ2VEZXRhaWxzJiBvcmlnaW5EZXRhaWxz IDogc3RvcmFnZURldGFpbHMpIHsKKyAgICAgICAgICAgIEhhc2hNYXA8U3RyaW5nLCBSZWZQdHI8 QVBJOjpPYmplY3Q+PiBkZXRhaWxzTWFwOwogCi0gICAgICAgIGRldGFpbHNNYXAuc2V0KFdlYktl eVZhbHVlU3RvcmFnZU1hbmFnZXI6Om9yaWdpbktleSgpLCBvcmlnaW4pOwotICAgICAgICBpZiAo b3JpZ2luRGV0YWlscy5jcmVhdGlvblRpbWUpCi0gICAgICAgICAgICBkZXRhaWxzTWFwLnNldChX ZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGlvblRpbWVLZXkoKSwgQVBJOjpEb3VibGU6 OmNyZWF0ZShvcmlnaW5EZXRhaWxzLmNyZWF0aW9uVGltZS52YWx1ZU9yKDApKSk7Ci0gICAgICAg IGlmIChvcmlnaW5EZXRhaWxzLm1vZGlmaWNhdGlvblRpbWUpCi0gICAgICAgICAgICBkZXRhaWxz TWFwLnNldChXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjptb2RpZmljYXRpb25UaW1lS2V5KCks IEFQSTo6RG91YmxlOjpjcmVhdGUob3JpZ2luRGV0YWlscy5tb2RpZmljYXRpb25UaW1lLnZhbHVl T3IoMCkpKTsKKyAgICAgICAgICAgIFJlZlB0cjxBUEk6Ok9iamVjdD4gb3JpZ2luID0gV2ViU2Vj dXJpdHlPcmlnaW46OmNyZWF0ZShTZWN1cml0eU9yaWdpbjo6Y3JlYXRlRnJvbURhdGFiYXNlSWRl bnRpZmllcihvcmlnaW5EZXRhaWxzLm9yaWdpbklkZW50aWZpZXIpKTsKIAotICAgICAgICByZXN1 bHQudW5jaGVja2VkQXBwZW5kKEltbXV0YWJsZURpY3Rpb25hcnk6OmNyZWF0ZShXVEY6Om1vdmUo ZGV0YWlsc01hcCkpKTsKLSAgICB9CisgICAgICAgICAgICBkZXRhaWxzTWFwLnNldChXZWJLZXlW YWx1ZVN0b3JhZ2VNYW5hZ2VyOjpvcmlnaW5LZXkoKSwgb3JpZ2luKTsKKyAgICAgICAgICAgIGlm IChvcmlnaW5EZXRhaWxzLmNyZWF0aW9uVGltZSkKKyAgICAgICAgICAgICAgICBkZXRhaWxzTWFw LnNldChXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGlvblRpbWVLZXkoKSwgQVBJOjpE b3VibGU6OmNyZWF0ZShvcmlnaW5EZXRhaWxzLmNyZWF0aW9uVGltZS52YWx1ZU9yKDApKSk7Cisg ICAgICAgICAgICBpZiAob3JpZ2luRGV0YWlscy5tb2RpZmljYXRpb25UaW1lKQorICAgICAgICAg ICAgICAgIGRldGFpbHNNYXAuc2V0KFdlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6Om1vZGlmaWNh dGlvblRpbWVLZXkoKSwgQVBJOjpEb3VibGU6OmNyZWF0ZShvcmlnaW5EZXRhaWxzLm1vZGlmaWNh dGlvblRpbWUudmFsdWVPcigwKSkpOwogCi0gICAgY2FsbGJhY2stPnBlcmZvcm1DYWxsYmFja1dp dGhSZXR1cm5WYWx1ZShBUEk6OkFycmF5OjpjcmVhdGUoV1RGOjptb3ZlKHJlc3VsdCkpLmdldCgp KTsKLX0KKyAgICAgICAgICAgIHJlc3VsdC51bmNoZWNrZWRBcHBlbmQoSW1tdXRhYmxlRGljdGlv bmFyeTo6Y3JlYXRlKFdURjo6bW92ZShkZXRhaWxzTWFwKSkpOwogCi12b2lkIFdlYktleVZhbHVl U3RvcmFnZU1hbmFnZXI6OmdldFN0b3JhZ2VEZXRhaWxzQnlPcmlnaW4oc3RkOjpmdW5jdGlvbjx2 b2lkIChBUEk6OkFycmF5KiwgQ2FsbGJhY2tCYXNlOjpFcnJvcik+IGNhbGxiYWNrRnVuY3Rpb24p Ci17Ci0gICAgY29udGV4dCgpLT5zdG9yYWdlTWFuYWdlcigpLmdldFN0b3JhZ2VEZXRhaWxzQnlP cmlnaW4oUnVuTG9vcDo6bWFpbigpLCBBcnJheUNhbGxiYWNrOjpjcmVhdGUoV1RGOjptb3ZlKGNh bGxiYWNrRnVuY3Rpb24pKS5sZWFrUmVmKCksIGRpZEdldFN0b3JhZ2VEZXRhaWxzQnlPcmlnaW4p OworICAgICAgICAgICAgY2FsbGJhY2tGdW5jdGlvbihBUEk6OkFycmF5OjpjcmVhdGUoV1RGOjpt b3ZlKHJlc3VsdCkpLmdldCgpLCBDYWxsYmFja0Jhc2U6OkVycm9yOjpOb25lKTsKKyAgICAgICAg fQorICAgIH0pOwogfQogCiB2b2lkIFdlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUVu dHJpZXNGb3JPcmlnaW4oV2ViU2VjdXJpdHlPcmlnaW4qIG9yaWdpbikK