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

Source/WebCore/inspector/front-end/ScriptsSearchScope.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:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 107 matching lines @@
 WebInspector.ScriptsSearchScope.prototype.__proto__ = WebInspector.SearchScope.prototype;
 
 /**
  * @constructor
  * @extends {WebInspector.FileBasedSearchResultsPane}
  * @param {WebInspector.SearchConfig} searchConfig
  */
 WebInspector.ScriptsSearchResultsPane = function(searchConfig)
 {
     WebInspector.FileBasedSearchResultsPane.call(this, searchConfig)
+
+    this._linkifier = WebInspector.debuggerPresentationModel.createLinkifier(new WebInspector.ScriptsSearchResultsPane.LinkifierFormatter());
 }
 
 WebInspector.ScriptsSearchResultsPane.prototype = {
     /**
      * @param {Object} file
      * @param {number} lineNumber
+     * @param {number} columnNumber
      */
-    createAnchor: function(file, lineNumber)
+    createAnchor: function(file, lineNumber, columnNumber)
     {
+        
         var uiSourceCode = file;
-        
-        var anchor = WebInspector.linkifyURLAsNode(uiSourceCode.url, "");
-        anchor.setAttribute("preferred_panel", "scripts");
-        anchor.uiSourceCode = uiSourceCode;
-        anchor.lineNumber = lineNumber;
+        var rawSourceCode = uiSourceCode.rawSourceCode;
+        var rawLocation = rawSourceCode.sourceMapping.uiLocationToRawLocation(uiSourceCode, lineNumber, columnNumber);
+        var anchor = this._linkifier.linkifyRawSourceCode(uiSourceCode.rawSourceCode, rawLocation.lineNumber, rawLocation.columnNumber);
         anchor.removeChildren();
-        
         return anchor;
     },
     
     /**
      * @param {Object} file
      * @return {string}
      */
     fileName: function(file)
     {
         var uiSourceCode = file;
         return uiSourceCode.url;
     },
 }
 
 WebInspector.ScriptsSearchResultsPane.prototype.__proto__ = WebInspector.FileBasedSearchResultsPane.prototype;
+
+/**
+ * @constructor
+ * @implements {WebInspector.DebuggerPresentationModel.LinkifierFormatter}
+ */
+WebInspector.ScriptsSearchResultsPane.LinkifierFormatter = function()
+{
+}
+
+WebInspector.ScriptsSearchResultsPane.LinkifierFormatter.prototype = {
+    /**
+     * @param {WebInspector.RawSourceCode} rawSourceCode
+     * @param {Element} anchor
+     */
+    formatRawSourceCodeAnchor: function(rawSourceCode, anchor)
+    {
+        // Empty because we don't want to ever update anchor contents after creation.
+    }
+}
+
+WebInspector.ScriptsSearchResultsPane.LinkifierFormatter.prototype.__proto__ = WebInspector.DebuggerPresentationModel.LinkifierFormatter.prototype;