198049 2019-05-20 11:57:38 -0700 Remove outdated FIXME in StorageManager 2019-05-31 21:17:19 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu commit-queue ggaren webkit-bug-importer youennf oldest_to_newest 1537653 0 sihui_liu 2019-05-20 11:57:38 -0700 Fix the FIXMEs in StorageManager 1539068 1 sihui_liu 2019-05-24 14:36:04 -0700 After r245649, we start dispatching StorageManager messages to main thread of network process and actually handling them on background thread. Therefore the places we marked that need message check won't be checked until after message dispatching completes on main thread. 1539069 2 370593 sihui_liu 2019-05-24 14:37:47 -0700 Created attachment 370593 Patch 1539100 3 370593 ggaren 2019-05-24 16:04:15 -0700 Comment on attachment 370593 Patch r=me 1540936 4 371106 sihui_liu 2019-05-31 20:33:17 -0700 Created attachment 371106 Patch for landing 1540938 5 371106 commit-queue 2019-05-31 21:16:46 -0700 Comment on attachment 371106 Patch for landing Clearing flags on attachment: 371106 Committed r246011: <https://trac.webkit.org/changeset/246011> 1540939 6 commit-queue 2019-05-31 21:16:47 -0700 All reviewed patches have been landed. Closing bug. 1540940 7 webkit-bug-importer 2019-05-31 21:17:19 -0700 <rdar://problem/51325006> 370593 2019-05-24 14:37:47 -0700 2019-05-31 20:33:15 -0700 Patch bug-198049-20190524143746.patch text/plain 5268 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1NzQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc2Y2YyNDAwMGFkNzYzMGVj OGVkZDI3ZDRkZWQ2OWNlYTc1ZmMzNGUuLmFlNGQzMzE5MmI2YWJmMTVlODkyYWJmYTlmOTljZjAx MThiNzhhMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTktMDUtMjQgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIG91dGRhdGVkIEZJWE1F IGluIFN0b3JhZ2VNYW5hZ2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTgwNDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3Bw OgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6Y3JlYXRlTG9jYWxTdG9yYWdlTWFw KToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmNyZWF0ZVRyYW5zaWVudExvY2Fs U3RvcmFnZU1hcCk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGVTZXNz aW9uU3RvcmFnZU1hcCk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpkZXN0cm95 U3RvcmFnZU1hcCk6CisKIDIwMTktMDUtMjMgIFJvc3MgS2lyc2xpbmcgIDxyb3NzLmtpcnNsaW5n QHNvbnkuY29tPgogCiAgICAgICAgIFNvY2tldC1iYXNlZCBSV0kgc2hvdWxkIGJlIGFibGUgdG8g aW5zcGVjdCBhIEpTQ29udGV4dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9XZWJTdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvV2ViU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAKaW5kZXggMDAzOTQ1MDUzZjU1 MDM0YzIzMDg3ZTkwNzk4YmY5YjdkZmJlODYyMy4uZGIzZTIzYmYxMjdiYWE0NzcxMWFjODg1ZTc0 YzZlZjkyYmJmN2JiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9X ZWJTdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCkBAIC03MTUsMTggKzcxNSwxNSBA QCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGVMb2NhbFN0b3JhZ2VNYXAoSVBDOjpDb25uZWN0 aW9uJiBjb25uZWN0aW9uLCB1aW50NjRfdAogICAgICAgICBBU1NFUlQoIW1faXNFcGhlbWVyYWwp OwogICAgICAgICBzdGQ6OnBhaXI8SVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJRCwgdWludDY0X3Q+ IGNvbm5lY3Rpb25BbmRTdG9yYWdlTWFwSURQYWlyKGNvbm5lY3Rpb25JRCwgc3RvcmFnZU1hcElE KTsKIAotICAgICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUgYSBtZXNzYWdlIGNoZWNrLgog ICAgICAgICBBU1NFUlQoKEhhc2hNYXA8c3RkOjpwYWlyPElQQzo6Q29ubmVjdGlvbjo6VW5pcXVl SUQsIHVpbnQ2NF90PiwgUmVmUHRyPFN0b3JhZ2VBcmVhPj46OmlzVmFsaWRLZXkoY29ubmVjdGlv bkFuZFN0b3JhZ2VNYXBJRFBhaXIpKSk7CiAKICAgICAgICAgYXV0byByZXN1bHQgPSBtX3N0b3Jh Z2VBcmVhc0J5Q29ubmVjdGlvbi5hZGQoY29ubmVjdGlvbkFuZFN0b3JhZ2VNYXBJRFBhaXIsIG51 bGxwdHIpOwogCi0gICAgICAgIC8vIEZJWE1FOiBUaGVzZSBzaG91bGQgYmUgYSBtZXNzYWdlIGNo ZWNrcy4KICAgICAgICAgQVNTRVJUKHJlc3VsdC5pc05ld0VudHJ5KTsKICAgICAgICAgQVNTRVJU KChIYXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8TG9jYWxTdG9yYWdlTmFtZXNwYWNlPj46OmlzVmFs aWRLZXkoc3RvcmFnZU5hbWVzcGFjZUlEKSkpOwogCiAgICAgICAgIExvY2FsU3RvcmFnZU5hbWVz cGFjZSogbG9jYWxTdG9yYWdlTmFtZXNwYWNlID0gZ2V0T3JDcmVhdGVMb2NhbFN0b3JhZ2VOYW1l c3BhY2Uoc3RvcmFnZU5hbWVzcGFjZUlEKTsKIAotICAgICAgICAvLyBGSVhNRTogVGhpcyBzaG91 bGQgYmUgYSBtZXNzYWdlIGNoZWNrLgogICAgICAgICBBU1NFUlQobG9jYWxTdG9yYWdlTmFtZXNw YWNlKTsKIAogICAgICAgICBhdXRvIHN0b3JhZ2VBcmVhID0gbG9jYWxTdG9yYWdlTmFtZXNwYWNl LT5nZXRPckNyZWF0ZVN0b3JhZ2VBcmVhKFdURk1vdmUoc2VjdXJpdHlPcmlnaW5EYXRhKSk7CkBA IC03MzksNyArNzM2LDYgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6Y3JlYXRlTG9jYWxTdG9yYWdl TWFwKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgdWludDY0X3QKIHZvaWQgU3RvcmFnZU1h bmFnZXI6OmNyZWF0ZVRyYW5zaWVudExvY2FsU3RvcmFnZU1hcChJUEM6OkNvbm5lY3Rpb24mIGNv bm5lY3Rpb24sIHVpbnQ2NF90IHN0b3JhZ2VNYXBJRCwgdWludDY0X3Qgc3RvcmFnZU5hbWVzcGFj ZUlELCBTZWN1cml0eU9yaWdpbkRhdGEmJiB0b3BMZXZlbE9yaWdpbkRhdGEsIFNlY3VyaXR5T3Jp Z2luRGF0YSYmIG9yaWdpbikKIHsKICAgICBtX3F1ZXVlLT5kaXNwYXRjaChbdGhpcywgcHJvdGVj dGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBjb25uZWN0aW9uSUQgPSBjb25uZWN0aW9uLnVuaXF1 ZUlEKCksIHN0b3JhZ2VNYXBJRCwgc3RvcmFnZU5hbWVzcGFjZUlELCB0b3BMZXZlbE9yaWdpbkRh dGEgPSB0b3BMZXZlbE9yaWdpbkRhdGEuaXNvbGF0ZWRDb3B5KCksIG9yaWdpbiA9IG9yaWdpbi5p c29sYXRlZENvcHkoKV0oKSBtdXRhYmxlIHsKLSAgICAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxk IGJlIGEgbWVzc2FnZSBjaGVjay4KICAgICAgICAgQVNTRVJUKG1fc3RvcmFnZUFyZWFzQnlDb25u ZWN0aW9uLmlzVmFsaWRLZXkoeyBjb25uZWN0aW9uSUQsIHN0b3JhZ2VNYXBJRCB9KSk7CiAKICAg ICAgICAgLy8gU2VlIGlmIHdlIGFscmVhZHkgaGF2ZSBzZXNzaW9uIHN0b3JhZ2UgZm9yIHRoaXMg Y29ubmVjdGlvbi9vcmlnaW4gY29tYm8uCkBAIC03NjQsOCArNzYwLDYgQEAgdm9pZCBTdG9yYWdl TWFuYWdlcjo6Y3JlYXRlVHJhbnNpZW50TG9jYWxTdG9yYWdlTWFwKElQQzo6Q29ubmVjdGlvbiYg Y29ubmVjdGlvbiwKICAgICAgICAgfQogCiAgICAgICAgIGF1dG8mIHNsb3QgPSBtX3N0b3JhZ2VB cmVhc0J5Q29ubmVjdGlvbi5hZGQoeyBjb25uZWN0aW9uSUQsIHN0b3JhZ2VNYXBJRCB9LCBudWxs cHRyKS5pdGVyYXRvci0+dmFsdWU7Ci0KLSAgICAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJl IGEgbWVzc2FnZSBjaGVjay4KICAgICAgICAgQVNTRVJUKCFzbG90KTsKIAogICAgICAgICBhdXRv KiB0cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2UgPSBnZXRPckNyZWF0ZVRyYW5zaWVudExv Y2FsU3RvcmFnZU5hbWVzcGFjZShzdG9yYWdlTmFtZXNwYWNlSUQsIFdURk1vdmUodG9wTGV2ZWxP cmlnaW5EYXRhKSk7CkBAIC03ODQsNyArNzc4LDYgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6Y3Jl YXRlU2Vzc2lvblN0b3JhZ2VNYXAoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uLCB1aW50NjQK ICAgICAgICAgICAgIG1fZXBoZW1lcmFsU3RvcmFnZS5hZGQoc2VjdXJpdHlPcmlnaW5EYXRhLCBX ZWJDb3JlOjpTdG9yYWdlTWFwOjpjcmVhdGUobG9jYWxTdG9yYWdlRGF0YWJhc2VRdW90YUluQnl0 ZXMpKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAgICAvLyBGSVhNRTog VGhpcyBzaG91bGQgYmUgYSBtZXNzYWdlIGNoZWNrLgogICAgICAgICBBU1NFUlQobV9zZXNzaW9u U3RvcmFnZU5hbWVzcGFjZXMuaXNWYWxpZEtleShzdG9yYWdlTmFtZXNwYWNlSUQpKTsKIAogICAg ICAgICBTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSogc2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UgPSBt X3Nlc3Npb25TdG9yYWdlTmFtZXNwYWNlcy5nZXQoc3RvcmFnZU5hbWVzcGFjZUlEKTsKQEAgLTc5 NCwxNSArNzg3LDEwIEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmNyZWF0ZVNlc3Npb25TdG9yYWdl TWFwKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgdWludDY0CiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIH0KIAotICAgICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUgYSBtZXNz YWdlIGNoZWNrLgogICAgICAgICBBU1NFUlQobV9zdG9yYWdlQXJlYXNCeUNvbm5lY3Rpb24uaXNW YWxpZEtleSh7IGNvbm5lY3Rpb25JRCwgc3RvcmFnZU1hcElEIH0pKTsKIAogICAgICAgICBhdXRv JiBzbG90ID0gbV9zdG9yYWdlQXJlYXNCeUNvbm5lY3Rpb24uYWRkKHsgY29ubmVjdGlvbklELCBz dG9yYWdlTWFwSUQgfSwgbnVsbHB0cikuaXRlcmF0b3ItPnZhbHVlOwotCi0gICAgICAgIC8vIEZJ WE1FOiBUaGlzIHNob3VsZCBiZSBhIG1lc3NhZ2UgY2hlY2suCiAgICAgICAgIEFTU0VSVCghc2xv dCk7Ci0KLSAgICAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJlIGEgbWVzc2FnZSBjaGVjay4K ICAgICAgICAgQVNTRVJUKHNlc3Npb25TdG9yYWdlTmFtZXNwYWNlLT5hbGxvd2VkQ29ubmVjdGlv bnMoKS5jb250YWlucyhjb25uZWN0aW9uSUQpKTsKIAogICAgICAgICBhdXRvIHN0b3JhZ2VBcmVh ID0gc2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UtPmdldE9yQ3JlYXRlU3RvcmFnZUFyZWEoV1RGTW92 ZShzZWN1cml0eU9yaWdpbkRhdGEpKTsKQEAgLTgxNiw4ICs4MDQsNiBAQCB2b2lkIFN0b3JhZ2VN YW5hZ2VyOjpkZXN0cm95U3RvcmFnZU1hcChJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIHVp bnQ2NF90IHN0bwogewogICAgIG1fcXVldWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlz ID0gbWFrZVJlZigqdGhpcyksIGNvbm5lY3Rpb25JRCA9IGNvbm5lY3Rpb24udW5pcXVlSUQoKSwg c3RvcmFnZU1hcElEXSgpIG11dGFibGUgewogICAgICAgICBzdGQ6OnBhaXI8SVBDOjpDb25uZWN0 aW9uOjpVbmlxdWVJRCwgdWludDY0X3Q+IGNvbm5lY3Rpb25BbmRTdG9yYWdlTWFwSURQYWlyKGNv bm5lY3Rpb25JRCwgc3RvcmFnZU1hcElEKTsKLQotICAgICAgICAvLyBGSVhNRTogVGhpcyBzaG91 bGQgYmUgYSBtZXNzYWdlIGNoZWNrLgogICAgICAgICBBU1NFUlQobV9zdG9yYWdlQXJlYXNCeUNv bm5lY3Rpb24uaXNWYWxpZEtleShjb25uZWN0aW9uQW5kU3RvcmFnZU1hcElEUGFpcikpOwogCiAg ICAgICAgIGF1dG8gaXQgPSBtX3N0b3JhZ2VBcmVhc0J5Q29ubmVjdGlvbi5maW5kKGNvbm5lY3Rp b25BbmRTdG9yYWdlTWFwSURQYWlyKTsK 371106 2019-05-31 20:33:17 -0700 2019-05-31 21:16:46 -0700 Patch for landing bug-198049-20190531203316.patch text/plain 5518 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MDA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc2NzQ3ZGY4ZTAzMzcyY2Mw MTk3NzAwYWFjMzZkNWZkMWMxNTIzZmQuLjFlYjk0OTNlYWIzZDU0NDExZWUwMWVmYjQxNzUxMDBi YzQzN2Y5MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDUtMzEgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIG91dGRhdGVkIEZJWE1F IGluIFN0b3JhZ2VNYW5hZ2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTgwNDkKKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZnJleSBHYXJlbi4K KworICAgICAgICBQcmV2aW91c2x5IFN0b3JhZ2VNYW5hZ2VyIG1lc3NhZ2VzIHdlcmUgZGlzcGF0 Y2hlZCBhbmQgaGFuZGxlZCBpbiB0aGUgc2FtZSB0aHJlYWQsIHNvIHdlIGNvdWxkIHBlcmZvcm0g YSBtZXNzYWdlCisgICAgICAgIGNoZWNrLiBOb3cgdGhleSBhcmUgb24gZGlmZmVyZW50IHRocmVh ZCwgYW5kIHdlIHdvdWxkIG5vdCBiZSBhYmxlIHRvIHZlcmlmeSB0aG9zZSBwYXJhbWV0ZXJzIHdo ZW4gZGlzcGF0Y2hpbmcKKyAgICAgICAgdGhlIG1lc3NhZ2UuCisKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9XZWJTdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 U3RvcmFnZU1hbmFnZXI6OmNyZWF0ZUxvY2FsU3RvcmFnZU1hcCk6CisgICAgICAgIChXZWJLaXQ6 OlN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGVUcmFuc2llbnRMb2NhbFN0b3JhZ2VNYXApOgorICAgICAg ICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6Y3JlYXRlU2Vzc2lvblN0b3JhZ2VNYXApOgorICAg ICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6ZGVzdHJveVN0b3JhZ2VNYXApOgorCiAyMDE5 LTA1LTMxICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CiAKICAgICAgICAgVGVh Y2ggQXV4aWxpYXJ5UHJvY2VzcyBhYm91dCBMb2FkT3B0aW1pemVyCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwIGIv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9XZWJTdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNw cAppbmRleCA0MzRmM2UzNmY1ZDc4OWJmOTUwMTY4MGQ4Zjk5YTQ5YTA2NDQxNjZmLi42OGJmYzQy ZGQ5YzQ1OTEzZjM0N2VlNmVlNDViZGI1Yzc3ODlkMDZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAK QEAgLTcxNSwxOCArNzE1LDEzIEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmNyZWF0ZUxvY2FsU3Rv cmFnZU1hcChJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIHVpbnQ2NF90CiAgICAgICAgIEFT U0VSVCghbV9pc0VwaGVtZXJhbCk7CiAgICAgICAgIHN0ZDo6cGFpcjxJUEM6OkNvbm5lY3Rpb246 OlVuaXF1ZUlELCB1aW50NjRfdD4gY29ubmVjdGlvbkFuZFN0b3JhZ2VNYXBJRFBhaXIoY29ubmVj dGlvbklELCBzdG9yYWdlTWFwSUQpOwogCi0gICAgICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBi ZSBhIG1lc3NhZ2UgY2hlY2suCiAgICAgICAgIEFTU0VSVCgoSGFzaE1hcDxzdGQ6OnBhaXI8SVBD OjpDb25uZWN0aW9uOjpVbmlxdWVJRCwgdWludDY0X3Q+LCBSZWZQdHI8U3RvcmFnZUFyZWE+Pjo6 aXNWYWxpZEtleShjb25uZWN0aW9uQW5kU3RvcmFnZU1hcElEUGFpcikpKTsKIAogICAgICAgICBh dXRvIHJlc3VsdCA9IG1fc3RvcmFnZUFyZWFzQnlDb25uZWN0aW9uLmFkZChjb25uZWN0aW9uQW5k U3RvcmFnZU1hcElEUGFpciwgbnVsbHB0cik7Ci0KLSAgICAgICAgLy8gRklYTUU6IFRoZXNlIHNo b3VsZCBiZSBhIG1lc3NhZ2UgY2hlY2tzLgogICAgICAgICBBU1NFUlQocmVzdWx0LmlzTmV3RW50 cnkpOwogICAgICAgICBBU1NFUlQoKEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxMb2NhbFN0b3Jh Z2VOYW1lc3BhY2U+Pjo6aXNWYWxpZEtleShzdG9yYWdlTmFtZXNwYWNlSUQpKSk7CiAKICAgICAg ICAgTG9jYWxTdG9yYWdlTmFtZXNwYWNlKiBsb2NhbFN0b3JhZ2VOYW1lc3BhY2UgPSBnZXRPckNy ZWF0ZUxvY2FsU3RvcmFnZU5hbWVzcGFjZShzdG9yYWdlTmFtZXNwYWNlSUQpOwotCi0gICAgICAg IC8vIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBhIG1lc3NhZ2UgY2hlY2suCiAgICAgICAgIEFTU0VS VChsb2NhbFN0b3JhZ2VOYW1lc3BhY2UpOwogCiAgICAgICAgIGF1dG8gc3RvcmFnZUFyZWEgPSBs b2NhbFN0b3JhZ2VOYW1lc3BhY2UtPmdldE9yQ3JlYXRlU3RvcmFnZUFyZWEoV1RGTW92ZShzZWN1 cml0eU9yaWdpbkRhdGEpKTsKQEAgLTczOSw3ICs3MzQsNiBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2Vy OjpjcmVhdGVMb2NhbFN0b3JhZ2VNYXAoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uLCB1aW50 NjRfdAogdm9pZCBTdG9yYWdlTWFuYWdlcjo6Y3JlYXRlVHJhbnNpZW50TG9jYWxTdG9yYWdlTWFw KElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgdWludDY0X3Qgc3RvcmFnZU1hcElELCB1aW50 NjRfdCBzdG9yYWdlTmFtZXNwYWNlSUQsIFNlY3VyaXR5T3JpZ2luRGF0YSYmIHRvcExldmVsT3Jp Z2luRGF0YSwgU2VjdXJpdHlPcmlnaW5EYXRhJiYgb3JpZ2luKQogewogICAgIG1fcXVldWUtPmRp c3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGNvbm5lY3Rpb25J RCA9IGNvbm5lY3Rpb24udW5pcXVlSUQoKSwgc3RvcmFnZU1hcElELCBzdG9yYWdlTmFtZXNwYWNl SUQsIHRvcExldmVsT3JpZ2luRGF0YSA9IHRvcExldmVsT3JpZ2luRGF0YS5pc29sYXRlZENvcHko KSwgb3JpZ2luID0gb3JpZ2luLmlzb2xhdGVkQ29weSgpXSgpIG11dGFibGUgewotICAgICAgICAv LyBGSVhNRTogVGhpcyBzaG91bGQgYmUgYSBtZXNzYWdlIGNoZWNrLgogICAgICAgICBBU1NFUlQo bV9zdG9yYWdlQXJlYXNCeUNvbm5lY3Rpb24uaXNWYWxpZEtleSh7IGNvbm5lY3Rpb25JRCwgc3Rv cmFnZU1hcElEIH0pKTsKIAogICAgICAgICAvLyBTZWUgaWYgd2UgYWxyZWFkeSBoYXZlIHNlc3Np b24gc3RvcmFnZSBmb3IgdGhpcyBjb25uZWN0aW9uL29yaWdpbiBjb21iby4KQEAgLTc2NCw4ICs3 NTgsNiBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGVUcmFuc2llbnRMb2NhbFN0b3JhZ2VN YXAoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uLAogICAgICAgICB9CiAKICAgICAgICAgYXV0 byYgc2xvdCA9IG1fc3RvcmFnZUFyZWFzQnlDb25uZWN0aW9uLmFkZCh7IGNvbm5lY3Rpb25JRCwg c3RvcmFnZU1hcElEIH0sIG51bGxwdHIpLml0ZXJhdG9yLT52YWx1ZTsKLQotICAgICAgICAvLyBG SVhNRTogVGhpcyBzaG91bGQgYmUgYSBtZXNzYWdlIGNoZWNrLgogICAgICAgICBBU1NFUlQoIXNs b3QpOwogCiAgICAgICAgIGF1dG8qIHRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZSA9IGdl dE9yQ3JlYXRlVHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlKHN0b3JhZ2VOYW1lc3BhY2VJ RCwgV1RGTW92ZSh0b3BMZXZlbE9yaWdpbkRhdGEpKTsKQEAgLTc4NCw3ICs3NzYsNyBAQCB2b2lk IFN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGVTZXNzaW9uU3RvcmFnZU1hcChJUEM6OkNvbm5lY3Rpb24m IGNvbm5lY3Rpb24sIHVpbnQ2NAogICAgICAgICAgICAgbV9lcGhlbWVyYWxTdG9yYWdlLmFkZChz ZWN1cml0eU9yaWdpbkRhdGEsIFdlYkNvcmU6OlN0b3JhZ2VNYXA6OmNyZWF0ZShsb2NhbFN0b3Jh Z2VEYXRhYmFzZVF1b3RhSW5CeXRlcykpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9 Ci0gICAgICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBhIG1lc3NhZ2UgY2hlY2suCisKICAg ICAgICAgQVNTRVJUKG1fc2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VzLmlzVmFsaWRLZXkoc3RvcmFn ZU5hbWVzcGFjZUlEKSk7CiAKICAgICAgICAgU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UqIHNlc3Np b25TdG9yYWdlTmFtZXNwYWNlID0gbV9zZXNzaW9uU3RvcmFnZU5hbWVzcGFjZXMuZ2V0KHN0b3Jh Z2VOYW1lc3BhY2VJRCk7CkBAIC03OTQsMTUgKzc4NiwxMCBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2Vy OjpjcmVhdGVTZXNzaW9uU3RvcmFnZU1hcChJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIHVp bnQ2NAogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgLy8gRklYTUU6 IFRoaXMgc2hvdWxkIGJlIGEgbWVzc2FnZSBjaGVjay4KICAgICAgICAgQVNTRVJUKG1fc3RvcmFn ZUFyZWFzQnlDb25uZWN0aW9uLmlzVmFsaWRLZXkoeyBjb25uZWN0aW9uSUQsIHN0b3JhZ2VNYXBJ RCB9KSk7CiAKICAgICAgICAgYXV0byYgc2xvdCA9IG1fc3RvcmFnZUFyZWFzQnlDb25uZWN0aW9u LmFkZCh7IGNvbm5lY3Rpb25JRCwgc3RvcmFnZU1hcElEIH0sIG51bGxwdHIpLml0ZXJhdG9yLT52 YWx1ZTsKLQotICAgICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUgYSBtZXNzYWdlIGNoZWNr LgogICAgICAgICBBU1NFUlQoIXNsb3QpOwotCi0gICAgICAgIC8vIEZJWE1FOiBUaGlzIHNob3Vs ZCBiZSBhIG1lc3NhZ2UgY2hlY2suCiAgICAgICAgIEFTU0VSVChzZXNzaW9uU3RvcmFnZU5hbWVz cGFjZS0+YWxsb3dlZENvbm5lY3Rpb25zKCkuY29udGFpbnMoY29ubmVjdGlvbklEKSk7CiAKICAg ICAgICAgYXV0byBzdG9yYWdlQXJlYSA9IHNlc3Npb25TdG9yYWdlTmFtZXNwYWNlLT5nZXRPckNy ZWF0ZVN0b3JhZ2VBcmVhKFdURk1vdmUoc2VjdXJpdHlPcmlnaW5EYXRhKSk7CkBAIC04MTYsOCAr ODAzLDYgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVzdHJveVN0b3JhZ2VNYXAoSVBDOjpDb25u ZWN0aW9uJiBjb25uZWN0aW9uLCB1aW50NjRfdCBzdG8KIHsKICAgICBtX3F1ZXVlLT5kaXNwYXRj aChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBjb25uZWN0aW9uSUQgPSBj b25uZWN0aW9uLnVuaXF1ZUlEKCksIHN0b3JhZ2VNYXBJRF0oKSBtdXRhYmxlIHsKICAgICAgICAg c3RkOjpwYWlyPElQQzo6Q29ubmVjdGlvbjo6VW5pcXVlSUQsIHVpbnQ2NF90PiBjb25uZWN0aW9u QW5kU3RvcmFnZU1hcElEUGFpcihjb25uZWN0aW9uSUQsIHN0b3JhZ2VNYXBJRCk7Ci0KLSAgICAg ICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJlIGEgbWVzc2FnZSBjaGVjay4KICAgICAgICAgQVNT RVJUKG1fc3RvcmFnZUFyZWFzQnlDb25uZWN0aW9uLmlzVmFsaWRLZXkoY29ubmVjdGlvbkFuZFN0 b3JhZ2VNYXBJRFBhaXIpKTsKIAogICAgICAgICBhdXRvIGl0ID0gbV9zdG9yYWdlQXJlYXNCeUNv bm5lY3Rpb24uZmluZChjb25uZWN0aW9uQW5kU3RvcmFnZU1hcElEUGFpcik7Cg==