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

Unified Diff: Source/WebCore/inspector/front-end/AdvancedSearchController.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/AdvancedSearchController.js
===================================================================
--- Source/WebCore/inspector/front-end/AdvancedSearchController.js (revision 98227)
+++ Source/WebCore/inspector/front-end/AdvancedSearchController.js (working copy)
@@ -360,25 +360,6 @@
fileName: function(file) { },
/**
- * @return {RegExp}
- */
- _createSearchRegex: function()
- {
- var regexFlags = this._searchConfig.ignoreCase ? "gi" : "g";
- var regexObject;
- try {
- regexObject = new RegExp(this._searchConfig.query, regexFlags);
- } catch (e) {
- // Silent catch.
- }
-
- if (!regexObject)
- regexObject = createSearchRegex(this._searchConfig.query, regexFlags);
-
- return regexObject;
- },
-
- /**
* @param {Object} searchResult
*/
addSearchResult: function(searchResult)
@@ -391,7 +372,7 @@
// Expand first file with matches only.
var fileTreeElement = this._addFileTreeElement(fileName, searchMatches.length, this._searchResults.length === 1);
- var regexObject = this._createSearchRegex();
+ var regexObject = createSearchRegex(this._searchConfig.query, !this._searchConfig.ignoreCase, this._searchConfig.isRegex);
for (var i = 0; i < searchMatches.length; i++) {
var lineNumber = searchMatches[i].lineNumber;

Powered by Google App Engine
This is Rietveld 408576698