139896 2014-12-22 19:43:53 -0800 Use a Transformer for UserData as well, to avoid always copying arrays and dictionaries 2014-12-22 22:49:31 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified NEW P2 Normal --- 1 andersca andersca oldest_to_newest 1057533 0 andersca 2014-12-22 19:43:53 -0800 Use a Transformer for UserData as well, to avoid always copying arrays and dictionaries 1057534 1 243660 andersca 2014-12-22 19:44:20 -0800 Created attachment 243660 Patch 243660 2014-12-22 19:44:20 -0800 2014-12-22 22:49:31 -0800 Patch bug-139896-20141222194421.patch text/plain 10205 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3Njc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTM1Y2ZmZGFiMGQ4OTMx Yjc1ZDllMTRlNGJmN2QyNmMwNzM3ZDFhMi4uNGI0YTZjZWJkNmJkZjZiOTFiYTYxMjMzODIyNWVl NDBhMmY3ZjJkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDE0LTEyLTIyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgVXNlIGEgVHJhbnNm b3JtZXIgZm9yIFVzZXJEYXRhIGFzIHdlbGwsIHRvIGF2b2lkIGFsd2F5cyBjb3B5aW5nIGFycmF5 cyBhbmQgZGljdGlvbmFyaWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMzk4OTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFNoYXJlZC9Vc2VyRGF0YS5jcHA6CisgICAgICAgIChXZWJLaXQ6OnNob3Vs ZFRyYW5zZm9ybSk6CisgICAgICAgIChXZWJLaXQ6OlVzZXJEYXRhOjp0cmFuc2Zvcm0pOgorICAg ICAgICAqIFNoYXJlZC9Vc2VyRGF0YS5oOgorICAgICAgICAoV2ViS2l0OjpVc2VyRGF0YTo6VHJh bnNmb3JtZXI6On5UcmFuc2Zvcm1lcik6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQ cm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6YXBpT2JqZWN0QnlD b252ZXJ0aW5nVG9IYW5kbGVzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjphcGlPYmplY3RCeUNvbnZlcnRpbmdGcm9t SGFuZGxlcyk6CisKKzIwMTQtMTItMjIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxl LmNvbT4KKwogICAgICAgICBNYWtlIGl0IHBvc3NpYmxlIHRvIHRyYW5zZm9ybSBPYmplY3RpdmUt QyBvYmplY3QgZ3JhcGhzLCByZXBsYWNpbmcgY2VydGFpbiBlbGVtZW50cyB3aXRoIG90aGVycwog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5ODkzCiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Vc2VyRGF0YS5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvVXNlckRhdGEuY3BwCmluZGV4IDUyNTM3ZjAwZDgxNDgxZTI0MzljZjFl YmM1MzAyZDk4ZGNkMTM3MGUuLjRmNWUwMzE1YTMxZTg2OWMyYTNlZGYxYmI5MzUzNzcyMTc2NGE5 ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Vc2VyRGF0YS5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvU2hhcmVkL1VzZXJEYXRhLmNwcApAQCAtNTcsMTggKzU3LDU0IEBAIFVz ZXJEYXRhOjp+VXNlckRhdGEoKQogewogfQogCi1SZWZQdHI8QVBJOjpPYmplY3Q+IFVzZXJEYXRh Ojp0cmFuc2Zvcm0oQVBJOjpPYmplY3QqIG9iamVjdCwgY29uc3Qgc3RkOjpmdW5jdGlvbjxSZWZQ dHI8QVBJOjpPYmplY3Q+IChjb25zdCBBUEk6Ok9iamVjdCYpPiB0cmFuc2Zvcm1lcikKK3N0YXRp YyBib29sIHNob3VsZFRyYW5zZm9ybShjb25zdCBBUEk6Ok9iamVjdCYgb2JqZWN0LCBjb25zdCBV c2VyRGF0YTo6VHJhbnNmb3JtZXImIHRyYW5zZm9ybWVyKQoreworICAgIGlmIChvYmplY3QudHlw ZSgpID09IEFQSTo6T2JqZWN0OjpUeXBlOjpBcnJheSkgeworICAgICAgICBjb25zdCBhdXRvJiBh cnJheSA9IHN0YXRpY19jYXN0PGNvbnN0IEFQSTo6QXJyYXkmPihvYmplY3QpOworCisgICAgICAg IGZvciAoY29uc3QgYXV0byYgZWxlbWVudCA6IGFycmF5LmVsZW1lbnRzKCkpIHsKKyAgICAgICAg ICAgIGlmICghZWxlbWVudCkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAg ICAgaWYgKHNob3VsZFRyYW5zZm9ybSgqZWxlbWVudCwgdHJhbnNmb3JtZXIpKQorICAgICAgICAg ICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisgICAgfQorCisgICAgaWYgKG9iamVjdC50 eXBlKCkgPT0gQVBJOjpPYmplY3Q6OlR5cGU6OkRpY3Rpb25hcnkpIHsKKyAgICAgICAgY29uc3Qg YXV0byYgZGljdGlvbmFyeSA9IHN0YXRpY19jYXN0PGNvbnN0IEltbXV0YWJsZURpY3Rpb25hcnkm PihvYmplY3QpOworCisgICAgICAgIGZvciAoY29uc3QgYXV0byYga2V5VmFsdWVQYWlyIDogZGlj dGlvbmFyeS5tYXAoKSkgeworICAgICAgICAgICAgaWYgKCFrZXlWYWx1ZVBhaXIudmFsdWUpCisg ICAgICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgICAgIGlmIChzaG91bGRUcmFuc2Zv cm0oKmtleVZhbHVlUGFpci52YWx1ZSwgdHJhbnNmb3JtZXIpKQorICAgICAgICAgICAgICAgIHJl dHVybiB0cnVlOworICAgICAgICB9CisgICAgfQorCisgICAgcmV0dXJuIHRyYW5zZm9ybWVyLnNo b3VsZFRyYW5zZm9ybU9iamVjdE9mVHlwZShvYmplY3QudHlwZSgpKTsKK30KKworUmVmUHRyPEFQ STo6T2JqZWN0PiBVc2VyRGF0YTo6dHJhbnNmb3JtKEFQSTo6T2JqZWN0KiBvYmplY3QsIGNvbnN0 IFRyYW5zZm9ybWVyJiB0cmFuc2Zvcm1lcikKIHsKICAgICBpZiAoIW9iamVjdCkKICAgICAgICAg cmV0dXJuIG51bGxwdHI7CiAKKyAgICBpZiAoIXNob3VsZFRyYW5zZm9ybSgqb2JqZWN0LCB0cmFu c2Zvcm1lcikpCisgICAgICAgIHJldHVybiBvYmplY3Q7CisKICAgICBpZiAob2JqZWN0LT50eXBl KCkgPT0gQVBJOjpPYmplY3Q6OlR5cGU6OkFycmF5KSB7CiAgICAgICAgIGF1dG8mIGFycmF5ID0g c3RhdGljX2Nhc3Q8QVBJOjpBcnJheSY+KCpvYmplY3QpOwogCiAgICAgICAgIFZlY3RvcjxSZWZQ dHI8QVBJOjpPYmplY3Q+PiBlbGVtZW50czsKICAgICAgICAgZWxlbWVudHMucmVzZXJ2ZUluaXRp YWxDYXBhY2l0eShhcnJheS5lbGVtZW50cygpLnNpemUoKSk7Ci0gICAgICAgIGZvciAoY29uc3Qg YXV0byYgZWxlbWVudCA6IGFycmF5LmVsZW1lbnRzKCkpCi0gICAgICAgICAgICBlbGVtZW50cy51 bmNoZWNrZWRBcHBlbmQodHJhbnNmb3JtKGVsZW1lbnQuZ2V0KCksIHRyYW5zZm9ybWVyKSk7Cisg ICAgICAgIGZvciAoY29uc3QgYXV0byYgZWxlbWVudCA6IGFycmF5LmVsZW1lbnRzKCkpIHsKKyAg ICAgICAgICAgIGlmICghZWxlbWVudCkKKyAgICAgICAgICAgICAgICBlbGVtZW50cy51bmNoZWNr ZWRBcHBlbmQobnVsbHB0cik7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgZWxl bWVudHMudW5jaGVja2VkQXBwZW5kKHRyYW5zZm9ybWVyLnRyYW5zZm9ybU9iamVjdCgqZWxlbWVu dCkpOworICAgICAgICB9CiAKICAgICAgICAgcmV0dXJuIEFQSTo6QXJyYXk6OmNyZWF0ZShXVEY6 Om1vdmUoZWxlbWVudHMpKTsKICAgICB9CkBAIC04Myw3ICsxMTksNyBAQCBSZWZQdHI8QVBJOjpP YmplY3Q+IFVzZXJEYXRhOjp0cmFuc2Zvcm0oQVBJOjpPYmplY3QqIG9iamVjdCwgY29uc3Qgc3Rk OjpmdW5jdGlvbgogICAgICAgICByZXR1cm4gSW1tdXRhYmxlRGljdGlvbmFyeTo6Y3JlYXRlKFdU Rjo6bW92ZShtYXApKTsKICAgICB9CiAKLSAgICBpZiAoYXV0byB0cmFuc2Zvcm1lZE9iamVjdCA9 IHRyYW5zZm9ybWVyKCpvYmplY3QpKQorICAgIGlmIChhdXRvIHRyYW5zZm9ybWVkT2JqZWN0ID0g dHJhbnNmb3JtZXIudHJhbnNmb3JtT2JqZWN0KCpvYmplY3QpKQogICAgICAgICByZXR1cm4gdHJh bnNmb3JtZWRPYmplY3Q7CiAKICAgICByZXR1cm4gb2JqZWN0OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvU2hhcmVkL1VzZXJEYXRhLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvVXNlckRh dGEuaAppbmRleCBjNDUyZjZiMDg1ZWU2OWE4OTVmNjc5NzkwMTlhZjJiMTgzZGViYWZmLi5iZDZm YTIyNmI1NTdmZjA3YzRmMDZlNTFlNjY3M2I3NzdlZjY1ZmU5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvVXNlckRhdGEuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvVXNl ckRhdGEuaApAQCAtMjYsMTMgKzI2LDkgQEAKICNpZm5kZWYgVXNlckRhdGFfaAogI2RlZmluZSBV c2VyRGF0YV9oCiAKLSNpbmNsdWRlIDxmdW5jdGlvbmFsPgorI2luY2x1ZGUgIkFQSU9iamVjdC5o IgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KIAotbmFtZXNwYWNlIEFQSSB7Ci1jbGFzcyBPYmpl Y3Q7Ci19Ci0KIG5hbWVzcGFjZSBJUEMgewogY2xhc3MgQXJndW1lbnRFbmNvZGVyOwogY2xhc3Mg QXJndW1lbnREZWNvZGVyOwpAQCAtNDYsNyArNDIsMTIgQEAgcHVibGljOgogICAgIGV4cGxpY2l0 IFVzZXJEYXRhKFJlZlB0cjxBUEk6Ok9iamVjdD4mJik7CiAgICAgflVzZXJEYXRhKCk7CiAKLSAg ICBzdGF0aWMgUmVmUHRyPEFQSTo6T2JqZWN0PiB0cmFuc2Zvcm0oQVBJOjpPYmplY3QqLCBjb25z dCBzdGQ6OmZ1bmN0aW9uPFJlZlB0cjxBUEk6Ok9iamVjdD4gKGNvbnN0IEFQSTo6T2JqZWN0Jik+ IHRyYW5zZm9ybWVyKTsKKyAgICBzdHJ1Y3QgVHJhbnNmb3JtZXIgeworICAgICAgICB2aXJ0dWFs IH5UcmFuc2Zvcm1lcigpIHsgfQorICAgICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkVHJhbnNmb3Jt T2JqZWN0T2ZUeXBlKEFQSTo6T2JqZWN0OjpUeXBlKSBjb25zdCA9IDA7CisgICAgICAgIHZpcnR1 YWwgUmVmUHRyPEFQSTo6T2JqZWN0PiB0cmFuc2Zvcm1PYmplY3QoQVBJOjpPYmplY3QmKSBjb25z dCA9IDA7CisgICAgfTsKKyAgICBzdGF0aWMgUmVmUHRyPEFQSTo6T2JqZWN0PiB0cmFuc2Zvcm0o QVBJOjpPYmplY3QqLCBjb25zdCBUcmFuc2Zvcm1lciYpOwogCiAgICAgQVBJOjpPYmplY3QqIG9i amVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fb2JqZWN0LmdldCgpOyB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKaW5kZXggZTVjOTkyMjIyZjE3ZmMwZWM0 ZDExNjlkZDI4NjIwYzRmMDZiMzYwNy4uMTczMWQyM2YwMmI2NTFlZGJiY2IyMmVkMzgwZjQwNjMx ZTczMjgxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQ cm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5j cHAKQEAgLTY1MiwyNyArNjUyLDQ1IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkaXNhYmxlU3Vk ZGVuVGVybWluYXRpb24oKQogCiBSZWZQdHI8QVBJOjpPYmplY3Q+IFdlYlByb2Nlc3NQcm94eTo6 YXBpT2JqZWN0QnlDb252ZXJ0aW5nVG9IYW5kbGVzKEFQSTo6T2JqZWN0KiBvYmplY3QpCiB7Ci0g ICAgcmV0dXJuIFVzZXJEYXRhOjp0cmFuc2Zvcm0ob2JqZWN0LCBbXShjb25zdCBBUEk6Ok9iamVj dCYgb2JqZWN0KSAtPiBSZWZQdHI8QVBJOjpPYmplY3Q+IHsKLSAgICAgICAgc3dpdGNoIChvYmpl Y3QudHlwZSgpKSB7Ci0gICAgICAgIGNhc2UgQVBJOjpPYmplY3Q6OlR5cGU6OkZyYW1lOiB7Ci0g ICAgICAgICAgICBhdXRvJiBmcmFtZSA9IHN0YXRpY19jYXN0PGNvbnN0IFdlYkZyYW1lUHJveHkm PihvYmplY3QpOwotICAgICAgICAgICAgcmV0dXJuIEFQSTo6RnJhbWVIYW5kbGU6OmNyZWF0ZShm cmFtZS5mcmFtZUlEKCkpOworICAgIHN0cnVjdCBUcmFuc2Zvcm1lciA6IFVzZXJEYXRhOjpUcmFu c2Zvcm1lciB7CisgICAgICAgIHZpcnR1YWwgYm9vbCBzaG91bGRUcmFuc2Zvcm1PYmplY3RPZlR5 cGUoQVBJOjpPYmplY3Q6OlR5cGUgdHlwZSkgY29uc3QKKyAgICAgICAgeworICAgICAgICAgICAg c3dpdGNoICh0eXBlKSB7CisgICAgICAgICAgICBjYXNlIEFQSTo6T2JqZWN0OjpUeXBlOjpGcmFt ZToKKyAgICAgICAgICAgIGNhc2UgQVBJOjpPYmplY3Q6OlR5cGU6OlBhZ2U6CisgICAgICAgICAg ICBjYXNlIEFQSTo6T2JqZWN0OjpUeXBlOjpQYWdlR3JvdXA6CisgICAgICAgICAgICAgICAgcmV0 dXJuIHRydWU7CisKKyAgICAgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICAgICAgfQogICAgICAgICB9CiAKLSAgICAgICAgY2FzZSBBUEk6Ok9i amVjdDo6VHlwZTo6UGFnZTogewotICAgICAgICAgICAgYXV0byYgcGFnZSA9IHN0YXRpY19jYXN0 PGNvbnN0IFdlYlBhZ2VQcm94eSY+KG9iamVjdCk7Ci0gICAgICAgICAgICByZXR1cm4gQVBJOjpQ YWdlSGFuZGxlOjpjcmVhdGUocGFnZS5wYWdlSUQoKSk7CisgICAgICAgIHZpcnR1YWwgUmVmUHRy PEFQSTo6T2JqZWN0PiB0cmFuc2Zvcm1PYmplY3QoQVBJOjpPYmplY3QmIG9iamVjdCkgY29uc3Qg b3ZlcnJpZGUKKyAgICAgICAgeworICAgICAgICAgICAgc3dpdGNoIChvYmplY3QudHlwZSgpKSB7 CisgICAgICAgICAgICBjYXNlIEFQSTo6T2JqZWN0OjpUeXBlOjpGcmFtZTogeworICAgICAgICAg ICAgICAgIGF1dG8mIGZyYW1lID0gc3RhdGljX2Nhc3Q8Y29uc3QgV2ViRnJhbWVQcm94eSY+KG9i amVjdCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIEFQSTo6RnJhbWVIYW5kbGU6OmNyZWF0ZShm cmFtZS5mcmFtZUlEKCkpOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBjYXNlIEFQSTo6 T2JqZWN0OjpUeXBlOjpQYWdlOiB7CisgICAgICAgICAgICAgICAgYXV0byYgcGFnZSA9IHN0YXRp Y19jYXN0PGNvbnN0IFdlYlBhZ2VQcm94eSY+KG9iamVjdCk7CisgICAgICAgICAgICAgICAgcmV0 dXJuIEFQSTo6UGFnZUhhbmRsZTo6Y3JlYXRlKHBhZ2UucGFnZUlEKCkpOworICAgICAgICAgICAg fQorCisgICAgICAgICAgICBjYXNlIEFQSTo6T2JqZWN0OjpUeXBlOjpQYWdlR3JvdXA6IHsKKyAg ICAgICAgICAgICAgICBhdXRvJiBwYWdlR3JvdXAgPSBzdGF0aWNfY2FzdDxjb25zdCBXZWJQYWdl R3JvdXAmPihvYmplY3QpOworICAgICAgICAgICAgICAgIHJldHVybiBBUEk6OlBhZ2VHcm91cEhh bmRsZTo6Y3JlYXRlKFdlYlBhZ2VHcm91cERhdGEocGFnZUdyb3VwLmRhdGEoKSkpOworICAgICAg ICAgICAgfQorCisgICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgIHJldHVybiBu dWxscHRyOworICAgICAgICAgICAgfQogICAgICAgICB9CisgICAgfSB0cmFuc2Zvcm1lcjsKIAot ICAgICAgICBjYXNlIEFQSTo6T2JqZWN0OjpUeXBlOjpQYWdlR3JvdXA6IHsKLSAgICAgICAgICAg IGF1dG8mIHBhZ2VHcm91cCA9IHN0YXRpY19jYXN0PGNvbnN0IFdlYlBhZ2VHcm91cCY+KG9iamVj dCk7Ci0gICAgICAgICAgICByZXR1cm4gQVBJOjpQYWdlR3JvdXBIYW5kbGU6OmNyZWF0ZShXZWJQ YWdlR3JvdXBEYXRhKHBhZ2VHcm91cC5kYXRhKCkpKTsKLSAgICAgICAgfQotCi0gICAgICAgIGRl ZmF1bHQ6Ci0gICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICAgICAgfQotICAgIH0pOwor ICAgIHJldHVybiBVc2VyRGF0YTo6dHJhbnNmb3JtKG9iamVjdCwgdHJhbnNmb3JtZXIpOwogfQog CiB2b2lkIFdlYlByb2Nlc3NQcm94eTo6c2VuZFByb2Nlc3NXaWxsU3VzcGVuZCgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAppbmRleCA5ZDYxNzBiMDM1OGI4N2E1OTFl MjliMmMxNTVjODdmMjU4OTNhZjYwLi4xOTU4MGI4ZjljM2VmYjI5ZWNmNWUxYjY4YmY2OGE5Zjcz NTFlNDU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3Mu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKQEAgLTEy MjksMzAgKzEyMjksNDkgQEAgdm9pZCBXZWJQcm9jZXNzOjpub25WaXNpYmxlUHJvY2Vzc0NsZWFu dXBUaW1lckZpcmVkKCkKIAogUmVmUHRyPEFQSTo6T2JqZWN0PiBXZWJQcm9jZXNzOjphcGlPYmpl Y3RCeUNvbnZlcnRpbmdGcm9tSGFuZGxlcyhBUEk6Ok9iamVjdCogb2JqZWN0KQogewotICAgIHJl dHVybiBVc2VyRGF0YTo6dHJhbnNmb3JtKG9iamVjdCwgW3RoaXNdKGNvbnN0IEFQSTo6T2JqZWN0 JiBvYmplY3QpIC0+IFJlZlB0cjxBUEk6Ok9iamVjdD4gewotICAgICAgICBzd2l0Y2ggKG9iamVj dC50eXBlKCkpIHsKLSAgICAgICAgY2FzZSBBUEk6Ok9iamVjdDo6VHlwZTo6RnJhbWVIYW5kbGU6 IHsKLSAgICAgICAgICAgIGF1dG8mIGZyYW1lSGFuZGxlID0gc3RhdGljX2Nhc3Q8Y29uc3QgQVBJ OjpGcmFtZUhhbmRsZSY+KG9iamVjdCk7Ci0KLSAgICAgICAgICAgIHJldHVybiB3ZWJGcmFtZShm cmFtZUhhbmRsZS5mcmFtZUlEKCkpOworICAgIHN0cnVjdCBUcmFuc2Zvcm1lciA6IFVzZXJEYXRh OjpUcmFuc2Zvcm1lciB7CisgICAgICAgIHZpcnR1YWwgYm9vbCBzaG91bGRUcmFuc2Zvcm1PYmpl Y3RPZlR5cGUoQVBJOjpPYmplY3Q6OlR5cGUgdHlwZSkgY29uc3QKKyAgICAgICAgeworICAgICAg ICAgICAgc3dpdGNoICh0eXBlKSB7CisgICAgICAgICAgICBjYXNlIEFQSTo6T2JqZWN0OjpUeXBl OjpGcmFtZUhhbmRsZToKKyAgICAgICAgICAgIGNhc2UgQVBJOjpPYmplY3Q6OlR5cGU6OlBhZ2VI YW5kbGU6CisgICAgICAgICAgICBjYXNlIEFQSTo6T2JqZWN0OjpUeXBlOjpQYWdlR3JvdXBIYW5k bGU6CisgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICAgICAgICAgIGRlZmF1bHQ6 CisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgfQogICAgICAgICB9 CiAKLSAgICAgICAgY2FzZSBBUEk6Ok9iamVjdDo6VHlwZTo6UGFnZUdyb3VwSGFuZGxlOiB7Ci0g ICAgICAgICAgICBhdXRvJiBwYWdlR3JvdXBIYW5kbGUgPSBzdGF0aWNfY2FzdDxjb25zdCBBUEk6 OlBhZ2VHcm91cEhhbmRsZSY+KG9iamVjdCk7CisgICAgICAgIHZpcnR1YWwgUmVmUHRyPEFQSTo6 T2JqZWN0PiB0cmFuc2Zvcm1PYmplY3QoQVBJOjpPYmplY3QmIG9iamVjdCkgY29uc3Qgb3ZlcnJp ZGUKKyAgICAgICAgeworICAgICAgICAgICAgc3dpdGNoIChvYmplY3QudHlwZSgpKSB7CisgICAg ICAgICAgICBjYXNlIEFQSTo6T2JqZWN0OjpUeXBlOjpGcmFtZUhhbmRsZTogeworICAgICAgICAg ICAgICAgIGF1dG8mIGZyYW1lSGFuZGxlID0gc3RhdGljX2Nhc3Q8Y29uc3QgQVBJOjpGcmFtZUhh bmRsZSY+KG9iamVjdCk7CiAKLSAgICAgICAgICAgIHJldHVybiB3ZWJQYWdlR3JvdXAocGFnZUdy b3VwSGFuZGxlLndlYlBhZ2VHcm91cERhdGEoKSk7Ci0gICAgICAgIH0KKyAgICAgICAgICAgICAg ICByZXR1cm4gV2ViUHJvY2Vzczo6c2hhcmVkKCkud2ViRnJhbWUoZnJhbWVIYW5kbGUuZnJhbWVJ RCgpKTsKKyAgICAgICAgICAgIH0KIAotICAgICAgICBjYXNlIEFQSTo6T2JqZWN0OjpUeXBlOjpQ YWdlSGFuZGxlOiB7Ci0gICAgICAgICAgICBhdXRvJiBwYWdlSGFuZGxlID0gc3RhdGljX2Nhc3Q8 Y29uc3QgQVBJOjpQYWdlSGFuZGxlJj4ob2JqZWN0KTsKKyAgICAgICAgICAgIGNhc2UgQVBJOjpP YmplY3Q6OlR5cGU6OlBhZ2VHcm91cEhhbmRsZTogeworICAgICAgICAgICAgICAgIGF1dG8mIHBh Z2VHcm91cEhhbmRsZSA9IHN0YXRpY19jYXN0PGNvbnN0IEFQSTo6UGFnZUdyb3VwSGFuZGxlJj4o b2JqZWN0KTsKIAotICAgICAgICAgICAgcmV0dXJuIHdlYlBhZ2UocGFnZUhhbmRsZS5wYWdlSUQo KSk7Ci0gICAgICAgIH0KKyAgICAgICAgICAgICAgICByZXR1cm4gV2ViUHJvY2Vzczo6c2hhcmVk KCkud2ViUGFnZUdyb3VwKHBhZ2VHcm91cEhhbmRsZS53ZWJQYWdlR3JvdXBEYXRhKCkpOworICAg ICAgICAgICAgfQorCisgICAgICAgICAgICBjYXNlIEFQSTo6T2JqZWN0OjpUeXBlOjpQYWdlSGFu ZGxlOiB7CisgICAgICAgICAgICAgICAgYXV0byYgcGFnZUhhbmRsZSA9IHN0YXRpY19jYXN0PGNv bnN0IEFQSTo6UGFnZUhhbmRsZSY+KG9iamVjdCk7CiAKLSAgICAgICAgZGVmYXVsdDoKLSAgICAg ICAgICAgIHJldHVybiBudWxscHRyOworICAgICAgICAgICAgICAgIHJldHVybiBXZWJQcm9jZXNz OjpzaGFyZWQoKS53ZWJQYWdlKHBhZ2VIYW5kbGUucGFnZUlEKCkpOworICAgICAgICAgICAgfQor CisgICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwor ICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAgfSk7CisgICAgfSB0cmFuc2Zvcm1lcjsKKwor ICAgIHJldHVybiBVc2VyRGF0YTo6dHJhbnNmb3JtKG9iamVjdCwgdHJhbnNmb3JtZXIpOworCiB9 CiAKIHZvaWQgV2ViUHJvY2Vzczo6c2V0TWVtb3J5Q2FjaGVEaXNhYmxlZChib29sIGRpc2FibGVk KQo=