147730 2015-08-06 10:42:48 -0700 Move the last remnants of DatabaseBackendBase to Database 2015-08-06 10:56:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1115365 0 andersca 2015-08-06 10:42:48 -0700 Move the last remnants of DatabaseBackendBase to Database 1115366 1 258373 andersca 2015-08-06 10:44:08 -0700 Created attachment 258373 Patch 1115369 2 andersca 2015-08-06 10:56:05 -0700 Committed r188045: <http://trac.webkit.org/changeset/188045> 258373 2015-08-06 10:44:08 -0700 2015-08-06 10:51:45 -0700 Patch bug-147730-20150806104359.patch text/plain 11872 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4MDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWVlNjczMzEzMDNmN2Zj ZWRhZTcxMzdkOWUzYmI1NWY5YWQ1N2MwMi4uMGM4MDk2MzMzNDVjZGE5MjBiZTUyZWZjZDMxMjZj ODBkYWQwZjQyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA4LTA2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSB0aGUgbGFz dCByZW1uYW50cyBvZiBEYXRhYmFzZUJhY2tlbmRCYXNlIHRvIERhdGFiYXNlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc3MzAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1vZHVsZXMvd2ViZGF0YWJh c2UvRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2U6OkRhdGFiYXNlKToK KyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlOjpwZXJmb3JtT3BlbkFuZFZlcmlmeSk6CisgICAg ICAgICogTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZS5oOgorICAgICAgICAqIE1vZHVsZXMv d2ViZGF0YWJhc2UvRGF0YWJhc2VCYWNrZW5kQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpE YXRhYmFzZUJhY2tlbmRCYXNlOjpEYXRhYmFzZUJhY2tlbmRCYXNlKToKKyAgICAgICAgKiBNb2R1 bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlQmFja2VuZEJhc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6 OkRhdGFiYXNlQmFja2VuZEJhc2U6OmRhdGFiYXNlQ29udGV4dCk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpEYXRhYmFzZUJhY2tlbmRCYXNlOjpzZXRGcm9udGVuZCk6IERlbGV0ZWQuCisK IDIwMTUtMDgtMDYgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4K IAogICAgICAgICBGaXggYnVpbGQgd2l0aG91dCBFTkFCTEUoVklERU8pIGFmdGVyIHIxODgwMzAu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2UuY3BwCmlu ZGV4IDhjMTIwOGQ3ZmFlMzFiNTg2NDk4MjM0ZjUyMTFmNGEzZjRhNzJmMGQuLjk4NjNiYzk1Yjkz YTlhNzNmYTg5MTIxMzMyZjg3Y2RkMDYyZDQ5YTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2UuY3BwCkBAIC02MCw2ICs2MCwzNSBAQAogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKKy8vIFJlZ2lzdGVyaW5nICJvcGVuZWQiIGRhdGFiYXNlcyB3aXRo IHRoZSBEYXRhYmFzZVRyYWNrZXIKKy8vID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KKy8vIFRoZSBEYXRhYmFzZVRyYWNrZXIgbWFpbnRhaW5z IGEgbGlzdCBvZiBkYXRhYmFzZXMgdGhhdCBoYXZlIGJlZW4KKy8vICJvcGVuZWQiIHNvIHRoYXQg dGhlIGNsaWVudCBjYW4gY2FsbCBpbnRlcnJ1cHQgb3IgZGVsZXRlIG9uIGV2ZXJ5IGRhdGFiYXNl CisvLyBhc3NvY2lhdGVkIHdpdGggYSBEYXRhYmFzZUNvbnRleHQuCisvLworLy8gV2Ugd2lsbCBv bmx5IGNhbGwgRGF0YWJhc2VUcmFja2VyOjphZGRPcGVuRGF0YWJhc2UoKSB0byBhZGQgdGhlIGRh dGFiYXNlCisvLyB0byB0aGUgdHJhY2tlciBhcyBvcGVuZWQgd2hlbiB3ZSd2ZSBzdWNjZWVkZWQg aW4gb3BlbmluZyB0aGUgZGF0YWJhc2UsCisvLyBhbmQgd2lsbCBzZXQgbV9vcGVuZWQgdG8gdHJ1 ZS4gU2ltaWxhcmx5LCB3ZSBvbmx5IGNhbGwKKy8vIERhdGFiYXNlVHJhY2tlcjo6cmVtb3ZlT3Bl bkRhdGFiYXNlKCkgdG8gcmVtb3ZlIHRoZSBkYXRhYmFzZSBmcm9tIHRoZQorLy8gdHJhY2tlciB3 aGVuIHdlIHNldCBtX29wZW5lZCB0byBmYWxzZSBpbiBjbG9zZURhdGFiYXNlKCkuIFRoaXMgc2V0 cyB1cAorLy8gYSBzaW1wbGUgc3ltbWV0cnkgYmV0d2VlbiBvcGVuIGFuZCBjbG9zZSBvcGVyYXRp b25zLCBhbmQgYSBkaXJlY3QKKy8vIGNvcnJlbGF0aW9uIHRvIGFkZGluZyBhbmQgcmVtb3Zpbmcg ZGF0YWJhc2VzIGZyb20gdGhlIHRyYWNrZXIncyBsaXN0LAorLy8gdGh1cyBlbnN1cmluZyB0aGF0 IHdlIGhhdmUgYSBjb3JyZWN0IGxpc3QgZm9yIHRoZSBpbnRlcnJ1cHQgYW5kCisvLyBkZWxldGUg b3BlcmF0aW9ucyB0byB3b3JrIG9uLgorLy8KKy8vIFRoZSBvbmx5IGRhdGFiYXNlcyBpbnN0YW5j ZXMgbm90IHRyYWNrZWQgYnkgdGhlIHRyYWNrZXIncyBvcGVuIGRhdGFiYXNlCisvLyBsaXN0IGFy ZSB0aGUgb25lcyB0aGF0IGhhdmUgbm90IGJlZW4gYWRkZWQgeWV0LCBvciB0aGUgb25lcyB0aGF0 IHdlCisvLyBhdHRlbXB0ZWQgYW4gb3BlbiBvbiBidXQgZmFpbGVkIHRvLiBTdWNoIGluc3RhbmNl cyBvbmx5IGV4aXN0IGluIHRoZQorLy8gRGF0YWJhc2VTZXJ2ZXIncyBmYWN0b3J5IG1ldGhvZHMg Zm9yIGNyZWF0aW5nIGRhdGFiYXNlIGJhY2tlbmRzLgorLy8KKy8vIFRoZSBmYWN0b3J5IG1ldGhv ZHMgd2lsbCBlaXRoZXIgY2FsbCBvcGVuQW5kVmVyaWZ5VmVyc2lvbigpIG9yCisvLyBwZXJmb3Jt T3BlbkFuZFZlcmlmeSgpLiBUaGVzZSBtZXRob2RzIHdpbGwgYWRkIHRoZSBuZXdseSBpbnN0YW50 aWF0ZWQKKy8vIGRhdGFiYXNlIGJhY2tlbmQgaWYgdGhleSBzdWNjZWVkIGluIG9wZW5pbmcgdGhl IHJlcXVlc3RlZCBkYXRhYmFzZS4KKy8vIEluIHRoZSBjYXNlIG9mIGZhaWx1cmUgdG8gb3BlbiB0 aGUgZGF0YWJhc2UsIHRoZSBmYWN0b3J5IG1ldGhvZHMgd2lsbAorLy8gc2ltcGx5IGRpc2NhcmQg dGhlIG5ld2x5IGluc3RhbnRpYXRlZCBkYXRhYmFzZSBiYWNrZW5kIHdoZW4gdGhleSByZXR1cm4u CisvLyBUaGUgcmVmIGNvdW50aW5nIG1lY2hhbmltcyB3aWxsIGF1dG9tYXRpY2FsbHkgZGVzdHJ1 Y3QgdGhlIHVuLWFkZGVkCisvLyAoYW5kIHVuLXJldHVybmVkKSBkYXRhYmFzZXMgaW5zdGFuY2Vz LgorCiBzdGF0aWMgY29uc3QgY2hhciB2ZXJzaW9uS2V5W10gPSAiV2ViS2l0RGF0YWJhc2VWZXJz aW9uS2V5IjsKIHN0YXRpYyBjb25zdCBjaGFyIHVucXVhbGlmaWVkSW5mb1RhYmxlTmFtZVtdID0g Il9fV2ViS2l0RGF0YWJhc2VJbmZvVGFibGVfXyI7CiAKQEAgLTE4NCwxMiArMjEzLDE3IEBAIHN0 YXRpYyBEYXRhYmFzZUd1aWQgZ3VpZEZvck9yaWdpbkFuZE5hbWUoY29uc3QgU3RyaW5nJiBvcmln aW4sIGNvbnN0IFN0cmluZyYgbmFtCiB9CiAKIERhdGFiYXNlOjpEYXRhYmFzZShQYXNzUmVmUHRy PERhdGFiYXNlQ29udGV4dD4gZGF0YWJhc2VDb250ZXh0LCBjb25zdCBTdHJpbmcmIG5hbWUsIGNv bnN0IFN0cmluZyYgZXhwZWN0ZWRWZXJzaW9uLCBjb25zdCBTdHJpbmcmIGRpc3BsYXlOYW1lLCB1 bnNpZ25lZCBsb25nIGVzdGltYXRlZFNpemUpCi0gICAgOiBEYXRhYmFzZUJhY2tlbmRCYXNlKGRh dGFiYXNlQ29udGV4dC5nZXQoKSwgbmFtZSwgZXhwZWN0ZWRWZXJzaW9uLCBkaXNwbGF5TmFtZSwg ZXN0aW1hdGVkU2l6ZSkKLSAgICAsIG1fdHJhbnNhY3Rpb25JblByb2dyZXNzKGZhbHNlKQotICAg ICwgbV9pc1RyYW5zYWN0aW9uUXVldWVFbmFibGVkKHRydWUpCi0gICAgLCBtX3NjcmlwdEV4ZWN1 dGlvbkNvbnRleHQoZGF0YWJhc2VDb250ZXh0LT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpCisg ICAgOiBtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQoZGF0YWJhc2VDb250ZXh0LT5zY3JpcHRFeGVj dXRpb25Db250ZXh0KCkpCiAgICAgLCBtX2RhdGFiYXNlQ29udGV4dChkYXRhYmFzZUNvbnRleHQp CiAgICAgLCBtX2RlbGV0ZWQoZmFsc2UpCisgICAgLCBtX25hbWUobmFtZS5pc29sYXRlZENvcHko KSkKKyAgICAsIG1fZXhwZWN0ZWRWZXJzaW9uKGV4cGVjdGVkVmVyc2lvbi5pc29sYXRlZENvcHko KSkKKyAgICAsIG1fZGlzcGxheU5hbWUoZGlzcGxheU5hbWUuaXNvbGF0ZWRDb3B5KCkpCisgICAg LCBtX2VzdGltYXRlZFNpemUoZXN0aW1hdGVkU2l6ZSkKKyAgICAsIG1fb3BlbmVkKGZhbHNlKQor ICAgICwgbV9uZXcoZmFsc2UpCisgICAgLCBtX3RyYW5zYWN0aW9uSW5Qcm9ncmVzcyhmYWxzZSkK KyAgICAsIG1faXNUcmFuc2FjdGlvblF1ZXVlRW5hYmxlZCh0cnVlKQogewogICAgIG1fY29udGV4 dFRocmVhZFNlY3VyaXR5T3JpZ2luID0gbV9kYXRhYmFzZUNvbnRleHQtPnNlY3VyaXR5T3JpZ2lu KCktPmlzb2xhdGVkQ29weSgpOwogCkBAIC0yMTEsNyArMjQ1LDYgQEAgRGF0YWJhc2U6OkRhdGFi YXNlKFBhc3NSZWZQdHI8RGF0YWJhc2VDb250ZXh0PiBkYXRhYmFzZUNvbnRleHQsIGNvbnN0IFN0 cmluZyYgbmEKICAgICBtX2ZpbGVuYW1lID0gRGF0YWJhc2VNYW5hZ2VyOjpzaW5nbGV0b24oKS5m dWxsUGF0aEZvckRhdGFiYXNlKHNlY3VyaXR5T3JpZ2luKCksIG1fbmFtZSk7CiAKICAgICBtX2Rh dGFiYXNlVGhyZWFkU2VjdXJpdHlPcmlnaW4gPSBtX2NvbnRleHRUaHJlYWRTZWN1cml0eU9yaWdp bi0+aXNvbGF0ZWRDb3B5KCk7Ci0gICAgc2V0RnJvbnRlbmQodGhpcyk7CiAKICAgICBBU1NFUlQo bV9kYXRhYmFzZUNvbnRleHQtPmRhdGFiYXNlVGhyZWFkKCkpOwogfQpAQCAtMzY1LDcgKzM5OCw3 IEBAIGJvb2wgRGF0YWJhc2U6OnBlcmZvcm1PcGVuQW5kVmVyaWZ5KGJvb2wgc2hvdWxkU2V0VmVy c2lvbkluTmV3RGF0YWJhc2UsIERhdGFiYXNlCiAgICAgICAgICAgICAgICAgICAgIG1fc3FsaXRl RGF0YWJhc2UuY2xvc2UoKTsKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg ICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0gZWxzZSBpZiAoIW1fZnJvbnRlbmQtPmdldFZl cnNpb25Gcm9tRGF0YWJhc2UoY3VycmVudFZlcnNpb24sIGZhbHNlKSkgeworICAgICAgICAgICAg fSBlbHNlIGlmICghZ2V0VmVyc2lvbkZyb21EYXRhYmFzZShjdXJyZW50VmVyc2lvbiwgZmFsc2Up KSB7CiAgICAgICAgICAgICAgICAgZXJyb3JNZXNzYWdlID0gZm9ybWF0RXJyb3JNZXNzYWdlKCJ1 bmFibGUgdG8gb3BlbiBkYXRhYmFzZSwgZmFpbGVkIHRvIHJlYWQgY3VycmVudCB2ZXJzaW9uIiwg bV9zcWxpdGVEYXRhYmFzZS5sYXN0RXJyb3IoKSwgbV9zcWxpdGVEYXRhYmFzZS5sYXN0RXJyb3JN c2coKSk7CiAgICAgICAgICAgICAgICAgdHJhbnNhY3Rpb24ucm9sbGJhY2soKTsKICAgICAgICAg ICAgICAgICBtX3NxbGl0ZURhdGFiYXNlLmNsb3NlKCk7CkBAIC0zNzYsNyArNDA5LDcgQEAgYm9v bCBEYXRhYmFzZTo6cGVyZm9ybU9wZW5BbmRWZXJpZnkoYm9vbCBzaG91bGRTZXRWZXJzaW9uSW5O ZXdEYXRhYmFzZSwgRGF0YWJhc2UKICAgICAgICAgICAgICAgICBMT0coU3RvcmFnZUFQSSwgIlJl dHJpZXZlZCBjdXJyZW50IHZlcnNpb24gJXMgZnJvbSBkYXRhYmFzZSAlcyIsIGN1cnJlbnRWZXJz aW9uLmFzY2lpKCkuZGF0YSgpLCBkYXRhYmFzZURlYnVnTmFtZSgpLmFzY2lpKCkuZGF0YSgpKTsK ICAgICAgICAgICAgIH0gZWxzZSBpZiAoIW1fbmV3IHx8IHNob3VsZFNldFZlcnNpb25Jbk5ld0Rh dGFiYXNlKSB7CiAgICAgICAgICAgICAgICAgTE9HKFN0b3JhZ2VBUEksICJTZXR0aW5nIHZlcnNp b24gJXMgaW4gZGF0YWJhc2UgJXMgdGhhdCB3YXMganVzdCBjcmVhdGVkIiwgbV9leHBlY3RlZFZl cnNpb24uYXNjaWkoKS5kYXRhKCksIGRhdGFiYXNlRGVidWdOYW1lKCkuYXNjaWkoKS5kYXRhKCkp OwotICAgICAgICAgICAgICAgIGlmICghbV9mcm9udGVuZC0+c2V0VmVyc2lvbkluRGF0YWJhc2Uo bV9leHBlY3RlZFZlcnNpb24sIGZhbHNlKSkgeworICAgICAgICAgICAgICAgIGlmICghc2V0VmVy c2lvbkluRGF0YWJhc2UobV9leHBlY3RlZFZlcnNpb24sIGZhbHNlKSkgewogICAgICAgICAgICAg ICAgICAgICBlcnJvck1lc3NhZ2UgPSBmb3JtYXRFcnJvck1lc3NhZ2UoInVuYWJsZSB0byBvcGVu IGRhdGFiYXNlLCBmYWlsZWQgdG8gd3JpdGUgY3VycmVudCB2ZXJzaW9uIiwgbV9zcWxpdGVEYXRh YmFzZS5sYXN0RXJyb3IoKSwgbV9zcWxpdGVEYXRhYmFzZS5sYXN0RXJyb3JNc2coKSk7CiAgICAg ICAgICAgICAgICAgICAgIHRyYW5zYWN0aW9uLnJvbGxiYWNrKCk7CiAgICAgICAgICAgICAgICAg ICAgIG1fc3FsaXRlRGF0YWJhc2UuY2xvc2UoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv d2ViZGF0YWJhc2UvRGF0YWJhc2UuaAppbmRleCAwYTg0ODRlOTZhZTczODBmYjQ0MWEzMTU1MTUx NjNlNzQ1NjE2NjZmLi4yOTJmM2ZjYmU0NjQ3YjA5ZjY4YzdhMzM3ZjhlMTY1YWM4ODJkYThkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZS5oCkBAIC0x MzgsMTggKzEzOCwzMyBAQCBwcml2YXRlOgogICAgIFN0cmluZyBkYXRhYmFzZURlYnVnTmFtZSgp IGNvbnN0OwogI2VuZGlmCiAKLSAgICBEZXF1ZTxSZWZQdHI8U1FMVHJhbnNhY3Rpb25CYWNrZW5k Pj4gbV90cmFuc2FjdGlvblF1ZXVlOwotICAgIE11dGV4IG1fdHJhbnNhY3Rpb25JblByb2dyZXNz TXV0ZXg7Ci0gICAgYm9vbCBtX3RyYW5zYWN0aW9uSW5Qcm9ncmVzczsKLSAgICBib29sIG1faXNU cmFuc2FjdGlvblF1ZXVlRW5hYmxlZDsKLQogICAgIFJlZlB0cjxTY3JpcHRFeGVjdXRpb25Db250 ZXh0PiBtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQ7CisgICAgUmVmUHRyPFNlY3VyaXR5T3JpZ2lu PiBtX2NvbnRleHRUaHJlYWRTZWN1cml0eU9yaWdpbjsKICAgICBSZWZQdHI8U2VjdXJpdHlPcmln aW4+IG1fZGF0YWJhc2VUaHJlYWRTZWN1cml0eU9yaWdpbjsKICAgICBSZWZQdHI8RGF0YWJhc2VD b250ZXh0PiBtX2RhdGFiYXNlQ29udGV4dDsKIAogICAgIGJvb2wgbV9kZWxldGVkOwogICAgIGJv b2wgbV9oYXNQZW5kaW5nQ3JlYXRpb25FdmVudCB7IGZhbHNlIH07CiAKKyAgICBTdHJpbmcgbV9u YW1lOworICAgIFN0cmluZyBtX2V4cGVjdGVkVmVyc2lvbjsKKyAgICBTdHJpbmcgbV9kaXNwbGF5 TmFtZTsKKyAgICB1bnNpZ25lZCBsb25nIG1fZXN0aW1hdGVkU2l6ZTsKKyAgICBTdHJpbmcgbV9m aWxlbmFtZTsKKworICAgIERhdGFiYXNlR3VpZCBtX2d1aWQ7CisgICAgYm9vbCBtX29wZW5lZDsK KyAgICBib29sIG1fbmV3OworCisgICAgU1FMaXRlRGF0YWJhc2UgbV9zcWxpdGVEYXRhYmFzZTsK KworICAgIFJlZlB0cjxEYXRhYmFzZUF1dGhvcml6ZXI+IG1fZGF0YWJhc2VBdXRob3JpemVyOwor CisgICAgRGVxdWU8UmVmUHRyPFNRTFRyYW5zYWN0aW9uQmFja2VuZD4+IG1fdHJhbnNhY3Rpb25R dWV1ZTsKKyAgICBNdXRleCBtX3RyYW5zYWN0aW9uSW5Qcm9ncmVzc011dGV4OworICAgIGJvb2wg bV90cmFuc2FjdGlvbkluUHJvZ3Jlc3M7CisgICAgYm9vbCBtX2lzVHJhbnNhY3Rpb25RdWV1ZUVu YWJsZWQ7CisKICAgICBmcmllbmQgY2xhc3MgQ2hhbmdlVmVyc2lvbldyYXBwZXI7CiAgICAgZnJp ZW5kIGNsYXNzIERhdGFiYXNlQmFja2VuZEJhc2U7CiAgICAgZnJpZW5kIGNsYXNzIERhdGFiYXNl TWFuYWdlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2Uv RGF0YWJhc2VCYWNrZW5kQmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFi YXNlL0RhdGFiYXNlQmFja2VuZEJhc2UuY3BwCmluZGV4IDAzMGYzMzM1OTQxYzE1Y2YzYWI5ZTc2 ZTRkY2E4MDIxN2M2MzBhNDkuLmFkNTJiMTk4MDJmNjk2N2YyMjkzZjk2MzNiNzllYTcyYTk5YWFk ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJh c2VCYWNrZW5kQmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFz ZS9EYXRhYmFzZUJhY2tlbmRCYXNlLmNwcApAQCAtNDksNDUgKzQ5LDkgQEAKICNpbmNsdWRlIDx3 dGYvdGV4dC9DU3RyaW5nLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nSGFzaC5oPgogCi0v LyBSZWdpc3RlcmluZyAib3BlbmVkIiBkYXRhYmFzZXMgd2l0aCB0aGUgRGF0YWJhc2VUcmFja2Vy Ci0vLyA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0vLyBUaGUgRGF0YWJhc2VUcmFja2VyIG1haW50YWlucyBhIGxpc3Qgb2YgZGF0YWJhc2Vz IHRoYXQgaGF2ZSBiZWVuCi0vLyAib3BlbmVkIiBzbyB0aGF0IHRoZSBjbGllbnQgY2FuIGNhbGwg aW50ZXJydXB0IG9yIGRlbGV0ZSBvbiBldmVyeSBkYXRhYmFzZQotLy8gYXNzb2NpYXRlZCB3aXRo IGEgRGF0YWJhc2VDb250ZXh0LgotLy8KLS8vIFdlIHdpbGwgb25seSBjYWxsIERhdGFiYXNlVHJh Y2tlcjo6YWRkT3BlbkRhdGFiYXNlKCkgdG8gYWRkIHRoZSBkYXRhYmFzZQotLy8gdG8gdGhlIHRy YWNrZXIgYXMgb3BlbmVkIHdoZW4gd2UndmUgc3VjY2VlZGVkIGluIG9wZW5pbmcgdGhlIGRhdGFi YXNlLAotLy8gYW5kIHdpbGwgc2V0IG1fb3BlbmVkIHRvIHRydWUuIFNpbWlsYXJseSwgd2Ugb25s eSBjYWxsCi0vLyBEYXRhYmFzZVRyYWNrZXI6OnJlbW92ZU9wZW5EYXRhYmFzZSgpIHRvIHJlbW92 ZSB0aGUgZGF0YWJhc2UgZnJvbSB0aGUKLS8vIHRyYWNrZXIgd2hlbiB3ZSBzZXQgbV9vcGVuZWQg dG8gZmFsc2UgaW4gY2xvc2VEYXRhYmFzZSgpLiBUaGlzIHNldHMgdXAKLS8vIGEgc2ltcGxlIHN5 bW1ldHJ5IGJldHdlZW4gb3BlbiBhbmQgY2xvc2Ugb3BlcmF0aW9ucywgYW5kIGEgZGlyZWN0Ci0v LyBjb3JyZWxhdGlvbiB0byBhZGRpbmcgYW5kIHJlbW92aW5nIGRhdGFiYXNlcyBmcm9tIHRoZSB0 cmFja2VyJ3MgbGlzdCwKLS8vIHRodXMgZW5zdXJpbmcgdGhhdCB3ZSBoYXZlIGEgY29ycmVjdCBs aXN0IGZvciB0aGUgaW50ZXJydXB0IGFuZAotLy8gZGVsZXRlIG9wZXJhdGlvbnMgdG8gd29yayBv bi4KLS8vCi0vLyBUaGUgb25seSBkYXRhYmFzZXMgaW5zdGFuY2VzIG5vdCB0cmFja2VkIGJ5IHRo ZSB0cmFja2VyJ3Mgb3BlbiBkYXRhYmFzZQotLy8gbGlzdCBhcmUgdGhlIG9uZXMgdGhhdCBoYXZl IG5vdCBiZWVuIGFkZGVkIHlldCwgb3IgdGhlIG9uZXMgdGhhdCB3ZQotLy8gYXR0ZW1wdGVkIGFu IG9wZW4gb24gYnV0IGZhaWxlZCB0by4gU3VjaCBpbnN0YW5jZXMgb25seSBleGlzdCBpbiB0aGUK LS8vIERhdGFiYXNlU2VydmVyJ3MgZmFjdG9yeSBtZXRob2RzIGZvciBjcmVhdGluZyBkYXRhYmFz ZSBiYWNrZW5kcy4KLS8vCi0vLyBUaGUgZmFjdG9yeSBtZXRob2RzIHdpbGwgZWl0aGVyIGNhbGwg b3BlbkFuZFZlcmlmeVZlcnNpb24oKSBvcgotLy8gcGVyZm9ybU9wZW5BbmRWZXJpZnkoKS4gVGhl c2UgbWV0aG9kcyB3aWxsIGFkZCB0aGUgbmV3bHkgaW5zdGFudGlhdGVkCi0vLyBkYXRhYmFzZSBi YWNrZW5kIGlmIHRoZXkgc3VjY2VlZCBpbiBvcGVuaW5nIHRoZSByZXF1ZXN0ZWQgZGF0YWJhc2Uu Ci0vLyBJbiB0aGUgY2FzZSBvZiBmYWlsdXJlIHRvIG9wZW4gdGhlIGRhdGFiYXNlLCB0aGUgZmFj dG9yeSBtZXRob2RzIHdpbGwKLS8vIHNpbXBseSBkaXNjYXJkIHRoZSBuZXdseSBpbnN0YW50aWF0 ZWQgZGF0YWJhc2UgYmFja2VuZCB3aGVuIHRoZXkgcmV0dXJuLgotLy8gVGhlIHJlZiBjb3VudGlu ZyBtZWNoYW5pbXMgd2lsbCBhdXRvbWF0aWNhbGx5IGRlc3RydWN0IHRoZSB1bi1hZGRlZAotLy8g KGFuZCB1bi1yZXR1cm5lZCkgZGF0YWJhc2VzIGluc3RhbmNlcy4KLQogbmFtZXNwYWNlIFdlYkNv cmUgewogCi1EYXRhYmFzZUJhY2tlbmRCYXNlOjpEYXRhYmFzZUJhY2tlbmRCYXNlKFBhc3NSZWZQ dHI8RGF0YWJhc2VDb250ZXh0PiBkYXRhYmFzZUNvbnRleHQsIGNvbnN0IFN0cmluZyYgbmFtZSwg Y29uc3QgU3RyaW5nJiBleHBlY3RlZFZlcnNpb24sIGNvbnN0IFN0cmluZyYgZGlzcGxheU5hbWUs IHVuc2lnbmVkIGxvbmcgZXN0aW1hdGVkU2l6ZSkKLSAgICA6IG1fZGF0YWJhc2VDb250ZXh0KGRh dGFiYXNlQ29udGV4dCkKLSAgICAsIG1fbmFtZShuYW1lLmlzb2xhdGVkQ29weSgpKQotICAgICwg bV9leHBlY3RlZFZlcnNpb24oZXhwZWN0ZWRWZXJzaW9uLmlzb2xhdGVkQ29weSgpKQotICAgICwg bV9kaXNwbGF5TmFtZShkaXNwbGF5TmFtZS5pc29sYXRlZENvcHkoKSkKLSAgICAsIG1fZXN0aW1h dGVkU2l6ZShlc3RpbWF0ZWRTaXplKQotICAgICwgbV9vcGVuZWQoZmFsc2UpCi0gICAgLCBtX25l dyhmYWxzZSkKK0RhdGFiYXNlQmFja2VuZEJhc2U6OkRhdGFiYXNlQmFja2VuZEJhc2UoKQogewog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFi YXNlQmFja2VuZEJhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0 YWJhc2VCYWNrZW5kQmFzZS5oCmluZGV4IGMxNzgyZWMzY2U0YmU5NTg3MTNiODYzMTI3ZWMwNDRk NmNmYmQ0N2QuLjhiMGUxZGNjNTg2YjY4YTU0MzlmMTgyNDE4ODgyYWYzNzRjNTFiMzIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VCYWNrZW5k QmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VC YWNrZW5kQmFzZS5oCkBAIC01MSw5ICs1MSw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5EYXRh YmFzZUJhY2tlbmRCYXNlKCk7CiAKIAotICAgIERhdGFiYXNlQ29udGV4dCogZGF0YWJhc2VDb250 ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9kYXRhYmFzZUNvbnRleHQuZ2V0KCk7IH0KLSAgICB2b2lk IHNldEZyb250ZW5kKERhdGFiYXNlKiBmcm9udGVuZCkgeyBtX2Zyb250ZW5kID0gZnJvbnRlbmQ7 IH0KLQogcHJvdGVjdGVkOgogICAgIGZyaWVuZCBjbGFzcyBDaGFuZ2VWZXJzaW9uV3JhcHBlcjsK ICAgICBmcmllbmQgY2xhc3MgU1FMU3RhdGVtZW50QmFja2VuZDsKQEAgLTYxLDI2ICs1OCw3IEBA IHByb3RlY3RlZDoKICAgICBmcmllbmQgY2xhc3MgU1FMVHJhbnNhY3Rpb25CYWNrZW5kOwogICAg IGZyaWVuZCBjbGFzcyBTUUxUcmFuc2FjdGlvbkJhY2tlbmRTeW5jOwogCi0gICAgRGF0YWJhc2VC YWNrZW5kQmFzZShQYXNzUmVmUHRyPERhdGFiYXNlQ29udGV4dD4sIGNvbnN0IFN0cmluZyYgbmFt ZSwgY29uc3QgU3RyaW5nJiBleHBlY3RlZFZlcnNpb24sIGNvbnN0IFN0cmluZyYgZGlzcGxheU5h bWUsIHVuc2lnbmVkIGxvbmcgZXN0aW1hdGVkU2l6ZSk7Ci0KLSAgICBSZWZQdHI8U2VjdXJpdHlP cmlnaW4+IG1fY29udGV4dFRocmVhZFNlY3VyaXR5T3JpZ2luOwotICAgIFJlZlB0cjxEYXRhYmFz ZUNvbnRleHQ+IG1fZGF0YWJhc2VDb250ZXh0OyAvLyBBc3NvY2lhdGVkIHdpdGggbV9zY3JpcHRF eGVjdXRpb25Db250ZXh0LgotCi0gICAgU3RyaW5nIG1fbmFtZTsKLSAgICBTdHJpbmcgbV9leHBl Y3RlZFZlcnNpb247Ci0gICAgU3RyaW5nIG1fZGlzcGxheU5hbWU7Ci0gICAgdW5zaWduZWQgbG9u ZyBtX2VzdGltYXRlZFNpemU7Ci0gICAgU3RyaW5nIG1fZmlsZW5hbWU7Ci0KLSAgICBEYXRhYmFz ZSogbV9mcm9udGVuZDsKLQotICAgIERhdGFiYXNlR3VpZCBtX2d1aWQ7Ci0gICAgYm9vbCBtX29w ZW5lZDsKLSAgICBib29sIG1fbmV3OwotCi0gICAgU1FMaXRlRGF0YWJhc2UgbV9zcWxpdGVEYXRh YmFzZTsKLQotICAgIFJlZlB0cjxEYXRhYmFzZUF1dGhvcml6ZXI+IG1fZGF0YWJhc2VBdXRob3Jp emVyOworICAgIERhdGFiYXNlQmFja2VuZEJhc2UoKTsKIAogICAgIGZyaWVuZCBjbGFzcyBEYXRh YmFzZVNlcnZlcjsKIH07Cg==