147691 2015-08-05 13:25:52 -0700 Change openDatabase to return a Database instead of a DatabaseBackendBase 2015-08-05 13:35:01 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1115100 0 andersca 2015-08-05 13:25:52 -0700 Change openDatabase to return a Database instead of a DatabaseBackendBase 1115101 1 258295 andersca 2015-08-05 13:28:44 -0700 Created attachment 258295 Patch 1115103 2 andersca 2015-08-05 13:35:01 -0700 Committed r187984: <http://trac.webkit.org/changeset/187984> 258295 2015-08-05 13:28:44 -0700 2015-08-05 13:30:39 -0700 Patch bug-147691-20150805132835.patch text/plain 12407 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3OTc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTY4M2NlOWZhNzZiNDll NjRkOGZlOGNlYzgwY2JmMDEzZmVkMzBhOC4uOWI0MzQwYTFhMDEyMDllYWUxZDk5ZDQ5NjAxOWZm YWE4NmFjZDQ0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACisyMDE1LTA4LTA1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQ2hhbmdlIG9wZW5E YXRhYmFzZSB0byByZXR1cm4gYSBEYXRhYmFzZSBpbnN0ZWFkIG9mIGEgRGF0YWJhc2VCYWNrZW5k QmFzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3 NjkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBN b2R1bGVzL3dlYmRhdGFiYXNlL0Fic3RyYWN0RGF0YWJhc2VTZXJ2ZXIuaDoKKyAgICAgICAgKiBN b2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFi YXNlOjpjcmVhdGUpOiBEZWxldGVkLgorICAgICAgICAqIE1vZHVsZXMvd2ViZGF0YWJhc2UvRGF0 YWJhc2UuaDoKKyAgICAgICAgKiBNb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlTWFuYWdlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZU1hbmFnZXI6Om9wZW5EYXRhYmFzZUJhY2tl bmQpOgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VNYW5hZ2VyOjpvcGVuRGF0YWJhc2UpOgor ICAgICAgICAqIE1vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VNYW5hZ2VyLmg6CisgICAgICAg ICogTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVNlcnZlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpEYXRhYmFzZVNlcnZlcjo6b3BlbkRhdGFiYXNlKToKKyAgICAgICAgKFdlYkNvcmU6OkRh dGFiYXNlU2VydmVyOjpjcmVhdGVEYXRhYmFzZSk6CisgICAgICAgICogTW9kdWxlcy93ZWJkYXRh YmFzZS9EYXRhYmFzZVNlcnZlci5oOgorCiAyMDE1LTA4LTA1ICBBbmRlcnMgQ2FybHNzb24gIDxh bmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgR2V0IHJpZCBvZiBEYXRhYmFzZUJhY2tlbmQg YXMgYW5vdGhlciBzdGVwIHRvd2FyZHMgbWVyZ2luZyBEYXRhYmFzZSBhbmQgRGF0YWJhc2VCYWNr ZW5kQmFzZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ3Njg3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2Uv QWJzdHJhY3REYXRhYmFzZVNlcnZlci5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRh YmFzZS9BYnN0cmFjdERhdGFiYXNlU2VydmVyLmgKaW5kZXggYTQyMTNjYWM0YTkwZmQ0MThhYjdi YWJlMDgyNGMyMTVjZGY2NzRlOC4uOGE4NzM5MzE2MDdkZTUzMmUzZjkxMTI4NTM4OTdlZDIyMzIy OTQ2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9BYnN0 cmFjdERhdGFiYXNlU2VydmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRh YmFzZS9BYnN0cmFjdERhdGFiYXNlU2VydmVyLmgKQEAgLTM1LDcgKzM1LDcgQEAKIAogbmFtZXNw YWNlIFdlYkNvcmUgewogCi1jbGFzcyBEYXRhYmFzZUJhY2tlbmRCYXNlOworY2xhc3MgRGF0YWJh c2U7CiBjbGFzcyBEYXRhYmFzZUNvbnRleHQ7CiBjbGFzcyBEYXRhYmFzZU1hbmFnZXJDbGllbnQ7 CiBjbGFzcyBTZWN1cml0eU9yaWdpbjsKQEAgLTU1LDcgKzU1LDcgQEAgcHVibGljOgogICAgICAg ICBSZXRyeU9wZW5EYXRhYmFzZQogICAgIH07CiAKLSAgICB2aXJ0dWFsIFJlZlB0cjxEYXRhYmFz ZUJhY2tlbmRCYXNlPiBvcGVuRGF0YWJhc2UoUmVmUHRyPERhdGFiYXNlQ29udGV4dD4mLCBjb25z dCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgZXhwZWN0ZWRWZXJzaW9uLCBjb25zdCBTdHJp bmcmIGRpc3BsYXlOYW1lLCB1bnNpZ25lZCBsb25nIGVzdGltYXRlZFNpemUsIGJvb2wgc2V0VmVy c2lvbkluTmV3RGF0YWJhc2UsIERhdGFiYXNlRXJyb3ImLCBTdHJpbmcmIGVycm9yTWVzc2FnZSwg T3BlbkF0dGVtcHQgPSBGaXJzdFRyeVRvT3BlbkRhdGFiYXNlKSA9IDA7CisgICAgdmlydHVhbCBS ZWZQdHI8RGF0YWJhc2U+IG9wZW5EYXRhYmFzZShSZWZQdHI8RGF0YWJhc2VDb250ZXh0PiYsIGNv bnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiBleHBlY3RlZFZlcnNpb24sIGNvbnN0IFN0 cmluZyYgZGlzcGxheU5hbWUsIHVuc2lnbmVkIGxvbmcgZXN0aW1hdGVkU2l6ZSwgYm9vbCBzZXRW ZXJzaW9uSW5OZXdEYXRhYmFzZSwgRGF0YWJhc2VFcnJvciYsIFN0cmluZyYgZXJyb3JNZXNzYWdl LCBPcGVuQXR0ZW1wdCA9IEZpcnN0VHJ5VG9PcGVuRGF0YWJhc2UpID0gMDsKIAogICAgIHZpcnR1 YWwgdm9pZCBjbG9zZUFsbERhdGFiYXNlcygpID0gMDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlLmNwcAppbmRleCBhOTg2ZDU2ZGFkNjAzNjhlYzY2 MjE0OTU1ZjJlMjhmMTdlMzAwNGNhLi44MmE1OTgwMGUxZTc4NTkzMTQzZDQ1MmU1MjAwODc5Yzlm ZmZiNzc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0Rh dGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFi YXNlLmNwcApAQCAtNjAsMTUgKzYwLDYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1QYXNz UmVmUHRyPERhdGFiYXNlPiBEYXRhYmFzZTo6Y3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQq LCBQYXNzUmVmUHRyPERhdGFiYXNlQmFja2VuZEJhc2U+IGJhY2tlbmQpCi17Ci0gICAgLy8gRklY TUU6IEN1cnJlbnRseSwgd2UncmUgb25seSBzaW11bGF0aW5nIHRoZSBiYWNrZW5kIGJ5IHJldHVy biB0aGUKLSAgICAvLyBmcm9udGVuZCBkYXRhYmFzZSBhcyBpdHMgb3duIHRoZSBiYWNrZW5kLiBX aGVuIHdlIHNwbGl0IHRoZSAyIGFwYXJ0LAotICAgIC8vIHRoaXMgY3JlYXRlKCkgZnVuY3Rpb24g c2hvdWxkIGJlIGNoYW5nZWQgdG8gYmUgYSBmYWN0b3J5IG1ldGhvZCBmb3IKLSAgICAvLyBpbnN0 YW50aWF0aW5nIHRoZSBiYWNrZW5kLgotICAgIHJldHVybiBzdGF0aWNfY2FzdDxEYXRhYmFzZSo+ KGJhY2tlbmQuZ2V0KCkpOwotfQotCiBEYXRhYmFzZTo6RGF0YWJhc2UoUGFzc1JlZlB0cjxEYXRh YmFzZUNvbnRleHQ+IGRhdGFiYXNlQ29udGV4dCwgY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBT dHJpbmcmIGV4cGVjdGVkVmVyc2lvbiwgY29uc3QgU3RyaW5nJiBkaXNwbGF5TmFtZSwgdW5zaWdu ZWQgbG9uZyBlc3RpbWF0ZWRTaXplKQogICAgIDogRGF0YWJhc2VCYWNrZW5kQmFzZShkYXRhYmFz ZUNvbnRleHQuZ2V0KCksIG5hbWUsIGV4cGVjdGVkVmVyc2lvbiwgZGlzcGxheU5hbWUsIGVzdGlt YXRlZFNpemUpCiAgICAgLCBtX3RyYW5zYWN0aW9uSW5Qcm9ncmVzcyhmYWxzZSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2UuaCBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2UuaAppbmRleCAzYzczMzVjMjQ3 MTk3NWY0OWI4ZGFmYWFkNjdkMmFiNmFjYjQ2ZDllLi5jMTQwN2JlMDU0MWEwN2Q1ZjIyMzRhNjg5 ZDM2MGE0MjM4ZjE3MDRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRh dGFiYXNlL0RhdGFiYXNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFz ZS9EYXRhYmFzZS5oCkBAIC05Nyw4ICs5Nyw2IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgRGF0 YWJhc2UoUGFzc1JlZlB0cjxEYXRhYmFzZUNvbnRleHQ+LCBjb25zdCBTdHJpbmcmIG5hbWUsIGNv bnN0IFN0cmluZyYgZXhwZWN0ZWRWZXJzaW9uLCBjb25zdCBTdHJpbmcmIGRpc3BsYXlOYW1lLCB1 bnNpZ25lZCBsb25nIGVzdGltYXRlZFNpemUpOwogCi0gICAgc3RhdGljIFBhc3NSZWZQdHI8RGF0 YWJhc2U+IGNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgUGFzc1JlZlB0cjxEYXRhYmFz ZUJhY2tlbmRCYXNlPik7Ci0KICAgICB2b2lkIHNjaGVkdWxlVHJhbnNhY3Rpb24oKTsKIAogICAg IHZvaWQgcnVuVHJhbnNhY3Rpb24oUmVmUHRyPFNRTFRyYW5zYWN0aW9uQ2FsbGJhY2s+JiYsIFJl ZlB0cjxTUUxUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2s+JiYsIFJlZlB0cjxWb2lkQ2FsbGJhY2s+ JiYgc3VjY2Vzc0NhbGxiYWNrLCBib29sIHJlYWRPbmx5LCBjb25zdCBDaGFuZ2VWZXJzaW9uRGF0 YSogPSBudWxscHRyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0 YWJhc2UvRGF0YWJhc2VNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0 YWJhc2UvRGF0YWJhc2VNYW5hZ2VyLmNwcAppbmRleCBkY2I3YmFlM2Y1MWNhN2Y2ZDNhZjAyN2E0 MGQwYjlmODc3N2NjMTZmLi5iNDM2Y2YyOWI3M2EwYTMxYTZjZDZmMDhjODZmNGQ0MzkyMDU4YTI5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNl TWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRh YmFzZU1hbmFnZXIuY3BwCkBAIC0yMDIsMTMgKzIwMiwxMyBAQCBzdGF0aWMgdm9pZCBsb2dPcGVu RGF0YWJhc2VFcnJvcihTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBjb25zdCBTdHJp bmcmCiAgICAgICAgIGNvbnRleHQtPnNlY3VyaXR5T3JpZ2luKCktPnRvU3RyaW5nKCkuYXNjaWko KS5kYXRhKCkpOwogfQogCi1QYXNzUmVmUHRyPERhdGFiYXNlQmFja2VuZEJhc2U+IERhdGFiYXNl TWFuYWdlcjo6b3BlbkRhdGFiYXNlQmFja2VuZChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250 ZXh0LCBjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgZXhwZWN0ZWRWZXJzaW9uLCBj b25zdCBTdHJpbmcmIGRpc3BsYXlOYW1lLCB1bnNpZ25lZCBsb25nIGVzdGltYXRlZFNpemUsIGJv b2wgc2V0VmVyc2lvbkluTmV3RGF0YWJhc2UsIERhdGFiYXNlRXJyb3ImIGVycm9yLCBTdHJpbmcm IGVycm9yTWVzc2FnZSkKK1Bhc3NSZWZQdHI8RGF0YWJhc2U+IERhdGFiYXNlTWFuYWdlcjo6b3Bl bkRhdGFiYXNlQmFja2VuZChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBjb25zdCBT dHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgZXhwZWN0ZWRWZXJzaW9uLCBjb25zdCBTdHJpbmcm IGRpc3BsYXlOYW1lLCB1bnNpZ25lZCBsb25nIGVzdGltYXRlZFNpemUsIGJvb2wgc2V0VmVyc2lv bkluTmV3RGF0YWJhc2UsIERhdGFiYXNlRXJyb3ImIGVycm9yLCBTdHJpbmcmIGVycm9yTWVzc2Fn ZSkKIHsKICAgICBBU1NFUlQoZXJyb3IgPT0gRGF0YWJhc2VFcnJvcjo6Tm9uZSk7CiAKICAgICBS ZWZQdHI8RGF0YWJhc2VDb250ZXh0PiBkYXRhYmFzZUNvbnRleHQgPSBkYXRhYmFzZUNvbnRleHRG b3IoY29udGV4dCk7CiAKLSAgICBSZWZQdHI8RGF0YWJhc2VCYWNrZW5kQmFzZT4gYmFja2VuZCA9 IG1fc2VydmVyLT5vcGVuRGF0YWJhc2UoZGF0YWJhc2VDb250ZXh0LCBuYW1lLCBleHBlY3RlZFZl cnNpb24sIGRpc3BsYXlOYW1lLCBlc3RpbWF0ZWRTaXplLCBzZXRWZXJzaW9uSW5OZXdEYXRhYmFz ZSwgZXJyb3IsIGVycm9yTWVzc2FnZSk7CisgICAgUmVmUHRyPERhdGFiYXNlPiBiYWNrZW5kID0g bV9zZXJ2ZXItPm9wZW5EYXRhYmFzZShkYXRhYmFzZUNvbnRleHQsIG5hbWUsIGV4cGVjdGVkVmVy c2lvbiwgZGlzcGxheU5hbWUsIGVzdGltYXRlZFNpemUsIHNldFZlcnNpb25Jbk5ld0RhdGFiYXNl LCBlcnJvciwgZXJyb3JNZXNzYWdlKTsKIAogICAgIGlmICghYmFja2VuZCkgewogICAgICAgICBB U1NFUlQoZXJyb3IgIT0gRGF0YWJhc2VFcnJvcjo6Tm9uZSk7CkBAIC0yODEsMTcgKzI4MSwxNSBA QCBSZWZQdHI8RGF0YWJhc2U+IERhdGFiYXNlTWFuYWdlcjo6b3BlbkRhdGFiYXNlKFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsCiAKICAgICBib29sIHNldFZlcnNpb25Jbk5ld0RhdGFi YXNlID0gIWNyZWF0aW9uQ2FsbGJhY2s7CiAgICAgU3RyaW5nIGVycm9yTWVzc2FnZTsKLSAgICBS ZWZQdHI8RGF0YWJhc2VCYWNrZW5kQmFzZT4gYmFja2VuZCA9IG9wZW5EYXRhYmFzZUJhY2tlbmQo Y29udGV4dCwgbmFtZSwgZXhwZWN0ZWRWZXJzaW9uLCBkaXNwbGF5TmFtZSwgZXN0aW1hdGVkU2l6 ZSwgc2V0VmVyc2lvbkluTmV3RGF0YWJhc2UsIGVycm9yLCBlcnJvck1lc3NhZ2UpOwotICAgIGlm ICghYmFja2VuZCkKKyAgICBSZWZQdHI8RGF0YWJhc2U+IGRhdGFiYXNlID0gb3BlbkRhdGFiYXNl QmFja2VuZChjb250ZXh0LCBuYW1lLCBleHBlY3RlZFZlcnNpb24sIGRpc3BsYXlOYW1lLCBlc3Rp bWF0ZWRTaXplLCBzZXRWZXJzaW9uSW5OZXdEYXRhYmFzZSwgZXJyb3IsIGVycm9yTWVzc2FnZSk7 CisgICAgaWYgKCFkYXRhYmFzZSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICBSZWZQ dHI8RGF0YWJhc2U+IGRhdGFiYXNlID0gRGF0YWJhc2U6OmNyZWF0ZShjb250ZXh0LCBiYWNrZW5k KTsKLQogICAgIFJlZlB0cjxEYXRhYmFzZUNvbnRleHQ+IGRhdGFiYXNlQ29udGV4dCA9IGRhdGFi YXNlQ29udGV4dEZvcihjb250ZXh0KTsKICAgICBkYXRhYmFzZUNvbnRleHQtPnNldEhhc09wZW5E YXRhYmFzZXMoKTsKICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZE9wZW5EYXRhYmFz ZShjb250ZXh0LCBkYXRhYmFzZS5jb3B5UmVmKCksIGNvbnRleHQtPnNlY3VyaXR5T3JpZ2luKCkt Pmhvc3QoKSwgbmFtZSwgZXhwZWN0ZWRWZXJzaW9uKTsKIAotICAgIGlmIChiYWNrZW5kLT5pc05l dygpICYmIGNyZWF0aW9uQ2FsbGJhY2suZ2V0KCkpIHsKKyAgICBpZiAoZGF0YWJhc2UtPmlzTmV3 KCkgJiYgY3JlYXRpb25DYWxsYmFjay5nZXQoKSkgewogICAgICAgICBMT0coU3RvcmFnZUFQSSwg IlNjaGVkdWxpbmcgRGF0YWJhc2VDcmVhdGlvbkNhbGxiYWNrVGFzayBmb3IgZGF0YWJhc2UgJXBc biIsIGRhdGFiYXNlLmdldCgpKTsKICAgICAgICAgZGF0YWJhc2UtPnNldEhhc1BlbmRpbmdDcmVh dGlvbkV2ZW50KHRydWUpOwogICAgICAgICBkYXRhYmFzZS0+bV9zY3JpcHRFeGVjdXRpb25Db250 ZXh0LT5wb3N0VGFzayhbY3JlYXRpb25DYWxsYmFjaywgZGF0YWJhc2VdIChTY3JpcHRFeGVjdXRp b25Db250ZXh0JikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRh YmFzZS9EYXRhYmFzZU1hbmFnZXIuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJh c2UvRGF0YWJhc2VNYW5hZ2VyLmgKaW5kZXggMmNkYjBkZTUyZjJkZmVkNGU0MjllNTE3ZmEyNWNk NmMyZmIxNGUxOS4uMWUwOTY1NDc4MmEwNmZlOGIzMjFkNGI2OWZkNmZiYmVhYjkzMGQ2ZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZU1hbmFn ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlTWFu YWdlci5oCkBAIC0xMjksNyArMTI5LDcgQEAgcHJpdmF0ZToKICAgICAvLyBpdCBhbHJlYWR5IGV4 aXN0IHByZXZpb3VzbHkuIE90aGVyd2lzZSwgaXQgcmV0dXJucyAwLgogICAgIFJlZlB0cjxEYXRh YmFzZUNvbnRleHQ+IGV4aXN0aW5nRGF0YWJhc2VDb250ZXh0Rm9yKFNjcmlwdEV4ZWN1dGlvbkNv bnRleHQqKTsKIAotICAgIFBhc3NSZWZQdHI8RGF0YWJhc2VCYWNrZW5kQmFzZT4gb3BlbkRhdGFi YXNlQmFja2VuZChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgY29uc3QgU3RyaW5nJiBuYW1lLCBj b25zdCBTdHJpbmcmIGV4cGVjdGVkVmVyc2lvbiwgY29uc3QgU3RyaW5nJiBkaXNwbGF5TmFtZSwg dW5zaWduZWQgbG9uZyBlc3RpbWF0ZWRTaXplLCBib29sIHNldFZlcnNpb25Jbk5ld0RhdGFiYXNl LCBEYXRhYmFzZUVycm9yJiwgU3RyaW5nJiBlcnJvck1lc3NhZ2UpOworICAgIFBhc3NSZWZQdHI8 RGF0YWJhc2U+IG9wZW5EYXRhYmFzZUJhY2tlbmQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIGNv bnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiBleHBlY3RlZFZlcnNpb24sIGNvbnN0IFN0 cmluZyYgZGlzcGxheU5hbWUsIHVuc2lnbmVkIGxvbmcgZXN0aW1hdGVkU2l6ZSwgYm9vbCBzZXRW ZXJzaW9uSW5OZXdEYXRhYmFzZSwgRGF0YWJhc2VFcnJvciYsIFN0cmluZyYgZXJyb3JNZXNzYWdl KTsKIAogICAgIHZvaWQgYWRkUHJvcG9zZWREYXRhYmFzZShQcm9wb3NlZERhdGFiYXNlKik7CiAg ICAgdm9pZCByZW1vdmVQcm9wb3NlZERhdGFiYXNlKFByb3Bvc2VkRGF0YWJhc2UqKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VTZXJ2ZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVNlcnZlci5j cHAKaW5kZXggYzlkOTQyODhlMTEzMjdhNDJhZjlmYWVjOWJmMWM3YjZmNDVmN2ViYS4uMDk0ZTNj NDlhZTBmYzZjNmE4ZDJiZTM5NTY2ZjVmNDY4ZmEzM2VlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVNlcnZlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVNlcnZlci5jcHAKQEAgLTExMiwx MCArMTEyLDEwIEBAIHZvaWQgRGF0YWJhc2VTZXJ2ZXI6OmNsb3NlQWxsRGF0YWJhc2VzKCkKICAg ICBEYXRhYmFzZVRyYWNrZXI6OnRyYWNrZXIoKS5jbG9zZUFsbERhdGFiYXNlcygpOwogfQogCi1S ZWZQdHI8RGF0YWJhc2VCYWNrZW5kQmFzZT4gRGF0YWJhc2VTZXJ2ZXI6Om9wZW5EYXRhYmFzZShS ZWZQdHI8RGF0YWJhc2VDb250ZXh0PiYgYmFja2VuZENvbnRleHQsIGNvbnN0IFN0cmluZyYgbmFt ZSwgY29uc3QgU3RyaW5nJiBleHBlY3RlZFZlcnNpb24sIGNvbnN0IFN0cmluZyYgZGlzcGxheU5h bWUsIHVuc2lnbmVkIGxvbmcgZXN0aW1hdGVkU2l6ZSwgYm9vbCBzZXRWZXJzaW9uSW5OZXdEYXRh YmFzZSwgRGF0YWJhc2VFcnJvciAmZXJyb3IsIFN0cmluZyYgZXJyb3JNZXNzYWdlLAorUmVmUHRy PERhdGFiYXNlPiBEYXRhYmFzZVNlcnZlcjo6b3BlbkRhdGFiYXNlKFJlZlB0cjxEYXRhYmFzZUNv bnRleHQ+JiBiYWNrZW5kQ29udGV4dCwgY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcm IGV4cGVjdGVkVmVyc2lvbiwgY29uc3QgU3RyaW5nJiBkaXNwbGF5TmFtZSwgdW5zaWduZWQgbG9u ZyBlc3RpbWF0ZWRTaXplLCBib29sIHNldFZlcnNpb25Jbk5ld0RhdGFiYXNlLCBEYXRhYmFzZUVy cm9yICZlcnJvciwgU3RyaW5nJiBlcnJvck1lc3NhZ2UsCiAgICAgT3BlbkF0dGVtcHQgYXR0ZW1w dCkKIHsKLSAgICBSZWZQdHI8RGF0YWJhc2VCYWNrZW5kQmFzZT4gZGF0YWJhc2U7CisgICAgUmVm UHRyPERhdGFiYXNlPiBkYXRhYmFzZTsKICAgICBib29sIHN1Y2Nlc3MgPSBmYWxzZTsgLy8gTWFr ZSBzb21lIG9sZGVyIGNvbXBpbGVycyBoYXBweS4KICAgICAKICAgICBzd2l0Y2ggKGF0dGVtcHQp IHsKQEAgLTEzMSw3ICsxMzEsNyBAQCBSZWZQdHI8RGF0YWJhc2VCYWNrZW5kQmFzZT4gRGF0YWJh c2VTZXJ2ZXI6Om9wZW5EYXRhYmFzZShSZWZQdHI8RGF0YWJhc2VDb250ZXh0PgogICAgIHJldHVy biBkYXRhYmFzZTsKIH0KIAotUmVmUHRyPERhdGFiYXNlQmFja2VuZEJhc2U+IERhdGFiYXNlU2Vy dmVyOjpjcmVhdGVEYXRhYmFzZShSZWZQdHI8RGF0YWJhc2VDb250ZXh0PiYgYmFja2VuZENvbnRl eHQsIGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiBleHBlY3RlZFZlcnNpb24sIGNv bnN0IFN0cmluZyYgZGlzcGxheU5hbWUsIHVuc2lnbmVkIGxvbmcgZXN0aW1hdGVkU2l6ZSwgYm9v bCBzZXRWZXJzaW9uSW5OZXdEYXRhYmFzZSwgRGF0YWJhc2VFcnJvciYgZXJyb3IsIFN0cmluZyYg ZXJyb3JNZXNzYWdlKQorUmVmUHRyPERhdGFiYXNlPiBEYXRhYmFzZVNlcnZlcjo6Y3JlYXRlRGF0 YWJhc2UoUmVmUHRyPERhdGFiYXNlQ29udGV4dD4mIGJhY2tlbmRDb250ZXh0LCBjb25zdCBTdHJp bmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgZXhwZWN0ZWRWZXJzaW9uLCBjb25zdCBTdHJpbmcmIGRp c3BsYXlOYW1lLCB1bnNpZ25lZCBsb25nIGVzdGltYXRlZFNpemUsIGJvb2wgc2V0VmVyc2lvbklu TmV3RGF0YWJhc2UsIERhdGFiYXNlRXJyb3ImIGVycm9yLCBTdHJpbmcmIGVycm9yTWVzc2FnZSkK IHsKICAgICBSZWZQdHI8RGF0YWJhc2U+IGRhdGFiYXNlID0gYWRvcHRSZWYobmV3IERhdGFiYXNl KGJhY2tlbmRDb250ZXh0LCBuYW1lLCBleHBlY3RlZFZlcnNpb24sIGRpc3BsYXlOYW1lLCBlc3Rp bWF0ZWRTaXplKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0 YWJhc2UvRGF0YWJhc2VTZXJ2ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJh c2UvRGF0YWJhc2VTZXJ2ZXIuaAppbmRleCBkZThkMjE0YTgyYmY2NDkzNDQ0NWJkYjhmMGI5ZDM2 YmE2ZTBiYTA2Li4zZWJhMGUyNjQ2YmQ0ZDEyNjExNTg3MWJiZGFjMTJlZThiYWZhNmQ3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlU2VydmVy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVNlcnZl ci5oCkBAIC0zMCw3ICszMCw3IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotY2xhc3MgRGF0 YWJhc2VTZXJ2ZXI6IHB1YmxpYyBBYnN0cmFjdERhdGFiYXNlU2VydmVyIHsKK2NsYXNzIERhdGFi YXNlU2VydmVyIGZpbmFsOiBwdWJsaWMgQWJzdHJhY3REYXRhYmFzZVNlcnZlciB7CiAgICAgV1RG X01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6CiAgICAgRGF0YWJhc2VTZXJ2ZXIoKSB7IH07 CkBAIC00NCw3ICs0NCw3IEBAIHB1YmxpYzoKIAogICAgIFN0cmluZyBmdWxsUGF0aEZvckRhdGFi YXNlKFNlY3VyaXR5T3JpZ2luKiwgY29uc3QgU3RyaW5nJiBuYW1lLCBib29sIGNyZWF0ZUlmRG9l c05vdEV4aXN0KSBvdmVycmlkZTsKIAotICAgIFJlZlB0cjxEYXRhYmFzZUJhY2tlbmRCYXNlPiBv cGVuRGF0YWJhc2UoUmVmUHRyPERhdGFiYXNlQ29udGV4dD4mLCBjb25zdCBTdHJpbmcmIG5hbWUs IGNvbnN0IFN0cmluZyYgZXhwZWN0ZWRWZXJzaW9uLCBjb25zdCBTdHJpbmcmIGRpc3BsYXlOYW1l LCB1bnNpZ25lZCBsb25nIGVzdGltYXRlZFNpemUsIGJvb2wgc2V0VmVyc2lvbkluTmV3RGF0YWJh c2UsIERhdGFiYXNlRXJyb3ImLCBTdHJpbmcmIGVycm9yTWVzc2FnZSwgT3BlbkF0dGVtcHQpIG92 ZXJyaWRlOworICAgIFJlZlB0cjxEYXRhYmFzZT4gb3BlbkRhdGFiYXNlKFJlZlB0cjxEYXRhYmFz ZUNvbnRleHQ+JiwgY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIGV4cGVjdGVkVmVy c2lvbiwgY29uc3QgU3RyaW5nJiBkaXNwbGF5TmFtZSwgdW5zaWduZWQgbG9uZyBlc3RpbWF0ZWRT aXplLCBib29sIHNldFZlcnNpb25Jbk5ld0RhdGFiYXNlLCBEYXRhYmFzZUVycm9yJiwgU3RyaW5n JiBlcnJvck1lc3NhZ2UsIE9wZW5BdHRlbXB0KSBvdmVycmlkZTsKIAogICAgIHZvaWQgY2xvc2VB bGxEYXRhYmFzZXMoKSBvdmVycmlkZTsKIApAQCAtNjMsNyArNjMsNyBAQCBwdWJsaWM6CiAgICAg Ym9vbCBkZWxldGVEYXRhYmFzZShTZWN1cml0eU9yaWdpbiosIGNvbnN0IFN0cmluZyYgbmFtZSkg b3ZlcnJpZGU7CiAKIHByb3RlY3RlZDoKLSAgICB2aXJ0dWFsIFJlZlB0cjxEYXRhYmFzZUJhY2tl bmRCYXNlPiBjcmVhdGVEYXRhYmFzZShSZWZQdHI8RGF0YWJhc2VDb250ZXh0PiYsIGNvbnN0IFN0 cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiBleHBlY3RlZFZlcnNpb24sIGNvbnN0IFN0cmluZyYg ZGlzcGxheU5hbWUsIHVuc2lnbmVkIGxvbmcgZXN0aW1hdGVkU2l6ZSwgYm9vbCBzZXRWZXJzaW9u SW5OZXdEYXRhYmFzZSwgRGF0YWJhc2VFcnJvciYsIFN0cmluZyYgZXJyb3JNZXNzYWdlKTsKKyAg ICBSZWZQdHI8RGF0YWJhc2U+IGNyZWF0ZURhdGFiYXNlKFJlZlB0cjxEYXRhYmFzZUNvbnRleHQ+ JiwgY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIGV4cGVjdGVkVmVyc2lvbiwgY29u c3QgU3RyaW5nJiBkaXNwbGF5TmFtZSwgdW5zaWduZWQgbG9uZyBlc3RpbWF0ZWRTaXplLCBib29s IHNldFZlcnNpb25Jbk5ld0RhdGFiYXNlLCBEYXRhYmFzZUVycm9yJiwgU3RyaW5nJiBlcnJvck1l c3NhZ2UpOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=