Merge 97975 - Web Inspector: Advanced search results should keep working after pretty print toggled.

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

Index: Source/WebCore/inspector/front-end/RawSourceCode.js
===================================================================
--- Source/WebCore/inspector/front-end/RawSourceCode.js	(revision 98246)
+++ Source/WebCore/inspector/front-end/RawSourceCode.js	(working copy)
@@ -266,9 +266,10 @@
     /**
      * @param {WebInspector.UISourceCode} uiSourceCode
      * @param {number} lineNumber
+     * @param {number} columnNumber
      * @return {DebuggerAgent.Location}
      */
-    uiLocationToRawLocation: function(uiSourceCode, lineNumber) { }
+    uiLocationToRawLocation: function(uiSourceCode, lineNumber, columnNumber) { }
 }
 
 /**
@@ -296,12 +297,13 @@
     /**
      * @param {WebInspector.UISourceCode} uiSourceCode
      * @param {number} lineNumber
+     * @param {number} columnNumber
      * @return {DebuggerAgent.Location}
      */
-    uiLocationToRawLocation: function(uiSourceCode, lineNumber)
+    uiLocationToRawLocation: function(uiSourceCode, lineNumber, columnNumber)
     {
         console.assert(uiSourceCode === this._uiSourceCodeList[0]);
-        var rawLocation = { lineNumber: lineNumber, columnNumber: 0 };
+        var rawLocation = { lineNumber: lineNumber, columnNumber: columnNumber };
         rawLocation.scriptId = this._rawSourceCode._scriptForRawLocation(rawLocation.lineNumber, rawLocation.columnNumber).scriptId;
         return /** @type {DebuggerAgent.Location} */ rawLocation;
     },
@@ -342,12 +344,13 @@
     /**
      * @param {WebInspector.UISourceCode} uiSourceCode
      * @param {number} lineNumber
+     * @param {number} columnNumber
      * @return {DebuggerAgent.Location}
      */
-    uiLocationToRawLocation: function(uiSourceCode, lineNumber)
+    uiLocationToRawLocation: function(uiSourceCode, lineNumber, columnNumber)
     {
         console.assert(uiSourceCode === this._uiSourceCodeList[0]);
-        var rawLocation = this._mapping.formattedToOriginal({ lineNumber: lineNumber, columnNumber: 0 });
+        var rawLocation = this._mapping.formattedToOriginal({ lineNumber: lineNumber, columnNumber: columnNumber });
         rawLocation.scriptId = this._rawSourceCode._scriptForRawLocation(rawLocation.lineNumber, rawLocation.columnNumber).scriptId;
         return rawLocation;
     },
@@ -392,11 +395,12 @@
     /**
      * @param {WebInspector.UISourceCode} uiSourceCode
      * @param {number} lineNumber
+     * @param {number} columnNumber
      * @return {DebuggerAgent.Location}
      */
-    uiLocationToRawLocation: function(uiSourceCode, lineNumber)
+    uiLocationToRawLocation: function(uiSourceCode, lineNumber, columnNumber)
     {
-        var rawLocation = this._mapping.sourceLocationToCompiledLocation(uiSourceCode.url, lineNumber, 0);
+        var rawLocation = this._mapping.sourceLocationToCompiledLocation(uiSourceCode.url, lineNumber);
         rawLocation.scriptId = this._rawSourceCode._scriptForRawLocation(rawLocation.lineNumber, rawLocation.columnNumber).scriptId;
         return /** @type {DebuggerAgent.Location} */ rawLocation;
     },