Changeset 202498 in webkit

Timestamp:

Jun 27, 2016 11:18:37 AM (8 years ago)

Author:

Joseph Pecoraro

Message:

REGRESSION: Web Inspector: Text search broken in resources with <CR>
​https://bugs.webkit.org/show_bug.cgi?id=159110
<rdar://problem/27008485>

Reviewed by Brian Burg.

Source/JavaScriptCore:

• inspector/ContentSearchUtilities.cpp:

(Inspector::ContentSearchUtilities::lineEndings):
The frontend moved to only treated newlines as line endings in
the TextEditor. The backend however was looking for many
different types of line endings (\r\n, \r, \n). This caused
the line endings to ultimately differ between the frontend
and the backend, so the frontend couldn't find the lines that
the backend was claiming search results were on. Change the
backend to only look for \n line endings.

LayoutTests:

• inspector/debugger/searchInContent-linebreaks-expected.txt:
• inspector/debugger/searchInContent-linebreaks.html:

Now that the backend responds with lines that end in \n, this test changes
the number of line results. The frontend interprets this correctly.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/searchInContent-linebreaks-expected.txt (modified) (2 diffs)
• LayoutTests/inspector/debugger/searchInContent-linebreaks.html (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-06-27  Joseph Pecoraro  <pecoraro@apple.com>
+
+        REGRESSION: Web Inspector: Text search broken in resources with <CR>
+        https://bugs.webkit.org/show_bug.cgi?id=159110
+        <rdar://problem/27008485>
+
+        Reviewed by Brian Burg.
+
+        * inspector/debugger/searchInContent-linebreaks-expected.txt:
+        * inspector/debugger/searchInContent-linebreaks.html:
+        Now that the backend responds with lines that end in \n, this test changes
+        the number of line results. The frontend interprets this correctly.
+
 2016-06-27  Joanmarie Diggs  <jdiggs@igalia.com>
 

trunk/LayoutTests/inspector/debugger/searchInContent-linebreaks-expected.txt

@@ -3 +3 @@
 
 Script: mac-linebreaks.js
-Results found: 4
-Line 0: "// test one\r"
-Line 2: "//  test two\r"
-Line 6: "    //   test three test four\r"
-Line 9: "// test no newline"
+Lines with matches: 1
+Line 0: "// test one\r// \r//  test two\r\rfunction boo()\r{\r    //   test three test four\r}\r\r// test no newline"
 
 Script: mixed-linebreaks.js
-Results found: 4
+Lines with matches: 4
 Line 0: "// test one\n"
-Line 2: "// test two\r"
-Line 6: "    //   test three test four\r\n"
-Line 9: "// test no newline"
+Line 2: "// test two\r\r\n"
+Line 5: "    //   test three test four\r\n"
+Line 8: "// test no newline"
 
 Script: unix-linebreaks.js
-Results found: 4
+Lines with matches: 4
 Line 0: "// test one\n"
 Line 2: "//  test two\n"
@@ -24 +21 @@
 
 Script: windows-linebreaks.js
-Results found: 4
+Lines with matches: 4
 Line 0: "// test one\r\n"
 Line 2: "//  test two\r\n"

trunk/LayoutTests/inspector/debugger/searchInContent-linebreaks.html

@@ -49 +49 @@
             var fileName = /([\w-]+\.js)$/.exec(testResult.url)[1];
             ProtocolTest.log("Script: " + fileName);
-            ProtocolTest.log("Results found: " + testResult.count);
+            ProtocolTest.log("Lines with matches: " + testResult.count);
     
             for (var match of testResult.matches)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-06-27  Joseph Pecoraro  <pecoraro@apple.com>
+
+        REGRESSION: Web Inspector: Text search broken in resources with <CR>
+        https://bugs.webkit.org/show_bug.cgi?id=159110
+        <rdar://problem/27008485>
+
+        Reviewed by Brian Burg.
+
+        * inspector/ContentSearchUtilities.cpp:
+        (Inspector::ContentSearchUtilities::lineEndings):
+        The frontend moved to only treated newlines as line endings in
+        the TextEditor. The backend however was looking for many
+        different types of line endings (\r\n, \r, \n). This caused
+        the line endings to ultimately differ between the frontend
+        and the backend, so the frontend couldn't find the lines that
+        the backend was claiming search results were on. Change the
+        backend to only look for \n line endings.
+
 2016-06-27  Brian Burg  <bburg@apple.com>
 

trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp

@@ -105 +105 @@
     size_t start = 0;
     while (start < text.length()) {
-        size_t nextStart = text.findNextLineStart(start);
-        if (nextStart == notFound) {
+        size_t nextStart = text.find('\n', start);
+        if (nextStart == notFound || nextStart == (text.length() - 1)) {
             result->append(text.length());
             break;
         }
 
+        nextStart += 1;
         result->append(nextStart);
         start = nextStart;