51753 2010-12-30 08:53:56 -0800 Web Inspector: move delayed search implementation to SourceFrame 2011-01-11 06:09:42 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein eric joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 327933 0 podivilov 2010-12-30 08:53:56 -0800 SourceFrame manages lazy initialization itself, so delayed searches should also be managed by SourceFrame. 327934 1 77682 podivilov 2010-12-30 08:54:55 -0800 Created attachment 77682 Patch. 328147 2 77682 pfeldman 2010-12-31 03:42:21 -0800 Comment on attachment 77682 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=77682&action=review > WebCore/ChangeLog:5 > + Web Inspector: move delayed search implementation to SourceFrame. I think search support should either be implemented in SourceView or SourceFrame. I see no reason for having it split between the two. I'm fine with both: having it implemented in SourceFrame or in SourceView. 328151 3 77682 pfeldman 2010-12-31 04:20:23 -0800 Comment on attachment 77682 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=77682&action=review > WebCore/inspector/front-end/SourceView.js:135 > + function didFindSearchMatches(searchResults) It seems strange that you only need this callback to manage searchResults in SourceView. Consider moving to SourceFrame instead. 332224 4 eric 2011-01-11 03:13:13 -0800 Did this land? 332299 5 podivilov 2011-01-11 06:09:42 -0800 Committed r75497: <http://trac.webkit.org/changeset/75497> 77682 2010-12-30 08:54:55 -0800 2010-12-31 04:20:23 -0800 Patch. patch text/plain 5541 podivilov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZjQ3NGQ0Ni4uNzdhZjYxMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyMyBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1vdmUgZGVsYXllZCBzZWFy Y2ggaW1wbGVtZW50YXRpb24gdG8gU291cmNlRnJhbWUuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTc1MworCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9Tb3VyY2VGcmFtZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFt ZS5wcm90b3R5cGUuX2NyZWF0ZVZpZXdlcklmTmVlZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuZmluZFNlYXJjaE1hdGNoZXMpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5jYW5jZWxGaW5kU2VhcmNoTWF0Y2hlcyk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3LmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNvdXJjZVZpZXcucHJvdG90eXBlLmhpZGUpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNvdXJjZVZpZXcucHJvdG90eXBlLnNlYXJjaENhbmNlbGVkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZS5wZXJmb3JtU2VhcmNoLmRpZEZpbmRTZWFy Y2hNYXRjaGVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZS5w ZXJmb3JtU2VhcmNoKToKKworMjAxMC0xMi0zMCAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92 QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwog ICAgICAgICBXZWIgSW5zcGVjdG9yOiByZWNyZWF0ZSBzY3JpcHQgdmlldyBhZnRlciBsaXZlIGVk aXQuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTc1 MQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUu anMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKaW5kZXggMzE1 YjJmOS4uMDJmYTQxMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nv dXJjZUZyYW1lLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFt ZS5qcwpAQCAtMjE3LDYgKzIxNywxMSBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90 eXBlID0gewogICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2xpbmVUb0hpZ2hsaWdodDsKICAgICAg ICAgfQogCisgICAgICAgIGlmICh0aGlzLl9kZWxheWVkRmluZFNlYXJjaE1hdGNoZXMpIHsKKyAg ICAgICAgICAgIHRoaXMuX2RlbGF5ZWRGaW5kU2VhcmNoTWF0Y2hlcygpOworICAgICAgICAgICAg ZGVsZXRlIHRoaXMuX2RlbGF5ZWRGaW5kU2VhcmNoTWF0Y2hlczsKKyAgICAgICAgfQorCiAgICAg ICAgIHZhciBicmVha3BvaW50cyA9IHRoaXMuX2JyZWFrcG9pbnRzKCk7CiAgICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgYnJlYWtwb2ludHMubGVuZ3RoOyArK2kpCiAgICAgICAgICAgICB0aGlz Ll9hZGRCcmVha3BvaW50KGJyZWFrcG9pbnRzW2ldKTsKQEAgLTIyOCwyMiArMjMzLDM1IEBAIFdl Ykluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl90 ZXh0Vmlld2VyLmVkaXRDYWxsYmFjayA9IHRoaXMuX2VkaXRMaW5lLmJpbmQodGhpcyk7CiAgICAg fSwKIAotICAgIGZpbmRTZWFyY2hNYXRjaGVzOiBmdW5jdGlvbihxdWVyeSkKKyAgICBmaW5kU2Vh cmNoTWF0Y2hlczogZnVuY3Rpb24ocXVlcnksIGZpbmlzaGVkQ2FsbGJhY2spCiAgICAgewotICAg ICAgICB2YXIgcmFuZ2VzID0gW107CisgICAgICAgIGZ1bmN0aW9uIGRvRmluZFNlYXJjaE1hdGNo ZXMoKQorICAgICAgICB7CisgICAgICAgICAgICB2YXIgcmFuZ2VzID0gW107CisKKyAgICAgICAg ICAgIC8vIEZpcnN0IGRvIGNhc2UtaW5zZW5zaXRpdmUgc2VhcmNoLgorICAgICAgICAgICAgdmFy IHJlZ2V4T2JqZWN0ID0gY3JlYXRlU2VhcmNoUmVnZXgocXVlcnkpOworICAgICAgICAgICAgdGhp cy5fY29sbGVjdFJlZ2V4TWF0Y2hlcyhyZWdleE9iamVjdCwgcmFuZ2VzKTsKKworICAgICAgICAg ICAgLy8gVGhlbiB0cnkgcmVnZXggc2VhcmNoIGlmIHVzZXIga25vd3MgdGhlIC8gLyBoaW50Lgor ICAgICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgICAgICBpZiAoL15cLy4qXC8kLy50ZXN0KHF1 ZXJ5KSkKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5fY29sbGVjdFJlZ2V4TWF0Y2hlcyhuZXcg UmVnRXhwKHF1ZXJ5LnN1YnN0cmluZygxLCBxdWVyeS5sZW5ndGggLSAxKSksIHJhbmdlcyk7Cisg ICAgICAgICAgICB9IGNhdGNoIChlKSB7CisgICAgICAgICAgICAgICAgLy8gU2lsZW50IGNhdGNo LgorICAgICAgICAgICAgfQorICAgICAgICAgICAgZmluaXNoZWRDYWxsYmFjayhyYW5nZXMpOwor ICAgICAgICB9CiAKLSAgICAgICAgLy8gRmlyc3QgZG8gY2FzZS1pbnNlbnNpdGl2ZSBzZWFyY2gu Ci0gICAgICAgIHZhciByZWdleE9iamVjdCA9IGNyZWF0ZVNlYXJjaFJlZ2V4KHF1ZXJ5KTsKLSAg ICAgICAgdGhpcy5fY29sbGVjdFJlZ2V4TWF0Y2hlcyhyZWdleE9iamVjdCwgcmFuZ2VzKTsKKyAg ICAgICAgaWYgKHRoaXMuX3RleHRWaWV3ZXIpCisgICAgICAgICAgICBkb0ZpbmRTZWFyY2hNYXRj aGVzLmNhbGwodGhpcyk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRoaXMuX2RlbGF5ZWRG aW5kU2VhcmNoTWF0Y2hlcyA9IGRvRmluZFNlYXJjaE1hdGNoZXMuYmluZCh0aGlzKTsKKyAgICB9 LAogCi0gICAgICAgIC8vIFRoZW4gdHJ5IHJlZ2V4IHNlYXJjaCBpZiB1c2VyIGtub3dzIHRoZSAv IC8gaGludC4KLSAgICAgICAgdHJ5IHsKLSAgICAgICAgICAgIGlmICgvXlwvLipcLyQvLnRlc3Qo cXVlcnkpKQotICAgICAgICAgICAgICAgIHRoaXMuX2NvbGxlY3RSZWdleE1hdGNoZXMobmV3IFJl Z0V4cChxdWVyeS5zdWJzdHJpbmcoMSwgcXVlcnkubGVuZ3RoIC0gMSkpLCByYW5nZXMpOwotICAg ICAgICB9IGNhdGNoIChlKSB7Ci0gICAgICAgICAgICAvLyBTaWxlbnQgY2F0Y2guCi0gICAgICAg IH0KLSAgICAgICAgcmV0dXJuIHJhbmdlczsKKyAgICBjYW5jZWxGaW5kU2VhcmNoTWF0Y2hlczog ZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgZGVsZXRlIHRoaXMuX2RlbGF5ZWRGaW5kU2VhcmNo TWF0Y2hlczsKICAgICB9LAogCiAgICAgX2NvbGxlY3RSZWdleE1hdGNoZXM6IGZ1bmN0aW9uKHJl Z2V4T2JqZWN0LCByYW5nZXMpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU291cmNlVmlldy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3 LmpzCmluZGV4IDdhOTdkYjIuLjFlNGVmNWQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Tb3VyY2VWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Tb3VyY2VWaWV3LmpzCkBAIC01OSw4ICs1OSw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3 LnByb3RvdHlwZSA9IHsKICAgICBoaWRlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlz LnNvdXJjZUZyYW1lLnZpc2libGUgPSBmYWxzZTsKLSAgICAgICAgaWYgKCF0aGlzLl9mcmFtZU5l ZWRzU2V0dXApCi0gICAgICAgICAgICB0aGlzLnNvdXJjZUZyYW1lLmNsZWFyTGluZUhpZ2hsaWdo dCgpOworICAgICAgICB0aGlzLnNvdXJjZUZyYW1lLmNsZWFyTGluZUhpZ2hsaWdodCgpOwogICAg ICAgICBXZWJJbnNwZWN0b3IuVmlldy5wcm90b3R5cGUuaGlkZS5jYWxsKHRoaXMpOwogICAgICAg ICB0aGlzLl9jdXJyZW50U2VhcmNoUmVzdWx0SW5kZXggPSAtMTsKICAgICB9LApAQCAtMTI1LDcg KzEyNCw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAg dGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4ID0gLTE7CiAgICAgICAgIHRoaXMuX3NlYXJj aFJlc3VsdHMgPSBbXTsKICAgICAgICAgdGhpcy5zb3VyY2VGcmFtZS5jbGVhck1hcmtlZFJhbmdl KCk7Ci0gICAgICAgIGRlbGV0ZSB0aGlzLl9kZWxheWVkRmluZFNlYXJjaE1hdGNoZXM7CisgICAg ICAgIHRoaXMuc291cmNlRnJhbWUuY2FuY2VsRmluZFNlYXJjaE1hdGNoZXMoKTsKICAgICB9LAog CiAgICAgcGVyZm9ybVNlYXJjaDogZnVuY3Rpb24ocXVlcnksIGZpbmlzaGVkQ2FsbGJhY2spCkBA IC0xMzMsMjMgKzEzMiwxNCBAQCBXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUgPSB7 CiAgICAgICAgIC8vIENhbGwgc2VhcmNoQ2FuY2VsZWQgc2luY2UgaXQgd2lsbCByZXNldCBldmVy eXRoaW5nIHdlIG5lZWQgYmVmb3JlIGRvaW5nIGEgbmV3IHNlYXJjaC4KICAgICAgICAgdGhpcy5z ZWFyY2hDYW5jZWxlZCgpOwogCi0gICAgICAgIHRoaXMuX3NlYXJjaEZpbmlzaGVkQ2FsbGJhY2sg PSBmaW5pc2hlZENhbGxiYWNrOwotCi0gICAgICAgIGZ1bmN0aW9uIGZpbmRTZWFyY2hNYXRjaGVz KHF1ZXJ5LCBmaW5pc2hlZENhbGxiYWNrKQorICAgICAgICBmdW5jdGlvbiBkaWRGaW5kU2VhcmNo TWF0Y2hlcyhzZWFyY2hSZXN1bHRzKQogICAgICAgICB7Ci0gICAgICAgICAgICB0aGlzLl9zZWFy Y2hSZXN1bHRzID0gdGhpcy5zb3VyY2VGcmFtZS5maW5kU2VhcmNoTWF0Y2hlcyhxdWVyeSk7Cisg ICAgICAgICAgICB0aGlzLl9zZWFyY2hSZXN1bHRzID0gc2VhcmNoUmVzdWx0czsKICAgICAgICAg ICAgIGlmICh0aGlzLl9zZWFyY2hSZXN1bHRzKQogICAgICAgICAgICAgICAgIGZpbmlzaGVkQ2Fs bGJhY2sodGhpcywgdGhpcy5fc2VhcmNoUmVzdWx0cy5sZW5ndGgpOwogICAgICAgICB9CiAKLSAg ICAgICAgaWYgKCF0aGlzLl9zb3VyY2VGcmFtZVNldHVwKSB7Ci0gICAgICAgICAgICAvLyBUaGUg c2VhcmNoIGlzIHBlcmZvcm1lZCBpbiBfc291cmNlRnJhbWVTZXR1cEZpbmlzaGVkIGJ5IGNhbGxp bmcgX2RlbGF5ZWRGaW5kU2VhcmNoTWF0Y2hlcy4KLSAgICAgICAgICAgIHRoaXMuX2RlbGF5ZWRG aW5kU2VhcmNoTWF0Y2hlcyA9IGZpbmRTZWFyY2hNYXRjaGVzLmJpbmQodGhpcywgcXVlcnksIGZp bmlzaGVkQ2FsbGJhY2spOwotICAgICAgICAgICAgdGhpcy5zZXR1cFNvdXJjZUZyYW1lSWZOZWVk ZWQoKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAgICAgIGZpbmRTZWFy Y2hNYXRjaGVzLmNhbGwodGhpcywgcXVlcnksIGZpbmlzaGVkQ2FsbGJhY2spOworICAgICAgICB0 aGlzLnNvdXJjZUZyYW1lLmZpbmRTZWFyY2hNYXRjaGVzKHF1ZXJ5LCBkaWRGaW5kU2VhcmNoTWF0 Y2hlcy5iaW5kKHRoaXMpKTsKICAgICB9LAogCiAgICAganVtcFRvRmlyc3RTZWFyY2hSZXN1bHQ6 IGZ1bmN0aW9uKCkK