Merge 97851 - Web Inspector: Enable caseSensitive search / Regex support in advanced search.

Source/WebCore/inspector/ContentSearchUtils.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 79 matching lines @@
 
 static PassRefPtr<InspectorObject> buildObjectForSearchMatch(int lineNumber, String lineContent)
 {
     RefPtr<InspectorObject> result = InspectorObject::create();
     result->setNumber("lineNumber", lineNumber);
     result->setString("lineContent", lineContent);
 
     return result;
 }
 
-RegularExpression createSearchRegex(const String& text, bool caseSensitive, bool isRegex)
+RegularExpression createSearchRegex(const String& query, bool caseSensitive, bool isRegex)
 {
-    String regexSource = isRegex ? text : createSearchRegexSource(text);
+    String regexSource = isRegex ? query : createSearchRegexSource(query);
     return RegularExpression(regexSource, caseSensitive ? TextCaseSensitive : TextCaseInsensitive);
 }
 
 int countRegularExpressionMatches(const RegularExpression& regex, const String& content)
 {
     int result = 0;
     int position;
     unsigned start = 0;
     int matchLength;
     while ((position = regex.match(content, start, &matchLength)) != -1) {
         if (start >= content.length())
             break;
         if (matchLength > 0)
             ++result;
         start = position + 1;
     }
     return result;
 }
 
-PassRefPtr<InspectorArray> searchInTextByLines(const String& query, const String& text)
+PassRefPtr<InspectorArray> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex)
 {
     RefPtr<InspectorArray> result = InspectorArray::create();
 
-    RegularExpression regex = ContentSearchUtils::createSearchRegex(query, false, false);
+    RegularExpression regex = ContentSearchUtils::createSearchRegex(query, caseSensitive, isRegex);
     Vector<pair<int, String> > matches = getRegularExpressionMatchesByLines(regex, text);
 
     for (Vector<pair<int, String> >::const_iterator it = matches.begin(); it != matches.end(); ++it)
         result->pushValue(buildObjectForSearchMatch(it->first, it->second));
 
     return result;
 }
 
 } // namespace ContentSearchUtils
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)