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

Source/WebCore/inspector/front-end/Script.js

 /*
  * Copyright (C) 2008 Apple 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 56 matching lines @@
         }
         if (this.scriptId) {
             // Script failed to parse.
             DebuggerAgent.getScriptSource(this.scriptId, didGetScriptSource.bind(this));
         } else
             callback("");
     },
 
     /**
      * @param {string} query
+     * @param {boolean} caseSensitive
+     * @param {boolean} isRegex
      * @param {function(Array.<PageAgent.SearchMatch>)} callback
      */
-    searchInContent: function(query, callback)
+    searchInContent: function(query, caseSensitive, isRegex, callback)
     {
         /**
          * @this {WebInspector.Script}
          * @param {?Protocol.Error} error
          * @param {Array.<PageAgent.SearchMatch>} searchMatches
          */
         function innerCallback(error, searchMatches)
         {
             if (error)
                 console.error(error);
-            callback(searchMatches || []);
+            var result = [];
+            for (var i = 0; i < searchMatches.length; ++i) {
+                var searchMatch = new WebInspector.ContentProvider.SearchMatch(searchMatches[i].lineNumber, searchMatches[i].lineContent);
+                result.push(searchMatch);
+            }
+            callback(result || []);
         }
         
         if (this.scriptId) {
             // Script failed to parse.
-            DebuggerAgent.searchInContent(this.scriptId, query, innerCallback.bind(this));
+            DebuggerAgent.searchInContent(this.scriptId, query, caseSensitive, isRegex, innerCallback.bind(this));
         } else
             callback([]);
     },
     
     /**
      * @param {string} newSource
      * @param {function(?Protocol.Error, Array.<DebuggerAgent.CallFrame>=)} callback
      */
     editSource: function(newSource, callback)
     {
         /**
          * @this {WebInspector.Script}
          * @param {?Protocol.Error} error
          * @param {Array.<DebuggerAgent.CallFrame>|undefined} callFrames
          */
         function didEditScriptSource(error, callFrames)
         {
             if (!error)
                 this._source = newSource;
             callback(error, callFrames);
         }
         if (this.scriptId) {
             // Script failed to parse.
             DebuggerAgent.setScriptSource(this.scriptId, newSource, undefined, didEditScriptSource.bind(this));
         } else
             callback("Script failed to parse");
     }
 }