139704 2014-12-16 14:00:12 -0800 More StorageManager modernization 2014-12-16 14:06:33 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1056132 0 andersca 2014-12-16 14:00:12 -0800 More StorageManager modernization 1056133 1 243391 andersca 2014-12-16 14:00:26 -0800 Created attachment 243391 Patch 1056134 2 243391 kling 2014-12-16 14:03:21 -0800 Comment on attachment 243391 Patch r=me 1056136 3 andersca 2014-12-16 14:06:33 -0800 Committed r177395: <http://trac.webkit.org/changeset/177395> 243391 2014-12-16 14:00:26 -0800 2014-12-16 14:03:21 -0800 Patch bug-139704-20141216140116.patch text/plain 8316 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MzkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTc2MzU3ZDhhMDc1OWRl Nzk2ZGNmZDQ3Y2U3NTEzNDkwM2ExNDE4My4uZWNjOGQ1ZjI2NTZkNThjOTdjMjk4N2RiOTE4ZWRl YjhhOTE1YzBiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDE0LTEyLTE2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgTW9yZSBTdG9yYWdl TWFuYWdlciBtb2Rlcm5pemF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzk3MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OkxvY2FsU3RvcmFnZU5hbWVzcGFjZTo6Z2V0 T3JDcmVhdGVTdG9yYWdlQXJlYSk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpT ZXNzaW9uU3RvcmFnZU5hbWVzcGFjZTo6Z2V0T3JDcmVhdGVTdG9yYWdlQXJlYSk6CisgICAgICAg IChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGVTZXNzaW9uU3RvcmFnZU1hcCk6CisgICAg ICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpkZXN0cm95U3RvcmFnZU1hcCk6CisgICAgICAg IChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpmaW5kU3RvcmFnZUFyZWEpOgorICAgICAgICAoV2Vi S2l0OjpTdG9yYWdlTWFuYWdlcjo6Z2V0T3JDcmVhdGVMb2NhbFN0b3JhZ2VOYW1lc3BhY2UpOgor CisyMDE0LTEyLTE2ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAg ICAgICAgVXNlIFJlZiBpbiBhbm90aGVyIFN0b3JhZ2VNYW5hZ2VyIGZ1bmN0aW9uCiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk3MDAKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCmlu ZGV4IGJiZTBkN2Q4ZjUyMGI3YTMyMmQ4MjQ1ODBlYTcyNTMxYmRkZThmNDQuLjZjYTY4YTcyMzcz YmYwODQwMzU2ZGJjMzc1YmJkYjI1ZGY4NjQ4M2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAKQEAgLTMxOSwxMiArMzE5LDEy IEBAIFN0b3JhZ2VNYW5hZ2VyOjpMb2NhbFN0b3JhZ2VOYW1lc3BhY2U6On5Mb2NhbFN0b3JhZ2VO YW1lc3BhY2UoKQogCiBSZWY8U3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhPiBTdG9yYWdlTWFu YWdlcjo6TG9jYWxTdG9yYWdlTmFtZXNwYWNlOjpnZXRPckNyZWF0ZVN0b3JhZ2VBcmVhKFJlZlB0 cjxTZWN1cml0eU9yaWdpbj4mJiBzZWN1cml0eU9yaWdpbikKIHsKLSAgICBhdXRvIHJlc3VsdCA9 IG1fc3RvcmFnZUFyZWFNYXAuYWRkKHNlY3VyaXR5T3JpZ2luLCBudWxscHRyKTsKLSAgICBpZiAo IXJlc3VsdC5pc05ld0VudHJ5KQotICAgICAgICByZXR1cm4gKnJlc3VsdC5pdGVyYXRvci0+dmFs dWU7CisgICAgYXV0byYgc2xvdCA9IG1fc3RvcmFnZUFyZWFNYXAuYWRkKHNlY3VyaXR5T3JpZ2lu LCBudWxscHRyKS5pdGVyYXRvci0+dmFsdWU7CisgICAgaWYgKHNsb3QpCisgICAgICAgIHJldHVy biAqc2xvdDsKIAotICAgIGF1dG8gc3RvcmFnZUFyZWEgPSBTdG9yYWdlQXJlYTo6Y3JlYXRlKHRo aXMsIHJlc3VsdC5pdGVyYXRvci0+a2V5LmNvcHlSZWYoKSwgbV9xdW90YUluQnl0ZXMpOwotICAg IHJlc3VsdC5pdGVyYXRvci0+dmFsdWUgPSAmc3RvcmFnZUFyZWEuZ2V0KCk7CisgICAgYXV0byBz dG9yYWdlQXJlYSA9IFN0b3JhZ2VBcmVhOjpjcmVhdGUodGhpcywgV1RGOjptb3ZlKHNlY3VyaXR5 T3JpZ2luKSwgbV9xdW90YUluQnl0ZXMpOworICAgIHNsb3QgPSAmc3RvcmFnZUFyZWEuZ2V0KCk7 CiAKICAgICByZXR1cm4gc3RvcmFnZUFyZWE7CiB9CkBAIC0zNjUsNyArMzY1LDcgQEAgcHVibGlj OgogICAgIElQQzo6Q29ubmVjdGlvbiogYWxsb3dlZENvbm5lY3Rpb24oKSBjb25zdCB7IHJldHVy biBtX2FsbG93ZWRDb25uZWN0aW9uLmdldCgpOyB9CiAgICAgdm9pZCBzZXRBbGxvd2VkQ29ubmVj dGlvbihJUEM6OkNvbm5lY3Rpb24qKTsKIAotICAgIFJlZlB0cjxTdG9yYWdlQXJlYT4gZ2V0T3JD cmVhdGVTdG9yYWdlQXJlYShSZWZQdHI8U2VjdXJpdHlPcmlnaW4+JiYpOworICAgIFJlZjxTdG9y YWdlQXJlYT4gZ2V0T3JDcmVhdGVTdG9yYWdlQXJlYShSZWZQdHI8U2VjdXJpdHlPcmlnaW4+JiYp OwogCiAgICAgdm9pZCBjbG9uZVRvKFNlc3Npb25TdG9yYWdlTmFtZXNwYWNlJiBuZXdTZXNzaW9u U3RvcmFnZU5hbWVzcGFjZSk7CiAKQEAgLTQwMCwxMyArNDAwLDEzIEBAIHZvaWQgU3RvcmFnZU1h bmFnZXI6OlNlc3Npb25TdG9yYWdlTmFtZXNwYWNlOjpzZXRBbGxvd2VkQ29ubmVjdGlvbihJUEM6 OkNvbm5lY3RpCiAgICAgbV9hbGxvd2VkQ29ubmVjdGlvbiA9IGFsbG93ZWRDb25uZWN0aW9uOwog fQogCi1SZWZQdHI8U3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhPiBTdG9yYWdlTWFuYWdlcjo6 U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2U6OmdldE9yQ3JlYXRlU3RvcmFnZUFyZWEoUmVmUHRyPFNl Y3VyaXR5T3JpZ2luPiYmIHNlY3VyaXR5T3JpZ2luKQorUmVmPFN0b3JhZ2VNYW5hZ2VyOjpTdG9y YWdlQXJlYT4gU3RvcmFnZU1hbmFnZXI6OlNlc3Npb25TdG9yYWdlTmFtZXNwYWNlOjpnZXRPckNy ZWF0ZVN0b3JhZ2VBcmVhKFJlZlB0cjxTZWN1cml0eU9yaWdpbj4mJiBzZWN1cml0eU9yaWdpbikK IHsKLSAgICBhdXRvIHJlc3VsdCA9IG1fc3RvcmFnZUFyZWFNYXAuYWRkKHNlY3VyaXR5T3JpZ2lu LCBudWxscHRyKTsKLSAgICBpZiAocmVzdWx0LmlzTmV3RW50cnkpCi0gICAgICAgIHJlc3VsdC5p dGVyYXRvci0+dmFsdWUgPSBTdG9yYWdlQXJlYTo6Y3JlYXRlKDAsIHJlc3VsdC5pdGVyYXRvci0+ a2V5LmNvcHlSZWYoKSwgbV9xdW90YUluQnl0ZXMpOworICAgIGF1dG8mIHNsb3QgPSBtX3N0b3Jh Z2VBcmVhTWFwLmFkZChzZWN1cml0eU9yaWdpbiwgbnVsbHB0cikuaXRlcmF0b3ItPnZhbHVlOwor ICAgIGlmICghc2xvdCkKKyAgICAgICAgc2xvdCA9IFN0b3JhZ2VBcmVhOjpjcmVhdGUoMCwgV1RG Ojptb3ZlKHNlY3VyaXR5T3JpZ2luKSwgbV9xdW90YUluQnl0ZXMpOwogCi0gICAgcmV0dXJuIHJl c3VsdC5pdGVyYXRvci0+dmFsdWU7CisgICAgcmV0dXJuICpzbG90OwogfQogCiB2b2lkIFN0b3Jh Z2VNYW5hZ2VyOjpTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZTo6Y2xvbmVUbyhTZXNzaW9uU3RvcmFn ZU5hbWVzcGFjZSYgbmV3U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UpCkBAIC01ODcsNyArNTg3LDgg QEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6Y3JlYXRlVHJhbnNpZW50TG9jYWxTdG9yYWdlTWFwKElQ Qzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwKIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmNyZWF0ZVNl c3Npb25TdG9yYWdlTWFwKElQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0X3Qgc3Rv cmFnZU1hcElELCB1aW50NjRfdCBzdG9yYWdlTmFtZXNwYWNlSUQsIGNvbnN0IFNlY3VyaXR5T3Jp Z2luRGF0YSYgc2VjdXJpdHlPcmlnaW5EYXRhKQogewogICAgIC8vIEZJWE1FOiBUaGlzIHNob3Vs ZCBiZSBhIG1lc3NhZ2UgY2hlY2suCi0gICAgQVNTRVJUKChIYXNoTWFwPHVpbnQ2NF90LCBSZWZQ dHI8U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2U+Pjo6aXNWYWxpZEtleShzdG9yYWdlTmFtZXNwYWNl SUQpKSk7CisgICAgQVNTRVJUKG1fc2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VzLmlzVmFsaWRLZXko c3RvcmFnZU5hbWVzcGFjZUlEKSk7CisKICAgICBTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSogc2Vz c2lvblN0b3JhZ2VOYW1lc3BhY2UgPSBtX3Nlc3Npb25TdG9yYWdlTmFtZXNwYWNlcy5nZXQoc3Rv cmFnZU5hbWVzcGFjZUlEKTsKICAgICBpZiAoIXNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKSB7CiAg ICAgICAgIC8vIFdlJ3JlIGdldHRpbmcgYW4gaW5jb21pbmcgbWVzc2FnZSBmcm9tIHRoZSB3ZWIg cHJvY2VzcyB0aGF0J3MgZm9yIHNlc3Npb24gc3RvcmFnZSBmb3IgYSB3ZWIgcGFnZQpAQCAtNTk1 LDIzICs1OTYsMjEgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6Y3JlYXRlU2Vzc2lvblN0b3JhZ2VN YXAoSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCB1aW50NjQKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAotICAgIHN0ZDo6cGFpcjxSZWZQdHI8SVBDOjpDb25uZWN0aW9uPiwgdWludDY0X3Q+ IGNvbm5lY3Rpb25BbmRTdG9yYWdlTWFwSURQYWlyKGNvbm5lY3Rpb24sIHN0b3JhZ2VNYXBJRCk7 Ci0KICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUgYSBtZXNzYWdlIGNoZWNrLgotICAgIEFT U0VSVCgoSGFzaE1hcDxzdGQ6OnBhaXI8UmVmUHRyPElQQzo6Q29ubmVjdGlvbj4sIHVpbnQ2NF90 PiwgUmVmUHRyPFN0b3JhZ2VBcmVhPj46OmlzVmFsaWRLZXkoY29ubmVjdGlvbkFuZFN0b3JhZ2VN YXBJRFBhaXIpKSk7CisgICAgQVNTRVJUKG1fc3RvcmFnZUFyZWFzQnlDb25uZWN0aW9uLmlzVmFs aWRLZXkoeyBjb25uZWN0aW9uLCBzdG9yYWdlTWFwSUQgfSkpOwogCi0gICAgSGFzaE1hcDxzdGQ6 OnBhaXI8UmVmUHRyPElQQzo6Q29ubmVjdGlvbj4sIHVpbnQ2NF90PiwgUmVmUHRyPFN0b3JhZ2VB cmVhPj46OkFkZFJlc3VsdCByZXN1bHQgPSBtX3N0b3JhZ2VBcmVhc0J5Q29ubmVjdGlvbi5hZGQo Y29ubmVjdGlvbkFuZFN0b3JhZ2VNYXBJRFBhaXIsIG51bGxwdHIpOworICAgIGF1dG8mIHNsb3Qg PSBtX3N0b3JhZ2VBcmVhc0J5Q29ubmVjdGlvbi5hZGQoeyBjb25uZWN0aW9uLCBzdG9yYWdlTWFw SUQgfSwgbnVsbHB0cikuaXRlcmF0b3ItPnZhbHVlOwogCiAgICAgLy8gRklYTUU6IFRoaXMgc2hv dWxkIGJlIGEgbWVzc2FnZSBjaGVjay4KLSAgICBBU1NFUlQocmVzdWx0LmlzTmV3RW50cnkpOwor ICAgIEFTU0VSVCghc2xvdCk7CiAKICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUgYSBtZXNz YWdlIGNoZWNrLgogICAgIEFTU0VSVChjb25uZWN0aW9uID09IHNlc3Npb25TdG9yYWdlTmFtZXNw YWNlLT5hbGxvd2VkQ29ubmVjdGlvbigpKTsKIAotICAgIFJlZlB0cjxTdG9yYWdlQXJlYT4gc3Rv cmFnZUFyZWEgPSBzZXNzaW9uU3RvcmFnZU5hbWVzcGFjZS0+Z2V0T3JDcmVhdGVTdG9yYWdlQXJl YShzZWN1cml0eU9yaWdpbkRhdGEuc2VjdXJpdHlPcmlnaW4oKSk7CisgICAgYXV0byBzdG9yYWdl QXJlYSA9IHNlc3Npb25TdG9yYWdlTmFtZXNwYWNlLT5nZXRPckNyZWF0ZVN0b3JhZ2VBcmVhKHNl Y3VyaXR5T3JpZ2luRGF0YS5zZWN1cml0eU9yaWdpbigpKTsKICAgICBzdG9yYWdlQXJlYS0+YWRk TGlzdGVuZXIoY29ubmVjdGlvbiwgc3RvcmFnZU1hcElEKTsKIAotICAgIHJlc3VsdC5pdGVyYXRv ci0+dmFsdWUgPSBzdG9yYWdlQXJlYS5yZWxlYXNlKCk7CisgICAgc2xvdCA9IFdURjo6bW92ZShz dG9yYWdlQXJlYSk7CiB9CiAKIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmRlc3Ryb3lTdG9yYWdlTWFw KElQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0X3Qgc3RvcmFnZU1hcElEKQpAQCAt NjE5LDkgKzYxOCw5IEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmRlc3Ryb3lTdG9yYWdlTWFwKElQ Qzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0X3Qgc3RvCiAgICAgc3RkOjpwYWlyPFJl ZlB0cjxJUEM6OkNvbm5lY3Rpb24+LCB1aW50NjRfdD4gY29ubmVjdGlvbkFuZFN0b3JhZ2VNYXBJ RFBhaXIoY29ubmVjdGlvbiwgc3RvcmFnZU1hcElEKTsKIAogICAgIC8vIEZJWE1FOiBUaGlzIHNo b3VsZCBiZSBhIG1lc3NhZ2UgY2hlY2suCi0gICAgQVNTRVJUKChIYXNoTWFwPHN0ZDo6cGFpcjxS ZWZQdHI8SVBDOjpDb25uZWN0aW9uPiwgdWludDY0X3Q+LCBSZWZQdHI8U3RvcmFnZUFyZWE+Pjo6 aXNWYWxpZEtleShjb25uZWN0aW9uQW5kU3RvcmFnZU1hcElEUGFpcikpKTsKKyAgICBBU1NFUlQo bV9zdG9yYWdlQXJlYXNCeUNvbm5lY3Rpb24uaXNWYWxpZEtleShjb25uZWN0aW9uQW5kU3RvcmFn ZU1hcElEUGFpcikpOwogCi0gICAgSGFzaE1hcDxzdGQ6OnBhaXI8UmVmUHRyPElQQzo6Q29ubmVj dGlvbj4sIHVpbnQ2NF90PiwgUmVmUHRyPFN0b3JhZ2VBcmVhPj46Oml0ZXJhdG9yIGl0ID0gbV9z dG9yYWdlQXJlYXNCeUNvbm5lY3Rpb24uZmluZChjb25uZWN0aW9uQW5kU3RvcmFnZU1hcElEUGFp cik7CisgICAgYXV0byBpdCA9IG1fc3RvcmFnZUFyZWFzQnlDb25uZWN0aW9uLmZpbmQoY29ubmVj dGlvbkFuZFN0b3JhZ2VNYXBJRFBhaXIpOwogICAgIGlmIChpdCA9PSBtX3N0b3JhZ2VBcmVhc0J5 Q29ubmVjdGlvbi5lbmQoKSkgewogICAgICAgICAvLyBUaGUgY29ubmVjdGlvbiBoYXMgYmVlbiBy ZW1vdmVkIGJlY2F1c2UgdGhlIGxhc3QgcGFnZSB3YXMgY2xvc2VkLgogICAgICAgICByZXR1cm47 CkBAIC03NTMsMjIgKzc1MiwyMyBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjppbnZhbGlkYXRlQ29u bmVjdGlvbkludGVybmFsKElQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbikKIFN0b3JhZ2VNYW5h Z2VyOjpTdG9yYWdlQXJlYSogU3RvcmFnZU1hbmFnZXI6OmZpbmRTdG9yYWdlQXJlYShJUEM6OkNv bm5lY3Rpb24qIGNvbm5lY3Rpb24sIHVpbnQ2NF90IHN0b3JhZ2VNYXBJRCkgY29uc3QKIHsKICAg ICBzdGQ6OnBhaXI8SVBDOjpDb25uZWN0aW9uKiwgdWludDY0X3Q+IGNvbm5lY3Rpb25BbmRTdG9y YWdlTWFwSURQYWlyKGNvbm5lY3Rpb24sIHN0b3JhZ2VNYXBJRCk7Ci0gICAgaWYgKCFIYXNoTWFw PHN0ZDo6cGFpcjxSZWZQdHI8SVBDOjpDb25uZWN0aW9uPiwgdWludDY0X3Q+LCBSZWZQdHI8U3Rv cmFnZUFyZWE+Pjo6aXNWYWxpZEtleShjb25uZWN0aW9uQW5kU3RvcmFnZU1hcElEUGFpcikpCi0g ICAgICAgIHJldHVybiAwOworCisgICAgaWYgKCFtX3N0b3JhZ2VBcmVhc0J5Q29ubmVjdGlvbi5p c1ZhbGlkS2V5KGNvbm5lY3Rpb25BbmRTdG9yYWdlTWFwSURQYWlyKSkKKyAgICAgICAgcmV0dXJu IG51bGxwdHI7CiAKICAgICByZXR1cm4gbV9zdG9yYWdlQXJlYXNCeUNvbm5lY3Rpb24uZ2V0KGNv bm5lY3Rpb25BbmRTdG9yYWdlTWFwSURQYWlyKTsKIH0KIAogU3RvcmFnZU1hbmFnZXI6OkxvY2Fs U3RvcmFnZU5hbWVzcGFjZSogU3RvcmFnZU1hbmFnZXI6OmdldE9yQ3JlYXRlTG9jYWxTdG9yYWdl TmFtZXNwYWNlKHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3BhY2VJRCkKIHsKLSAgICBpZiAoIUhhc2hN YXA8dWludDY0X3QsIFJlZlB0cjxMb2NhbFN0b3JhZ2VOYW1lc3BhY2U+Pjo6aXNWYWxpZEtleShz dG9yYWdlTmFtZXNwYWNlSUQpKQorICAgIGlmICghbV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzLmlz VmFsaWRLZXkoc3RvcmFnZU5hbWVzcGFjZUlEKSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBI YXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8TG9jYWxTdG9yYWdlTmFtZXNwYWNlPj46OkFkZFJlc3Vs dCByZXN1bHQgPSBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMuYWRkKHN0b3JhZ2VOYW1lc3BhY2VJ RCwgbnVsbHB0cik7Ci0gICAgaWYgKHJlc3VsdC5pc05ld0VudHJ5KQotICAgICAgICByZXN1bHQu aXRlcmF0b3ItPnZhbHVlID0gTG9jYWxTdG9yYWdlTmFtZXNwYWNlOjpjcmVhdGUodGhpcywgc3Rv cmFnZU5hbWVzcGFjZUlEKTsKKyAgICBhdXRvJiBzbG90ID0gbV9sb2NhbFN0b3JhZ2VOYW1lc3Bh Y2VzLmFkZChzdG9yYWdlTmFtZXNwYWNlSUQsIG51bGxwdHIpLml0ZXJhdG9yLT52YWx1ZTsKKyAg ICBpZiAoIXNsb3QpCisgICAgICAgIHNsb3QgPSBMb2NhbFN0b3JhZ2VOYW1lc3BhY2U6OmNyZWF0 ZSh0aGlzLCBzdG9yYWdlTmFtZXNwYWNlSUQpOwogCi0gICAgcmV0dXJuIHJlc3VsdC5pdGVyYXRv ci0+dmFsdWUuZ2V0KCk7CisgICAgcmV0dXJuIHNsb3QuZ2V0KCk7CiB9CiAKIFN0b3JhZ2VNYW5h Z2VyOjpUcmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2UqIFN0b3JhZ2VNYW5hZ2VyOjpnZXRP ckNyZWF0ZVRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZSh1aW50NjRfdCBzdG9yYWdlTmFt ZXNwYWNlSUQsIFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luJiB0b3BMZXZlbE9yaWdpbikK