Diff
Modified: trunk/LayoutTests/ChangeLog (141090 => 141091)
--- trunk/LayoutTests/ChangeLog 2013-01-29 11:06:00 UTC (rev 141090)
+++ trunk/LayoutTests/ChangeLog 2013-01-29 11:08:14 UTC (rev 141091)
@@ -1,3 +1,13 @@
+2013-01-29 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: [Regression] Search across all sources is broken.
+ https://bugs.webkit.org/show_bug.cgi?id=108157
+
+ Reviewed by Pavel Feldman.
+
+ * http/tests/inspector/search/scripts-search-scope-expected.txt: Added.
+ * http/tests/inspector/search/scripts-search-scope.html: Added.
+
2013-01-29 Sheriff Bot <[email protected]>
Unreviewed, rolling out r140959 and r140977.
Added: trunk/LayoutTests/http/tests/inspector/search/scripts-search-scope-expected.txt (0 => 141091)
--- trunk/LayoutTests/http/tests/inspector/search/scripts-search-scope-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/search/scripts-search-scope-expected.txt 2013-01-29 11:08:14 UTC (rev 141091)
@@ -0,0 +1,31 @@
+
+
+Running: testIgnoreCase
+Search result #1: uiSourceCode.uri = http://127.0.0.1:8000/inspector/search/resources/search.css
+ search match #1: lineNumber = 0, lineContent = 'div.searchTestUniqueString {'
+ search match #2: lineNumber = 4, lineContent = 'div.searchTestUniqueString:hover {'
+ search match #3: lineNumber = 5, lineContent = ' /* another searchTestUniqueString occurence */'
+Search result #2: uiSourceCode.uri = http://127.0.0.1:8000/inspector/search/resources/search.html
+ search match #1: lineNumber = 5, lineContent = '<div>searchTestUniqueString</div>'
+ search match #2: lineNumber = 7, lineContent = '<!-- searchTestUniqueString -->'
+ search match #3: lineNumber = 9, lineContent = '<div id="searchTestUniqueString">div text</div>'
+Search result #3: uiSourceCode.uri = http://127.0.0.1:8000/inspector/search/resources/search.js
+ search match #1: lineNumber = 0, lineContent = 'function searchTestUniqueString()'
+ search match #2: lineNumber = 3, lineContent = ' // searchTestUniqueString two occurences on the same line searchTestUniqueString'
+ search match #3: lineNumber = 9, lineContent = ' searchTestUniqueString();'
+ search match #4: lineNumber = 10, lineContent = ' // SEARCHTestUniqueString();'
+
+Running: testCaseSensitive
+Search result #1: uiSourceCode.uri = http://127.0.0.1:8000/inspector/search/resources/search.css
+ search match #1: lineNumber = 0, lineContent = 'div.searchTestUniqueString {'
+ search match #2: lineNumber = 4, lineContent = 'div.searchTestUniqueString:hover {'
+ search match #3: lineNumber = 5, lineContent = ' /* another searchTestUniqueString occurence */'
+Search result #2: uiSourceCode.uri = http://127.0.0.1:8000/inspector/search/resources/search.html
+ search match #1: lineNumber = 5, lineContent = '<div>searchTestUniqueString</div>'
+ search match #2: lineNumber = 7, lineContent = '<!-- searchTestUniqueString -->'
+ search match #3: lineNumber = 9, lineContent = '<div id="searchTestUniqueString">div text</div>'
+Search result #3: uiSourceCode.uri = http://127.0.0.1:8000/inspector/search/resources/search.js
+ search match #1: lineNumber = 0, lineContent = 'function searchTestUniqueString()'
+ search match #2: lineNumber = 3, lineContent = ' // searchTestUniqueString two occurences on the same line searchTestUniqueString'
+ search match #3: lineNumber = 9, lineContent = ' searchTestUniqueString();'
+
Added: trunk/LayoutTests/http/tests/inspector/search/scripts-search-scope.html (0 => 141091)
--- trunk/LayoutTests/http/tests/inspector/search/scripts-search-scope.html (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/search/scripts-search-scope.html 2013-01-29 11:08:14 UTC (rev 141091)
@@ -0,0 +1,80 @@
+<html>
+<head>
+<title>Change inspected iframe's "src" attribute.</title>
+<script src=""
+<script src=""
+<script>
+function test()
+{
+ WebInspector.showPanel("scripts");
+ InspectorTest.runAfterResourcesAreFinished(["search.html", "search.js", "search.css"], step1)
+
+ function runSearchAndDumpResults(searchConfig, callback)
+ {
+ var searchResults = [];
+ var scope = new WebInspector.ScriptsSearchScope(WebInspector.workspace);
+ scope.performSearch(searchConfig, searchResultCallback, searchFinishedCallback);
+
+ function searchResultCallback(searchResult)
+ {
+ searchResults.push(searchResult);
+ }
+
+ function searchFinishedCallback()
+ {
+ function filterOutEmptySearchResults(searchResult)
+ {
+ return searchResult.searchMatches.length;
+ }
+ searchResults = searchResults.filter(filterOutEmptySearchResults);
+
+ for (var i = 0; i < searchResults.length; ++i) {
+ var searchResult = searchResults[i];
+ var uiSourceCode = searchResult.uiSourceCode;
+ var searchMatches = searchResult.searchMatches;
+
+ if (!searchMatches.length)
+ continue;
+ InspectorTest.addResult("Search result #" + (i + 1) + ": uiSourceCode.uri = " + uiSourceCode.uri());
+ for (var j = 0; j < searchMatches.length; ++j) {
+ var lineNumber = searchMatches[j].lineNumber;
+ var lineContent = searchMatches[j].lineContent;
+ InspectorTest.addResult(" search match #" + (j + 1) + ": lineNumber = " + lineNumber + ", lineContent = '" + lineContent + "'");
+ }
+ }
+ callback();
+ }
+ }
+
+ function step1()
+ {
+ InspectorTest.runTestSuite([
+ function testIgnoreCase(next)
+ {
+ var searchConfig = {};
+ searchConfig.query = "searchTest" + "UniqueString";
+ searchConfig.ignoreCase = true;
+ searchConfig.isRegex = false;
+ runSearchAndDumpResults(searchConfig, next);
+ },
+
+ function testCaseSensitive(next)
+ {
+ var searchConfig = {};
+ searchConfig.query = "searchTest" + "UniqueString";
+ searchConfig.ignoreCase = false;
+ searchConfig.isRegex = false;
+ runSearchAndDumpResults(searchConfig, next);
+ },
+ ]);
+ }
+}
+
+</script>
+</head>
+<body _onload_="runTest()">
+<iframe src=""
+<p>Tests that ScriptSearchScope performs search across all sources correctly.</p>
+See <a href="" 41350</a>.
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (141090 => 141091)
--- trunk/Source/WebCore/ChangeLog 2013-01-29 11:06:00 UTC (rev 141090)
+++ trunk/Source/WebCore/ChangeLog 2013-01-29 11:08:14 UTC (rev 141091)
@@ -1,3 +1,15 @@
+2013-01-29 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: [Regression] Search across all sources is broken.
+ https://bugs.webkit.org/show_bug.cgi?id=108157
+
+ Reviewed by Pavel Feldman.
+
+ Test: http/tests/inspector/search/scripts-search-scope.html
+
+ * inspector/front-end/ScriptsSearchScope.js:
+ (WebInspector.ScriptsSearchScope.prototype._sortedUISourceCodes):
+
2013-01-29 Mike West <[email protected]>
IDBFactory::webkitGetDatabaseNames should raise DOMExceptions.
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsSearchScope.js (141090 => 141091)
--- trunk/Source/WebCore/inspector/front-end/ScriptsSearchScope.js 2013-01-29 11:06:00 UTC (rev 141090)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsSearchScope.js 2013-01-29 11:08:14 UTC (rev 141091)
@@ -123,7 +123,7 @@
for (var i = 0; i < projects.length; ++i) {
if (projects[i].isServiceProject())
continue;
- uiSourceCodes = this._uiSourceCodes.concat(projects[i].uiSourceCodes());
+ uiSourceCodes = uiSourceCodes.concat(projects[i].uiSourceCodes());
}
uiSourceCodes = uiSourceCodes.filter(filterOutAnonymous);
