44516 2010-08-24 05:21:39 -0700 Web Inspector: search in Scripts panel brings ui back to original search view. 2010-08-25 03:06:57 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 loislo pfeldman bweinstein joepeck keishi pfeldman pmuellr rik timothy yurys oldest_to_newest 268489 0 loislo 2010-08-24 05:21:39 -0700 1) open a site with two or more js files 2) try to search a string which exists in both files 3) open the other file 4) continue to search the same text cmd-g expected: the first matched entry in the second file was selected actual: the first file was automatically opened and the next matched string was selected 268685 1 65301 pfeldman 2010-08-24 11:42:37 -0700 Created attachment 65301 [PATCH] Proposed fix. Instead of using scary Panel's logic, we now have simple local search implementation for scripts panel. 269128 2 65301 pfeldman 2010-08-25 03:06:48 -0700 Comment on attachment 65301 [PATCH] Proposed fix. Clearing flags on attachment: 65301 Committed r66002: <http://trac.webkit.org/changeset/66002> 269129 3 pfeldman 2010-08-25 03:06:57 -0700 All reviewed patches have been landed. Closing bug. 65301 2010-08-24 11:42:37 -0700 2010-08-25 03:06:48 -0700 [PATCH] Proposed fix. scripts_search text/plain 6676 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YjYxYmM4Zi4uZTIzY2JhNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wOC0yNCAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBzZWFyY2ggaW4gU2NyaXB0cyBwYW5l bCBicmluZ3MgdWkgYmFjayB0byBvcmlnaW5hbCBzZWFyY2ggdmlldy4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0NTE2CisKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBhbmVsLnBy b3RvdHlwZS5zZWFyY2hDYW5jZWxlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUGFuZWwucHJv dG90eXBlLmp1bXBUb05leHRTZWFyY2hSZXN1bHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBh bmVsLnByb3RvdHlwZS5qdW1wVG9QcmV2aW91c1NlYXJjaFJlc3VsdCk6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qczoKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuc2Vh cmNoQ2FuY2VsZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5 cGUucGVyZm9ybVNlYXJjaC5maW5pc2hlZENhbGxiYWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLnBlcmZvcm1TZWFyY2gpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuanVtcFRvTmV4dFNlYXJjaFJlc3VsdCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5qdW1wVG9QcmV2aW91 c1NlYXJjaFJlc3VsdCk6CisKIDIwMTAtMDgtMjMgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFu ZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFhhbiBMb3Blei4KZGlmZiAtLWdp dCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9QYW5lbC5qcwppbmRleCAyZmEwZDM0Li44Y2JkZWJiIDEwMDY0NAotLS0g YS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzCkBAIC0xMTYsNyArMTE2LDcgQEAgV2ViSW5zcGVjdG9y LlBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJtYWluLXBhbmVscyIpLmFwcGVuZENoaWxkKHRoaXMuZWxlbWVudCk7CiAgICAgfSwKIAotICAg IHNlYXJjaENhbmNlbGVkOiBmdW5jdGlvbihzdGFydGluZ05ld1NlYXJjaCkKKyAgICBzZWFyY2hD YW5jZWxlZDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX3NlYXJjaFJlc3Vs dHMpIHsKICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fc2VhcmNoUmVzdWx0 cy5sZW5ndGg7ICsraSkgewpAQCAtMjM4LDExICsyMzgsOSBAQCBXZWJJbnNwZWN0b3IuUGFuZWwu cHJvdG90eXBlID0gewogICAgICAgICB2YXIgY3VycmVudFZpZXcgPSB0aGlzLl9zZWFyY2hSZXN1 bHRzW3RoaXMuX2N1cnJlbnRTZWFyY2hSZXN1bHRJbmRleF07CiAKICAgICAgICAgaWYgKGN1cnJl bnRWaWV3LnNob3dpbmdMYXN0U2VhcmNoUmVzdWx0KCkpIHsKLSAgICAgICAgICAgIGlmICh0aGlz LnNlYXJjaEl0ZXJhdGVzT3ZlclZpZXdzKCkpIHsKLSAgICAgICAgICAgICAgICBpZiAoKyt0aGlz Ll9jdXJyZW50U2VhcmNoUmVzdWx0SW5kZXggPj0gdGhpcy5fc2VhcmNoUmVzdWx0cy5sZW5ndGgp Ci0gICAgICAgICAgICAgICAgICAgIHRoaXMuX2N1cnJlbnRTZWFyY2hSZXN1bHRJbmRleCA9IDA7 Ci0gICAgICAgICAgICAgICAgY3VycmVudFZpZXcgPSB0aGlzLl9zZWFyY2hSZXN1bHRzW3RoaXMu X2N1cnJlbnRTZWFyY2hSZXN1bHRJbmRleF07Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBp ZiAoKyt0aGlzLl9jdXJyZW50U2VhcmNoUmVzdWx0SW5kZXggPj0gdGhpcy5fc2VhcmNoUmVzdWx0 cy5sZW5ndGgpCisgICAgICAgICAgICAgICAgdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4 ID0gMDsKKyAgICAgICAgICAgIGN1cnJlbnRWaWV3ID0gdGhpcy5fc2VhcmNoUmVzdWx0c1t0aGlz Ll9jdXJyZW50U2VhcmNoUmVzdWx0SW5kZXhdOwogICAgICAgICAgICAgc2hvd0ZpcnN0UmVzdWx0 ID0gdHJ1ZTsKICAgICAgICAgfQogCkBAIC0yNzMsMTEgKzI3MSw5IEBAIFdlYkluc3BlY3Rvci5Q YW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBjdXJyZW50VmlldyA9IHRoaXMuX3NlYXJj aFJlc3VsdHNbdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4XTsKIAogICAgICAgICBpZiAo Y3VycmVudFZpZXcuc2hvd2luZ0ZpcnN0U2VhcmNoUmVzdWx0KCkpIHsKLSAgICAgICAgICAgIGlm ICh0aGlzLnNlYXJjaEl0ZXJhdGVzT3ZlclZpZXdzKCkpIHsKLSAgICAgICAgICAgICAgICBpZiAo LS10aGlzLl9jdXJyZW50U2VhcmNoUmVzdWx0SW5kZXggPCAwKQotICAgICAgICAgICAgICAgICAg ICB0aGlzLl9jdXJyZW50U2VhcmNoUmVzdWx0SW5kZXggPSAodGhpcy5fc2VhcmNoUmVzdWx0cy5s ZW5ndGggLSAxKTsKLSAgICAgICAgICAgICAgICBjdXJyZW50VmlldyA9IHRoaXMuX3NlYXJjaFJl c3VsdHNbdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4XTsKLSAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIGlmICgtLXRoaXMuX2N1cnJlbnRTZWFyY2hSZXN1bHRJbmRleCA8IDApCisgICAg ICAgICAgICAgICAgdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4ID0gKHRoaXMuX3NlYXJj aFJlc3VsdHMubGVuZ3RoIC0gMSk7CisgICAgICAgICAgICBjdXJyZW50VmlldyA9IHRoaXMuX3Nl YXJjaFJlc3VsdHNbdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4XTsKICAgICAgICAgICAg IHNob3dMYXN0UmVzdWx0ID0gdHJ1ZTsKICAgICAgICAgfQogCkBAIC00MDksMTEgKzQwNSw2IEBA IFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBmYWxzZTsK ICAgICB9LAogCi0gICAgc2VhcmNoSXRlcmF0ZXNPdmVyVmlld3M6IGZ1bmN0aW9uKCkKLSAgICB7 Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9LAotCiAgICAgZWxlbWVudHNUb1Jlc3RvcmVT Y3JvbGxQb3NpdGlvbnNGb3I6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHJldHVybiBbXTsK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5q cyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwppbmRleCAw MWVlZmM3Li5mZjBkMWFiIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2VzUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlc1BhbmVsLmpzCkBAIC03NjksMTEgKzc2OSw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQ YW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLml0ZW1zOwogICAgIH0sCiAK LSAgICBzZWFyY2hJdGVyYXRlc092ZXJWaWV3czogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAg cmV0dXJuIHRydWU7Ci0gICAgfSwKLQogICAgIGVsZW1lbnRzVG9SZXN0b3JlU2Nyb2xsUG9zaXRp b25zRm9yOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICByZXR1cm4gWyB0aGlzLmNvbnRhaW5l ckVsZW1lbnQgXTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3Jp cHRzUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpz CmluZGV4IDg2NzVmNzkuLjY3M2Q3ZmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdHNQYW5lbC5qcwpAQCAtMjI3LDExICsyMjcsNiBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0 c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgV2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlw ZS5oaWRlLmNhbGwodGhpcyk7CiAgICAgfSwKIAotICAgIGdldCBzZWFyY2hhYmxlVmlld3MoKQot ICAgIHsKLSAgICAgICAgcmV0dXJuIFsgdGhpcy52aXNpYmxlVmlldyBdOwotICAgIH0sCi0KICAg ICBnZXQgYnJlYWtwb2ludHNBY3RpdmF0ZWQoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMu dG9nZ2xlQnJlYWtwb2ludHNCdXR0b24udG9nZ2xlZDsKQEAgLTEwMjksNiArMTAyNCw3NCBAQCBX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgc2VjdGlvbi5h ZGRBbHRlcm5hdGVLZXlzKFsgc2hvcnRjdXQxLm5hbWUsIHNob3J0Y3V0Mi5uYW1lIF0sIFdlYklu c3BlY3Rvci5VSVN0cmluZygiU3RlcCBvdXQiKSk7CiAKICAgICAgICAgdGhpcy5zaWRlYmFyUGFu ZXMuY2FsbHN0YWNrLnJlZ2lzdGVyU2hvcnRjdXRzKHNlY3Rpb24pOworICAgIH0sCisKKyAgICBz ZWFyY2hDYW5jZWxlZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnVw ZGF0ZVNlYXJjaE1hdGNoZXNDb3VudCgwLCB0aGlzKTsKKworICAgICAgICBpZiAodGhpcy5fc2Vh cmNoVmlldykKKyAgICAgICAgICAgIHRoaXMuX3NlYXJjaFZpZXcuc2VhcmNoQ2FuY2VsZWQoKTsK KworICAgICAgICBkZWxldGUgdGhpcy5fc2VhcmNoVmlldzsKKyAgICAgICAgZGVsZXRlIHRoaXMu X3NlYXJjaFF1ZXJ5OworICAgIH0sCisKKyAgICBwZXJmb3JtU2VhcmNoOiBmdW5jdGlvbihxdWVy eSkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy52aXNpYmxlVmlldykKKyAgICAgICAgICAgIHJl dHVybjsKKworICAgICAgICAvLyBDYWxsIHNlYXJjaENhbmNlbGVkIHNpbmNlIGl0IHdpbGwgcmVz ZXQgZXZlcnl0aGluZyB3ZSBuZWVkIGJlZm9yZSBkb2luZyBhIG5ldyBzZWFyY2guCisgICAgICAg IHRoaXMuc2VhcmNoQ2FuY2VsZWQoKTsKKworICAgICAgICB0aGlzLl9zZWFyY2hWaWV3ID0gdGhp cy52aXNpYmxlVmlldzsKKyAgICAgICAgdGhpcy5fc2VhcmNoUXVlcnkgPSBxdWVyeTsKKworICAg ICAgICBmdW5jdGlvbiBmaW5pc2hlZENhbGxiYWNrKHZpZXcsIHNlYXJjaE1hdGNoZXMpCisgICAg ICAgIHsKKyAgICAgICAgICAgIGlmICghc2VhcmNoTWF0Y2hlcykKKyAgICAgICAgICAgICAgICBy ZXR1cm47CisKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci51cGRhdGVTZWFyY2hNYXRjaGVzQ291 bnQoc2VhcmNoTWF0Y2hlcywgdGhpcyk7CisgICAgICAgICAgICB2aWV3Lmp1bXBUb0ZpcnN0U2Vh cmNoUmVzdWx0KCk7CisgICAgICAgIH0KKworICAgICAgICB0aGlzLl9zZWFyY2hWaWV3LnBlcmZv cm1TZWFyY2gocXVlcnksIGZpbmlzaGVkQ2FsbGJhY2suYmluZCh0aGlzKSk7CisgICAgfSwKKwor ICAgIGp1bXBUb05leHRTZWFyY2hSZXN1bHQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlm ICghdGhpcy5fc2VhcmNoVmlldykKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBpZiAo dGhpcy5fc2VhcmNoVmlldyAhPT0gdGhpcy52aXNpYmxlVmlldykgeworICAgICAgICAgICAgdGhp cy5wZXJmb3JtU2VhcmNoKHRoaXMuX3NlYXJjaFF1ZXJ5KTsKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgfQorCisgICAgICAgIGlmICh0aGlzLl9zZWFyY2hWaWV3LnNob3dpbmdMYXN0U2Vh cmNoUmVzdWx0KCkpCisgICAgICAgICAgICB0aGlzLl9zZWFyY2hWaWV3Lmp1bXBUb0ZpcnN0U2Vh cmNoUmVzdWx0KCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRoaXMuX3NlYXJjaFZpZXcu anVtcFRvTmV4dFNlYXJjaFJlc3VsdCgpOworICAgIH0sCisKKyAgICBqdW1wVG9QcmV2aW91c1Nl YXJjaFJlc3VsdDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLl9zZWFyY2hW aWV3KQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGlmICh0aGlzLl9zZWFyY2hWaWV3 ICE9PSB0aGlzLnZpc2libGVWaWV3KSB7CisgICAgICAgICAgICB0aGlzLnBlcmZvcm1TZWFyY2go dGhpcy5fc2VhcmNoUXVlcnkpOworICAgICAgICAgICAgaWYgKHRoaXMuX3NlYXJjaFZpZXcpCisg ICAgICAgICAgICAgICAgdGhpcy5fc2VhcmNoVmlldy5qdW1wVG9MYXN0U2VhcmNoUmVzdWx0KCk7 CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBpZiAodGhpcy5fc2Vh cmNoVmlldy5zaG93aW5nRmlyc3RTZWFyY2hSZXN1bHQoKSkKKyAgICAgICAgICAgIHRoaXMuX3Nl YXJjaFZpZXcuanVtcFRvTGFzdFNlYXJjaFJlc3VsdCgpOworICAgICAgICBlbHNlCisgICAgICAg ICAgICB0aGlzLl9zZWFyY2hWaWV3Lmp1bXBUb1ByZXZpb3VzU2VhcmNoUmVzdWx0KCk7CiAgICAg fQogfQogCg==