Merge 98105 - Web Inspector: Advanced search is working very slowly and does not show searching p...

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 44 matching lines @@
             result.append("\\");
         result.append(characters[i]);
     }
 
     return result;
 }
 
 static Vector<pair<int, String> > getRegularExpressionMatchesByLines(const RegularExpression& regex, const String& text)
 {
     Vector<pair<int, String> > result;
+    if (text.isEmpty())
+        return result;
 
     int lineNumber = 0;
     unsigned start = 0;
     while (start < text.length()) {
         size_t lineEnd = text.find('\n', start);
         if (lineEnd == notFound)
             lineEnd = text.length();
         else
             lineEnd++;
 
@@ skipping 23 matching lines @@
 }
 
 RegularExpression createSearchRegex(const String& query, bool caseSensitive, bool isRegex)
 {
     String regexSource = isRegex ? query : createSearchRegexSource(query);
     return RegularExpression(regexSource, caseSensitive ? TextCaseSensitive : TextCaseInsensitive);
 }
 
 int countRegularExpressionMatches(const RegularExpression& regex, const String& content)
 {
+    if (content.isEmpty())
+        return 0;
+
     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;
@@ skipping 11 matching lines @@
     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)