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

Unified Diff: Source/WebCore/inspector/InspectorPageAgent.cpp

Issue 8371003: Merge 97851 - Web Inspector: Enable caseSensitive search / Regex support in advanced search. (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/InspectorPageAgent.cpp
===================================================================
--- Source/WebCore/inspector/InspectorPageAgent.cpp (revision 98111)
+++ Source/WebCore/inspector/InspectorPageAgent.cpp (working copy)
@@ -484,10 +484,13 @@
return false;
}
-void InspectorPageAgent::searchInResource(ErrorString*, const String& frameId, const String& url, const String& query, RefPtr<InspectorArray>* results)
+void InspectorPageAgent::searchInResource(ErrorString*, const String& frameId, const String& url, const String& query, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<InspectorArray>* results)
{
*results = InspectorArray::create();
+ bool isRegex = optionalIsRegex ? *optionalIsRegex : false;
+ bool caseSensitive = optionalCaseSensitive ? *optionalCaseSensitive : false;
+
Frame* frame = frameForId(frameId);
KURL kurl(ParsedURLString, url);
@@ -510,7 +513,7 @@
if (!success)
return;
- *results = ContentSearchUtils::searchInTextByLines(query, content);
+ *results = ContentSearchUtils::searchInTextByLines(content, query, caseSensitive, isRegex);
}
static PassRefPtr<InspectorObject> buildObjectForSearchResult(const String& frameId, const String& url, int matchesCount)
« no previous file with comments | « Source/WebCore/inspector/InspectorPageAgent.h ('k') | Source/WebCore/inspector/front-end/AdvancedSearchController.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698