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

Source/WebCore/inspector/InspectorPageAgent.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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 466 matching lines @@
         String content;
         bool base64Encoded;
         if (InspectorPageAgent::cachedResourceContent(cachedResource, result, &base64Encoded)) {
             ASSERT(!base64Encoded);
             return true;
         }
     }
     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);
 
     FrameLoader* frameLoader = frame ? frame->loader() : 0;
     DocumentLoader* loader = frameLoader ? frameLoader->documentLoader() : 0;
     if (!loader)
         return;
 
     String content;
     bool success = false;
     if (equalIgnoringFragmentIdentifier(kurl, loader->url()))
         success = mainResourceContent(frame, false, &content);
 
     if (!success) {
         CachedResource* resource = cachedResource(frame, kurl);
         if (resource)
             success = textContentForCachedResource(resource, &content);
     }
 
     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)
 {
     RefPtr<InspectorObject> result = InspectorObject::create();
     result->setString("frameId", frameId);
     result->setString("url", url);
     result->setNumber("matchesCount", matchesCount);
 
     return result;
@@ skipping 157 matching lines @@
             result->setArray("childFrames", childrenArray);
         }
         childrenArray->pushObject(buildObjectForFrameTree(child));
     }
     return result;
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)