47840 2010-10-18 11:30:32 -0700 Add matchCountDidChange callback 2010-10-18 12:36:41 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca abarth eric webkit.review.bot oldest_to_newest 295648 0 andersca 2010-10-18 11:30:32 -0700 Add matchCountDidChange callback 295652 1 71065 andersca 2010-10-18 11:33:28 -0700 Created attachment 71065 Patch 295654 2 71065 darin 2010-10-18 11:34:50 -0700 Comment on attachment 71065 Patch Side thought, not just about this patch: I’m not sure that a single boolean for case sensitivity is the right set of options for text finding. Since Safari only uses “case insensitive false” mode, the “case insensitive true” mode is for future use. Might we want some other searching modes for future use? 295655 3 webkit.review.bot 2010-10-18 11:35:23 -0700 Attachment 71065 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/UIProcess/API/C/WKPage.h:174: Extra space between WKPageMatchCountDidChangeCallback and matchCountDidChange [whitespace/declaration] [3] Total errors found: 1 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 295662 4 andersca 2010-10-18 11:47:32 -0700 Committed r69978: <http://trac.webkit.org/changeset/69978> 295698 5 webkit.review.bot 2010-10-18 12:36:41 -0700 http://trac.webkit.org/changeset/69978 might have broken Leopard Intel Debug (Tests) 71065 2010-10-18 11:33:28 -0700 2010-10-18 11:34:49 -0700 Patch bug-47840-20101018113326.patch text/plain 9485 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg YjdhNDgyOTRiNzNiMWQ4OWVlNzZhMjViNGY3NGNhODUyN2E3OTNhMC4uYmQxYzE3Y2FlYTkzNTU4 MTdkZjdkMTAxZTg5MmE1YzQ4OTczYjhkMyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzMyBAQAogMjAxMC0xMC0xOCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBtYXRjaENvdW50RGlkQ2hhbmdlIGNhbGxi YWNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Nzg0 MAorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oOgorICAgICAgICBBZGQgbWF0 Y2hDb3VudERpZENoYW5nZSBXS1BhZ2VGaW5kQ2xpZW50IGNhbGxiYWNrLgorICAgICAgICAKKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViRmluZENsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YkZpbmRDbGllbnQ6Om1hdGNoQ291bnREaWRDaGFuZ2UpOgorICAgICAgICBDYWxsIHRoZSBXS1Bh Z2VGaW5kQ2xpZW50IGNhbGxiYWNrLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgQWRkIE1hdGNoQ291bnREaWRDaGFuZ2UgbWVzc2FnZS4K KworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHA6CisgICAg ICAgIChXZWJLaXQ6OkZpbmRDb250cm9sbGVyOjpjb3VudFN0cmluZ01hdGNoZXMpOgorICAgICAg ICBNb3ZlIGNvZGUgaGVyZSBmcm9tIFdlYlBhZ2UuCisKKyAgICAgICAgKFdlYktpdDo6RmluZENv bnRyb2xsZXI6OmZpbmRTdHJpbmcpOgorICAgICAgICBTZW5kIHRoZSBNYXRjaENvdW50RGlkQ2hh bmdlIG1lc3NhZ2UuCisgICAgICAgIAorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Y291bnRTdHJpbmdNYXRjaGVzKToK KyAgICAgICAgTW92ZSB0aGlzIGNvZGUgb3ZlciB0byBGaW5kQ29udHJvbGxlci4KKworMjAxMC0x MC0xOCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIFJl dmlld2VkIGJ5IERhcmluIEFkbGVyLgogCiAgICAgICAgIFVzZSBudWxscHRyIGluc3RlYWQgb2Yg MC4KZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oIGIvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgKaW5kZXggODliMWNkYWQ2ZGNhYzZlOGNjMTgzOGU0 NGZhNWZjNjY3MTBkNTM4Ny4uYTViYTkyZDVmMDY4OWIxZTE1NTAwMGVjNjdjNzQ4MTJiYTczZGVi OCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgKKysrIGIvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgKQEAgLTE2NSwxMSArMTY1LDEzIEBAIHN0cnVj dCBXS1BhZ2VVSUNsaWVudCB7CiB0eXBlZGVmIHN0cnVjdCBXS1BhZ2VVSUNsaWVudCBXS1BhZ2VV SUNsaWVudDsKIAogLy8gRmluZCBjbGllbnQuCit0eXBlZGVmIHZvaWQgKCpXS1BhZ2VNYXRjaENv dW50RGlkQ2hhbmdlQ2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiBzdHJpbmcs IHVuc2lnbmVkIG1hdGNoQ291bnQsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwogdHlwZWRlZiB2 b2lkICgqV0tQYWdlRGlkQ291bnRTdHJpbmdNYXRjaGVzQ2FsbGJhY2spKFdLUGFnZVJlZiBwYWdl LCBXS1N0cmluZ1JlZiBzdHJpbmcsIHVuc2lnbmVkIG51bU1hdGNoZXMsIGNvbnN0IHZvaWQqIGNs aWVudEluZm8pOwogCiBzdHJ1Y3QgV0tQYWdlRmluZENsaWVudCB7CiAgICAgaW50ICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2 ZXJzaW9uOwogICAgIGNvbnN0IHZvaWQgKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY2xpZW50SW5mbzsKKyAgICBXS1BhZ2VNYXRjaENvdW50 RGlkQ2hhbmdlQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1hdGNo Q291bnREaWRDaGFuZ2U7CiAgICAgV0tQYWdlRGlkQ291bnRTdHJpbmdNYXRjaGVzQ2FsbGJhY2sg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWRDb3VudFN0cmluZ01hdGNoZXM7CiB9 OwogdHlwZWRlZiBzdHJ1Y3QgV0tQYWdlRmluZENsaWVudCBXS1BhZ2VGaW5kQ2xpZW50OwpkaWZm IC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRmluZENsaWVudC5jcHAgYi9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJGaW5kQ2xpZW50LmNwcAppbmRleCA0NzcyMTIxOWY5YjM4OWRhYmRkMGU0N2Q4 MDg1OWRhZjVhODI0YTYxLi4yYTYwYWUwZjU3NDIyMzk3YjEwMTcyNzAwODlhMDU1MjExNDE0ZTdj IDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJGaW5kQ2xpZW50LmNwcAorKysgYi9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJGaW5kQ2xpZW50LmNwcApAQCAtMjksNiArMjksMTQgQEAKIAog bmFtZXNwYWNlIFdlYktpdCB7CiAKK3ZvaWQgV2ViRmluZENsaWVudDo6bWF0Y2hDb3VudERpZENo YW5nZShXZWJQYWdlUHJveHkqIHBhZ2UsIGNvbnN0IFN0cmluZyYgc3RyaW5nLCB1aW50MzJfdCBt YXRjaENvdW50KQoreworICAgIGlmICghbV9jbGllbnQubWF0Y2hDb3VudERpZENoYW5nZSkKKyAg ICAgICAgcmV0dXJuOworCisgICAgbV9jbGllbnQubWF0Y2hDb3VudERpZENoYW5nZSh0b0FQSShw YWdlKSwgdG9BUEkoc3RyaW5nLmltcGwoKSksIG1hdGNoQ291bnQsIG1fY2xpZW50LmNsaWVudElu Zm8pOworfQorCiB2b2lkIFdlYkZpbmRDbGllbnQ6OmRpZENvdW50U3RyaW5nTWF0Y2hlcyhXZWJQ YWdlUHJveHkqIHBhZ2UsIGNvbnN0IFN0cmluZyYgc3RyaW5nLCB1aW50MzJfdCBudW1NYXRjaGVz KQogewogICAgIGlmICghbV9jbGllbnQuZGlkQ291bnRTdHJpbmdNYXRjaGVzKQpkaWZmIC0tZ2l0 IGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRmluZENsaWVudC5oIGIvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViRmluZENsaWVudC5oCmluZGV4IGJlYmJiZWI1YmIxNzE0YmE2ZGYzZWE4Y2RhYjVlYTFkNWVi NTMwYWUuLmFhZGRjZWVkZDA2ZTMxZmY4Y2YwNzRkMDViODE4NTI2ZDZkODc5YTMgMTAwNjQ0Ci0t LSBhL1dlYktpdDIvVUlQcm9jZXNzL1dlYkZpbmRDbGllbnQuaAorKysgYi9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJGaW5kQ2xpZW50LmgKQEAgLTM2LDYgKzM2LDcgQEAgY2xhc3MgV2ViUGFnZVByb3h5 OwogCiBjbGFzcyBXZWJGaW5kQ2xpZW50IDogcHVibGljIEFQSUNsaWVudDxXS1BhZ2VGaW5kQ2xp ZW50PiB7CiBwdWJsaWM6CisgICAgdm9pZCBtYXRjaENvdW50RGlkQ2hhbmdlKFdlYlBhZ2VQcm94 eSosIGNvbnN0IFN0cmluZyYsIHVpbnQzMl90IG1hdGNoQ291bnQpOwogICAgIHZvaWQgZGlkQ291 bnRTdHJpbmdNYXRjaGVzKFdlYlBhZ2VQcm94eSosIGNvbnN0IFN0cmluZyYsIHVpbnQzMl90IG51 bU1hdGNoZXMpOwogfTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcCBiL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMWI1Yjg2 MWE5MjBkZjc3MzZhMzg0ZGRhZWFjMjk0MTQ5ZTY3ZmNiYS4uYWFmNWEzZmFmNWFkMmUzMmRiN2Qy NmMxMjU3NjY0MjEwNzMzZjAxZiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC05 NzIsNiArOTcyLDExIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzZXRGaW5kSW5kaWNhdG9yKGNvbnN0 IEZsb2F0UmVjdCYgc2VsZWN0aW9uUmVjdCwgY29uc3QgVmVjdG9yCiAgICAgbV9wYWdlQ2xpZW50 LT5zZXRGaW5kSW5kaWNhdG9yKGZpbmRJbmRpY2F0b3IucmVsZWFzZSgpLCBmYWRlT3V0KTsKIH0K IAordm9pZCBXZWJQYWdlUHJveHk6Om1hdGNoQ291bnREaWRDaGFuZ2UoY29uc3QgU3RyaW5nJiBz dHJpbmcsIHVpbnQzMl90IG1hdGNoQ291bnQpCit7CisgICAgbV9maW5kQ2xpZW50Lm1hdGNoQ291 bnREaWRDaGFuZ2UodGhpcywgc3RyaW5nLCBtYXRjaENvdW50KTsKK30KKwogdm9pZCBXZWJQYWdl UHJveHk6OnNob3dQb3B1cE1lbnUoY29uc3QgSW50UmVjdCYgcmVjdCwgY29uc3QgVmVjdG9yPFdl YlBvcHVwSXRlbT4mIGl0ZW1zLCBpbnQzMl90IHNlbGVjdGVkSW5kZXgpCiB7CiAgICAgaWYgKG1f YWN0aXZlUG9wdXBNZW51KQpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmggYi9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBkYzQxM2MxNTc1 ZmVhZTM0ZTAyODY2MmYyOTllMTA5YTkxNjA5YTM3Li44MjA5ZTY1NTVmYmFlMzY5Mzc0MGRjYjRi NjIxYTUwMzI1OGRjNWMzIDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMjg3LDYgKzI4 Nyw3IEBAIHByaXZhdGU6CiAgICAgLy8gRmluZC4KICAgICB2b2lkIGRpZENvdW50U3RyaW5nTWF0 Y2hlcyhjb25zdCBTdHJpbmcmLCB1aW50MzJfdCBudW1NYXRjaGVzKTsKICAgICB2b2lkIHNldEZp bmRJbmRpY2F0b3IoY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBzZWxlY3Rpb25SZWN0LCBjb25z dCBWZWN0b3I8V2ViQ29yZTo6RmxvYXRSZWN0PiYgdGV4dFJlY3RzLCBjb25zdCBTaGFyZWRNZW1v cnk6OkhhbmRsZSYgY29udGVudEltYWdlSGFuZGxlLCBib29sIGZhZGVPdXQpOworICAgIHZvaWQg bWF0Y2hDb3VudERpZENoYW5nZShjb25zdCBTdHJpbmcmLCB1aW50MzJfdCBtYXRjaENvdW50KTsK IAogICAgIC8vIFBvcHVwIE1lbnUuCiAgICAgdm9pZCBzaG93UG9wdXBNZW51KGNvbnN0IFdlYkNv cmU6OkludFJlY3QmIHJlY3QsIGNvbnN0IFZlY3RvcjxXZWJQb3B1cEl0ZW0+JiBpdGVtcywgaW50 MzJfdCBzZWxlY3RlZEluZGV4KTsKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5tZXNzYWdlcy5pbiBiL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNz YWdlcy5pbgppbmRleCBiZWQxZTVlMDBhOWRmMzEzYThkZDNkNDkyMzM0NmY3ZTM1OTc5OWY5Li43 NzcwN2JkZDY5NmRiNzg3NjMwMzI3MTk3NzI5OTE3ZmY1OGU1ZTRmIDEwMDY0NAotLS0gYS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KKysrIGIvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCkBAIC05NCw2ICs5NCw3IEBAIG1lc3NhZ2Vz IC0+IFdlYlBhZ2VQcm94eSB7CiAgICAgIyBGaW5kLgogICAgIERpZENvdW50U3RyaW5nTWF0Y2hl cyhXVEY6OlN0cmluZyBzdHJpbmcsIHVpbnQzMl90IG51bU1hdGNoZXMpCiAgICAgU2V0RmluZElu ZGljYXRvcihXZWJDb3JlOjpGbG9hdFJlY3Qgc2VsZWN0aW9uUmVjdCwgVmVjdG9yPFdlYkNvcmU6 OkZsb2F0UmVjdD4gdGV4dFJlY3RzLCBXZWJLaXQ6OlNoYXJlZE1lbW9yeTo6SGFuZGxlIGNvbnRl bnRJbWFnZUhhbmRsZSwgYm9vbCBmYWRlT3V0KQorICAgIE1hdGNoQ291bnREaWRDaGFuZ2UoV1RG OjpTdHJpbmcgc3RyaW5nLCB1aW50MzJfdCBtYXRjaENvdW50KQogCiAgICAgIyBQb3B1cE1lbnUu CiAgICAgU2hvd1BvcHVwTWVudShXZWJDb3JlOjpJbnRSZWN0IHJlY3QsIFZlY3RvcjxXZWJLaXQ6 OldlYlBvcHVwSXRlbT4gaXRlbXMsIGludDMyX3Qgc2VsZWN0ZWRJbmRleCkKZGlmZiAtLWdpdCBh L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcCBiL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcAppbmRleCBlMzZhNDQ3YzcyOTlj NDhjZThiYjE2NGI2ODAzY2JmYzBkY2Y2YjJkLi43Y2RhZjc1NGQ0YTdmYWExZGM3ZGNkNjZlZDE0 MTZlMDU5OGQzNzI1IDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5k Q29udHJvbGxlci5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRy b2xsZXIuY3BwCkBAIC00Niw2ICs0NiwxNCBAQCBGaW5kQ29udHJvbGxlcjo6RmluZENvbnRyb2xs ZXIoV2ViUGFnZSogd2ViUGFnZSkKIHsKIH0KIAordm9pZCBGaW5kQ29udHJvbGxlcjo6Y291bnRT dHJpbmdNYXRjaGVzKGNvbnN0IFN0cmluZyYgc3RyaW5nLCBib29sIGNhc2VJbnNlbnNpdGl2ZSwg dW5zaWduZWQgbWF4TnVtTWF0Y2hlcykKK3sKKyAgICB1bnNpZ25lZCBudW1NYXRjaGVzID0gbV93 ZWJQYWdlLT5jb3JlUGFnZSgpLT5tYXJrQWxsTWF0Y2hlc0ZvclRleHQoc3RyaW5nLCBjYXNlSW5z ZW5zaXRpdmUgPyBUZXh0Q2FzZUluc2Vuc2l0aXZlIDogVGV4dENhc2VTZW5zaXRpdmUsIGZhbHNl LCBtYXhOdW1NYXRjaGVzKTsKKyAgICBtX3dlYlBhZ2UtPmNvcmVQYWdlKCktPnVubWFya0FsbFRl eHRNYXRjaGVzKCk7CisKKyAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5jb25uZWN0aW9uKCktPnNl bmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ291bnRTdHJpbmdNYXRjaGVzKHN0cmluZywg bnVtTWF0Y2hlcyksIG1fd2ViUGFnZS0+cGFnZUlEKCkpOworfQorCiBzdGF0aWMgRnJhbWUqIGZy YW1lV2l0aFNlbGVjdGlvbihQYWdlKiBwYWdlKQogewogICAgIGZvciAoRnJhbWUqIGZyYW1lID0g cGFnZS0+bWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCktPnRyYXZlcnNl TmV4dCgpKSB7CkBAIC03NSw2ICs4Myw5IEBAIHZvaWQgRmluZENvbnRyb2xsZXI6OmZpbmRTdHJp bmcoY29uc3QgU3RyaW5nJiBzdHJpbmcsIEZpbmREaXJlY3Rpb24gZmluZERpcmVjdGlvCiAgICAg ICAgICAgICBzZWxlY3RlZEZyYW1lLT5zZWxlY3Rpb24oKS0+Y2xlYXIoKTsKIAogICAgICAgICBo aWRlRmluZEluZGljYXRvcigpOworCisgICAgICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLmNvbm5l Y3Rpb24oKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpNYXRjaENvdW50RGlkQ2hhbmdl KHN0cmluZywgMCksIG1fd2ViUGFnZS0+cGFnZUlEKCkpOworCiAgICAgfSBlbHNlIHsKICAgICAg ICAgc2hvdWxkU2hvd092ZXJsYXkgPSBmaW5kT3B0aW9ucyAmIEZpbmRPcHRpb25zU2hvd092ZXJs YXk7CiAKQEAgLTg0LDYgKzk1LDggQEAgdm9pZCBGaW5kQ29udHJvbGxlcjo6ZmluZFN0cmluZyhj b25zdCBTdHJpbmcmIHN0cmluZywgRmluZERpcmVjdGlvbiBmaW5kRGlyZWN0aW8KICAgICAgICAg ICAgIC8vIENoZWNrIGlmIHdlIGhhdmUgbW9yZSBtYXRjaGVzIHRoYW4gYWxsb3dlZC4KICAgICAg ICAgICAgIGlmIChudW1NYXRjaGVzID4gbWF4TnVtTWF0Y2hlcykKICAgICAgICAgICAgICAgICBz aG91bGRTaG93T3ZlcmxheSA9IGZhbHNlOworCisgICAgICAgICAgICBXZWJQcm9jZXNzOjpzaGFy ZWQoKS5jb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6TWF0Y2hDb3Vu dERpZENoYW5nZShzdHJpbmcsIG51bU1hdGNoZXMpLCBtX3dlYlBhZ2UtPnBhZ2VJRCgpKTsKICAg ICAgICAgfQogCiAgICAgICAgIGlmICghKGZpbmRPcHRpb25zICYgRmluZE9wdGlvbnNTaG93Rmlu ZEluZGljYXRvcikgfHwgIXVwZGF0ZUZpbmRJbmRpY2F0b3Ioc2VsZWN0ZWRGcmFtZSwgc2hvdWxk U2hvd092ZXJsYXkpKSB7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9G aW5kQ29udHJvbGxlci5oIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xs ZXIuaAppbmRleCAzYWE4YjEwZjRhYTA4OGY5ODYxMGQ5MmNjYzU1NGFjZjlmZWMzZGQzLi42NmVh YzhlYThjOTdiYzI0NDI5MDE1NjdjNGFmNWM2YzQwOTVmOTVhIDEwMDY0NAotLS0gYS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5oCisrKyBiL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmgKQEAgLTQ3LDcgKzQ3LDggQEAgcHVibGljOgog CiAgICAgdm9pZCBmaW5kU3RyaW5nKGNvbnN0IFN0cmluZyYsIEZpbmREaXJlY3Rpb24sIEZpbmRP cHRpb25zLCB1bnNpZ25lZCBtYXhOdW1NYXRjaGVzKTsKICAgICB2b2lkIGhpZGVGaW5kVUkoKTsK LQorICAgIHZvaWQgY291bnRTdHJpbmdNYXRjaGVzKGNvbnN0IFN0cmluZyYsIGJvb2wgY2FzZUlu c2Vuc2l0aXZlLCB1bnNpZ25lZCBtYXhOdW1NYXRjaGVzKTsKKyAgICAKICAgICB2b2lkIGZpbmRQ YWdlT3ZlcmxheURlc3Ryb3llZCgpOwogCiAgICAgdm9pZCBoaWRlRmluZEluZGljYXRvcigpOwpk aWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCA1MDVjNzFiNWQ4MzgxZTk5 NTAzZWFjNTVmNDNjNTA0ZmJkMWVlNjYwLi4wNmU3MWE4ZWI3ODE0ZjNmY2Y3OWQ4MmUwODJjZWFh MDk1ZTNhYzY3IDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtNzk5 LDEwICs3OTksNyBAQCB2b2lkIFdlYlBhZ2U6OmhpZGVGaW5kVUkoKQogCiB2b2lkIFdlYlBhZ2U6 OmNvdW50U3RyaW5nTWF0Y2hlcyhjb25zdCBTdHJpbmcmIHN0cmluZywgYm9vbCBjYXNlSW5zZW5z aXRpdmUsIHVpbnQzMl90IG1heE51bU1hdGNoZXMpCiB7Ci0gICAgdW5zaWduZWQgbnVtTWF0Y2hl cyA9IG1fcGFnZS0+bWFya0FsbE1hdGNoZXNGb3JUZXh0KHN0cmluZywgY2FzZUluc2Vuc2l0aXZl ID8gVGV4dENhc2VJbnNlbnNpdGl2ZSA6IFRleHRDYXNlU2Vuc2l0aXZlLCBmYWxzZSwgbWF4TnVt TWF0Y2hlcyk7Ci0gICAgbV9wYWdlLT51bm1hcmtBbGxUZXh0TWF0Y2hlcygpOwotCi0gICAgV2Vi UHJvY2Vzczo6c2hhcmVkKCkuY29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6OkRpZENvdW50U3RyaW5nTWF0Y2hlcyhzdHJpbmcsIG51bU1hdGNoZXMpLCBtX3BhZ2VJRCk7 CisgICAgbV9maW5kQ29udHJvbGxlci5jb3VudFN0cmluZ01hdGNoZXMoc3RyaW5nLCBjYXNlSW5z ZW5zaXRpdmUsIG1heE51bU1hdGNoZXMpOwogfQogCiB2b2lkIFdlYlBhZ2U6OmRpZENoYW5nZVNl bGVjdGVkSW5kZXhGb3JBY3RpdmVQb3B1cE1lbnUoaW50MzJfdCBuZXdJbmRleCkKQEAgLTgxNCw3 ICs4MTEsNiBAQCB2b2lkIFdlYlBhZ2U6OmRpZENoYW5nZVNlbGVjdGVkSW5kZXhGb3JBY3RpdmVQ b3B1cE1lbnUoaW50MzJfdCBuZXdJbmRleCkKICAgICBtX2FjdGl2ZVBvcHVwTWVudSA9IDA7CiB9 CiAKLQogI2lmIFBMQVRGT1JNKE1BQykKIHZvaWQgV2ViUGFnZTo6YWRkUGx1Z2luVmlldyhQbHVn aW5WaWV3KiBwbHVnaW5WaWV3KQogewo=