114831 2013-04-18 14:15:09 -0700 StorageManager should keep track of local storage namespaces 2013-04-18 15:12:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca bdakin webkit-ews oldest_to_newest 878078 0 andersca 2013-04-18 14:15:09 -0700 StorageManager should keep track of local storage namespaces 878081 1 198762 andersca 2013-04-18 14:20:15 -0700 Created attachment 198762 Patch 878082 2 198762 webkit-ews 2013-04-18 14:24:42 -0700 Comment on attachment 198762 Patch Attachment 198762 did not pass qt-wk2-ews (qt-wk2): Output: http://webkit-queues.appspot.com/results/113398 878107 3 andersca 2013-04-18 15:12:09 -0700 Committed r148706: <http://trac.webkit.org/changeset/148706> 198762 2013-04-18 14:20:15 -0700 2013-04-18 15:02:23 -0700 Patch bug-114831-20130418141945.patch text/plain 12398 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4Njk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzQ0MTI2ZjViZGZiMWM2 OWQzOTEyMmQ2MTJjYTc5OWI0MjQwYTBlZC4uZGU0MWMxZWU1ZGU1MWZlODBhZjEzMjRiYjE5Mzg0 ZGJkNTVmNWNmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM5IEBACiAyMDEzLTA0LTE4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU3RvcmFnZU1hbmFn ZXIgc2hvdWxkIGtlZXAgdHJhY2sgb2YgbG9jYWwgc3RvcmFnZSBuYW1lc3BhY2VzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQ4MzEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9TdG9y YWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdl QXJlYSk6CisgICAgICAgIEFkZCB0aGUgbG9jYWwgc3RvcmFnZSBuYW1lc3BhY2UsIGFuZCBzZWN1 cml0eSBvcmlnaW4gYXMgbWVtYmVyIHZhcmlhYmxlcy4KKworICAgICAgICAoU3RvcmFnZU1hbmFn ZXI6OkxvY2FsU3RvcmFnZU5hbWVzcGFjZSk6CisgICAgICAgIE5ldyBjbGFzcyB0aGF0IHJlcHJl c2VudHMgYSBsb2NhbCBzdG9yYWdlIG5hbWVzcGFjZS4KKworICAgICAgICAoV2ViS2l0OjpTdG9y YWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6On5TdG9yYWdlQXJlYSk6CisgICAgICAgIElmIHRoaXMg c3RvcmFnZSBhcmVhIGJlbG9uZ3MgdG8gYSBsb2NhbCBzdG9yYWdlIG5hbWVzcGFjZSwgbm90aWZ5 IGl0IHRoYXQgd2UndmUgYmVlbiBkZXN0cm95ZWQuCisKKyAgICAgICAgKFdlYktpdDo6U3RvcmFn ZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjpjbG9uZSk6CisgICAgICAgIEFzc2VydCB0aGF0IHdlIGRv bid0IGhhdmUgYSBsb2NhbCBzdG9yYWdlIG5hbWVzcGFjZS4KKworICAgICAgICAoV2ViS2l0OjpT dG9yYWdlTWFuYWdlcjo6TG9jYWxTdG9yYWdlTmFtZXNwYWNlOjpnZXRPckNyZWF0ZVN0b3JhZ2VB cmVhKToKKyAgICAgICAgSWYgd2UgYWxyZWFkeSBoYXZlIGEgc3RvcmFnZSBhcmVhIGZvciB0aGUg Z2l2ZW4gc2VjdXJpdHkgb3JpZ2luLCByZXR1cm4gaXQuIE90aGVyd2lzZSwgY3JlYXRlIGEgbmV3 IHN0b3JhZ2UgYXJlYS4KKyAgICAgICAgTm90ZSB0aGF0IExvY2FsU3RvcmFnZU5hbWVzcGFjZSBk b2VzIG5vdCBob2xkIHN0cm9uZyByZWZlcmVuY2VzIHRvIGl0cyBTdG9yYWdlQXJlYSBvYmplY3Rz OyB0aGV5IGFyZSBiZWluZyBrZXB0IGFsaXZlCisgICAgICAgIGJ5IGEgbWFwcGluZyBpbnNpZGUg dGhlIFN0b3JhZ2VNYW5hZ2VyLgorCisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpM b2NhbFN0b3JhZ2VOYW1lc3BhY2U6OmRpZERlc3Ryb3lTdG9yYWdlQXJlYSk6CisgICAgICAgIFJl bW92ZSB0aGUgc3RvcmFnZSBhcmVhIGZyb20gdGhlIG1hcC4gSWYgdGhlcmUgYXJlIG5vIG1vcmUg YXJlYXMsIHJlbW92ZSB0aGUgbmFtZXNwYWNlIGZyb20gdGhlIG1hbmFnZXIuCisKKyAgICAgICAg KFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OlNlc3Npb25TdG9yYWdlTmFtZXNwYWNlOjpnZXRPckNy ZWF0ZVN0b3JhZ2VBcmVhKToKKyAgICAgICAgU3RvcmFnZUFyZWE6OmNyZWF0ZSBub3cgdGFrZXMg dGhlIHNlY3VyaXR5IG9yaWdpbi4KKworICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6 Y3JlYXRlTG9jYWxTdG9yYWdlTWFwKToKKyAgICAgICAgR2V0IChvciBjcmVhdGUpIHRoZSByaWdo dCBsb2NhbCBzdG9yYWdlIG5hbWVzcGFjZSBhbmQgdGhlbiBjcmVhdGUgYSBzdG9yYWdlIGFyZWEu CisKKzIwMTMtMDQtMTggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwog ICAgICAgICBEaWZmZXJlbnRpYXRlIGJldHdlZW4gY3JlYXRpbmcgbG9jYWwgc3RvcmFnZSBtYXBz IGFuZCBzZXNzaW9uIHN0b3JhZ2UgbWFwcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE0ODIzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcAppbmRleCBjMWU2Mzg0YzUwYjNlMDQ5OWU3 Y2RiMGZkMzVmMmE3MjU4NGI0MGMzLi43ZmUyNmYzNTBlMTUzNjc4ZDUwNmQ4N2I0NDcwZDVlOTQw YWU1OTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9y YWdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3Rv cmFnZU1hbmFnZXIuY3BwCkBAIC00MCw5ICs0MCwxMSBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAog Y2xhc3MgU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhIDogcHVibGljIFRocmVhZFNhZmVSZWZD b3VudGVkPFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYT4gewogcHVibGljOgotICAgIHN0YXRp YyBQYXNzUmVmUHRyPFN0b3JhZ2VBcmVhPiBjcmVhdGUodW5zaWduZWQgcXVvdGFJbkJ5dGVzKTsK KyAgICBzdGF0aWMgUGFzc1JlZlB0cjxTdG9yYWdlQXJlYT4gY3JlYXRlKExvY2FsU3RvcmFnZU5h bWVzcGFjZSosIFBhc3NSZWZQdHI8U2VjdXJpdHlPcmlnaW4+LCB1bnNpZ25lZCBxdW90YUluQnl0 ZXMpOwogICAgIH5TdG9yYWdlQXJlYSgpOwogCisgICAgU2VjdXJpdHlPcmlnaW4qIHNlY3VyaXR5 T3JpZ2luKCkgY29uc3QgeyByZXR1cm4gbV9zZWN1cml0eU9yaWdpbi5nZXQoKTsgfQorCiAgICAg dm9pZCBhZGRMaXN0ZW5lcihDb3JlSVBDOjpDb25uZWN0aW9uKiwgdWludDY0X3Qgc3RvcmFnZU1h cElEKTsKICAgICB2b2lkIHJlbW92ZUxpc3RlbmVyKENvcmVJUEM6OkNvbm5lY3Rpb24qLCB1aW50 NjRfdCBzdG9yYWdlTWFwSUQpOwogCkBAIC01NSwyMiArNTcsNDcgQEAgcHVibGljOgogICAgIGNv bnN0IEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+JiBpdGVtcygpIGNvbnN0IHsgcmV0dXJuIG1fc3Rv cmFnZU1hcC0+aXRlbXMoKTsgfQogCiBwcml2YXRlOgotICAgIGV4cGxpY2l0IFN0b3JhZ2VBcmVh KHVuc2lnbmVkIHF1b3RhSW5CeXRlcyk7CisgICAgZXhwbGljaXQgU3RvcmFnZUFyZWEoTG9jYWxT dG9yYWdlTmFtZXNwYWNlKiwgUGFzc1JlZlB0cjxTZWN1cml0eU9yaWdpbj4sIHVuc2lnbmVkIHF1 b3RhSW5CeXRlcyk7CiAKICAgICB2b2lkIGRpc3BhdGNoRXZlbnRzKENvcmVJUEM6OkNvbm5lY3Rp b24qIHNvdXJjZUNvbm5lY3Rpb24sIHVpbnQ2NF90IHNvdXJjZVN0b3JhZ2VBcmVhSUQsIGNvbnN0 IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIG9sZFZhbHVlLCBjb25zdCBTdHJpbmcmIG5ld1Zh bHVlLCBjb25zdCBTdHJpbmcmIHVybFN0cmluZykgY29uc3Q7CiAKKyAgICAvLyBXaWxsIGJlIG51 bGwgaWYgdGhlIHN0b3JhZ2UgYXJlYSBiZWxvbmdzIHRvIGEgc2Vzc2lvbiBzdG9yYWdlIG5hbWVz cGFjZS4KKyAgICBMb2NhbFN0b3JhZ2VOYW1lc3BhY2UqIG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNl OworICAgIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4gbV9zZWN1cml0eU9yaWdpbjsKICAgICB1bnNp Z25lZCBtX3F1b3RhSW5CeXRlczsKKwogICAgIFJlZlB0cjxTdG9yYWdlTWFwPiBtX3N0b3JhZ2VN YXA7CiAgICAgSGFzaFNldDxzdGQ6OnBhaXI8UmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+LCB1 aW50NjRfdD4gPiBtX2V2ZW50TGlzdGVuZXJzOwogfTsKIAotUGFzc1JlZlB0cjxTdG9yYWdlTWFu YWdlcjo6U3RvcmFnZUFyZWE+IFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6Y3JlYXRlKHVu c2lnbmVkIHF1b3RhSW5CeXRlcykKK2NsYXNzIFN0b3JhZ2VNYW5hZ2VyOjpMb2NhbFN0b3JhZ2VO YW1lc3BhY2UgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8TG9jYWxTdG9yYWdlTmFtZXNw YWNlPiB7CitwdWJsaWM6CisgICAgc3RhdGljIFBhc3NSZWZQdHI8TG9jYWxTdG9yYWdlTmFtZXNw YWNlPiBjcmVhdGUoU3RvcmFnZU1hbmFnZXIqLCB1aW50NjRfdCBzdG9yYWdlTWFuYWdlcklEKTsK KyAgICB+TG9jYWxTdG9yYWdlTmFtZXNwYWNlKCk7CisKKyAgICBQYXNzUmVmUHRyPFN0b3JhZ2VB cmVhPiBnZXRPckNyZWF0ZVN0b3JhZ2VBcmVhKFBhc3NSZWZQdHI8U2VjdXJpdHlPcmlnaW4+KTsK KyAgICB2b2lkIGRpZERlc3Ryb3lTdG9yYWdlQXJlYShTdG9yYWdlQXJlYSopOworCitwcml2YXRl OgorICAgIGV4cGxpY2l0IExvY2FsU3RvcmFnZU5hbWVzcGFjZShTdG9yYWdlTWFuYWdlciosIHVp bnQ2NF90IHN0b3JhZ2VNYW5hZ2VySUQpOworCisgICAgU3RvcmFnZU1hbmFnZXIqIG1fc3RvcmFn ZU1hbmFnZXI7CisgICAgdWludDY0X3QgbV9zdG9yYWdlTmFtZXNwYWNlSUQ7CisgICAgdW5zaWdu ZWQgbV9xdW90YUluQnl0ZXM7CisKKyAgICAvLyBXZSBkb24ndCBob2xkIGFuIGV4cGxpY2l0IHJl ZmVyZW5jZSB0byB0aGUgU3RvcmFnZUFyZWFzOyB0aGV5IGFyZSBrZXB0IGFsaXZlIGJ5IHRoZSBt X3N0b3JhZ2VBcmVhc0J5Q29ubmVjdGlvbiBtYXAgaW4gU3RvcmFnZU1hbmFnZXIuCisgICAgSGFz aE1hcDxSZWZQdHI8U2VjdXJpdHlPcmlnaW4+LCBTdG9yYWdlQXJlYSo+IG1fc3RvcmFnZUFyZWFN YXA7Cit9OworCitQYXNzUmVmUHRyPFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYT4gU3RvcmFn ZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjpjcmVhdGUoTG9jYWxTdG9yYWdlTmFtZXNwYWNlKiBsb2Nh bFN0b3JhZ2VOYW1lc3BhY2UsIFBhc3NSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IHNlY3VyaXR5T3Jp Z2luLCB1bnNpZ25lZCBxdW90YUluQnl0ZXMpCiB7Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBT dG9yYWdlQXJlYShxdW90YUluQnl0ZXMpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IFN0b3Jh Z2VBcmVhKGxvY2FsU3RvcmFnZU5hbWVzcGFjZSwgc2VjdXJpdHlPcmlnaW4sIHF1b3RhSW5CeXRl cykpOwogfQogCi1TdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OlN0b3JhZ2VBcmVhKHVuc2ln bmVkIHF1b3RhSW5CeXRlcykKLSAgICA6IG1fcXVvdGFJbkJ5dGVzKHF1b3RhSW5CeXRlcykKK1N0 b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6U3RvcmFnZUFyZWEoTG9jYWxTdG9yYWdlTmFtZXNw YWNlKiBsb2NhbFN0b3JhZ2VOYW1lc3BhY2UsIFBhc3NSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IHNl Y3VyaXR5T3JpZ2luLCB1bnNpZ25lZCBxdW90YUluQnl0ZXMpCisgICAgOiBtX2xvY2FsU3RvcmFn ZU5hbWVzcGFjZShsb2NhbFN0b3JhZ2VOYW1lc3BhY2UpCisgICAgLCBtX3NlY3VyaXR5T3JpZ2lu KHNlY3VyaXR5T3JpZ2luKQorICAgICwgbV9xdW90YUluQnl0ZXMocXVvdGFJbkJ5dGVzKQogICAg ICwgbV9zdG9yYWdlTWFwKFN0b3JhZ2VNYXA6OmNyZWF0ZShtX3F1b3RhSW5CeXRlcykpCiB7CiB9 CkBAIC03OCw2ICsxMDUsOSBAQCBTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OlN0b3JhZ2VB cmVhKHVuc2lnbmVkIHF1b3RhSW5CeXRlcykKIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6 flN0b3JhZ2VBcmVhKCkKIHsKICAgICBBU1NFUlQobV9ldmVudExpc3RlbmVycy5pc0VtcHR5KCkp OworCisgICAgaWYgKG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlKQorICAgICAgICBtX2xvY2FsU3Rv cmFnZU5hbWVzcGFjZS0+ZGlkRGVzdHJveVN0b3JhZ2VBcmVhKHRoaXMpOwogfQogCiB2b2lkIFN0 b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6YWRkTGlzdGVuZXIoQ29yZUlQQzo6Q29ubmVjdGlv biogY29ubmVjdGlvbiwgdWludDY0X3Qgc3RvcmFnZU1hcElEKQpAQCAtOTQsNyArMTI0LDkgQEAg dm9pZCBTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OnJlbW92ZUxpc3RlbmVyKENvcmVJUEM6 OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24KIAogUGFzc1JlZlB0cjxTdG9yYWdlTWFuYWdlcjo6U3Rv cmFnZUFyZWE+IFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6Y2xvbmUoKSBjb25zdAogewot ICAgIFJlZlB0cjxTdG9yYWdlQXJlYT4gc3RvcmFnZUFyZWEgPSBTdG9yYWdlQXJlYTo6Y3JlYXRl KG1fcXVvdGFJbkJ5dGVzKTsKKyAgICBBU1NFUlQoIW1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlKTsK KworICAgIFJlZlB0cjxTdG9yYWdlQXJlYT4gc3RvcmFnZUFyZWEgPSBTdG9yYWdlQXJlYTo6Y3Jl YXRlKDAsIG1fc2VjdXJpdHlPcmlnaW4sIG1fcXVvdGFJbkJ5dGVzKTsKICAgICBzdG9yYWdlQXJl YS0+bV9zdG9yYWdlTWFwID0gbV9zdG9yYWdlTWFwOwogCiAgICAgcmV0dXJuIHN0b3JhZ2VBcmVh LnJlbGVhc2UoKTsKQEAgLTE0Myw2ICsxNzUsNDkgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6U3Rv cmFnZUFyZWE6OmRpc3BhdGNoRXZlbnRzKENvcmVJUEM6OkNvbm5lY3Rpb24qIHNvdXJjZUNvbm4K ICAgICB9CiB9CiAKK1Bhc3NSZWZQdHI8U3RvcmFnZU1hbmFnZXI6OkxvY2FsU3RvcmFnZU5hbWVz cGFjZT4gU3RvcmFnZU1hbmFnZXI6OkxvY2FsU3RvcmFnZU5hbWVzcGFjZTo6Y3JlYXRlKFN0b3Jh Z2VNYW5hZ2VyKiBzdG9yYWdlTWFuYWdlciwgdWludDY0X3Qgc3RvcmFnZU5hbWVzcGFjZUlEKQor eworICAgIHJldHVybiBhZG9wdFJlZihuZXcgTG9jYWxTdG9yYWdlTmFtZXNwYWNlKHN0b3JhZ2VN YW5hZ2VyLCBzdG9yYWdlTmFtZXNwYWNlSUQpKTsKK30KKworLy8gRklYTUU6IFRoZSBxdW90YSB2 YWx1ZSBpcyBjb3BpZWQgZnJvbSBHcm91cFNldHRpbmdzLmNwcC4KKy8vIFdlIHNob3VsZCBpbnZl c3RpZ2F0ZSBhIHdheSB0byBzaGFyZSBpdCB3aXRoIFdlYkNvcmUuCitTdG9yYWdlTWFuYWdlcjo6 TG9jYWxTdG9yYWdlTmFtZXNwYWNlOjpMb2NhbFN0b3JhZ2VOYW1lc3BhY2UoU3RvcmFnZU1hbmFn ZXIqIHN0b3JhZ2VNYW5hZ2VyLCB1aW50NjRfdCBzdG9yYWdlTmFtZXNwYWNlSUQpCisgICAgOiBt X3N0b3JhZ2VNYW5hZ2VyKHN0b3JhZ2VNYW5hZ2VyKQorICAgICwgbV9zdG9yYWdlTmFtZXNwYWNl SUQoc3RvcmFnZU5hbWVzcGFjZUlEKQorICAgICwgbV9xdW90YUluQnl0ZXMoNSAqIDEwMjQgKiAx MDI0KQoreworfQorCitTdG9yYWdlTWFuYWdlcjo6TG9jYWxTdG9yYWdlTmFtZXNwYWNlOjp+TG9j YWxTdG9yYWdlTmFtZXNwYWNlKCkKK3sKKyAgICBBU1NFUlQobV9zdG9yYWdlQXJlYU1hcC5pc0Vt cHR5KCkpOworfQorCitQYXNzUmVmUHRyPFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYT4gU3Rv cmFnZU1hbmFnZXI6OkxvY2FsU3RvcmFnZU5hbWVzcGFjZTo6Z2V0T3JDcmVhdGVTdG9yYWdlQXJl YShQYXNzUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiBzZWN1cml0eU9yaWdpbikKK3sKKyAgICBIYXNo TWFwPFJlZlB0cjxTZWN1cml0eU9yaWdpbj4sIFN0b3JhZ2VBcmVhKj46OkFkZFJlc3VsdCByZXN1 bHQgPSBtX3N0b3JhZ2VBcmVhTWFwLmFkZChzZWN1cml0eU9yaWdpbiwgMCk7CisgICAgaWYgKCFy ZXN1bHQuaXNOZXdFbnRyeSkKKyAgICAgICAgcmV0dXJuIHJlc3VsdC5pdGVyYXRvci0+dmFsdWU7 CisKKyAgICBSZWZQdHI8U3RvcmFnZUFyZWE+IHN0b3JhZ2VBcmVhID0gU3RvcmFnZUFyZWE6OmNy ZWF0ZSh0aGlzLCByZXN1bHQuaXRlcmF0b3ItPmtleSwgbV9xdW90YUluQnl0ZXMpOworICAgIHJl c3VsdC5pdGVyYXRvci0+dmFsdWUgPSBzdG9yYWdlQXJlYS5nZXQoKTsKKworICAgIHJldHVybiBz dG9yYWdlQXJlYS5yZWxlYXNlKCk7Cit9CisKK3ZvaWQgU3RvcmFnZU1hbmFnZXI6OkxvY2FsU3Rv cmFnZU5hbWVzcGFjZTo6ZGlkRGVzdHJveVN0b3JhZ2VBcmVhKFN0b3JhZ2VBcmVhKiBzdG9yYWdl QXJlYSkKK3sKKyAgICBBU1NFUlQobV9zdG9yYWdlQXJlYU1hcC5jb250YWlucyhzdG9yYWdlQXJl YS0+c2VjdXJpdHlPcmlnaW4oKSkpOworCisgICAgbV9zdG9yYWdlQXJlYU1hcC5yZW1vdmUoc3Rv cmFnZUFyZWEtPnNlY3VyaXR5T3JpZ2luKCkpOworICAgIGlmICghbV9zdG9yYWdlQXJlYU1hcC5p c0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKworICAgIEFTU0VSVChtX3N0b3JhZ2VNYW5hZ2Vy LT5tX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMuY29udGFpbnMobV9zdG9yYWdlTmFtZXNwYWNlSUQp KTsKKyAgICBtX3N0b3JhZ2VNYW5hZ2VyLT5tX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMucmVtb3Zl KG1fc3RvcmFnZU5hbWVzcGFjZUlEKTsKK30KKwogY2xhc3MgU3RvcmFnZU1hbmFnZXI6OlNlc3Np b25TdG9yYWdlTmFtZXNwYWNlIDogcHVibGljIFRocmVhZFNhZmVSZWZDb3VudGVkPFNlc3Npb25T dG9yYWdlTmFtZXNwYWNlPiB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8U2Vzc2lv blN0b3JhZ2VOYW1lc3BhY2U+IGNyZWF0ZShDb3JlSVBDOjpDb25uZWN0aW9uKiBhbGxvd2VkQ29u bmVjdGlvbiwgdW5zaWduZWQgcXVvdGFJbkJ5dGVzKTsKQEAgLTE5Miw3ICsyNjcsNyBAQCBQYXNz UmVmUHRyPFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYT4gU3RvcmFnZU1hbmFnZXI6OlNlc3Np b25TdG9yYWdlTmFtZXNwYWNlOgogewogICAgIEhhc2hNYXA8UmVmUHRyPFNlY3VyaXR5T3JpZ2lu PiwgUmVmUHRyPFN0b3JhZ2VBcmVhPiA+OjpBZGRSZXN1bHQgcmVzdWx0ID0gbV9zdG9yYWdlQXJl YU1hcC5hZGQoc2VjdXJpdHlPcmlnaW4sIDApOwogICAgIGlmIChyZXN1bHQuaXNOZXdFbnRyeSkK LSAgICAgICAgcmVzdWx0Lml0ZXJhdG9yLT52YWx1ZSA9IFN0b3JhZ2VBcmVhOjpjcmVhdGUobV9x dW90YUluQnl0ZXMpOworICAgICAgICByZXN1bHQuaXRlcmF0b3ItPnZhbHVlID0gU3RvcmFnZUFy ZWE6OmNyZWF0ZSgwLCByZXN1bHQuaXRlcmF0b3ItPmtleSwgbV9xdW90YUluQnl0ZXMpOwogCiAg ICAgcmV0dXJuIHJlc3VsdC5pdGVyYXRvci0+dmFsdWU7CiB9CkBAIC0yNTYsOSArMzMxLDI4IEBA IHZvaWQgU3RvcmFnZU1hbmFnZXI6OnByb2Nlc3NXaWxsQ2xvc2VDb25uZWN0aW9uKFdlYlByb2Nl c3NQcm94eSogd2ViUHJvY2Vzc1Byb3h5CiAgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goYmluZCgmU3Rv cmFnZU1hbmFnZXI6OmludmFsaWRhdGVDb25uZWN0aW9uSW50ZXJuYWwsIHRoaXMsIFJlZlB0cjxD b3JlSVBDOjpDb25uZWN0aW9uPih3ZWJQcm9jZXNzUHJveHktPmNvbm5lY3Rpb24oKSkpKTsKIH0K IAotdm9pZCBTdG9yYWdlTWFuYWdlcjo6Y3JlYXRlTG9jYWxTdG9yYWdlTWFwKENvcmVJUEM6OkNv bm5lY3Rpb24qLCB1aW50NjRfdCBzdG9yYWdlTWFwSUQsIHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3Bh Y2VJRCwgY29uc3QgU2VjdXJpdHlPcmlnaW5EYXRhJikKK3ZvaWQgU3RvcmFnZU1hbmFnZXI6OmNy ZWF0ZUxvY2FsU3RvcmFnZU1hcChDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCB1aW50 NjRfdCBzdG9yYWdlTWFwSUQsIHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3BhY2VJRCwgY29uc3QgU2Vj dXJpdHlPcmlnaW5EYXRhJiBzZWN1cml0eU9yaWdpbkRhdGEpCiB7Ci0gICAgLy8gRklYTUU6IElt cGxlbWVudC4KKyAgICBzdGQ6OnBhaXI8UmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+LCB1aW50 NjRfdD4gY29ubmVjdGlvbkFuZFN0b3JhZ2VNYXBJRFBhaXIoY29ubmVjdGlvbiwgc3RvcmFnZU1h cElEKTsKKworICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBhIG1lc3NhZ2UgY2hlY2suCisg ICAgQVNTRVJUKChIYXNoTWFwPHN0ZDo6cGFpcjxSZWZQdHI8Q29yZUlQQzo6Q29ubmVjdGlvbj4s IHVpbnQ2NF90PiwgUmVmUHRyPFN0b3JhZ2VBcmVhPiA+Ojppc1ZhbGlkS2V5KGNvbm5lY3Rpb25B bmRTdG9yYWdlTWFwSURQYWlyKSkpOworCisgICAgSGFzaE1hcDxzdGQ6OnBhaXI8UmVmUHRyPENv cmVJUEM6OkNvbm5lY3Rpb24+LCB1aW50NjRfdD4sIFJlZlB0cjxTdG9yYWdlQXJlYT4gPjo6QWRk UmVzdWx0IHJlc3VsdCA9IG1fc3RvcmFnZUFyZWFzQnlDb25uZWN0aW9uLmFkZChjb25uZWN0aW9u QW5kU3RvcmFnZU1hcElEUGFpciwgMCk7CisKKyAgICAvLyBGSVhNRTogVGhlc2Ugc2hvdWxkIGJl IGEgbWVzc2FnZSBjaGVja3MuCisgICAgQVNTRVJUKHJlc3VsdC5pc05ld0VudHJ5KTsKKyAgICBB U1NFUlQoKEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxMb2NhbFN0b3JhZ2VOYW1lc3BhY2U+ID46 OmlzVmFsaWRLZXkoc3RvcmFnZU5hbWVzcGFjZUlEKSkpOworCisgICAgTG9jYWxTdG9yYWdlTmFt ZXNwYWNlKiBsb2NhbFN0b3JhZ2VOYW1lc3BhY2UgPSBnZXRPckNyZWF0ZUxvY2FsU3RvcmFnZU5h bWVzcGFjZShzdG9yYWdlTmFtZXNwYWNlSUQpOworCisgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxk IGJlIGEgbWVzc2FnZSBjaGVjay4KKyAgICBBU1NFUlQobG9jYWxTdG9yYWdlTmFtZXNwYWNlKTsK KworICAgIFJlZlB0cjxTdG9yYWdlQXJlYT4gc3RvcmFnZUFyZWEgPSBsb2NhbFN0b3JhZ2VOYW1l c3BhY2UtPmdldE9yQ3JlYXRlU3RvcmFnZUFyZWEoc2VjdXJpdHlPcmlnaW5EYXRhLnNlY3VyaXR5 T3JpZ2luKCkpOworICAgIHN0b3JhZ2VBcmVhLT5hZGRMaXN0ZW5lcihjb25uZWN0aW9uLCBzdG9y YWdlTWFwSUQpOworCisgICAgcmVzdWx0Lml0ZXJhdG9yLT52YWx1ZSA9IHN0b3JhZ2VBcmVhLnJl bGVhc2UoKTsKIH0KIAogdm9pZCBTdG9yYWdlTWFuYWdlcjo6Y3JlYXRlU2Vzc2lvblN0b3JhZ2VN YXAoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0X3Qgc3RvcmFnZU1hcElE LCB1aW50NjRfdCBzdG9yYWdlTmFtZXNwYWNlSUQsIGNvbnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYg c2VjdXJpdHlPcmlnaW5EYXRhKQpAQCAtNDA4LDQgKzUwMiwxNiBAQCBTdG9yYWdlTWFuYWdlcjo6 U3RvcmFnZUFyZWEqIFN0b3JhZ2VNYW5hZ2VyOjpmaW5kU3RvcmFnZUFyZWEoQ29yZUlQQzo6Q29u bmVjdGlvbgogICAgIHJldHVybiBtX3N0b3JhZ2VBcmVhc0J5Q29ubmVjdGlvbi5nZXQoY29ubmVj dGlvbkFuZFN0b3JhZ2VNYXBJRFBhaXIpLmdldCgpOwogfQogCitTdG9yYWdlTWFuYWdlcjo6TG9j YWxTdG9yYWdlTmFtZXNwYWNlKiBTdG9yYWdlTWFuYWdlcjo6Z2V0T3JDcmVhdGVMb2NhbFN0b3Jh Z2VOYW1lc3BhY2UodWludDY0X3Qgc3RvcmFnZU5hbWVzcGFjZUlEKQoreworICAgIGlmICghSGFz aE1hcDx1aW50NjRfdCwgUmVmUHRyPExvY2FsU3RvcmFnZU5hbWVzcGFjZT4gPjo6aXNWYWxpZEtl eShzdG9yYWdlTmFtZXNwYWNlSUQpKQorICAgICAgICByZXR1cm4gMDsKKworICAgIEhhc2hNYXA8 dWludDY0X3QsIFJlZlB0cjxMb2NhbFN0b3JhZ2VOYW1lc3BhY2U+ID46OkFkZFJlc3VsdCByZXN1 bHQgPSBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMuYWRkKHN0b3JhZ2VOYW1lc3BhY2VJRCwgbnVs bHB0cik7CisgICAgaWYgKHJlc3VsdC5pc05ld0VudHJ5KQorICAgICAgICByZXN1bHQuaXRlcmF0 b3ItPnZhbHVlID0gTG9jYWxTdG9yYWdlTmFtZXNwYWNlOjpjcmVhdGUodGhpcywgc3RvcmFnZU5h bWVzcGFjZUlEKTsKKworICAgIHJldHVybiByZXN1bHQuaXRlcmF0b3ItPnZhbHVlLmdldCgpOwor fQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCmluZGV4IGQxZWU1MDhhY2E1NDRhZTdkNTcxMjc5 ZmYyZTIzYTUxZTQ1MWYwOTUuLjVjYTY4MmM3ODcxMzZjZjgyMDNmYjQ0NGRmYzg4N2FmOTU3MTgz Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VN YW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1h bmFnZXIuaApAQCAtODEsMTAgKzgxLDE1IEBAIHByaXZhdGU6CiAgICAgY2xhc3MgU3RvcmFnZUFy ZWE7CiAgICAgU3RvcmFnZUFyZWEqIGZpbmRTdG9yYWdlQXJlYShDb3JlSVBDOjpDb25uZWN0aW9u KiwgdWludDY0X3QpIGNvbnN0OwogCisgICAgY2xhc3MgTG9jYWxTdG9yYWdlTmFtZXNwYWNlOwor ICAgIExvY2FsU3RvcmFnZU5hbWVzcGFjZSogZ2V0T3JDcmVhdGVMb2NhbFN0b3JhZ2VOYW1lc3Bh Y2UodWludDY0X3Qgc3RvcmFnZU5hbWVzcGFjZUlEKTsKKwogICAgIFJlZlB0cjxXb3JrUXVldWU+ IG1fcXVldWU7CiAKICAgICBTdHJpbmcgbV9sb2NhbFN0b3JhZ2VEaXJlY3Rvcnk7CiAKKyAgICBI YXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8TG9jYWxTdG9yYWdlTmFtZXNwYWNlPiA+IG1fbG9jYWxT dG9yYWdlTmFtZXNwYWNlczsKKwogICAgIGNsYXNzIFNlc3Npb25TdG9yYWdlTmFtZXNwYWNlOwog ICAgIEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZT4gPiBt X3Nlc3Npb25TdG9yYWdlTmFtZXNwYWNlczsKIAo=