| Index: Source/core/inspector/ContentSearchUtils.cpp
|
| diff --git a/Source/core/inspector/ContentSearchUtils.cpp b/Source/core/inspector/ContentSearchUtils.cpp
|
| index cf065e3e0427f58f618c55f5c90f090d2ddf44c3..af61a71713815bec3263c933ce2aa674e36634d2 100644
|
| --- a/Source/core/inspector/ContentSearchUtils.cpp
|
| +++ b/Source/core/inspector/ContentSearchUtils.cpp
|
| @@ -56,13 +56,13 @@ static String createSearchRegexSource(const String& text)
|
| return result.toString();
|
| }
|
|
|
| -static Vector<pair<int, String> > getScriptRegexpMatchesByLines(const ScriptRegexp* regex, const String& text)
|
| +static Vector<pair<int, String>> getScriptRegexpMatchesByLines(const ScriptRegexp* regex, const String& text)
|
| {
|
| - Vector<pair<int, String> > result;
|
| + Vector<pair<int, String>> result;
|
| if (text.isEmpty())
|
| return result;
|
|
|
| - OwnPtr<Vector<unsigned> > endings(lineEndings(text));
|
| + OwnPtr<Vector<unsigned>> endings(lineEndings(text));
|
| unsigned size = endings->size();
|
| unsigned start = 0;
|
| for (unsigned lineNumber = 0; lineNumber < size; ++lineNumber) {
|
| @@ -94,12 +94,12 @@ PassOwnPtr<ScriptRegexp> createSearchRegex(const String& query, bool caseSensiti
|
| return adoptPtr(new ScriptRegexp(regexSource, caseSensitive ? TextCaseSensitive : TextCaseInsensitive));
|
| }
|
|
|
| -PassRefPtr<TypeBuilder::Array<TypeBuilder::Page::SearchMatch> > searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex)
|
| +PassRefPtr<TypeBuilder::Array<TypeBuilder::Page::SearchMatch>> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex)
|
| {
|
| - RefPtr<TypeBuilder::Array<TypeBuilder::Page::SearchMatch> > result = TypeBuilder::Array<TypeBuilder::Page::SearchMatch>::create();
|
| + RefPtr<TypeBuilder::Array<TypeBuilder::Page::SearchMatch>> result = TypeBuilder::Array<TypeBuilder::Page::SearchMatch>::create();
|
|
|
| OwnPtr<ScriptRegexp> regex = ContentSearchUtils::createSearchRegex(query, caseSensitive, isRegex);
|
| - Vector<pair<int, String> > matches = getScriptRegexpMatchesByLines(regex.get(), text);
|
| + Vector<pair<int, String>> matches = getScriptRegexpMatchesByLines(regex.get(), text);
|
|
|
| for (const auto& match : matches)
|
| result->addItem(buildObjectForSearchMatch(match.first, match.second));
|
|
|