19160 2008-05-20 16:17:46 -0700 Inspector should support console.count 2008-08-19 11:33:55 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Enhancement --- 14354 1 aroben keishi oldest_to_newest 81051 0 aroben 2008-05-20 16:17:46 -0700 The Inspector should support console.count for Firebug parity. 81060 1 mrowe 2008-05-20 16:23:15 -0700 <rdar://problem/5950865> 83867 2 aroben 2008-06-19 07:41:58 -0700 One thing that will make implementing this tricky is that currently there's no way for the console methods to know what file/line they were called from. See https://bugs.webkit.org/show_bug.cgi?id=17234#c2 and https://bugs.webkit.org/show_bug.cgi?id=17234#c3 83872 3 21837 keishi 2008-06-19 08:13:52 -0700 Created attachment 21837 Testcase for console.count behavior in Firebug I think this testcase proves that console.count only cares about the title attribute and not the line it was called. 83876 4 21837 aroben 2008-06-19 08:49:01 -0700 Comment on attachment 21837 Testcase for console.count behavior in Firebug Results from Firefox 2 with Firebug 1.1b: 100 100 a 100 a 100 So it looks like Firebug is in fact doing what it claims to do. 83878 5 keishi 2008-06-19 08:54:26 -0700 Oops. I guess it's a bug in Firebug 1.2 then. http://gyazo.com/eae0e3bcf7fd423181f7aabf0d459e73.png 88648 6 22836 keishi 2008-08-16 21:09:13 -0700 Created attachment 22836 proposed patch Line number insensitive, but can be upgraded once the line numbers are available. 88650 7 22837 keishi 2008-08-16 21:21:31 -0700 Created attachment 22837 fixed a minor mistake I couldn't figure out how to update a value in m_counts without removing and adding it back. 88654 8 22837 ggaren 2008-08-16 22:01:57 -0700 Comment on attachment 22837 fixed a minor mistake r=me 88832 9 timothy 2008-08-19 11:33:55 -0700 Landed in r35842. 21837 2008-06-19 08:13:52 -0700 2008-06-19 08:13:52 -0700 Testcase for console.count behavior in Firebug count_testcase.html text/html 1234 keishi PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBYSFRNTCAxLjAgU3RyaWN0Ly9FTiIK CSJodHRwOi8vd3d3LnczLm9yZy9UUi94aHRtbDEvRFREL3hodG1sMS1zdHJpY3QuZHRkIj4KCjxo dG1sIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hodG1sIiB4bWw6bGFuZz0iZW4iIGxh bmc9ImVuIj4KPGhlYWQ+Cgk8bWV0YSBodHRwLWVxdWl2PSJDb250ZW50LVR5cGUiIGNvbnRlbnQ9 InRleHQvaHRtbDsgY2hhcnNldD11dGYtOCIvPgoKCTx0aXRsZT5jb25zb2xlLmNvdW50IGJlaGF2 aW91ciB0ZXN0PC90aXRsZT4KCQo8L2hlYWQ+Cgo8Ym9keT4KPHNjcmlwdCB0eXBlPSJ0ZXh0L2ph dmFzY3JpcHQiIGNoYXJzZXQ9InV0Zi04Ij4KCWZ1bmN0aW9uIHRlc3RNYW55VGltZXMoKQoJewoJ CWZvciAodmFyIGk9MDsgaSA8IDEwMDsgaSsrKSB7CgkJCXRlc3QoKTsKCQl9Cgl9CglmdW5jdGlv biB0ZXN0KCkKCXsKCQljb25zb2xlLmNvdW50KCk7CgkJY29uc29sZS5jb3VudCgpOwoJCWNvbnNv bGUuY291bnQoImEiKTsKCQljb25zb2xlLmNvdW50KCJhIik7Cgl9Cjwvc2NyaXB0Pgo8aDE+Y29u c29sZS5jb3VudCBiZWhhdmlvdXIgdGVzdDwvaDE+CjxwPlF1b3RlIGZyb20gaHR0cDovL2dldGZp cmVidWcuY29tL2NvbnNvbGUuaHRtbDwvcD4KPGJsb2NrcXVvdGU+Cgk8aDI+Y29uc29sZS5jb3Vu dChbdGl0bGVdKTwvaDI+CgoJPHA+V3JpdGVzIHRoZSBudW1iZXIgb2YgdGltZXMgdGhhdCB0aGUg bGluZSBvZiBjb2RlIHdoZXJlIGNvdW50IHdhcyBjYWxsZWQgd2FzIGV4ZWN1dGVkLiBUaGUgb3B0 aW9uYWwgYXJndW1lbnQgdGl0bGUgd2lsbCBwcmludCBhIG1lc3NhZ2UgaW4gYWRkaXRpb24gdG8g dGhlIG51bWJlciBvZiB0aGUgY291bnQuPC9wPgo8L2Jsb2NrcXVvdGU+CjxidXR0b24gb25jbGlj az0idGVzdE1hbnlUaW1lcygpOyI+U3RhcnQgdGVzdDwvYnV0dG9uPgo8cD5UaGlzIHdpbGwgcnVu IHRoZSBjb2RlIGJlbG93IDEwMCB0aW1lcy48L3A+CjxwcmU+PGNvZGU+ZnVuY3Rpb24gdGVzdCgp CnsKCWNvbnNvbGUuY291bnQoKTsKCWNvbnNvbGUuY291bnQoKTsKCWNvbnNvbGUuY291bnQoImEi KTsKCWNvbnNvbGUuY291bnQoImEiKTsKfTwvY29kZT48L3ByZT4KPHA+Y29uc29sZS5jb3VudCBz aG91bGQgZGlzcGxheSAxMDAgZm9yIGVhY2ggY291bnQgaWYgaXQgZG9lcyB3aGF0IGl0IHNheXMg b24gaXQncyB3ZWJzaXRlLjwvcD4KPC9ib2R5Pgo8L2h0bWw+Cg== 22836 2008-08-16 21:09:13 -0700 2008-08-16 21:21:31 -0700 proposed patch patch18.txt text/plain 4985 keishi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNTgwNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDgtMDgtMTYgIEtlaXNoaSBIYXR0b3JpICA8Y2FzZXkuaGF0dG9y aUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWRkZWQgc3VwcG9ydCBmb3IgY29uc29sZS5jb3VudCBpbiB0aGUgaW5zcGVjdG9yLgor ICAgICAgICAKKworICAgICAgICAqIHBhZ2UvQ29uc29sZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDb25zb2xlOjpjb3VudCk6CisgICAgICAgICogcGFnZS9Db25zb2xlLmg6CisgICAgICAgICog cGFnZS9Db25zb2xlLmlkbDogQWRkZWQgY29uc29sZS5jb3VudC4KKyAgICAgICAgKiBwYWdlL0lu c3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJv bGxlcjo6ZGlkQ29tbWl0TG9hZCk6IENsZWFycyBtX2NvdW50cy4KKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvckNvbnRyb2xsZXI6OmNvdW50KTogVXBkYXRlcyB0aGUgY291bnQgbnVtYmVyIHVz aW5nICJ0aXRsZUBzb3VyY2U6bGluZSIgYXMgCisgICAgICAgIHRoZSBpZGVudGlmaWVyLCBhbmQg YWRkcyBhIG1lc3NhZ2UgdG8gdGhlIGNvbnNvbGUuCisgICAgICAgICogcGFnZS9JbnNwZWN0b3JD b250cm9sbGVyLmg6IEFkZGVkIG1fY291bnRzLgorCiAyMDA4LTA4LTE1ICBNYXJrIFJvd2UgIDxt cm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KSW5k ZXg6IFdlYkNvcmUvcGFnZS9Db25zb2xlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2Uv Q29uc29sZS5jcHAJKHJldmlzaW9uIDM1ODAxKQorKysgV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yNjcsNiArMjY3LDE4IEBAIHZvaWQgQ29uc29sZTo6YXNzZXJ0 Q29uZGl0aW9uKGJvb2wgY29uZGkKICAgICBwcmludFRvU3RhbmRhcmRPdXQoRXJyb3JNZXNzYWdl TGV2ZWwsIGV4ZWMsIGFyZ3MsIHVybCk7CiB9CiAKK3ZvaWQgQ29uc29sZTo6Y291bnQoY29uc3Qg VVN0cmluZyYgdGl0bGUpCit7CisgICAgaWYgKCFtX2ZyYW1lKQorICAgICAgICByZXR1cm47Cisg ICAgCisgICAgUGFnZSogcGFnZSA9IG1fZnJhbWUtPnBhZ2UoKTsKKyAgICBpZiAoIXBhZ2UpCisg ICAgICAgIHJldHVybjsKKyAgICAKKyAgICBwYWdlLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPmNv dW50KHRpdGxlLCAwLCBTdHJpbmcoKSk7Cit9CisKIHZvaWQgQ29uc29sZTo6cHJvZmlsZShFeGVj U3RhdGUqIGV4ZWMsIGNvbnN0IEFyZ0xpc3QmIGFyZ3MpCiB7CiAgICAgVVN0cmluZyB0aXRsZSA9 IGFyZ3MuYXQoZXhlYywgMCktPnRvU3RyaW5nKGV4ZWMpOwpJbmRleDogV2ViQ29yZS9wYWdlL0Nv bnNvbGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvQ29uc29sZS5oCShyZXZpc2lvbiAz NTgwMSkKKysrIFdlYkNvcmUvcGFnZS9Db25zb2xlLmgJKHdvcmtpbmcgY29weSkKQEAgLTc5LDYg Kzc5LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHdhcm4oS0pTOjpFeGVj U3RhdGUqLCBjb25zdCBLSlM6OkFyZ0xpc3QmIGFyZ3VtZW50cyk7CiAgICAgICAgIHZvaWQgZGly KEtKUzo6RXhlY1N0YXRlKiwgY29uc3QgS0pTOjpBcmdMaXN0JiBhcmd1bWVudHMpOwogICAgICAg ICB2b2lkIGFzc2VydENvbmRpdGlvbihib29sIGNvbmRpdGlvbiwgS0pTOjpFeGVjU3RhdGUqLCBj b25zdCBLSlM6OkFyZ0xpc3QmIGFyZ3VtZW50cyk7CisgICAgICAgIHZvaWQgY291bnQoY29uc3Qg S0pTOjpVU3RyaW5nJiB0aXRsZSk7CiAgICAgICAgIHZvaWQgcHJvZmlsZShLSlM6OkV4ZWNTdGF0 ZSosIGNvbnN0IEtKUzo6QXJnTGlzdCYgYXJndW1lbnRzKTsKICAgICAgICAgdm9pZCBwcm9maWxl RW5kKEtKUzo6RXhlY1N0YXRlKiwgY29uc3QgS0pTOjpBcmdMaXN0JiBhcmd1bWVudHMpOwogICAg ICAgICB2b2lkIHRpbWUoY29uc3QgS0pTOjpVU3RyaW5nJiB0aXRsZSk7CkluZGV4OiBXZWJDb3Jl L3BhZ2UvQ29uc29sZS5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL0NvbnNvbGUuaWRs CShyZXZpc2lvbiAzNTgwMSkKKysrIFdlYkNvcmUvcGFnZS9Db25zb2xlLmlkbAkod29ya2luZyBj b3B5KQpAQCAtMzYsNiArMzYsNyBAQCBtb2R1bGUgd2luZG93IHsKICAgICAgICAgW0N1c3RvbV0g dm9pZCB3YXJuKCk7CiAgICAgICAgIFtDdXN0b21dIHZvaWQgZGlyKCk7CiAgICAgICAgIFtDdXN0 b20sIEltcGxlbWVudGF0aW9uRnVuY3Rpb249YXNzZXJ0Q29uZGl0aW9uXSB2b2lkIGFzc2VydChp biBib29sZWFuIGNvbmRpdGlvbik7CisgICAgICAgIHZvaWQgY291bnQoaW4gW0NvbnZlcnRVbmRl ZmluZWRPck51bGxUb051bGxTdHJpbmddIERPTVN0cmluZyB0aXRsZSk7CiAKICAgICAgICAgW0N1 c3RvbV0gdm9pZCBwcm9maWxlKGluIERPTVN0cmluZyB0aXRsZSk7CiAgICAgICAgIFtDdXN0b21d IHZvaWQgcHJvZmlsZUVuZCgpOwpJbmRleDogV2ViQ29yZS9wYWdlL0luc3BlY3RvckNvbnRyb2xs ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9JbnNwZWN0b3JDb250cm9sbGVyLmNw cAkocmV2aXNpb24gMzU4MDEpCisrKyBXZWJDb3JlL3BhZ2UvSW5zcGVjdG9yQ29udHJvbGxlci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTIwODUsNiArMjA4NSw3IEBAIHZvaWQgSW5zcGVjdG9yQ29u dHJvbGxlcjo6ZGlkQ29tbWl0TG9hZCgKICAgICAgICAgbV9jb25zb2xlTWVzc2FnZXMuY2xlYXIo KTsKICAgICAgICAgbV9ncm91cExldmVsID0gMDsKIAorICAgICAgICBtX2NvdW50cy5jbGVhcigp OwogICAgICAgICBtX3Byb2ZpbGVzLmNsZWFyKCk7CiAKICNpZiBFTkFCTEUoREFUQUJBU0UpCkBA IC0yNTYyLDYgKzI1NjMsMjMgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkcmF3Tm9kZUhp Z2hsaQogICAgIGRyYXdIaWdobGlnaHRGb3JCb3hlcyhjb250ZXh0LCBsaW5lQm94UmVjdHMsIGNv bnRlbnRCb3gsIHBhZGRpbmdCb3gsIGJvcmRlckJveCwgbWFyZ2luQm94KTsKIH0KIAordm9pZCBJ bnNwZWN0b3JDb250cm9sbGVyOjpjb3VudChjb25zdCBVU3RyaW5nJiB0aXRsZSwgdW5zaWduZWQg bGluZU51bWJlciwgY29uc3QgU3RyaW5nJiBzb3VyY2VJRCkKK3sKKyAgICBTdHJpbmcgaWRlbnRp ZmllciA9IFN0cmluZyh0aXRsZSkgKyBTdHJpbmc6OmZvcm1hdCgiQCVzOiVkIiwgc291cmNlSUQu dXRmOCgpLmRhdGEoKSwgbGluZU51bWJlcik7CisgICAgSGFzaE1hcDxTdHJpbmcsIHVuc2lnbmVk Pjo6aXRlcmF0b3IgaXQgPSBtX2NvdW50cy5maW5kKGlkZW50aWZpZXIpOworICAgIGludCBjb3Vu dDsKKyAgICBpZiAoaXQgPT0gbV9jb3VudHMuZW5kKCkpCisgICAgICAgIGNvdW50ID0gMTsKKyAg ICBlbHNlIHsKKyAgICAgICAgY291bnQgPSBpdC0+c2Vjb25kICsgMTsKKyAgICAgICAgbV9jb3Vu dHMucmVtb3ZlKGlkZW50aWZpZXIpOworICAgIH0KKyAgICBtX2NvdW50cy5hZGQoaWRlbnRpZmll ciwgY291bnQpOworICAgIAorICAgIFN0cmluZyBtZXNzYWdlID0gU3RyaW5nOjpmb3JtYXQoIiVz OiAlZCIsIHRpdGxlLlVURjhTdHJpbmcoKS5jX3N0cigpLCBjb3VudCk7CisgICAgYWRkTWVzc2Fn ZVRvQ29uc29sZShKU01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VMZXZlbCwgbWVzc2FnZSwgbGlu ZU51bWJlciwgc291cmNlSUQpOworfQorCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnN0YXJ0 VGltaW5nKGNvbnN0IFVTdHJpbmcmIHRpdGxlKQogewogICAgIG1fdGltZXMuYWRkKHRpdGxlLCBj dXJyZW50VGltZSgpICogMTAwMCk7CkluZGV4OiBXZWJDb3JlL3BhZ2UvSW5zcGVjdG9yQ29udHJv bGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9JbnNwZWN0b3JDb250cm9sbGVyLmgJ KHJldmlzaW9uIDM1ODAxKQorKysgV2ViQ29yZS9wYWdlL0luc3BlY3RvckNvbnRyb2xsZXIuaAko d29ya2luZyBjb3B5KQpAQCAtMTc3LDYgKzE3Nyw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZHJh d05vZGVIaWdobGlnaHQoR3JhcGhpY3NDb250ZXh0JikgY29uc3Q7CiAgICAgCisgICAgdm9pZCBj b3VudChjb25zdCBLSlM6OlVTdHJpbmcmIHRpdGxlLCB1bnNpZ25lZCBsaW5lTnVtYmVyLCBjb25z dCBTdHJpbmcmIHNvdXJjZUlEKTsKKyAgICAKICAgICB2b2lkIHN0YXJ0VGltaW5nKGNvbnN0IEtK Uzo6VVN0cmluZyYgdGl0bGUpOwogICAgIGJvb2wgc3RvcFRpbWluZyhjb25zdCBLSlM6OlVTdHJp bmcmIHRpdGxlLCBkb3VibGUmIGVsYXBzZWQpOwogCkBAIC0yMzMsNiArMjM1LDcgQEAgcHJpdmF0 ZToKICAgICBWZWN0b3I8Q29uc29sZU1lc3NhZ2UqPiBtX2NvbnNvbGVNZXNzYWdlczsKICAgICBW ZWN0b3I8UmVmUHRyPEtKUzo6UHJvZmlsZT4gPiBtX3Byb2ZpbGVzOwogICAgIEhhc2hNYXA8U3Ry aW5nLCBkb3VibGU+IG1fdGltZXM7CisgICAgSGFzaE1hcDxTdHJpbmcsIHVuc2lnbmVkPiBtX2Nv dW50czsKICNpZiBFTkFCTEUoREFUQUJBU0UpCiAgICAgRGF0YWJhc2VSZXNvdXJjZXNTZXQgbV9k YXRhYmFzZVJlc291cmNlczsKICNlbmRpZgo= 22837 2008-08-16 21:21:31 -0700 2008-08-16 22:01:57 -0700 fixed a minor mistake patch18.txt text/plain 4977 keishi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNTgwNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDgtMDgtMTYgIEtlaXNoaSBIYXR0b3JpICA8Y2FzZXkuaGF0dG9y aUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWRkZWQgc3VwcG9ydCBmb3IgY29uc29sZS5jb3VudCBpbiB0aGUgaW5zcGVjdG9yLgor ICAgICAgICAKKworICAgICAgICAqIHBhZ2UvQ29uc29sZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDb25zb2xlOjpjb3VudCk6CisgICAgICAgICogcGFnZS9Db25zb2xlLmg6CisgICAgICAgICog cGFnZS9Db25zb2xlLmlkbDogQWRkZWQgY29uc29sZS5jb3VudC4KKyAgICAgICAgKiBwYWdlL0lu c3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJv bGxlcjo6ZGlkQ29tbWl0TG9hZCk6IENsZWFycyBtX2NvdW50cy4KKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvckNvbnRyb2xsZXI6OmNvdW50KTogVXBkYXRlcyB0aGUgY291bnQgbnVtYmVyIHVz aW5nICJ0aXRsZUBzb3VyY2U6bGluZSIgYXMgCisgICAgICAgIHRoZSBpZGVudGlmaWVyLCBhbmQg YWRkcyBhIG1lc3NhZ2UgdG8gdGhlIGNvbnNvbGUuCisgICAgICAgICogcGFnZS9JbnNwZWN0b3JD b250cm9sbGVyLmg6IEFkZGVkIG1fY291bnRzLgorCiAyMDA4LTA4LTE1ICBNYXJrIFJvd2UgIDxt cm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KSW5k ZXg6IFdlYkNvcmUvcGFnZS9Db25zb2xlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2Uv Q29uc29sZS5jcHAJKHJldmlzaW9uIDM1ODAxKQorKysgV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yNjcsNiArMjY3LDE4IEBAIHZvaWQgQ29uc29sZTo6YXNzZXJ0 Q29uZGl0aW9uKGJvb2wgY29uZGkKICAgICBwcmludFRvU3RhbmRhcmRPdXQoRXJyb3JNZXNzYWdl TGV2ZWwsIGV4ZWMsIGFyZ3MsIHVybCk7CiB9CiAKK3ZvaWQgQ29uc29sZTo6Y291bnQoY29uc3Qg VVN0cmluZyYgdGl0bGUpCit7CisgICAgaWYgKCFtX2ZyYW1lKQorICAgICAgICByZXR1cm47Cisg ICAgCisgICAgUGFnZSogcGFnZSA9IG1fZnJhbWUtPnBhZ2UoKTsKKyAgICBpZiAoIXBhZ2UpCisg ICAgICAgIHJldHVybjsKKyAgICAKKyAgICBwYWdlLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPmNv dW50KHRpdGxlLCAwLCBTdHJpbmcoKSk7Cit9CisKIHZvaWQgQ29uc29sZTo6cHJvZmlsZShFeGVj U3RhdGUqIGV4ZWMsIGNvbnN0IEFyZ0xpc3QmIGFyZ3MpCiB7CiAgICAgVVN0cmluZyB0aXRsZSA9 IGFyZ3MuYXQoZXhlYywgMCktPnRvU3RyaW5nKGV4ZWMpOwpJbmRleDogV2ViQ29yZS9wYWdlL0Nv bnNvbGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvQ29uc29sZS5oCShyZXZpc2lvbiAz NTgwMSkKKysrIFdlYkNvcmUvcGFnZS9Db25zb2xlLmgJKHdvcmtpbmcgY29weSkKQEAgLTc5LDYg Kzc5LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHdhcm4oS0pTOjpFeGVj U3RhdGUqLCBjb25zdCBLSlM6OkFyZ0xpc3QmIGFyZ3VtZW50cyk7CiAgICAgICAgIHZvaWQgZGly KEtKUzo6RXhlY1N0YXRlKiwgY29uc3QgS0pTOjpBcmdMaXN0JiBhcmd1bWVudHMpOwogICAgICAg ICB2b2lkIGFzc2VydENvbmRpdGlvbihib29sIGNvbmRpdGlvbiwgS0pTOjpFeGVjU3RhdGUqLCBj b25zdCBLSlM6OkFyZ0xpc3QmIGFyZ3VtZW50cyk7CisgICAgICAgIHZvaWQgY291bnQoY29uc3Qg S0pTOjpVU3RyaW5nJiB0aXRsZSk7CiAgICAgICAgIHZvaWQgcHJvZmlsZShLSlM6OkV4ZWNTdGF0 ZSosIGNvbnN0IEtKUzo6QXJnTGlzdCYgYXJndW1lbnRzKTsKICAgICAgICAgdm9pZCBwcm9maWxl RW5kKEtKUzo6RXhlY1N0YXRlKiwgY29uc3QgS0pTOjpBcmdMaXN0JiBhcmd1bWVudHMpOwogICAg ICAgICB2b2lkIHRpbWUoY29uc3QgS0pTOjpVU3RyaW5nJiB0aXRsZSk7CkluZGV4OiBXZWJDb3Jl L3BhZ2UvQ29uc29sZS5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL0NvbnNvbGUuaWRs CShyZXZpc2lvbiAzNTgwMSkKKysrIFdlYkNvcmUvcGFnZS9Db25zb2xlLmlkbAkod29ya2luZyBj b3B5KQpAQCAtMzYsNiArMzYsNyBAQCBtb2R1bGUgd2luZG93IHsKICAgICAgICAgW0N1c3RvbV0g dm9pZCB3YXJuKCk7CiAgICAgICAgIFtDdXN0b21dIHZvaWQgZGlyKCk7CiAgICAgICAgIFtDdXN0 b20sIEltcGxlbWVudGF0aW9uRnVuY3Rpb249YXNzZXJ0Q29uZGl0aW9uXSB2b2lkIGFzc2VydChp biBib29sZWFuIGNvbmRpdGlvbik7CisgICAgICAgIHZvaWQgY291bnQoaW4gW0NvbnZlcnRVbmRl ZmluZWRPck51bGxUb051bGxTdHJpbmddIERPTVN0cmluZyB0aXRsZSk7CiAKICAgICAgICAgW0N1 c3RvbV0gdm9pZCBwcm9maWxlKGluIERPTVN0cmluZyB0aXRsZSk7CiAgICAgICAgIFtDdXN0b21d IHZvaWQgcHJvZmlsZUVuZCgpOwpJbmRleDogV2ViQ29yZS9wYWdlL0luc3BlY3RvckNvbnRyb2xs ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9JbnNwZWN0b3JDb250cm9sbGVyLmNw cAkocmV2aXNpb24gMzU4MDEpCisrKyBXZWJDb3JlL3BhZ2UvSW5zcGVjdG9yQ29udHJvbGxlci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTIwODUsNiArMjA4NSw3IEBAIHZvaWQgSW5zcGVjdG9yQ29u dHJvbGxlcjo6ZGlkQ29tbWl0TG9hZCgKICAgICAgICAgbV9jb25zb2xlTWVzc2FnZXMuY2xlYXIo KTsKICAgICAgICAgbV9ncm91cExldmVsID0gMDsKIAorICAgICAgICBtX2NvdW50cy5jbGVhcigp OwogICAgICAgICBtX3Byb2ZpbGVzLmNsZWFyKCk7CiAKICNpZiBFTkFCTEUoREFUQUJBU0UpCkBA IC0yNTYyLDYgKzI1NjMsMjMgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkcmF3Tm9kZUhp Z2hsaQogICAgIGRyYXdIaWdobGlnaHRGb3JCb3hlcyhjb250ZXh0LCBsaW5lQm94UmVjdHMsIGNv bnRlbnRCb3gsIHBhZGRpbmdCb3gsIGJvcmRlckJveCwgbWFyZ2luQm94KTsKIH0KIAordm9pZCBJ bnNwZWN0b3JDb250cm9sbGVyOjpjb3VudChjb25zdCBVU3RyaW5nJiB0aXRsZSwgdW5zaWduZWQg bGluZU51bWJlciwgY29uc3QgU3RyaW5nJiBzb3VyY2VJRCkKK3sKKyAgICBTdHJpbmcgaWRlbnRp ZmllciA9IFN0cmluZyh0aXRsZSkgKyBTdHJpbmc6OmZvcm1hdCgiQCVzOiVkIiwgc291cmNlSUQu dXRmOCgpLmRhdGEoKSwgbGluZU51bWJlcik7CisgICAgSGFzaE1hcDxTdHJpbmcsIHVuc2lnbmVk Pjo6aXRlcmF0b3IgaXQgPSBtX2NvdW50cy5maW5kKGlkZW50aWZpZXIpOworICAgIGludCBjb3Vu dDsKKyAgICBpZiAoaXQgPT0gbV9jb3VudHMuZW5kKCkpCisgICAgICAgIGNvdW50ID0gMTsKKyAg ICBlbHNlIHsKKyAgICAgICAgY291bnQgPSBpdC0+c2Vjb25kICsgMTsKKyAgICAgICAgbV9jb3Vu dHMucmVtb3ZlKGl0KTsKKyAgICB9CisgICAgbV9jb3VudHMuYWRkKGlkZW50aWZpZXIsIGNvdW50 KTsKKyAgICAKKyAgICBTdHJpbmcgbWVzc2FnZSA9IFN0cmluZzo6Zm9ybWF0KCIlczogJWQiLCB0 aXRsZS5VVEY4U3RyaW5nKCkuY19zdHIoKSwgY291bnQpOworICAgIGFkZE1lc3NhZ2VUb0NvbnNv bGUoSlNNZXNzYWdlU291cmNlLCBMb2dNZXNzYWdlTGV2ZWwsIG1lc3NhZ2UsIGxpbmVOdW1iZXIs IHNvdXJjZUlEKTsKK30KKwogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpzdGFydFRpbWluZyhj b25zdCBVU3RyaW5nJiB0aXRsZSkKIHsKICAgICBtX3RpbWVzLmFkZCh0aXRsZSwgY3VycmVudFRp bWUoKSAqIDEwMDApOwpJbmRleDogV2ViQ29yZS9wYWdlL0luc3BlY3RvckNvbnRyb2xsZXIuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvSW5zcGVjdG9yQ29udHJvbGxlci5oCShyZXZpc2lv biAzNTgwMSkKKysrIFdlYkNvcmUvcGFnZS9JbnNwZWN0b3JDb250cm9sbGVyLmgJKHdvcmtpbmcg Y29weSkKQEAgLTE3Nyw2ICsxNzcsOCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGRyYXdOb2RlSGln aGxpZ2h0KEdyYXBoaWNzQ29udGV4dCYpIGNvbnN0OwogICAgIAorICAgIHZvaWQgY291bnQoY29u c3QgS0pTOjpVU3RyaW5nJiB0aXRsZSwgdW5zaWduZWQgbGluZU51bWJlciwgY29uc3QgU3RyaW5n JiBzb3VyY2VJRCk7CisgICAgCiAgICAgdm9pZCBzdGFydFRpbWluZyhjb25zdCBLSlM6OlVTdHJp bmcmIHRpdGxlKTsKICAgICBib29sIHN0b3BUaW1pbmcoY29uc3QgS0pTOjpVU3RyaW5nJiB0aXRs ZSwgZG91YmxlJiBlbGFwc2VkKTsKIApAQCAtMjMzLDYgKzIzNSw3IEBAIHByaXZhdGU6CiAgICAg VmVjdG9yPENvbnNvbGVNZXNzYWdlKj4gbV9jb25zb2xlTWVzc2FnZXM7CiAgICAgVmVjdG9yPFJl ZlB0cjxLSlM6OlByb2ZpbGU+ID4gbV9wcm9maWxlczsKICAgICBIYXNoTWFwPFN0cmluZywgZG91 YmxlPiBtX3RpbWVzOworICAgIEhhc2hNYXA8U3RyaW5nLCB1bnNpZ25lZD4gbV9jb3VudHM7CiAj aWYgRU5BQkxFKERBVEFCQVNFKQogICAgIERhdGFiYXNlUmVzb3VyY2VzU2V0IG1fZGF0YWJhc2VS ZXNvdXJjZXM7CiAjZW5kaWYK