159110 2016-06-24 18:00:00 -0700 REGRESSION: Web Inspector: Text search broken in resources with <CR> 2016-06-27 11:19:32 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue joepeck keith_miller mark.lam mattbaker msaboff nvasilyev saam timothy webkit-bug-importer oldest_to_newest 1205298 0 joepeck 2016-06-24 18:00:00 -0700 Summary: Text search broken in resources with <CR>. Steps To Reproduce: 1. Inspect <http://daringfireball.net> 2. Open main resource (daringfireball.net) in Resources tab 3. Click in the editor 4. ⌘F to show find banner 5. Search for "href" or "title=" => few results, all broken after the first <CR> Notes: - We changed CodeMirror to only \n as lineEndings earlier. The backend still treats \r as a line ending, which is causing slow drifting in line number differences between the frontend and backend.  1205299 1 joepeck 2016-06-24 18:00:14 -0700 <rdar://problem/27008485> 1205302 2 282040 joepeck 2016-06-24 18:19:46 -0700 Created attachment 282040 [PATCH] Proposed Fix 1205380 3 282040 bburg 2016-06-25 09:49:46 -0700 Comment on attachment 282040 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=282040&action=review r=me with comments > Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp:-107 > - size_t nextStart = text.findNextLineStart(start); Does this still have other callers? > Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp:108 > + if (nextStart == notFound || nextStart == text.length()) { Good catch, although wouldn't the last character be text.length() - 1? 1205622 4 joepeck 2016-06-27 11:12:27 -0700 (In reply to comment #3) > Comment on attachment 282040 [details] > [PATCH] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=282040&action=review > > r=me with comments > > > Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp:-107 > > - size_t nextStart = text.findNextLineStart(start); > > Does this still have other callers? Hmm, no it doesn't. > > Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp:108 > > + if (nextStart == notFound || nextStart == text.length()) { > > Good catch, although wouldn't the last character be text.length() - 1? Yes! Good catch. 1205628 5 joepeck 2016-06-27 11:19:32 -0700 <https://trac.webkit.org/changeset/202498> 282040 2016-06-24 18:19:46 -0700 2016-06-25 09:49:46 -0700 [PATCH] Proposed Fix find-1.patch text/plain 5267 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiYTEwZTg4Li4xOTQ5ODQ2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTYtMDYt MjQgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAorICAgICAgICBSRUdS RVNTSU9OOiBXZWIgSW5zcGVjdG9yOiBUZXh0IHNlYXJjaCBicm9rZW4gaW4gcmVzb3VyY2VzIHdp dGggPENSPgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTU5MTEwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNzAwODQ4NT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9z ZWFyY2hJbkNvbnRlbnQtbGluZWJyZWFrcy1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVj dG9yL2RlYnVnZ2VyL3NlYXJjaEluQ29udGVudC1saW5lYnJlYWtzLmh0bWw6CisgICAgICAgIE5v dyB0aGF0IHRoZSBiYWNrZW5kIHJlc3BvbmRzIHdpdGggbGluZXMgdGhhdCBlbmQgaW4gXG4sIHRo aXMgdGVzdCBjaGFuZ2VzCisgICAgICAgIHRoZSBudW1iZXIgb2YgbGluZSByZXN1bHRzLiBUaGUg ZnJvbnRlbmQgaW50ZXJwcmV0cyB0aGlzIGNvcnJlY3RseS4KKworMjAxNi0wNi0yNCAgSm9zZXBo IFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IFdyb25nIGZ1bmN0aW9uIG5hbWUgbmV4dCB0byBzY29wZQogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4MjEwCiAgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8yNjU0MzA5Mz4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9z ZWFyY2hJbkNvbnRlbnQtbGluZWJyZWFrcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZGVidWdnZXIvc2VhcmNoSW5Db250ZW50LWxpbmVicmVha3MtZXhwZWN0ZWQudHh0Cmlu ZGV4IGQ3ODk2MmEuLmFhZDZmZGUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9k ZWJ1Z2dlci9zZWFyY2hJbkNvbnRlbnQtbGluZWJyZWFrcy1leHBlY3RlZC50eHQKKysrIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NlYXJjaEluQ29udGVudC1saW5lYnJlYWtzLWV4 cGVjdGVkLnR4dApAQCAtMiwyOCArMiwyNSBAQCBWZXJpZnkgdGhhdCBEZWJ1Z2dlci5zZWFyY2hJ bkNvbnRlbnQgd29ya3Mgd2l0aCBzY3JpcHRzIHRoYXQgaGF2ZSB2YXJ5aW5nIGxpbmUgZQogU2Ny aXB0cyBzZWFyY2hlZDogNAogCiBTY3JpcHQ6IG1hYy1saW5lYnJlYWtzLmpzCi1SZXN1bHRzIGZv dW5kOiA0Ci1MaW5lIDA6ICIvLyB0ZXN0IG9uZVxyIgotTGluZSAyOiAiLy8gIHRlc3QgdHdvXHIi Ci1MaW5lIDY6ICIgICAgLy8gICB0ZXN0IHRocmVlIHRlc3QgZm91clxyIgotTGluZSA5OiAiLy8g dGVzdCBubyBuZXdsaW5lIgorTGluZXMgd2l0aCBtYXRjaGVzOiAxCitMaW5lIDA6ICIvLyB0ZXN0 IG9uZVxyLy8gXHIvLyAgdGVzdCB0d29cclxyZnVuY3Rpb24gYm9vKClccntcciAgICAvLyAgIHRl c3QgdGhyZWUgdGVzdCBmb3VyXHJ9XHJcci8vIHRlc3Qgbm8gbmV3bGluZSIKIAogU2NyaXB0OiBt aXhlZC1saW5lYnJlYWtzLmpzCi1SZXN1bHRzIGZvdW5kOiA0CitMaW5lcyB3aXRoIG1hdGNoZXM6 IDQKIExpbmUgMDogIi8vIHRlc3Qgb25lXG4iCi1MaW5lIDI6ICIvLyB0ZXN0IHR3b1xyIgotTGlu ZSA2OiAiICAgIC8vICAgdGVzdCB0aHJlZSB0ZXN0IGZvdXJcclxuIgotTGluZSA5OiAiLy8gdGVz dCBubyBuZXdsaW5lIgorTGluZSAyOiAiLy8gdGVzdCB0d29cclxyXG4iCitMaW5lIDU6ICIgICAg Ly8gICB0ZXN0IHRocmVlIHRlc3QgZm91clxyXG4iCitMaW5lIDg6ICIvLyB0ZXN0IG5vIG5ld2xp bmUiCiAKIFNjcmlwdDogdW5peC1saW5lYnJlYWtzLmpzCi1SZXN1bHRzIGZvdW5kOiA0CitMaW5l cyB3aXRoIG1hdGNoZXM6IDQKIExpbmUgMDogIi8vIHRlc3Qgb25lXG4iCiBMaW5lIDI6ICIvLyAg dGVzdCB0d29cbiIKIExpbmUgNjogIiAgICAvLyB0ZXN0IHRocmVlIHRlc3QgZm91clxuIgogTGlu ZSA5OiAiLy8gdGVzdCBubyBuZXdsaW5lIgogCiBTY3JpcHQ6IHdpbmRvd3MtbGluZWJyZWFrcy5q cwotUmVzdWx0cyBmb3VuZDogNAorTGluZXMgd2l0aCBtYXRjaGVzOiA0CiBMaW5lIDA6ICIvLyB0 ZXN0IG9uZVxyXG4iCiBMaW5lIDI6ICIvLyAgdGVzdCB0d29cclxuIgogTGluZSA2OiAiICAgIC8v IHRlc3QgdGhyZWUgdGVzdCBmb3VyXHJcbiIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9zZWFyY2hJbkNvbnRlbnQtbGluZWJyZWFrcy5odG1sIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NlYXJjaEluQ29udGVudC1saW5lYnJlYWtzLmh0bWwKaW5k ZXggM2Y3MjZjOC4uN2RiYzllMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Rl YnVnZ2VyL3NlYXJjaEluQ29udGVudC1saW5lYnJlYWtzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2RlYnVnZ2VyL3NlYXJjaEluQ29udGVudC1saW5lYnJlYWtzLmh0bWwKQEAgLTQ4 LDcgKzQ4LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIGZvciAodmFyIHRlc3RSZXN1bHQg b2Ygc29ydGVkVGVzdFJlc3VsdHMpIHsKICAgICAgICAgICAgIHZhciBmaWxlTmFtZSA9IC8oW1x3 LV0rXC5qcykkLy5leGVjKHRlc3RSZXN1bHQudXJsKVsxXTsKICAgICAgICAgICAgIFByb3RvY29s VGVzdC5sb2coIlNjcmlwdDogIiArIGZpbGVOYW1lKTsKLSAgICAgICAgICAgIFByb3RvY29sVGVz dC5sb2coIlJlc3VsdHMgZm91bmQ6ICIgKyB0ZXN0UmVzdWx0LmNvdW50KTsKKyAgICAgICAgICAg IFByb3RvY29sVGVzdC5sb2coIkxpbmVzIHdpdGggbWF0Y2hlczogIiArIHRlc3RSZXN1bHQuY291 bnQpOwogICAgIAogICAgICAgICAgICAgZm9yICh2YXIgbWF0Y2ggb2YgdGVzdFJlc3VsdC5tYXRj aGVzKQogICAgICAgICAgICAgICAgIFByb3RvY29sVGVzdC5sb2coIkxpbmUgIiArIG1hdGNoLmxp bmVOdW1iZXIgKyAiOiAiICsgSlNPTi5zdHJpbmdpZnkobWF0Y2gubGluZUNvbnRlbnQpKTsgICAg CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0ZjMyOTU5Li5lZmVkNDE5IDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMyBAQAogMjAxNi0wNi0yNCAgSm9zZXBoIFBlY29y YXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCisgICAgICAgIFJFR1JFU1NJT046IFdlYiBJbnNw ZWN0b3I6IFRleHQgc2VhcmNoIGJyb2tlbiBpbiByZXNvdXJjZXMgd2l0aCA8Q1I+CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTkxMTAKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzI3MDA4NDg1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0NvbnRlbnRTZWFyY2hVdGlsaXRpZXMuY3Bw OgorICAgICAgICAoSW5zcGVjdG9yOjpDb250ZW50U2VhcmNoVXRpbGl0aWVzOjpsaW5lRW5kaW5n cyk6CisgICAgICAgIFRoZSBmcm9udGVuZCBtb3ZlZCB0byBvbmx5IHRyZWF0ZWQgbmV3bGluZXMg YXMgbGluZSBlbmRpbmdzIGluCisgICAgICAgIHRoZSBUZXh0RWRpdG9yLiBUaGUgYmFja2VuZCBo b3dldmVyIHdhcyBsb29raW5nIGZvciBtYW55CisgICAgICAgIGRpZmZlcmVudCB0eXBlcyBvZiBs aW5lIGVuZGluZ3MgKFxyXG4sIFxyLCBcbikuIFRoaXMgY2F1c2VkCisgICAgICAgIHRoZSBsaW5l IGVuZGluZ3MgdG8gdWx0aW1hdGVseSBkaWZmZXIgYmV0d2VlbiB0aGUgZnJvbnRlbmQKKyAgICAg ICAgYW5kIHRoZSBiYWNrZW5kLCBzbyB0aGUgZnJvbnRlbmQgY291bGRuJ3QgZmluZCB0aGUgbGlu ZXMgdGhhdAorICAgICAgICB0aGUgYmFja2VuZCB3YXMgY2xhaW1pbmcgc2VhcmNoIHJlc3VsdHMg d2VyZSBvbi4gQ2hhbmdlIHRoZQorICAgICAgICBiYWNrZW5kIHRvIG9ubHkgbG9vayBmb3IgXG4g bGluZSBlbmRpbmdzLgorCisyMDE2LTA2LTI0ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0Bh cHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogV3JvbmcgZnVuY3Rpb24gbmFtZSBu ZXh0IHRvIHNjb3BlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNTgyMTAKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI2NTQzMDkzPgpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9Db250ZW50U2VhcmNoVXRpbGl0aWVz LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvQ29udGVudFNlYXJjaFV0aWxp dGllcy5jcHAKaW5kZXggNmI2NDAxNC4uNGVjNjM4NiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9Db250ZW50U2VhcmNoVXRpbGl0aWVzLmNwcAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0NvbnRlbnRTZWFyY2hVdGlsaXRpZXMuY3BwCkBA IC0xMDQsMTIgKzEwNCwxMyBAQCBzdGQ6OnVuaXF1ZV9wdHI8VmVjdG9yPHNpemVfdD4+IGxpbmVF bmRpbmdzKGNvbnN0IFN0cmluZyYgdGV4dCkKIAogICAgIHNpemVfdCBzdGFydCA9IDA7CiAgICAg d2hpbGUgKHN0YXJ0IDwgdGV4dC5sZW5ndGgoKSkgewotICAgICAgICBzaXplX3QgbmV4dFN0YXJ0 ID0gdGV4dC5maW5kTmV4dExpbmVTdGFydChzdGFydCk7Ci0gICAgICAgIGlmIChuZXh0U3RhcnQg PT0gbm90Rm91bmQpIHsKKyAgICAgICAgc2l6ZV90IG5leHRTdGFydCA9IHRleHQuZmluZCgnXG4n LCBzdGFydCk7CisgICAgICAgIGlmIChuZXh0U3RhcnQgPT0gbm90Rm91bmQgfHwgbmV4dFN0YXJ0 ID09IHRleHQubGVuZ3RoKCkpIHsKICAgICAgICAgICAgIHJlc3VsdC0+YXBwZW5kKHRleHQubGVu Z3RoKCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KIAorICAgICAgICBuZXh0U3Rh cnQgKz0gMTsKICAgICAgICAgcmVzdWx0LT5hcHBlbmQobmV4dFN0YXJ0KTsKICAgICAgICAgc3Rh cnQgPSBuZXh0U3RhcnQ7CiAgICAgfQo=