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

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

 /*
  * 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 248 matching lines @@
 WebInspector.RawSourceCode.SourceMapping.prototype = {
     /**
      * @param {DebuggerAgent.Location} rawLocation
      * @return {WebInspector.UILocation}
      */
     rawLocationToUILocation: function(rawLocation) { },
 
     /**
      * @param {WebInspector.UISourceCode} uiSourceCode
      * @param {number} lineNumber
+     * @param {number} columnNumber
      * @return {DebuggerAgent.Location}
      */
-    uiLocationToRawLocation: function(uiSourceCode, lineNumber) { }
+    uiLocationToRawLocation: function(uiSourceCode, lineNumber, columnNumber) { }
 }
 
 /**
  * @constructor
  * @implements {WebInspector.RawSourceCode.SourceMapping}
  * @param {WebInspector.RawSourceCode} rawSourceCode
  * @param {WebInspector.UISourceCode} uiSourceCode
  */
 WebInspector.RawSourceCode.PlainSourceMapping = function(rawSourceCode, uiSourceCode)
 {
     this._rawSourceCode = rawSourceCode;
     this._uiSourceCodeList = [uiSourceCode];
 }
 
 WebInspector.RawSourceCode.PlainSourceMapping.prototype = {
     /**
      * @param {DebuggerAgent.Location} rawLocation
      * @return {WebInspector.UILocation}
      */
     rawLocationToUILocation: function(rawLocation)
     {
         return new WebInspector.UILocation(this._uiSourceCodeList[0], rawLocation.lineNumber, rawLocation.columnNumber || 0);
     },
 
     /**
      * @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;
     },
 
     /**
      * @return {Array.<WebInspector.UISourceCode>}
      */
     uiSourceCodeList: function()
     {
         return this._uiSourceCodeList;
@@ skipping 20 matching lines @@
      */
     rawLocationToUILocation: function(rawLocation)
     {
         var location = this._mapping.originalToFormatted(rawLocation);
         return new WebInspector.UILocation(this._uiSourceCodeList[0], location.lineNumber, location.columnNumber || 0);
     },
 
     /**
      * @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;
     },
 
     /**
      * @return {Array.<WebInspector.UISourceCode>}
      */
     uiSourceCodeList: function()
     {
         return this._uiSourceCodeList;
@@ skipping 24 matching lines @@
     rawLocationToUILocation: function(rawLocation)
     {
         var location = this._mapping.compiledLocationToSourceLocation(rawLocation.lineNumber, rawLocation.columnNumber || 0);
         var uiSourceCode = this._uiSourceCodeByURL[location.sourceURL];
         return new WebInspector.UILocation(uiSourceCode, location.lineNumber, location.columnNumber);
     },
 
     /**
      * @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;
     },
 
     /**
      * @return {Array.<WebInspector.UISourceCode>}
      */
     get uiSourceCodeList()
     {
         return this._uiSourceCodeList;
     }
 }
 
 /**
  * @constructor
  * @param {WebInspector.UISourceCode} uiSourceCode
  * @param {number} lineNumber
  * @param {number} columnNumber
  */
 WebInspector.UILocation = function(uiSourceCode, lineNumber, columnNumber)
 {
     this.uiSourceCode = uiSourceCode;
     this.lineNumber = lineNumber;
     this.columnNumber = columnNumber;
 }