48262 2010-10-25 13:15:54 -0700 Replace matchCountDidChange with didFindString/didFailToFindString 2010-10-25 14:30:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 299072 0 andersca 2010-10-25 13:15:54 -0700 Replace matchCountDidChange with didFindString/didFailToFindString 299075 1 andersca 2010-10-25 13:17:28 -0700 <rdar://problem/8568928> 299076 2 71788 andersca 2010-10-25 13:20:18 -0700 Created attachment 71788 Patch 299079 3 webkit.review.bot 2010-10-25 13:22:23 -0700 Attachment 71788 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/UIProcess/API/C/WKPage.h:175: Extra space between WKPageDidFindStringCallback and didFindString [whitespace/declaration] [3] WebKit2/UIProcess/API/C/WKPage.h:176: Extra space between WKPageDidFailToFindStringCallback and didFailToFindString [whitespace/declaration] [3] Total errors found: 2 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 299108 4 andersca 2010-10-25 14:30:43 -0700 Committed r70491: <http://trac.webkit.org/changeset/70491> 71788 2010-10-25 13:20:18 -0700 2010-10-25 13:20:43 -0700 Patch bug-48262-20101025132017.patch text/plain 8558 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg ZWI5YjMxMjAxOGVhYzA4ODNmYjU4MDQwZTBiZjRjNDU3Njk4OWYxMS4uYWU4YzgzNGVjODhhMDM5 NTc0NDhkZDQ5MTZmZmZjMDAxM2U5MTk0MCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNiBAQAogMjAxMC0xMC0yNSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlcGxhY2UgbWF0Y2hDb3VudERpZENoYW5nZSB3 aXRoIGRpZEZpbmRTdHJpbmcvZGlkRmFpbFRvRmluZFN0cmluZworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDgyNjIKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzg1Njg5Mjg+CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmg6CisgICAg ICAgICogVUlQcm9jZXNzL1dlYkZpbmRDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJG aW5kQ2xpZW50OjpkaWRGaW5kU3RyaW5nKToKKyAgICAgICAgKFdlYktpdDo6V2ViRmluZENsaWVu dDo6ZGlkRmFpbFRvRmluZFN0cmluZyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkZpbmRDbGll bnQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjpkaWRGaW5kU3RyaW5nKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpkaWRGYWlsVG9GaW5kU3RyaW5nKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5p bjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwOgorICAg ICAgICAoV2ViS2l0OjpGaW5kQ29udHJvbGxlcjo6ZmluZFN0cmluZyk6CisKKzIwMTAtMTAtMjUg IEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBSZXZpZXdl ZCBieSBBZGFtIFJvYmVuLgogCiAgICAgICAgIEFkZCBhIHBhZ2VEaWRTY3JvbGwgQnVuZGxlVUlD bGllbnQgY2FsbGJhY2sKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFn ZS5oIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgKaW5kZXggZGIzMjI0MzQwMDky M2JhMzdiMTE0ZWY0MGQyNGM3ZTk5M2RmODZhNi4uOGE5MjQxMjlkNDhjYzIyYmFmNTI5MzYxNmMw MGIyNDBlOTU4YTE0NyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdl LmgKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgKQEAgLTE2NSwxMyArMTY1 LDE1IEBAIHN0cnVjdCBXS1BhZ2VVSUNsaWVudCB7CiB0eXBlZGVmIHN0cnVjdCBXS1BhZ2VVSUNs aWVudCBXS1BhZ2VVSUNsaWVudDsKIAogLy8gRmluZCBjbGllbnQuCi10eXBlZGVmIHZvaWQgKCpX S1BhZ2VNYXRjaENvdW50RGlkQ2hhbmdlQ2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmlu Z1JlZiBzdHJpbmcsIHVuc2lnbmVkIG1hdGNoQ291bnQsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8p OwordHlwZWRlZiB2b2lkICgqV0tQYWdlRGlkRmluZFN0cmluZ0NhbGxiYWNrKShXS1BhZ2VSZWYg cGFnZSwgV0tTdHJpbmdSZWYgc3RyaW5nLCB1bnNpZ25lZCBtYXRjaENvdW50LCBjb25zdCB2b2lk KiBjbGllbnRJbmZvKTsKK3R5cGVkZWYgdm9pZCAoKldLUGFnZURpZEZhaWxUb0ZpbmRTdHJpbmdD YWxsYmFjaykoV0tQYWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmIHN0cmluZywgY29uc3Qgdm9pZCog Y2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VEaWRDb3VudFN0cmluZ01hdGNoZXND YWxsYmFjaykoV0tQYWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmIHN0cmluZywgdW5zaWduZWQgbWF0 Y2hDb3VudCwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CiAKIHN0cnVjdCBXS1BhZ2VGaW5kQ2xp ZW50IHsKICAgICBpbnQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHZlcnNpb247CiAgICAgY29uc3Qgdm9pZCAqICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjbGllbnRJbmZv OwotICAgIFdLUGFnZU1hdGNoQ291bnREaWRDaGFuZ2VDYWxsYmFjayAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbWF0Y2hDb3VudERpZENoYW5nZTsKKyAgICBXS1BhZ2VEaWRGaW5k U3RyaW5nQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRp ZEZpbmRTdHJpbmc7CisgICAgV0tQYWdlRGlkRmFpbFRvRmluZFN0cmluZ0NhbGxiYWNrICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWRGYWlsVG9GaW5kU3RyaW5nOwogICAgIFdL UGFnZURpZENvdW50U3RyaW5nTWF0Y2hlc0NhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZGlkQ291bnRTdHJpbmdNYXRjaGVzOwogfTsKIHR5cGVkZWYgc3RydWN0IFdLUGFn ZUZpbmRDbGllbnQgV0tQYWdlRmluZENsaWVudDsKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9j ZXNzL1dlYkZpbmRDbGllbnQuY3BwIGIvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRmluZENsaWVudC5j cHAKaW5kZXggODAwMjllMDI2YTQzYzQwM2JlNDZiMGY2NTAwNmRiMWYwNjIxNzIwOC4uZTJlOGRl NWViNzhjNzFmYWUwZGIzODE5MDBlY2FmMzVkZDg0OTM1MyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViRmluZENsaWVudC5jcHAKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRmlu ZENsaWVudC5jcHAKQEAgLTI5LDEyICsyOSwyMSBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAot dm9pZCBXZWJGaW5kQ2xpZW50OjptYXRjaENvdW50RGlkQ2hhbmdlKFdlYlBhZ2VQcm94eSogcGFn ZSwgY29uc3QgU3RyaW5nJiBzdHJpbmcsIHVpbnQzMl90IG1hdGNoQ291bnQpCit2b2lkIFdlYkZp bmRDbGllbnQ6OmRpZEZpbmRTdHJpbmcoV2ViUGFnZVByb3h5KiBwYWdlLCBjb25zdCBTdHJpbmcm IHN0cmluZywgdWludDMyX3QgbWF0Y2hDb3VudCkKIHsKLSAgICBpZiAoIW1fY2xpZW50Lm1hdGNo Q291bnREaWRDaGFuZ2UpCisgICAgaWYgKCFtX2NsaWVudC5kaWRGaW5kU3RyaW5nKQogICAgICAg ICByZXR1cm47CiAKLSAgICBtX2NsaWVudC5tYXRjaENvdW50RGlkQ2hhbmdlKHRvQVBJKHBhZ2Up LCB0b0FQSShzdHJpbmcuaW1wbCgpKSwgbWF0Y2hDb3VudCwgbV9jbGllbnQuY2xpZW50SW5mbyk7 CisgICAgbV9jbGllbnQuZGlkRmluZFN0cmluZyh0b0FQSShwYWdlKSwgdG9BUEkoc3RyaW5nLmlt cGwoKSksIG1hdGNoQ291bnQsIG1fY2xpZW50LmNsaWVudEluZm8pOworCit9CisKK3ZvaWQgV2Vi RmluZENsaWVudDo6ZGlkRmFpbFRvRmluZFN0cmluZyhXZWJQYWdlUHJveHkqIHBhZ2UsIGNvbnN0 IFN0cmluZyYgc3RyaW5nKQoreworICAgIGlmICghbV9jbGllbnQuZGlkRmFpbFRvRmluZFN0cmlu ZykKKyAgICAgICAgcmV0dXJuOworICAgIAorICAgIG1fY2xpZW50LmRpZEZhaWxUb0ZpbmRTdHJp bmcodG9BUEkocGFnZSksIHRvQVBJKHN0cmluZy5pbXBsKCkpLCBtX2NsaWVudC5jbGllbnRJbmZv KTsKIH0KIAogdm9pZCBXZWJGaW5kQ2xpZW50OjpkaWRDb3VudFN0cmluZ01hdGNoZXMoV2ViUGFn ZVByb3h5KiBwYWdlLCBjb25zdCBTdHJpbmcmIHN0cmluZywgdWludDMyX3QgbWF0Y2hDb3VudCkK ZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL1dlYkZpbmRDbGllbnQuaCBiL1dlYktpdDIv VUlQcm9jZXNzL1dlYkZpbmRDbGllbnQuaAppbmRleCAzYjdhNTYxN2M4MWExNDljNjdjMmMyY2Rh MzhkZTljZGQ0ZWJhNzU3Li5jNjU5YzVkZmE5NWRhNmE1MTJlM2FhNTMzNTA5YTdjYzJmNDIyYWI5 IDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJGaW5kQ2xpZW50LmgKKysrIGIvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViRmluZENsaWVudC5oCkBAIC0zNiw3ICszNiw4IEBAIGNsYXNzIFdl YlBhZ2VQcm94eTsKIAogY2xhc3MgV2ViRmluZENsaWVudCA6IHB1YmxpYyBBUElDbGllbnQ8V0tQ YWdlRmluZENsaWVudD4gewogcHVibGljOgotICAgIHZvaWQgbWF0Y2hDb3VudERpZENoYW5nZShX ZWJQYWdlUHJveHkqLCBjb25zdCBTdHJpbmcmLCB1aW50MzJfdCBtYXRjaENvdW50KTsKKyAgICB2 b2lkIGRpZEZpbmRTdHJpbmcoV2ViUGFnZVByb3h5KiwgY29uc3QgU3RyaW5nJiwgdWludDMyX3Qg bWF0Y2hDb3VudCk7CisgICAgdm9pZCBkaWRGYWlsVG9GaW5kU3RyaW5nKFdlYlBhZ2VQcm94eSos IGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgZGlkQ291bnRTdHJpbmdNYXRjaGVzKFdlYlBhZ2VQ cm94eSosIGNvbnN0IFN0cmluZyYsIHVpbnQzMl90IG1hdGNoQ291bnQpOwogfTsKIApkaWZmIC0t Z2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggNGQyNTlmZGYxMTMwMWYzY2MxMzRiMzYxNWExMjBh NmE5MmE2OGIxMy4uNWJlZWVlYTgzMjhmMGU4NmZlMjBmNWY2OTdhODk0YTM3OWVmMGM5NiAxMDA2 NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC05ODgsOSArOTg4LDE0IEBAIHZvaWQgV2Vi UGFnZVByb3h5OjpzZXRGaW5kSW5kaWNhdG9yKGNvbnN0IEZsb2F0UmVjdCYgc2VsZWN0aW9uUmVj dCwgY29uc3QgVmVjdG9yCiAgICAgbV9wYWdlQ2xpZW50LT5zZXRGaW5kSW5kaWNhdG9yKGZpbmRJ bmRpY2F0b3IucmVsZWFzZSgpLCBmYWRlT3V0KTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6Om1h dGNoQ291bnREaWRDaGFuZ2UoY29uc3QgU3RyaW5nJiBzdHJpbmcsIHVpbnQzMl90IG1hdGNoQ291 bnQpCit2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmluZFN0cmluZyhjb25zdCBTdHJpbmcmIHN0cmlu ZywgdWludDMyX3QgbWF0Y2hDb3VudCkKIHsKLSAgICBtX2ZpbmRDbGllbnQubWF0Y2hDb3VudERp ZENoYW5nZSh0aGlzLCBzdHJpbmcsIG1hdGNoQ291bnQpOworICAgIG1fZmluZENsaWVudC5kaWRG aW5kU3RyaW5nKHRoaXMsIHN0cmluZywgbWF0Y2hDb3VudCk7Cit9CisKK3ZvaWQgV2ViUGFnZVBy b3h5OjpkaWRGYWlsVG9GaW5kU3RyaW5nKGNvbnN0IFN0cmluZyYgc3RyaW5nKQoreworICAgIG1f ZmluZENsaWVudC5kaWRGYWlsVG9GaW5kU3RyaW5nKHRoaXMsIHN0cmluZyk7CiB9CiAKIHZvaWQg V2ViUGFnZVByb3h5OjpzaG93UG9wdXBNZW51KGNvbnN0IEludFJlY3QmIHJlY3QsIGNvbnN0IFZl Y3RvcjxXZWJQb3B1cEl0ZW0+JiBpdGVtcywgaW50MzJfdCBzZWxlY3RlZEluZGV4KQpkaWZmIC0t Z2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaAppbmRleCA2OWM3YTcyM2U0M2NkMjcwZGQyZDM2ZTE0MDk5YzEzMjFl NzkwNzEzLi5kYjNhOTUwZTNkYTgwMjIzOTVlYzY3YWJlZGU3YmM0MjIyODNmOTk1IDEwMDY0NAot LS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMjg4LDcgKzI4OCw4IEBAIHByaXZhdGU6CiAgICAgLy8g RmluZC4KICAgICB2b2lkIGRpZENvdW50U3RyaW5nTWF0Y2hlcyhjb25zdCBTdHJpbmcmLCB1aW50 MzJfdCBtYXRjaENvdW50KTsKICAgICB2b2lkIHNldEZpbmRJbmRpY2F0b3IoY29uc3QgV2ViQ29y ZTo6RmxvYXRSZWN0JiBzZWxlY3Rpb25SZWN0LCBjb25zdCBWZWN0b3I8V2ViQ29yZTo6RmxvYXRS ZWN0PiYgdGV4dFJlY3RzLCBjb25zdCBTaGFyZWRNZW1vcnk6OkhhbmRsZSYgY29udGVudEltYWdl SGFuZGxlLCBib29sIGZhZGVPdXQpOwotICAgIHZvaWQgbWF0Y2hDb3VudERpZENoYW5nZShjb25z dCBTdHJpbmcmLCB1aW50MzJfdCBtYXRjaENvdW50KTsKKyAgICB2b2lkIGRpZEZpbmRTdHJpbmco Y29uc3QgU3RyaW5nJiwgdWludDMyX3QgbWF0Y2hDb3VudCk7CisgICAgdm9pZCBkaWRGYWlsVG9G aW5kU3RyaW5nKGNvbnN0IFN0cmluZyYpOwogCiAgICAgLy8gUG9wdXAgTWVudS4KICAgICB2b2lk IHNob3dQb3B1cE1lbnUoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgcmVjdCwgY29uc3QgVmVjdG9y PFdlYlBvcHVwSXRlbT4mIGl0ZW1zLCBpbnQzMl90IHNlbGVjdGVkSW5kZXgpOwpkaWZmIC0tZ2l0 IGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluIGIvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCmluZGV4IGI4NTM0MmQ0MzY1NWNhOGIw NTdkMWU5MWJhYzU3MTJkYzc5YmVkMDEuLmZjZjFmZjgzODA3NTg3ZWU5YzZjODgyZmEwYTU1MjRi YzNmYWY0N2QgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNz YWdlcy5pbgorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4K QEAgLTk0LDcgKzk0LDggQEAgbWVzc2FnZXMgLT4gV2ViUGFnZVByb3h5IHsKICAgICAjIEZpbmQu CiAgICAgRGlkQ291bnRTdHJpbmdNYXRjaGVzKFdURjo6U3RyaW5nIHN0cmluZywgdWludDMyX3Qg bWF0Y2hDb3VudCkKICAgICBTZXRGaW5kSW5kaWNhdG9yKFdlYkNvcmU6OkZsb2F0UmVjdCBzZWxl Y3Rpb25SZWN0LCBWZWN0b3I8V2ViQ29yZTo6RmxvYXRSZWN0PiB0ZXh0UmVjdHMsIFdlYktpdDo6 U2hhcmVkTWVtb3J5OjpIYW5kbGUgY29udGVudEltYWdlSGFuZGxlLCBib29sIGZhZGVPdXQpCi0g ICAgTWF0Y2hDb3VudERpZENoYW5nZShXVEY6OlN0cmluZyBzdHJpbmcsIHVpbnQzMl90IG1hdGNo Q291bnQpCisgICAgRGlkRmluZFN0cmluZyhXVEY6OlN0cmluZyBzdHJpbmcsIHVpbnQzMl90IG1h dGNoQ291bnQpCisgICAgRGlkRmFpbFRvRmluZFN0cmluZyhXVEY6OlN0cmluZyBzdHJpbmcpCiAK ICAgICAjIFBvcHVwTWVudS4KICAgICBTaG93UG9wdXBNZW51KFdlYkNvcmU6OkludFJlY3QgcmVj dCwgVmVjdG9yPFdlYktpdDo6V2ViUG9wdXBJdGVtPiBpdGVtcywgaW50MzJfdCBzZWxlY3RlZElu ZGV4KQpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xs ZXIuY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwCmlu ZGV4IGMxMDQ3ZmQyODdiZDQ0Y2NjYjIyZmQ3YmQ4YWE2OWMzYTBiNTc0NDUuLmQ5ZjEyYzcxODlk MWNhZGM5YTYxMjQ3Y2Y2NzkyYmVjMTRkMWY2MGYgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAKQEAgLTg0LDcgKzg0LDcgQEAgdm9pZCBGaW5kQ29u dHJvbGxlcjo6ZmluZFN0cmluZyhjb25zdCBTdHJpbmcmIHN0cmluZywgRmluZERpcmVjdGlvbiBm aW5kRGlyZWN0aW8KIAogICAgICAgICBoaWRlRmluZEluZGljYXRvcigpOwogCi0gICAgICAgIFdl YlByb2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpNYXRjaENvdW50RGlkQ2hhbmdlKHN0cmluZywgMCksIG1fd2ViUGFnZS0+cGFnZUlEKCkp OworICAgICAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5jb25uZWN0aW9uKCktPnNlbmQoTWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6RGlkRmFpbFRvRmluZFN0cmluZyhzdHJpbmcpLCBtX3dlYlBhZ2Ut PnBhZ2VJRCgpKTsKICAgICB9IGVsc2UgewogICAgICAgICBzaG91bGRTaG93T3ZlcmxheSA9IGZp bmRPcHRpb25zICYgRmluZE9wdGlvbnNTaG93T3ZlcmxheTsKIApAQCAtOTUsNyArOTUsNyBAQCB2 b2lkIEZpbmRDb250cm9sbGVyOjpmaW5kU3RyaW5nKGNvbnN0IFN0cmluZyYgc3RyaW5nLCBGaW5k RGlyZWN0aW9uIGZpbmREaXJlY3RpbwogICAgICAgICAgICAgaWYgKG1hdGNoQ291bnQgPiBtYXhN YXRjaENvdW50KQogICAgICAgICAgICAgICAgIHNob3VsZFNob3dPdmVybGF5ID0gZmFsc2U7CiAK LSAgICAgICAgICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rpb24oKS0+c2VuZChNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpNYXRjaENvdW50RGlkQ2hhbmdlKHN0cmluZywgbWF0Y2hDb3Vu dCksIG1fd2ViUGFnZS0+cGFnZUlEKCkpOworICAgICAgICAgICAgV2ViUHJvY2Vzczo6c2hhcmVk KCkuY29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZEZpbmRTdHJp bmcoc3RyaW5nLCBtYXRjaENvdW50KSwgbV93ZWJQYWdlLT5wYWdlSUQoKSk7CiAgICAgICAgIH0K IAogICAgICAgICBpZiAoIShmaW5kT3B0aW9ucyAmIEZpbmRPcHRpb25zU2hvd0ZpbmRJbmRpY2F0 b3IpIHx8ICF1cGRhdGVGaW5kSW5kaWNhdG9yKHNlbGVjdGVkRnJhbWUsIHNob3VsZFNob3dPdmVy bGF5KSkgewo=