140402 2015-01-13 11:53:08 -0800 Remove pure virtual functions from DatabaseBackendBase 2015-01-13 14:23:41 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1060871 0 andersca 2015-01-13 11:53:08 -0800 Remove pure virtual functions from DatabaseBackendBase 1060874 1 244530 andersca 2015-01-13 11:56:18 -0800 Created attachment 244530 Patch 1060939 2 andersca 2015-01-13 14:23:41 -0800 Committed r178376: <http://trac.webkit.org/changeset/178376> 244530 2015-01-13 11:56:18 -0800 2015-01-13 13:16:35 -0800 Patch bug-140402-20150113115624.patch text/plain 10074 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4MzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWNjMTRiY2YxYzJjYWE0 NjkyZjVhOTdkY2Y1MTkyNmFlNDI2OTVhMi4uNWRlMTE0YjE3Y2EyZThiZDhhNmVhMWFjNGQ1YjVm MWVmYzBlZDY1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE1LTAxLTEzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHB1cmUg dmlydHVhbCBmdW5jdGlvbnMgZnJvbSBEYXRhYmFzZUJhY2tlbmRCYXNlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA0MDIKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbHNvIGNoYW5nZSBEYXRhYmFzZUJh Y2tlbmRCYXNlIHRvIERhdGFiYXNlIGluIGEgY291cGxlIG9mIHBsYWNlcy4KKworICAgICAgICAq IE1vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VCYWNrZW5kQmFzZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpEYXRhYmFzZUJhY2tlbmRCYXNlOjpjbG9zZURhdGFiYXNlKToKKyAgICAgICAgKFdl YkNvcmU6OkRvbmVDcmVhdGluZ0RhdGFiYXNlT25FeGl0Q2FsbGVyOjp+RG9uZUNyZWF0aW5nRGF0 YWJhc2VPbkV4aXRDYWxsZXIpOgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VCYWNrZW5kQmFz ZTo6cGVyZm9ybU9wZW5BbmRWZXJpZnkpOgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VCYWNr ZW5kQmFzZTo6bWF4aW11bVNpemUpOgorICAgICAgICAqIE1vZHVsZXMvd2ViZGF0YWJhc2UvRGF0 YWJhc2VCYWNrZW5kQmFzZS5oOgorICAgICAgICAqIE1vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJh c2VTZXJ2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VTZXJ2ZXI6OmNyZWF0ZURh dGFiYXNlKToKKyAgICAgICAgKiBNb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlVHJhY2tlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZVRyYWNrZXI6OmdldE1heFNpemVGb3JEYXRh YmFzZSk6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZVRyYWNrZXI6OmRvbmVDcmVhdGluZ0Rh dGFiYXNlKToKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6YWRkT3BlbkRhdGFi YXNlKToKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6cmVtb3ZlT3BlbkRhdGFi YXNlKToKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6Z2V0T3BlbkRhdGFiYXNl cyk6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZVRyYWNrZXI6OmRlbGV0ZURhdGFiYXNlRmls ZSk6CisgICAgICAgICogTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVRyYWNrZXIuaDoKKwog MjAxNS0wMS0xMyAgU2hpdmFrdW1hciBKTSAgPHNoaXZhLmptQHNhbXN1bmcuY29tPgogCiAgICAg ICAgIEZpeCBEZWJ1ZyBCdWlsZCBFcnJvciBpbiBXZWJjb3JlIG1vZHVsZS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VCYWNrZW5kQmFzZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlQmFja2VuZEJh c2UuY3BwCmluZGV4IDJmNDFlMzViZjUxMTE3N2U2Y2RmMGZlOGU4YTg5MGUxMzM3N2EzYzMuLjQ4 OTM4MDliZmYzYTBhYzNjZjNlNjM0NmE2MDRlMWU3NTZjNDkxNzQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VCYWNrZW5kQmFzZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZUJhY2tlbmRCYXNl LmNwcApAQCAtMjU2LDcgKzI1Niw3IEBAIHZvaWQgRGF0YWJhc2VCYWNrZW5kQmFzZTo6Y2xvc2VE YXRhYmFzZSgpCiAgICAgbV9zcWxpdGVEYXRhYmFzZS5jbG9zZSgpOwogICAgIG1fb3BlbmVkID0g ZmFsc2U7CiAgICAgLy8gU2VlIGNvbW1lbnQgYXQgdGhlIHRvcCB0aGlzIGZpbGUgcmVnYXJkaW5n IGNhbGxpbmcgcmVtb3ZlT3BlbkRhdGFiYXNlKCkuCi0gICAgRGF0YWJhc2VUcmFja2VyOjp0cmFj a2VyKCkucmVtb3ZlT3BlbkRhdGFiYXNlKHRoaXMpOworICAgIERhdGFiYXNlVHJhY2tlcjo6dHJh Y2tlcigpLnJlbW92ZU9wZW5EYXRhYmFzZShzdGF0aWNfY2FzdDxEYXRhYmFzZSo+KHRoaXMpKTsK ICAgICB7CiAgICAgICAgIHN0ZDo6bG9ja19ndWFyZDxzdGQ6Om11dGV4PiBsb2NrZXIoZ3VpZE11 dGV4KCkpOwogCkBAIC0yODksNyArMjg5LDcgQEAgcHVibGljOgogICAgIH0KICAgICB+RG9uZUNy ZWF0aW5nRGF0YWJhc2VPbkV4aXRDYWxsZXIoKQogICAgIHsKLSAgICAgICAgRGF0YWJhc2VUcmFj a2VyOjp0cmFja2VyKCkuZG9uZUNyZWF0aW5nRGF0YWJhc2UobV9kYXRhYmFzZSk7CisgICAgICAg IERhdGFiYXNlVHJhY2tlcjo6dHJhY2tlcigpLmRvbmVDcmVhdGluZ0RhdGFiYXNlKHN0YXRpY19j YXN0PERhdGFiYXNlKj4obV9kYXRhYmFzZSkpOwogICAgIH0KIAogICAgIHZvaWQgc2V0T3BlblN1 Y2NlZWRlZCgpIHsgbV9vcGVuU3VjY2VlZGVkID0gdHJ1ZTsgfQpAQCAtMzk3LDcgKzM5Nyw3IEBA IGJvb2wgRGF0YWJhc2VCYWNrZW5kQmFzZTo6cGVyZm9ybU9wZW5BbmRWZXJpZnkoYm9vbCBzaG91 bGRTZXRWZXJzaW9uSW5OZXdEYXRhYmFzCiAgICAgbV9zcWxpdGVEYXRhYmFzZS5zZXRBdXRob3Jp emVyKG1fZGF0YWJhc2VBdXRob3JpemVyKTsKIAogICAgIC8vIFNlZSBjb21tZW50IGF0IHRoZSB0 b3AgdGhpcyBmaWxlIHJlZ2FyZGluZyBjYWxsaW5nIGFkZE9wZW5EYXRhYmFzZSgpLgotICAgIERh dGFiYXNlVHJhY2tlcjo6dHJhY2tlcigpLmFkZE9wZW5EYXRhYmFzZSh0aGlzKTsKKyAgICBEYXRh YmFzZVRyYWNrZXI6OnRyYWNrZXIoKS5hZGRPcGVuRGF0YWJhc2Uoc3RhdGljX2Nhc3Q8RGF0YWJh c2UqPih0aGlzKSk7CiAgICAgbV9vcGVuZWQgPSB0cnVlOwogCiAgICAgLy8gRGVjbGFyZSBzdWNj ZXNzOgpAQCAtNTU5LDcgKzU1OSw3IEBAIHZvaWQgRGF0YWJhc2VCYWNrZW5kQmFzZTo6cmVzZXRB dXRob3JpemVyKCkKIAogdW5zaWduZWQgbG9uZyBsb25nIERhdGFiYXNlQmFja2VuZEJhc2U6Om1h eGltdW1TaXplKCkgY29uc3QKIHsKLSAgICByZXR1cm4gRGF0YWJhc2VUcmFja2VyOjp0cmFja2Vy KCkuZ2V0TWF4U2l6ZUZvckRhdGFiYXNlKHRoaXMpOworICAgIHJldHVybiBEYXRhYmFzZVRyYWNr ZXI6OnRyYWNrZXIoKS5nZXRNYXhTaXplRm9yRGF0YWJhc2Uoc3RhdGljX2Nhc3Q8Y29uc3QgRGF0 YWJhc2UqPih0aGlzKSk7CiB9CiAKIHZvaWQgRGF0YWJhc2VCYWNrZW5kQmFzZTo6aW5jcmVtZW50 YWxWYWN1dW1JZk5lZWRlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dl YmRhdGFiYXNlL0RhdGFiYXNlQmFja2VuZEJhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv d2ViZGF0YWJhc2UvRGF0YWJhc2VCYWNrZW5kQmFzZS5oCmluZGV4IDhhYzlhNTJkNTc4ZmZiYzQ0 NWIzOTRhYjM3NjlhYzgzYzRmZTI1MjkuLjM2NjJmMGI5ODcyZDE5ZjJkMTA3NTI3OWI5OTdiN2E0 YzU0MTNkZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2Uv RGF0YWJhc2VCYWNrZW5kQmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0 YWJhc2UvRGF0YWJhc2VCYWNrZW5kQmFzZS5oCkBAIC03OSw5ICs3OSw2IEBAIHB1YmxpYzoKICAg ICBib29sIGhhZERlbGV0ZXMoKTsKICAgICB2b2lkIHJlc2V0QXV0aG9yaXplcigpOwogCi0gICAg dmlydHVhbCB2b2lkIG1hcmtBc0RlbGV0ZWRBbmRDbG9zZSgpID0gMDsKLSAgICB2aXJ0dWFsIHZv aWQgY2xvc2VJbW1lZGlhdGVseSgpID0gMDsKLQogICAgIERhdGFiYXNlQ29udGV4dCogZGF0YWJh c2VDb250ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9kYXRhYmFzZUNvbnRleHQuZ2V0KCk7IH0KICAg ICB2b2lkIHNldEZyb250ZW5kKERhdGFiYXNlKiBmcm9udGVuZCkgeyBtX2Zyb250ZW5kID0gZnJv bnRlbmQ7IH0KIApAQCAtOTYsNyArOTMsNiBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2b2lkIGNsb3Nl RGF0YWJhc2UoKTsKIAotICAgIHZpcnR1YWwgYm9vbCBvcGVuQW5kVmVyaWZ5VmVyc2lvbihib29s IHNldFZlcnNpb25Jbk5ld0RhdGFiYXNlLCBEYXRhYmFzZUVycm9yJiwgU3RyaW5nJiBlcnJvck1l c3NhZ2UpID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgcGVyZm9ybU9wZW5BbmRWZXJpZnkoYm9vbCBz aG91bGRTZXRWZXJzaW9uSW5OZXdEYXRhYmFzZSwgRGF0YWJhc2VFcnJvciYsIFN0cmluZyYgZXJy b3JNZXNzYWdlKTsKIAogICAgIGJvb2wgZ2V0VmVyc2lvbkZyb21EYXRhYmFzZShTdHJpbmcmIHZl cnNpb24sIGJvb2wgc2hvdWxkQ2FjaGVWZXJzaW9uID0gdHJ1ZSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlU2VydmVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VTZXJ2ZXIuY3BwCmluZGV4IGM4 MzViYWZkMjQxYTkzM2Y0NDljYTUwMmVkOTgxZWJlMDBmYTIwMzguLmI0NjY0MDRmMGU5MGExZjc4 ZmYxYTUwZDU3YzRlYTI4NDJjMWIyMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VTZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VTZXJ2ZXIuY3BwCkBAIC0xMzYsNyArMTM2LDcgQEAg UGFzc1JlZlB0cjxEYXRhYmFzZUJhY2tlbmRCYXNlPiBEYXRhYmFzZVNlcnZlcjo6b3BlbkRhdGFi YXNlKFJlZlB0cjxEYXRhYmFzZUNvbnQKIAogUGFzc1JlZlB0cjxEYXRhYmFzZUJhY2tlbmRCYXNl PiBEYXRhYmFzZVNlcnZlcjo6Y3JlYXRlRGF0YWJhc2UoUmVmUHRyPERhdGFiYXNlQ29udGV4dD4m IGJhY2tlbmRDb250ZXh0LCBjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgZXhwZWN0 ZWRWZXJzaW9uLCBjb25zdCBTdHJpbmcmIGRpc3BsYXlOYW1lLCB1bnNpZ25lZCBsb25nIGVzdGlt YXRlZFNpemUsIGJvb2wgc2V0VmVyc2lvbkluTmV3RGF0YWJhc2UsIERhdGFiYXNlRXJyb3ImIGVy cm9yLCBTdHJpbmcmIGVycm9yTWVzc2FnZSkKIHsKLSAgICBSZWZQdHI8RGF0YWJhc2VCYWNrZW5k QmFzZT4gZGF0YWJhc2UgPSBhZG9wdFJlZihuZXcgRGF0YWJhc2UoYmFja2VuZENvbnRleHQsIG5h bWUsIGV4cGVjdGVkVmVyc2lvbiwgZGlzcGxheU5hbWUsIGVzdGltYXRlZFNpemUpKTsKKyAgICBS ZWZQdHI8RGF0YWJhc2U+IGRhdGFiYXNlID0gYWRvcHRSZWYobmV3IERhdGFiYXNlKGJhY2tlbmRD b250ZXh0LCBuYW1lLCBleHBlY3RlZFZlcnNpb24sIGRpc3BsYXlOYW1lLCBlc3RpbWF0ZWRTaXpl KSk7CiAKICAgICBpZiAoIWRhdGFiYXNlLT5vcGVuQW5kVmVyaWZ5VmVyc2lvbihzZXRWZXJzaW9u SW5OZXdEYXRhYmFzZSwgZXJyb3IsIGVycm9yTWVzc2FnZSkpCiAgICAgICAgIHJldHVybiAwOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVRy YWNrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVRy YWNrZXIuY3BwCmluZGV4IDVjZjkzMjI4MjM1ZWMyNDMxOGVlNGM3Mjc4NzVlMGViNTBiNzViZDUu LjYyN2JlZjY1ZjllNDc5ZmViMmM2NTI4YjBmZWI2ZjIyMzMxODU3YmIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VUcmFja2VyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlVHJhY2tlci5jcHAK QEAgLTI3OCw3ICsyNzgsNyBAQCBib29sIERhdGFiYXNlVHJhY2tlcjo6aGFzRW50cnlGb3JEYXRh YmFzZShTZWN1cml0eU9yaWdpbiogb3JpZ2luLCBjb25zdCBTdHJpbmcmCiAgICAgcmV0dXJuIHN0 YXRlbWVudC5zdGVwKCkgPT0gU1FMUmVzdWx0Um93OwogfQogCi11bnNpZ25lZCBsb25nIGxvbmcg RGF0YWJhc2VUcmFja2VyOjpnZXRNYXhTaXplRm9yRGF0YWJhc2UoY29uc3QgRGF0YWJhc2VCYWNr ZW5kQmFzZSogZGF0YWJhc2UpCit1bnNpZ25lZCBsb25nIGxvbmcgRGF0YWJhc2VUcmFja2VyOjpn ZXRNYXhTaXplRm9yRGF0YWJhc2UoY29uc3QgRGF0YWJhc2UqIGRhdGFiYXNlKQogewogICAgIC8v IFRoZSBtYXhpbXVtIHNpemUgZm9yIGEgZGF0YWJhc2UgaXMgdGhlIGZ1bGwgcXVvdGEgZm9yIGl0 cyBvcmlnaW4sIG1pbnVzIHRoZSBjdXJyZW50IHVzYWdlIHdpdGhpbiB0aGUgb3JpZ2luLAogICAg IC8vIHBsdXMgdGhlIGN1cnJlbnQgdXNhZ2Ugb2YgdGhlIGdpdmVuIGRhdGFiYXNlCkBAIC01NDMs MTMgKzU0MywxMyBAQCB2b2lkIERhdGFiYXNlVHJhY2tlcjo6c2V0RGF0YWJhc2VEZXRhaWxzKFNl Y3VyaXR5T3JpZ2luKiBvcmlnaW4sIGNvbnN0IFN0cmluZyYgbgogICAgICAgICBtX2NsaWVudC0+ ZGlzcGF0Y2hEaWRNb2RpZnlEYXRhYmFzZShvcmlnaW4sIG5hbWUpOwogfQogCi12b2lkIERhdGFi YXNlVHJhY2tlcjo6ZG9uZUNyZWF0aW5nRGF0YWJhc2UoRGF0YWJhc2VCYWNrZW5kQmFzZSogZGF0 YWJhc2UpCit2b2lkIERhdGFiYXNlVHJhY2tlcjo6ZG9uZUNyZWF0aW5nRGF0YWJhc2UoRGF0YWJh c2UqIGRhdGFiYXNlKQogewogICAgIE11dGV4TG9ja2VyIGxvY2tEYXRhYmFzZShtX2RhdGFiYXNl R3VhcmQpOwogICAgIGRvbmVDcmVhdGluZ0RhdGFiYXNlKGRhdGFiYXNlLT5zZWN1cml0eU9yaWdp bigpLCBkYXRhYmFzZS0+c3RyaW5nSWRlbnRpZmllcigpKTsKIH0KIAotdm9pZCBEYXRhYmFzZVRy YWNrZXI6OmFkZE9wZW5EYXRhYmFzZShEYXRhYmFzZUJhY2tlbmRCYXNlKiBkYXRhYmFzZSkKK3Zv aWQgRGF0YWJhc2VUcmFja2VyOjphZGRPcGVuRGF0YWJhc2UoRGF0YWJhc2UqIGRhdGFiYXNlKQog ewogICAgIGlmICghZGF0YWJhc2UpCiAgICAgICAgIHJldHVybjsKQEAgLTU3OSw3ICs1NzksNyBA QCB2b2lkIERhdGFiYXNlVHJhY2tlcjo6YWRkT3BlbkRhdGFiYXNlKERhdGFiYXNlQmFja2VuZEJh c2UqIGRhdGFiYXNlKQogICAgIH0KIH0KIAotdm9pZCBEYXRhYmFzZVRyYWNrZXI6OnJlbW92ZU9w ZW5EYXRhYmFzZShEYXRhYmFzZUJhY2tlbmRCYXNlKiBkYXRhYmFzZSkKK3ZvaWQgRGF0YWJhc2VU cmFja2VyOjpyZW1vdmVPcGVuRGF0YWJhc2UoRGF0YWJhc2UqIGRhdGFiYXNlKQogewogICAgIGlm ICghZGF0YWJhc2UpCiAgICAgICAgIHJldHVybjsKQEAgLTYyMyw3ICs2MjMsNyBAQCB2b2lkIERh dGFiYXNlVHJhY2tlcjo6cmVtb3ZlT3BlbkRhdGFiYXNlKERhdGFiYXNlQmFja2VuZEJhc2UqIGRh dGFiYXNlKQogICAgIH0KIH0KIAotdm9pZCBEYXRhYmFzZVRyYWNrZXI6OmdldE9wZW5EYXRhYmFz ZXMoU2VjdXJpdHlPcmlnaW4qIG9yaWdpbiwgY29uc3QgU3RyaW5nJiBuYW1lLCBIYXNoU2V0PFJl ZlB0cjxEYXRhYmFzZUJhY2tlbmRCYXNlPj4qIGRhdGFiYXNlcykKK3ZvaWQgRGF0YWJhc2VUcmFj a2VyOjpnZXRPcGVuRGF0YWJhc2VzKFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4sIGNvbnN0IFN0cmlu ZyYgbmFtZSwgSGFzaFNldDxSZWZQdHI8RGF0YWJhc2U+PiogZGF0YWJhc2VzKQogewogICAgIE11 dGV4TG9ja2VyIG9wZW5EYXRhYmFzZU1hcExvY2sobV9vcGVuRGF0YWJhc2VNYXBHdWFyZCk7CiAg ICAgaWYgKCFtX29wZW5EYXRhYmFzZU1hcCkKQEAgLTExMDUsNyArMTEwNSw3IEBAIGJvb2wgRGF0 YWJhc2VUcmFja2VyOjpkZWxldGVEYXRhYmFzZUZpbGUoU2VjdXJpdHlPcmlnaW4qIG9yaWdpbiwg Y29uc3QgU3RyaW5nJiBuCiAgICAgfQogI2VuZGlmCiAKLSAgICBWZWN0b3I8UmVmUHRyPERhdGFi YXNlQmFja2VuZEJhc2U+PiBkZWxldGVkRGF0YWJhc2VzOworICAgIFZlY3RvcjxSZWZQdHI8RGF0 YWJhc2U+PiBkZWxldGVkRGF0YWJhc2VzOwogCiAgICAgLy8gTWFrZSBzdXJlIG5vdCB0byBob2xk IHRoZSBhbnkgbG9ja3Mgd2hlbiBjYWxsaW5nCiAgICAgLy8gRGF0YWJhc2U6Om1hcmtBc0RlbGV0 ZWRBbmRDbG9zZSgpLCBzaW5jZSB0aGF0IGNhbiBjYXVzZSBhIGRlYWRsb2NrCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlVHJhY2tlci5oIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVRyYWNrZXIuaAppbmRl eCBlYTdjN2RjNWEzMWZhYTFmZmJmOWYwNzcxYmYxYzJlNDM2ZWM0MDg1Li5kNjJiMmE2MmU1OWM1 N2VjZGRjMjg3Yjc3NGU4NWQ5M2NmMzU4NzIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlVHJhY2tlci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VUcmFja2VyLmgKQEAgLTQyLDcgKzQyLDcgQEAK IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1jbGFzcyBEYXRhYmFzZUJhY2tlbmRCYXNlOworY2xh c3MgRGF0YWJhc2U7CiBjbGFzcyBEYXRhYmFzZUNvbnRleHQ7CiBjbGFzcyBEYXRhYmFzZU1hbmFn ZXJDbGllbnQ7CiBjbGFzcyBPcmlnaW5Mb2NrOwpAQCAtNjcsMTEgKzY3LDExIEBAIHB1YmxpYzoK ICAgICB2b2lkIHNldERhdGFiYXNlRGV0YWlscyhTZWN1cml0eU9yaWdpbiosIGNvbnN0IFN0cmlu ZyYgbmFtZSwgY29uc3QgU3RyaW5nJiBkaXNwbGF5TmFtZSwgdW5zaWduZWQgbG9uZyBlc3RpbWF0 ZWRTaXplKTsKICAgICBTdHJpbmcgZnVsbFBhdGhGb3JEYXRhYmFzZShTZWN1cml0eU9yaWdpbios IGNvbnN0IFN0cmluZyYgbmFtZSwgYm9vbCBjcmVhdGVJZkRvZXNOb3RFeGlzdCA9IHRydWUpOwog Ci0gICAgdm9pZCBhZGRPcGVuRGF0YWJhc2UoRGF0YWJhc2VCYWNrZW5kQmFzZSopOwotICAgIHZv aWQgcmVtb3ZlT3BlbkRhdGFiYXNlKERhdGFiYXNlQmFja2VuZEJhc2UqKTsKLSAgICB2b2lkIGdl dE9wZW5EYXRhYmFzZXMoU2VjdXJpdHlPcmlnaW4qLCBjb25zdCBTdHJpbmcmIG5hbWUsIEhhc2hT ZXQ8UmVmUHRyPERhdGFiYXNlQmFja2VuZEJhc2U+PiogZGF0YWJhc2VzKTsKKyAgICB2b2lkIGFk ZE9wZW5EYXRhYmFzZShEYXRhYmFzZSopOworICAgIHZvaWQgcmVtb3ZlT3BlbkRhdGFiYXNlKERh dGFiYXNlKik7CisgICAgdm9pZCBnZXRPcGVuRGF0YWJhc2VzKFNlY3VyaXR5T3JpZ2luKiwgY29u c3QgU3RyaW5nJiBuYW1lLCBIYXNoU2V0PFJlZlB0cjxEYXRhYmFzZT4+KiBkYXRhYmFzZXMpOwog Ci0gICAgdW5zaWduZWQgbG9uZyBsb25nIGdldE1heFNpemVGb3JEYXRhYmFzZShjb25zdCBEYXRh YmFzZUJhY2tlbmRCYXNlKik7CisgICAgdW5zaWduZWQgbG9uZyBsb25nIGdldE1heFNpemVGb3JE YXRhYmFzZShjb25zdCBEYXRhYmFzZSopOwogCiAgICAgdm9pZCBpbnRlcnJ1cHRBbGxEYXRhYmFz ZXNGb3JDb250ZXh0KGNvbnN0IERhdGFiYXNlQ29udGV4dCopOwogCkBAIC0xMjAsNyArMTIwLDcg QEAgcHVibGljOgogCiAgICAgYm9vbCBoYXNFbnRyeUZvck9yaWdpbihTZWN1cml0eU9yaWdpbiop OwogCi0gICAgdm9pZCBkb25lQ3JlYXRpbmdEYXRhYmFzZShEYXRhYmFzZUJhY2tlbmRCYXNlKik7 CisgICAgdm9pZCBkb25lQ3JlYXRpbmdEYXRhYmFzZShEYXRhYmFzZSopOwogCiBwcml2YXRlOgog ICAgIGJvb2wgaGFzRW50cnlGb3JPcmlnaW5Ob0xvY2soU2VjdXJpdHlPcmlnaW4qIG9yaWdpbik7 CkBAIC0xNDYsNyArMTQ2LDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgZGVsZXRlT3JpZ2luTG9j a0ZvcihTZWN1cml0eU9yaWdpbiopOwogCi0gICAgdHlwZWRlZiBIYXNoU2V0PERhdGFiYXNlQmFj a2VuZEJhc2UqPiBEYXRhYmFzZVNldDsKKyAgICB0eXBlZGVmIEhhc2hTZXQ8RGF0YWJhc2UqPiBE YXRhYmFzZVNldDsKICAgICB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBEYXRhYmFzZVNldCo+IERh dGFiYXNlTmFtZU1hcDsKICAgICB0eXBlZGVmIEhhc2hNYXA8UmVmUHRyPFNlY3VyaXR5T3JpZ2lu PiwgRGF0YWJhc2VOYW1lTWFwKj4gRGF0YWJhc2VPcmlnaW5NYXA7CiAK