66048 2011-08-11 06:16:55 -0700 Web Inspector: Scripts panel: display the current search match index in the toolbar. 2011-08-11 07:59:35 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 61119 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 449723 0 vsevik 2011-08-11 06:16:55 -0700 Scripts panel: display the current search match index in the toolbar. 449727 1 103610 vsevik 2011-08-11 06:21:10 -0700 Created attachment 103610 Patch 449757 2 103610 pfeldman 2011-08-11 07:31:20 -0700 Comment on attachment 103610 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103610&action=review > Source/WebCore/inspector/front-end/SearchController.js:161 > + var matchesString = WebInspector.UIString("%d / %d matches", currentMatchIndex, matches); "1 of 8" ? 449773 3 vsevik 2011-08-11 07:59:35 -0700 Committed r92849: <http://trac.webkit.org/changeset/92849> 103610 2011-08-11 06:21:10 -0700 2011-08-11 07:31:20 -0700 Patch bug-66048-20110811172107.patch text/plain 7675 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTI4MzQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjZjhmODAxYzYzMTRhZTYw MzRlOTMxNmE2MTVlMmQ4YWFhNzQxYzYxLi4wNTYyODVlN2Y4YzhjMzU2NDVhNjAxMzlkZTZkNzdj M2M1ZTAxYTAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMDgtMTEgIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogU2NyaXB0cyBwYW5lbDogZGlzcGxheSB0aGUgY3VycmVudCBzZWFyY2ggbWF0Y2ggaW5kZXgg aW4gdGhlIHRvb2xiYXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD02NjA0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNjcmlwdHNQYW5lbC5wcm90b3R5cGUucGVyZm9ybVNlYXJjaC5maW5pc2hlZENhbGxiYWNrKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLnBlcmZvcm1TZWFy Y2gpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuanVtcFRv TmV4dFNlYXJjaFJlc3VsdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnBy b3RvdHlwZS5qdW1wVG9QcmV2aW91c1NlYXJjaFJlc3VsdCk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9TZWFyY2hDb250cm9sbGVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNl YXJjaENvbnRyb2xsZXIucHJvdG90eXBlLnVwZGF0ZVNlYXJjaE1hdGNoZXNDb3VudCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU2VhcmNoQ29udHJvbGxlci5wcm90b3R5cGUudXBkYXRlQ3VycmVu dE1hdGNoSW5kZXgpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNlYXJjaENvbnRyb2xsZXIucHJv dG90eXBlLmFjdGl2ZVBhbmVsQ2hhbmdlZC5wZXJmb3JtUGFuZWxTZWFyY2gpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNlYXJjaENvbnRyb2xsZXIucHJvdG90eXBlLmFjdGl2ZVBhbmVsQ2hhbmdl ZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VhcmNoQ29udHJvbGxlci5wcm90b3R5cGUuX3Vw ZGF0ZVNlYXJjaE1hdGNoZXNDb3VudEFuZEN1cnJlbnRNYXRjaEluZGV4KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TZWFyY2hDb250cm9sbGVyLnByb3RvdHlwZS5fcGVyZm9ybVNlYXJjaCk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuZ2V0IGN1cnJlbnRTZWFyY2hSZXN1bHRJ bmRleCk6CisKIDIwMTEtMDgtMTEgIEFuZHJhcyBCZWNzaSAgPGFiZWNzaUB3ZWJraXQub3JnPgog CiAgICAgICAgIFtHVEtdIEZpeCB0aGUgYnVpbGQgYWZ0ZXIgcjkyNzkyLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNl L1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGI1MDc2OTNh NjAyYmY0MWIzN2QwNTViM2Y0MmEwNmMyNGFkNjJlOTMuLjM2NGZkNDEwZjdhNDMwN2IwMDQ1NDc3 ZTA0OWU0YjRjODk0NGY4MDMgMTAwNjQ0CkdJVCBiaW5hcnkgcGF0Y2gKZGVsdGEgNzcKemNtYlJB cDg0NGE8Xy1SdyU9ISFwbFJZQHFDJS0/I0g5NFF0Wm5IbjwzbSNSVkFjRytnPVExUVJsclNWU1dI MlooClghfiolWUsmJTlvMGNyQ1F2KXBWZjdYSl9jWVhLOG8KCmRlbHRhIDE5CmJjbWFGJWZxQnc8 PF8tUnduLTZsbjtNdlNBOXttc2lWODk2SQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggYmUwYWViZDE0ZTNlYmYyMDQ0ODU1 YzI5YWI1YzM1ZDAxYTljN2RlYy4uZjFkOTc1MjJhNDJjMGI5ODA1NmY0Njk3YTVmOWEzZjBhOWU1 Yzg5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3Jp cHRzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3Jp cHRzUGFuZWwuanMKQEAgLTEwNDksNiArMTA0OSw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwucHJvdG90eXBlID0gewogCiAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2VhcmNoQ29udHJv bGxlci51cGRhdGVTZWFyY2hNYXRjaGVzQ291bnQoc2VhcmNoTWF0Y2hlcywgdGhpcyk7CiAgICAg ICAgICAgICB2aWV3Lmp1bXBUb0ZpcnN0U2VhcmNoUmVzdWx0KCk7CisgICAgICAgICAgICBXZWJJ bnNwZWN0b3Iuc2VhcmNoQ29udHJvbGxlci51cGRhdGVDdXJyZW50TWF0Y2hJbmRleCh2aWV3LmN1 cnJlbnRTZWFyY2hSZXN1bHRJbmRleCArIDEsIHRoaXMpOwogICAgICAgICB9CiAKICAgICAgICAg dGhpcy5fc2VhcmNoVmlldy5wZXJmb3JtU2VhcmNoKHF1ZXJ5LCBmaW5pc2hlZENhbGxiYWNrLmJp bmQodGhpcykpOwpAQCAtMTA2OCw2ICsxMDY5LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5l bC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9zZWFyY2hWaWV3Lmp1bXBUb0ZpcnN0 U2VhcmNoUmVzdWx0KCk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHRoaXMuX3NlYXJjaFZp ZXcuanVtcFRvTmV4dFNlYXJjaFJlc3VsdCgpOworICAgICAgICBXZWJJbnNwZWN0b3Iuc2VhcmNo Q29udHJvbGxlci51cGRhdGVDdXJyZW50TWF0Y2hJbmRleCh0aGlzLl9zZWFyY2hWaWV3LmN1cnJl bnRTZWFyY2hSZXN1bHRJbmRleCArIDEsIHRoaXMpOwogICAgIH0sCiAKICAgICBqdW1wVG9QcmV2 aW91c1NlYXJjaFJlc3VsdDogZnVuY3Rpb24oKQpAQCAtMTA4Niw2ICsxMDg4LDcgQEAgV2ViSW5z cGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9zZWFy Y2hWaWV3Lmp1bXBUb0xhc3RTZWFyY2hSZXN1bHQoKTsKICAgICAgICAgZWxzZQogICAgICAgICAg ICAgdGhpcy5fc2VhcmNoVmlldy5qdW1wVG9QcmV2aW91c1NlYXJjaFJlc3VsdCgpOworICAgICAg ICBXZWJJbnNwZWN0b3Iuc2VhcmNoQ29udHJvbGxlci51cGRhdGVDdXJyZW50TWF0Y2hJbmRleCh0 aGlzLl9zZWFyY2hWaWV3LmN1cnJlbnRTZWFyY2hSZXN1bHRJbmRleCArIDEsIHRoaXMpOwogICAg IH0sCiAKICAgICBfdG9nZ2xlRm9ybWF0U291cmNlRmlsZXM6IGZ1bmN0aW9uKCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2VhcmNoQ29udHJvbGxlci5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2VhcmNoQ29udHJvbGxlci5q cwppbmRleCBkMGY5Y2I0YTIwN2E4NDViODNlYTk2ZDRhOTQyOTJhNmMwNmI4ZGFhLi5hYzQ2N2I3 NTA2NmU3NmE1ZDYxMjdmMWM2ZjE1Njc4ZWZjNmI5NTAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NlYXJjaENvbnRyb2xsZXIuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZWFyY2hDb250cm9sbGVyLmpzCkBAIC00OSw3 ICs0OSwxMyBAQCBXZWJJbnNwZWN0b3IuU2VhcmNoQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHBhbmVsLmN1cnJlbnRTZWFyY2hNYXRjaGVzID0gbWF0Y2hlczsKIAogICAgICAgICBp ZiAocGFuZWwgPT09IFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwpCi0gICAgICAgICAgICB0aGlz Ll91cGRhdGVTZWFyY2hNYXRjaGVzQ291bnQoV2ViSW5zcGVjdG9yLmN1cnJlbnRQYW5lbC5jdXJy ZW50UXVlcnkgJiYgbWF0Y2hlcyk7CisgICAgICAgICAgICB0aGlzLl91cGRhdGVTZWFyY2hNYXRj aGVzQ291bnRBbmRDdXJyZW50TWF0Y2hJbmRleChXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsLmN1 cnJlbnRRdWVyeSAmJiBtYXRjaGVzKTsKKyAgICB9LAorCisgICAgdXBkYXRlQ3VycmVudE1hdGNo SW5kZXg6IGZ1bmN0aW9uKGN1cnJlbnRNYXRjaEluZGV4LCBwYW5lbCkKKyAgICB7CisgICAgICAg IGlmIChwYW5lbCA9PT0gV2ViSW5zcGVjdG9yLmN1cnJlbnRQYW5lbCkKKyAgICAgICAgICAgIHRo aXMuX3VwZGF0ZVNlYXJjaE1hdGNoZXNDb3VudEFuZEN1cnJlbnRNYXRjaEluZGV4KHBhbmVsLmN1 cnJlbnRTZWFyY2hNYXRjaGVzLCBjdXJyZW50TWF0Y2hJbmRleCk7CiAgICAgfSwKIAogICAgIHVw ZGF0ZVNlYXJjaExhYmVsOiBmdW5jdGlvbigpCkBAIC0xMjMsNyArMTI5LDcgQEAgV2ViSW5zcGVj dG9yLlNlYXJjaENvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgICAgICBpZiAocGFuZWwucGVy Zm9ybVNlYXJjaCkgewogICAgICAgICAgICAgZnVuY3Rpb24gcGVyZm9ybVBhbmVsU2VhcmNoKCkK ICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICB0aGlzLl91cGRhdGVTZWFyY2hNYXRjaGVz Q291bnQoKTsKKyAgICAgICAgICAgICAgICB0aGlzLl91cGRhdGVTZWFyY2hNYXRjaGVzQ291bnRB bmRDdXJyZW50TWF0Y2hJbmRleCgpOwogCiAgICAgICAgICAgICAgICAgcGFuZWwuY3VycmVudFF1 ZXJ5ID0gdGhpcy5fY3VycmVudFF1ZXJ5OwogICAgICAgICAgICAgICAgIHBhbmVsLnBlcmZvcm1T ZWFyY2godGhpcy5fY3VycmVudFF1ZXJ5KTsKQEAgLTEzMywxMSArMTM5LDExIEBAIFdlYkluc3Bl Y3Rvci5TZWFyY2hDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHNldFRpbWVv dXQocGVyZm9ybVBhbmVsU2VhcmNoLmJpbmQodGhpcyksIDApOwogICAgICAgICB9IGVsc2Ugewog ICAgICAgICAgICAgLy8gVXBkYXRlIHRvIHNob3cgTm90IGZvdW5kIGZvciBwYW5lbHMgdGhhdCBj YW4ndCBiZSBzZWFyY2hlZC4KLSAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNlYXJjaE1hdGNoZXND b3VudCgpOworICAgICAgICAgICAgdGhpcy5fdXBkYXRlU2VhcmNoTWF0Y2hlc0NvdW50QW5kQ3Vy cmVudE1hdGNoSW5kZXgoKTsKICAgICAgICAgfQogICAgIH0sCiAKLSAgICBfdXBkYXRlU2VhcmNo TWF0Y2hlc0NvdW50OiBmdW5jdGlvbihtYXRjaGVzKQorICAgIF91cGRhdGVTZWFyY2hNYXRjaGVz Q291bnRBbmRDdXJyZW50TWF0Y2hJbmRleDogZnVuY3Rpb24obWF0Y2hlcywgY3VycmVudE1hdGNo SW5kZXgpCiAgICAgewogICAgICAgICBpZiAobWF0Y2hlcyA9PSBudWxsKSB7CiAgICAgICAgICAg ICB0aGlzLl9tYXRjaGVzRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKQEAgLTE0NSwx MCArMTUxLDE3IEBAIFdlYkluc3BlY3Rvci5TZWFyY2hDb250cm9sbGVyLnByb3RvdHlwZSA9IHsK ICAgICAgICAgfQogCiAgICAgICAgIGlmIChtYXRjaGVzKSB7Ci0gICAgICAgICAgICBpZiAobWF0 Y2hlcyA9PT0gMSkKLSAgICAgICAgICAgICAgICB2YXIgbWF0Y2hlc1N0cmluZyA9IFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiMSBtYXRjaCIpOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAg ICAgIHZhciBtYXRjaGVzU3RyaW5nID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIlZCBtYXRjaGVz IiwgbWF0Y2hlcyk7CisgICAgICAgICAgICBpZiAobWF0Y2hlcyA9PT0gMSkgeworICAgICAgICAg ICAgICAgIGlmIChjdXJyZW50TWF0Y2hJbmRleCA9PT0gMSkKKyAgICAgICAgICAgICAgICAgICAg dmFyIG1hdGNoZXNTdHJpbmcgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIjEgLyAxIG1hdGNoIik7 CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICB2YXIgbWF0Y2hlc1N0 cmluZyA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiMSBtYXRjaCIpOworICAgICAgICAgICAgfSBl bHNlIHsKKyAgICAgICAgICAgICAgICBpZiAoY3VycmVudE1hdGNoSW5kZXgpCisgICAgICAgICAg ICAgICAgICAgIHZhciBtYXRjaGVzU3RyaW5nID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIlZCAv ICVkIG1hdGNoZXMiLCBjdXJyZW50TWF0Y2hJbmRleCwgbWF0Y2hlcyk7CisgICAgICAgICAgICAg ICAgZWxzZQorICAgICAgICAgICAgICAgICAgICB2YXIgbWF0Y2hlc1N0cmluZyA9IFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiJWQgbWF0Y2hlcyIsIG1hdGNoZXMpOworICAgICAgICAgICAgfQogICAg ICAgICB9IGVsc2UKICAgICAgICAgICAgIHZhciBtYXRjaGVzU3RyaW5nID0gV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJOb3QgRm91bmQiKTsKIApAQCAtMjM4LDcgKzI1MSw3IEBAIFdlYkluc3BlY3Rv ci5TZWFyY2hDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICAgICAgcGFu ZWwuc2VhcmNoQ2FuY2VsZWQoKTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgdGhpcy5f dXBkYXRlU2VhcmNoTWF0Y2hlc0NvdW50KCk7CisgICAgICAgICAgICB0aGlzLl91cGRhdGVTZWFy Y2hNYXRjaGVzQ291bnRBbmRDdXJyZW50TWF0Y2hJbmRleCgpOwogCiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIH0KQEAgLTI1OCw3ICsyNzEsNyBAQCBXZWJJbnNwZWN0b3IuU2VhcmNoQ29u dHJvbGxlci5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdGhpcy5fY3VycmVudFF1ZXJ5ID0gcXVl cnk7CiAKLSAgICAgICAgdGhpcy5fdXBkYXRlU2VhcmNoTWF0Y2hlc0NvdW50KCk7CisgICAgICAg IHRoaXMuX3VwZGF0ZVNlYXJjaE1hdGNoZXNDb3VudEFuZEN1cnJlbnRNYXRjaEluZGV4KCk7CiAK ICAgICAgICAgaWYgKCFjdXJyZW50UGFuZWwucGVyZm9ybVNlYXJjaCkKICAgICAgICAgICAgIHJl dHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291 cmNlRnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZy YW1lLmpzCmluZGV4IDM0MGJjNzY3ZGRiOGE1NDM5Njg4Y2YxMjg4NmYwNTMzZmJiZTAxMWEuLjdk MjI2YTE1NmYyOTE2NmY2NTEzYzg2N2JhNjI4MWRjYzUzNjgzZjEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwpAQCAtNDIwLDYgKzQy MCwxMSBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICBy ZXR1cm4gdGhpcy5fc2VhcmNoUmVzdWx0cy5sZW5ndGggJiYgdGhpcy5fY3VycmVudFNlYXJjaFJl c3VsdEluZGV4ID09PSAodGhpcy5fc2VhcmNoUmVzdWx0cy5sZW5ndGggLSAxKTsKICAgICB9LAog CisgICAgZ2V0IGN1cnJlbnRTZWFyY2hSZXN1bHRJbmRleCgpCisgICAgeworICAgICAgICByZXR1 cm4gdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4OworICAgIH0sCisKICAgICBqdW1wVG9T ZWFyY2hSZXN1bHQ6IGZ1bmN0aW9uKGluZGV4KQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLmxv YWRlZCB8fCAhdGhpcy5fc2VhcmNoUmVzdWx0cy5sZW5ndGgpCg==