Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(266)

Unified Diff: Source/WebCore/inspector/front-end/ContentProviders.js

Issue 8368025: Merge 97959 - Web Inspector: Enable support for advanced search in script's static content provider. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/912/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/inspector/front-end/ContentProviders.js
===================================================================
--- Source/WebCore/inspector/front-end/ContentProviders.js (revision 98227)
+++ Source/WebCore/inspector/front-end/ContentProviders.js (working copy)
@@ -304,7 +304,27 @@
*/
searchInContent: function(query, caseSensitive, isRegex, callback)
{
- callback([]);
+ function performSearch()
+ {
+ var regex = createSearchRegex(query, caseSensitive, isRegex);
+
+ var result = [];
+ var lineEndings = this._content.lineEndings();
+ for (var i = 0; i < lineEndings.length; ++i) {
+ var lineStart = i > 0 ? lineEndings[i - 1] + 1 : 0;
+ var lineEnd = lineEndings[i];
+ var lineContent = this._content.substring(lineStart, lineEnd);
+ if (lineContent.length > 0 && lineContent.charAt(lineContent.length - 1) === "\r")
+ lineContent = lineContent.substring(0, lineContent.length - 1)
+
+ if (regex.exec(lineContent))
+ result.push(new WebInspector.ContentProvider.SearchMatch(i, lineContent));
+ }
+ callback(result);
+ }
+
+ // searchInContent should call back later.
+ window.setTimeout(performSearch.bind(this), 0);
}
}
« no previous file with comments | « Source/WebCore/inspector/front-end/ConsolePanel.js ('k') | Source/WebCore/inspector/front-end/ElementsTreeOutline.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698